diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
index 99dc720a635d..55e0a0b353b1 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -154,6 +154,12 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{^lombok.Data}}
 
   {{! begin feature: fluent setter methods }}
+  {{#deprecated}}
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
+  {{/deprecated}}
   public {{classname}} {{name}}({{>nullableArgument_chainSetter}} {{name}}) {
     {{#openApiNullable}}
     this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.of{{#optionalAcceptNullable}}Nullable{{/optionalAcceptNullable}}({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}};
@@ -165,6 +171,12 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   }
   {{#isArray}}
 
+  {{#deprecated}}
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
+  {{/deprecated}}
   public {{classname}} add{{nameInPascalCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
     {{#openApiNullable}}
     if (this.{{name}} == null{{#isNullable}} || !this.{{name}}.isPresent() || this.{{name}}.get() == null{{/isNullable}}) {
@@ -183,6 +195,12 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{/isArray}}
   {{#isMap}}
 
+  {{#deprecated}}
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
+  {{/deprecated}}
   public {{classname}} put{{nameInPascalCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     {{#openApiNullable}}
     if (this.{{name}} == null{{#isNullable}} || !this.{{name}}.isPresent() || this.{{name}}.get() == null{{/isNullable}}) {
@@ -247,7 +265,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{^lombok.Setter}}
   {{#deprecated}}
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   {{/deprecated}}
   {{#vendorExtensions.x-setter-extra-annotation}}
@@ -270,12 +288,24 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
 
   {{^lombok.Setter}}
   {{! begin feature: fluent setter methods for inherited properties }}
+  {{#deprecated}}
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
+  {{/deprecated}}
   public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
     super.{{name}}({{name}});
     return this;
   }
   {{#isArray}}
 
+  {{#deprecated}}
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
+  {{/deprecated}}
   public {{classname}} add{{nameInPascalCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
     super.add{{nameInPascalCase}}Item({{name}}Item);
     return this;
@@ -283,6 +313,12 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}
   {{/isArray}}
   {{#isMap}}
 
+  {{#deprecated}}
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
+  {{/deprecated}}
   public {{classname}} put{{nameInPascalCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     super.put{{nameInPascalCase}}Item(key, {{name}}Item);
     return this;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
index d959fdcb607a..77ed49fb92a8 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
@@ -3254,6 +3254,48 @@ public void contractWithDeprecatedEnumGeneratesDeprecatedAnnotation() throws IOE
                 .fileDoesNotContain("@Deprecated");
     }
 
+    @Test
+    public void contractWithDeprecatedPropertiesAnnotatesFluentSettersAndCollectionHelpers() throws IOException {
+        Map<String, File> output = generateFromContract(
+                "src/test/resources/3_0/spring/issue_24704.yaml",
+                SPRING_BOOT,
+                Map.of(GENERATE_BUILDERS, true)
+        );
+
+        JavaFileAssert.assertThat(output.get("Example.java"))
+                .fileContains(
+                        "  /**\n   * @deprecated deprecated\n   */\n  @Deprecated\n  public Example deprecatedProperty(",
+                        "  /**\n   * @deprecated deprecated\n   */\n  @Deprecated\n  public Example deprecatedValues(",
+                        "  /**\n   * @deprecated deprecated\n   */\n  @Deprecated\n  public Example addDeprecatedValuesItem(",
+                        "  /**\n   * @deprecated deprecated\n   */\n  @Deprecated\n  public Example deprecatedMap(",
+                        "  /**\n   * @deprecated deprecated\n   */\n  @Deprecated\n  public Example putDeprecatedMapItem("
+                )
+                .assertMethod("deprecatedProperty", "String")
+                .hasAnnotation("Deprecated")
+                .toFileAssert()
+                .assertMethod("deprecatedValues")
+                .hasAnnotation("Deprecated")
+                .toFileAssert()
+                .assertMethod("deprecatedMap")
+                .hasAnnotation("Deprecated")
+                .toFileAssert()
+                .assertMethod("addDeprecatedValuesItem", "String")
+                .hasAnnotation("Deprecated")
+                .toFileAssert()
+                .assertMethod("putDeprecatedMapItem", "String", "String")
+                .hasAnnotation("Deprecated")
+                .toFileAssert()
+                .assertMethod("currentProperty", "String")
+                .doesNotHaveAnnotation("Deprecated")
+                .toFileAssert()
+                .assertInnerClass("Builder")
+                .assertMethod("deprecatedProperty", "String")
+                .hasAnnotation("Deprecated")
+                .toInnerClassAssert()
+                .assertMethod("currentProperty", "String")
+                .doesNotHaveAnnotation("Deprecated");
+    }
+
     @Test
     public void contractWithResolvedInnerEnumContainsEnumConverter() throws IOException {
         File output = Files.createTempDirectory("test").toFile();
diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/issue_24704.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24704.yaml
new file mode 100644
index 000000000000..f1872d6643e8
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/spring/issue_24704.yaml
@@ -0,0 +1,35 @@
+openapi: 3.0.3
+info:
+  title: Deprecated property example
+  version: 1.0.0
+paths:
+  /example:
+    get:
+      operationId: getExample
+      responses:
+        "200":
+          description: Example response
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Example"
+components:
+  schemas:
+    Example:
+      type: object
+      properties:
+        currentProperty:
+          type: string
+        deprecatedProperty:
+          type: string
+          deprecated: true
+        deprecatedValues:
+          type: array
+          deprecated: true
+          items:
+            type: string
+        deprecatedMap:
+          type: object
+          deprecated: true
+          additionalProperties:
+            type: string
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java
index cbfefe49d0ce..a99617cede90 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java
@@ -161,11 +161,19 @@ public void setName(JsonNullable<String> name) {
     this.name = name;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet photoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
     return this;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet addPhotoUrlsItem(String photoUrlsItem) {
     if (this.photoUrls == null) {
       this.photoUrls = new ArrayList<>();
@@ -188,7 +196,7 @@ public List<String> getPhotoUrls() {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("photoUrls")
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java
index aed326d47e76..98c909f0c1d9 100644
--- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java
@@ -212,6 +212,10 @@ public void setTags(List<@Valid TagDto> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public PetDto status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -230,7 +234,7 @@ public PetDto status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/PetDto.java
index 5b62a26b9fd8..10e58cdc9ac2 100644
--- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/PetDto.java
@@ -211,6 +211,10 @@ public void setTags(List<TagDto> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public PetDto status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -229,7 +233,7 @@ public PetDto status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/PetDto.java
index 364eb0af3c0c..6d75ee81ffe4 100644
--- a/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/client/petstore/spring-http-interface-oauth/src/main/java/org/openapitools/model/PetDto.java
@@ -212,6 +212,10 @@ public void setTags(List<TagDto> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public PetDto status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -230,7 +234,7 @@ public PetDto status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java
index aa5696d9edff..05b15511a6f3 100644
--- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java
@@ -218,6 +218,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -236,7 +240,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java
index 9e4323f1115c..8c49509cf271 100644
--- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java
@@ -217,6 +217,10 @@ public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -235,7 +239,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java
index 9e4323f1115c..8c49509cf271 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java
@@ -217,6 +217,10 @@ public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -235,7 +239,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java
index e9d00a6b6f2d..3d57a334bb16 100644
--- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java
@@ -218,6 +218,10 @@ public void setTags(List<@Valid TagDto> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public PetDto status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -236,7 +240,7 @@ public PetDto status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java
index 12be472e2153..86b0159c38e7 100644
--- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java
@@ -219,6 +219,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -237,7 +241,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
index 5b62a26b9fd8..10e58cdc9ac2 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
@@ -211,6 +211,10 @@ public void setTags(List<TagDto> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public PetDto status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -229,7 +233,7 @@ public PetDto status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java
index 1f283da5f8b7..58e0a757aae3 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java
@@ -214,6 +214,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(StatusEnum status) {
     this.status = Optional.ofNullable(status);
     return this;
@@ -232,7 +236,7 @@ public Optional<StatusEnum> getStatus() {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java
index 988c42ca95f9..4e2a5960939c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java
@@ -219,6 +219,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(StatusEnum status) {
     this.status = status;
     return this;
@@ -237,7 +241,7 @@ public StatusEnum getStatus() {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
index c5deb2f1e1ee..7780a7d509fa 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
@@ -216,6 +216,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -235,7 +239,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java
index adbd3ac4721e..e1f7e037deaf 100644
--- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java
@@ -262,6 +262,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -283,7 +287,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
index 69f5479e14e2..4e97c3f7b920 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
@@ -261,6 +261,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -282,7 +286,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java
index 7f0a042f672f..7a3349f4055b 100644
--- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java
@@ -267,6 +267,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -288,7 +292,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
index 2c9687e5a1fb..3e220ecfa17a 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
index 2c9687e5a1fb..3e220ecfa17a 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
index 6bc756d1c1e1..9e60d2073dbc 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
@@ -214,6 +214,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -232,7 +236,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
index 2d94237930ba..4c9f4d578428 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
@@ -217,6 +217,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -236,7 +240,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java
index 2c9687e5a1fb..3e220ecfa17a 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
index e5a470f46246..046a41ec128e 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
@@ -229,6 +229,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -248,7 +252,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
index 2c9687e5a1fb..3e220ecfa17a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java
index 2c9687e5a1fb..3e220ecfa17a 100644
--- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
index 2c9687e5a1fb..3e220ecfa17a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
index 3d98449a58d6..3ae252aa64ca 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
@@ -236,6 +236,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -255,7 +259,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java
index b88a12a9449a..0c0797e5f012 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java
@@ -214,6 +214,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -232,7 +236,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
index 60155272ecbc..25f49948a29f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java
index 36dfb19c7c1d..b491016d4d53 100644
--- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java
@@ -226,6 +226,10 @@ public void setTags(List<@Valid TagDto> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public PetDto status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -245,7 +249,7 @@ public PetDto status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java
index 694d9419602f..116f2c0cc62d 100644
--- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/model/Pet.java
@@ -151,6 +151,10 @@ public Pet addTagsItem(Tag tagsItem) {
   }
 
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java
index dcc9864ef5fa..cf6f4c2cfc38 100644
--- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java
@@ -221,6 +221,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -240,7 +244,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java
index 2c9687e5a1fb..3e220ecfa17a 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
index 2c9687e5a1fb..3e220ecfa17a 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
index 0f8f2c76f2da..ab88a6b08305 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(StatusEnum status) {
     this.status = Optional.ofNullable(status);
     return this;
@@ -243,7 +247,7 @@ public Optional<StatusEnum> getStatus() {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
index b839dc0b136c..221799bfa6e4 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
@@ -224,6 +224,10 @@ public void setTags(List<@Valid Tag> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public Pet status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -243,7 +247,7 @@ public Pet status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ObjectWithDeprecatedFieldsDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ObjectWithDeprecatedFieldsDto.java
index 20fcb7e81930..e0ea19ca6cb7 100644
--- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ObjectWithDeprecatedFieldsDto.java
+++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ObjectWithDeprecatedFieldsDto.java
@@ -66,6 +66,10 @@ public void setUuid(@Nullable String uuid) {
     this.uuid = uuid;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public ObjectWithDeprecatedFieldsDto id(@Nullable BigDecimal id) {
     this.id = id;
     return this;
@@ -85,7 +89,7 @@ public ObjectWithDeprecatedFieldsDto id(@Nullable BigDecimal id) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("id")
@@ -93,6 +97,10 @@ public void setId(@Nullable BigDecimal id) {
     this.id = id;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public ObjectWithDeprecatedFieldsDto deprecatedRef(@Nullable DeprecatedObjectDto deprecatedRef) {
     this.deprecatedRef = deprecatedRef;
     return this;
@@ -112,7 +120,7 @@ public ObjectWithDeprecatedFieldsDto deprecatedRef(@Nullable DeprecatedObjectDto
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("deprecatedRef")
@@ -120,11 +128,19 @@ public void setDeprecatedRef(@Nullable DeprecatedObjectDto deprecatedRef) {
     this.deprecatedRef = deprecatedRef;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public ObjectWithDeprecatedFieldsDto bars(List<String> bars) {
     this.bars = bars;
     return this;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public ObjectWithDeprecatedFieldsDto addBarsItem(String barsItem) {
     if (this.bars == null) {
       this.bars = new ArrayList<>();
@@ -147,7 +163,7 @@ public List<String> getBars() {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("bars")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java
index 50a0ab6923f5..8c2c9d6a8c18 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java
@@ -227,6 +227,10 @@ public void setTags(List<@Valid TagDto> tags) {
     this.tags = tags;
   }
 
+  /**
+   * @deprecated deprecated
+   */
+  @Deprecated
   public PetDto status(@Nullable StatusEnum status) {
     this.status = status;
     return this;
@@ -246,7 +250,7 @@ public PetDto status(@Nullable StatusEnum status) {
   }
 
   /**
-   * @deprecated
+   * @deprecated deprecated
    */
   @Deprecated
   @JsonProperty("status")