[Spring] fix deprecated generation (#12832)

2025-12-08 06:36:10 +00:00 · 2022-07-13 06:08:28 +03:00
parent 8025aa3bfa
commit 2e2da7bc82
45 changed files with 51 additions and 0 deletions
--- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
@@ -134,6 +134,9 @@ public interface {{classname}} {
     * @see <a href="{{url}}">{{summary}} Documentation</a>
    {{/externalDocs}}
     */
+    {{#isDeprecated}}
+    @Deprecated
+    {{/isDeprecated}}
    {{#virtualService}}
    @ApiVirtual
    {{/virtualService}}
--- a/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache
@@ -115,6 +115,9 @@ public class {{classname}}Controller implements {{classname}} {
    {{/externalDocs}}
     * @see {{classname}}#{{operationId}}
     */
+    {{#isDeprecated}}
+    @Deprecated
+    {{/isDeprecated}}
    public {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}(
        {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{>cookieParams}}{{^-last}},
        {{/-last}}{{/allParams}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}},
--- a/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache
@@ -62,6 +62,9 @@ public interface {{classname}}Delegate {
    {{/externalDocs}}
     * @see {{classname}}#{{operationId}}
     */
+    {{#isDeprecated}}
+    @Deprecated
+    {{/isDeprecated}}
    {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#isArray}}List<{{/isArray}}{{#reactive}}Flux<Part>{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}}{{/isFile}} {{paramName}}{{^-last}},
        {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}},
        {{/hasParams}}ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}}{{^jdk8-default-interface}};{{/jdk8-default-interface}}{{#jdk8-default-interface}} {
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
@@ -137,6 +137,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java
@@ -141,6 +141,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
@@ -139,6 +139,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -141,6 +141,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
@@ -163,6 +163,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java
@@ -140,6 +140,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
@@ -133,6 +133,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java
@@ -137,6 +137,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
@@ -135,6 +135,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -140,6 +140,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java
@@ -132,6 +132,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java
@@ -159,6 +159,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java
@@ -181,6 +181,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java
@@ -181,6 +181,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java
@@ -164,6 +164,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
@@ -143,6 +143,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -91,6 +91,7 @@ public interface PetApiDelegate {
     * @deprecated
     * @see PetApi#findPetsByTags
     */
+    @Deprecated
    default ResponseEntity<Set<Pet>> findPetsByTags(Set<String> tags) {
        getRequest().ifPresent(request -> {
            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
@@ -165,6 +165,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
@@ -150,6 +150,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -102,6 +102,7 @@ public interface PetApiDelegate {
     * @deprecated
     * @see PetApi#findPetsByTags
     */
+    @Deprecated
    default Mono<ResponseEntity<Flux<Pet>>> findPetsByTags(Set<String> tags,
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java
@@ -131,6 +131,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @RequestMapping(
        method = RequestMethod.GET,
        value = "/pet/findByTags",
--- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
@@ -164,6 +164,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
@@ -181,6 +181,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/PetApi.java
@@ -137,6 +137,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @Operation(
        operationId = "findPetsByTags",
        summary = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java
@@ -168,6 +168,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java
@@ -168,6 +168,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -147,6 +147,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -91,6 +91,7 @@ public interface PetApiDelegate {
     * @deprecated
     * @see PetApi#findPetsByTags
     */
+    @Deprecated
    default ResponseEntity<Set<Pet>> findPetsByTags(Set<String> tags) {
        getRequest().ifPresent(request -> {
            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java
@@ -147,6 +147,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -91,6 +91,7 @@ public interface PetApiDelegate {
     * @deprecated
     * @see PetApi#findPetsByTags
     */
+    @Deprecated
    default ResponseEntity<Set<Pet>> findPetsByTags(Set<String> tags) {
        getRequest().ifPresent(request -> {
            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java
@@ -169,6 +169,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java
@@ -155,6 +155,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -103,6 +103,7 @@ public interface PetApiDelegate {
     * @deprecated
     * @see PetApi#findPetsByTags
     */
+    @Deprecated
    default Mono<ResponseEntity<Flux<Pet>>> findPetsByTags(Set<String> tags,
        ServerWebExchange exchange) {
        Mono<Void> result = Mono.empty();
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -149,6 +149,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -92,6 +92,7 @@ public interface PetApiDelegate {
     * @deprecated
     * @see PetApi#findPetsByTags
     */
+    @Deprecated
    default ResponseEntity<List<Pet>> findPetsByTags(List<String> tags, final Pageable pageable) {
        getRequest().ifPresent(request -> {
            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java
@@ -149,6 +149,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -92,6 +92,7 @@ public interface PetApiDelegate {
     * @deprecated
     * @see PetApi#findPetsByTags
     */
+    @Deprecated
    default ResponseEntity<List<Pet>> findPetsByTags(List<String> tags, final Pageable pageable) {
        getRequest().ifPresent(request -> {
            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java
@@ -170,6 +170,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java
@@ -170,6 +170,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java
@@ -168,6 +168,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java
@@ -170,6 +170,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiVirtual
    @Operation(
        operationId = "findPetsByTags",
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java
@@ -168,6 +168,7 @@ public interface PetApi {
     *         or Invalid tag value (status code 400)
     * @deprecated
     */
+    @Deprecated
    @ApiOperation(
        tags = { "pet" },
        value = "Finds Pets by tags",