From 809180ae56550d4a72f184c87d761fc0baa0f7e2 Mon Sep 17 00:00:00 2001 From: Bernhard Danecker Date: Mon, 13 Oct 2025 19:18:22 +0200 Subject: [PATCH 1/3] Optimize imports --- .../codegen/languages/SpringCodegen.java | 6 +---- .../main/resources/JavaSpring/api.mustache | 24 +++++++++++-------- .../java-pkmst/apiController.mustache | 12 +++++----- .../java/org/openapitools/api/SomeApi.java | 3 --- .../java/org/openapitools/api/DefaultApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../org/openapitools/api/PetController.java | 3 --- .../org/openapitools/api/StoreController.java | 3 --- .../org/openapitools/api/UserController.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../java/org/openapitools/api/DefaultApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../org/openapitools/api/AnotherFakeApi.java | 3 --- .../java/org/openapitools/api/FakeApi.java | 3 --- .../api/FakeClassnameTags123Api.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- .../org/openapitools/api/AnotherFakeApi.java | 3 --- .../java/org/openapitools/api/FakeApi.java | 3 --- .../api/FakeClassnameTestApi.java | 3 --- .../java/org/openapitools/api/PetApi.java | 3 --- .../java/org/openapitools/api/StoreApi.java | 3 --- .../java/org/openapitools/api/UserApi.java | 3 --- 49 files changed, 21 insertions(+), 159 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index d5f38662761b..c200a7e42b7f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -568,12 +568,8 @@ public void processOpts() { (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiUtil.java")); } - if (!delegatePattern || delegateMethod) { - additionalProperties.put("jdk8-no-delegate", true); - } - if (delegatePattern && !delegateMethod) { - additionalProperties.put("isDelegate", "true"); + additionalProperties.put("isDelegate", true); apiTemplateFiles.put("apiDelegate.mustache", "Delegate.java"); } diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache index c3beb18bbde5..e6431fe66d92 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache @@ -24,14 +24,16 @@ import io.swagger.v3.oas.annotations.media.ExampleObject; {{#swagger1AnnotationLibrary}} import io.swagger.annotations.*; {{/swagger1AnnotationLibrary}} -{{#jdk8-no-delegate}} +{{^isDelegate}} +{{#jdk8-default-interface}} {{#virtualService}} import io.virtualan.annotation.ApiVirtual; import io.virtualan.annotation.VirtualService; {{/virtualService}} import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -{{/jdk8-no-delegate}} +{{/jdk8-default-interface}} +{{/isDelegate}} {{^useResponseEntity}} import org.springframework.http.HttpStatus; {{/useResponseEntity}} @@ -48,11 +50,13 @@ import org.springframework.web.bind.annotation.RestController; {{/useResponseEntity}} {{/useSpringController}} import org.springframework.web.bind.annotation.*; -{{#jdk8-no-delegate}} -{{^reactive}} +{{#jdk8-default-interface}} + {{^isDelegate}} + {{^reactive}} import org.springframework.web.context.request.NativeWebRequest; -{{/reactive}} -{{/jdk8-no-delegate}} + {{/reactive}} + {{/isDelegate}} +{{/jdk8-default-interface}} import org.springframework.web.multipart.MultipartFile; {{#reactive}} import org.springframework.web.server.ServerWebExchange; @@ -67,14 +71,14 @@ import {{javaxPackage}}.validation.constraints.*; {{/useBeanValidation}} import java.util.List; import java.util.Map; -{{#jdk8-no-delegate}} +{{^isDelegate}} import java.util.Optional; -{{/jdk8-no-delegate}} -{{^jdk8-no-delegate}} +{{/isDelegate}} +{{#isDelegate}} {{#useOptional}} import java.util.Optional; {{/useOptional}} -{{/jdk8-no-delegate}} +{{/isDelegate}} {{#async}} import java.util.concurrent.CompletableFuture; {{/async}} diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/apiController.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/apiController.mustache index c8caae1ded06..6d35cda248dd 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/apiController.mustache @@ -1,6 +1,6 @@ package {{package}}; -{{^jdk8-no-delegate}} +{{^isDelegate}} {{#imports}}import {{import}}; {{/imports}} @@ -8,9 +8,9 @@ import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -{{/jdk8-no-delegate}} +{{/isDelegate}} import org.springframework.stereotype.Controller; -{{^jdk8-no-delegate}} +{{^isDelegate}} import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -26,7 +26,7 @@ import java.util.Optional; {{#async}} import java.util.concurrent.Callable; {{/async}} -{{/jdk8-no-delegate}} +{{/isDelegate}} {{^useSpringCloudClient}} import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; @@ -60,7 +60,7 @@ public class {{classname}}Controller implements {{classname}} { } {{/isDelegate}} -{{^jdk8-no-delegate}} +{{^isDelegate}} {{#operation}} public {{#async}}Callable<{{/async}}ResponseEntity<{{>returnTypes}}>{{#async}}>{{/async}} {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}, {{/allParams}}@RequestHeader(value = "Accept", required = false) String accept) throws Exception { @@ -111,6 +111,6 @@ public class {{classname}}Controller implements {{classname}} { } {{/operation}} -{{/jdk8-no-delegate}} +{{/isDelegate}} } {{/operations}} diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java index 433fe2a65514..cc808c538f3d 100644 --- a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java +++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java @@ -5,12 +5,9 @@ */ package org.openapitools.api; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 2a11e177960a..307e4d19b48b 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -10,12 +10,9 @@ import org.springframework.lang.Nullable; import java.time.OffsetDateTime; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java index 767498dc3d05..15cc7e3936db 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java @@ -20,12 +20,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java index ccf2ae1d7c58..1823f34a628d 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java index 755e6a5a95d3..418ea4e2778d 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git 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 index 4b05c3c6b1e2..da6504c1af69 100644 --- 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 @@ -9,12 +9,9 @@ import org.springframework.lang.Nullable; import org.openapitools.model.Pet; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java index 1e451a74b4a9..1ccd7fb337be 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java @@ -8,12 +8,9 @@ import java.util.Map; import org.openapitools.model.Order; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java index 05f49e1c6fe2..a6665d483a2a 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java @@ -8,12 +8,9 @@ import java.time.OffsetDateTime; import org.openapitools.model.User; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java index 868576f54c22..c25835f87fba 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java @@ -11,12 +11,9 @@ import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java index ce59fc0be998..3a76b05a795e 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java @@ -8,12 +8,9 @@ import java.util.Map; import org.openapitools.model.Order; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java index d5b1c6df0227..c49ae0b7c73d 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java @@ -8,12 +8,9 @@ import java.time.OffsetDateTime; import org.openapitools.model.User; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git 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 index 4b05c3c6b1e2..da6504c1af69 100644 --- 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 @@ -9,12 +9,9 @@ import org.springframework.lang.Nullable; import org.openapitools.model.Pet; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 1e451a74b4a9..1ccd7fb337be 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -8,12 +8,9 @@ import java.util.Map; import org.openapitools.model.Order; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 05f49e1c6fe2..a6665d483a2a 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -8,12 +8,9 @@ import java.time.OffsetDateTime; import org.openapitools.model.User; import io.swagger.annotations.*; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java index 442bf9f8e3d4..49f573bca308 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java @@ -8,12 +8,9 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.lang.Nullable; import org.openapitools.model.Pet; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import jakarta.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java index a1591b46eb2c..0e28f5d0dc5e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java @@ -7,12 +7,9 @@ import java.util.Map; import org.openapitools.model.Order; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import jakarta.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java index 2c03c5b9bf56..661242259e9f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java @@ -7,12 +7,9 @@ import java.time.OffsetDateTime; import org.openapitools.model.User; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import jakarta.validation.Valid; diff --git 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 index 4769d11de457..f51178762080 100644 --- 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 @@ -20,12 +20,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import jakarta.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java index 6d0587f98b0e..7b4343496c84 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import jakarta.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java index e7d096895e94..d65ff4f7865b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import jakarta.validation.Valid; diff --git 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 index 17deb6315361..de91862dae76 100644 --- 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 @@ -20,12 +20,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 9cf71b6932ae..a1344c4f99c0 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index 5fc7f72eaf4e..29779da970f1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 7c10efa14c45..4f7efdaaef22 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -21,12 +21,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java index 360dac7c392d..f69219a2aa03 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java @@ -18,12 +18,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java index 73217e29c896..c5dbacdef45d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -18,12 +18,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index c851f839af26..1a45011e7278 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -29,12 +29,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 6d9456838b66..48a56df70799 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -18,12 +18,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git 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 index 0160964af459..9ea26bdb48df 100644 --- 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 @@ -22,12 +22,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java index b4ffe7085b46..057cdec7f349 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java index 983298aff626..dad57252c744 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git 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 index c8bac049bb33..62d2613eb14d 100644 --- 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 @@ -22,12 +22,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index fa015b077e1f..0a9708e4a150 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 54a5e8254922..43b93878d017 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git 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 index 31ed4244ff13..c91bfe37e5e5 100644 --- 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 @@ -20,12 +20,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index ccf2ae1d7c58..1823f34a628d 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index c2e14e5eb6fd..1fffcbebf794 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git 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 index cb7827ac999f..b81749039fc7 100644 --- 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 @@ -20,12 +20,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java index 8749f906520f..1d6da4a306a6 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java index 680a212b928e..640f111cd731 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java index 2be50e4e0343..ccaebd522b91 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -18,12 +18,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index dba4053b8c72..82997195f6dc 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -31,12 +31,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index fa124d3da5b9..6bf9f34e97a5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -18,12 +18,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git 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 index 02806cbade39..c8e09e34e9a2 100644 --- 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 @@ -21,12 +21,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java index eabbdcb1deba..008b52371d99 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java index 0794a62dc708..768dc69f1a45 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java @@ -19,12 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.ExampleObject; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; From 49219e1698893222007a7833848b32405a60db94 Mon Sep 17 00:00:00 2001 From: Bernhard Danecker Date: Thu, 16 Oct 2025 22:48:00 +0200 Subject: [PATCH 2/3] remove unnecessary blank line --- .../main/resources/JavaSpring/api.mustache | 6 ++- .../java/org/openapitools/api/SomeApi.java | 1 - .../java/org/openapitools/api/DefaultApi.java | 2 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/PetController.java | 8 --- .../org/openapitools/api/StoreController.java | 4 -- .../org/openapitools/api/UserController.java | 9 ---- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/DefaultApi.java | 2 - .../java/org/openapitools/api/PetApi.java | 1 - .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 16 ------ .../api/FakeClassnameTags123Api.java | 1 - .../java/org/openapitools/api/PetApi.java | 10 ---- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 9 ---- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/BarApi.java | 1 - .../java/org/openapitools/api/FooApi.java | 2 - .../java/org/openapitools/api/BarApi.java | 1 - .../java/org/openapitools/api/FooApi.java | 2 - .../java/org/openapitools/api/BarApi.java | 1 - .../java/org/openapitools/api/FooApi.java | 2 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 54 +++++++------------ .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 +++------ .../java/org/openapitools/api/StoreApi.java | 12 ++--- .../java/org/openapitools/api/UserApi.java | 24 +++------ .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 18 ------- .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 18 ------- .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/NullableApi.java | 1 - .../java/org/openapitools/api/DogsApi.java | 3 +- .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 18 ------- .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 18 ------- .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 18 ------- .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 54 +++++++------------ .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 +++------ .../java/org/openapitools/api/StoreApi.java | 12 ++--- .../java/org/openapitools/api/UserApi.java | 24 +++------ .../java/org/openapitools/api/PetApi.java | 24 +++------ .../java/org/openapitools/api/StoreApi.java | 12 ++--- .../java/org/openapitools/api/UserApi.java | 24 +++------ .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 54 +++++++------------ .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 +++------ .../java/org/openapitools/api/StoreApi.java | 12 ++--- .../java/org/openapitools/api/UserApi.java | 24 +++------ .../java/org/openapitools/api/DummyApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 18 ------- .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../java/org/openapitools/api/PetApi.java | 24 +++------ .../java/org/openapitools/api/StoreApi.java | 12 ++--- .../java/org/openapitools/api/UserApi.java | 24 +++------ .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 54 +++++++------------ .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 +++------ .../java/org/openapitools/api/StoreApi.java | 12 ++--- .../java/org/openapitools/api/UserApi.java | 24 +++------ .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 54 +++++++------------ .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 24 +++------ .../java/org/openapitools/api/StoreApi.java | 12 ++--- .../java/org/openapitools/api/UserApi.java | 24 +++------ .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++---------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 27 ++++------ .../java/org/openapitools/api/StoreApi.java | 12 ++--- .../java/org/openapitools/api/UserApi.java | 24 +++------ .../org/openapitools/api/VersioningApi.java | 9 ++-- .../org/openapitools/api/AnotherFakeApi.java | 3 +- .../java/org/openapitools/api/FakeApi.java | 45 ++++++---------- .../api/FakeClassnameTestApi.java | 3 +- .../java/org/openapitools/api/PetApi.java | 27 ++++------ .../java/org/openapitools/api/StoreApi.java | 12 ++--- .../java/org/openapitools/api/UserApi.java | 24 +++------ .../org/openapitools/api/VersioningApi.java | 9 ++-- .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 15 ------ .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 9 ---- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/VersioningApi.java | 3 -- .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 15 ------ .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 9 ---- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../org/openapitools/api/VersioningApi.java | 3 -- .../java/org/openapitools/api/UserApi.java | 2 - .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 18 ------- .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- .../virtualan/api/AnotherFakeApi.java | 1 - .../openapitools/virtualan/api/FakeApi.java | 18 ------- .../virtualan/api/FakeClassnameTestApi.java | 1 - .../openapitools/virtualan/api/PetApi.java | 8 --- .../openapitools/virtualan/api/StoreApi.java | 4 -- .../openapitools/virtualan/api/UserApi.java | 8 --- .../org/openapitools/api/AnotherFakeApi.java | 1 - .../java/org/openapitools/api/FakeApi.java | 18 ------- .../api/FakeClassnameTestApi.java | 1 - .../java/org/openapitools/api/PetApi.java | 8 --- .../java/org/openapitools/api/StoreApi.java | 4 -- .../java/org/openapitools/api/UserApi.java | 8 --- 193 files changed, 328 insertions(+), 1512 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache index e6431fe66d92..d646b6115d2c 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache @@ -265,7 +265,9 @@ public interface {{classname}} { {{#vendorExtensions.x-operation-extra-annotation}} {{{.}}} {{/vendorExtensions.x-operation-extra-annotation}} - {{#vendorExtensions.x-sse}}@ResponseBody{{/vendorExtensions.x-sse}} + {{#vendorExtensions.x-sse}} + @ResponseBody + {{/vendorExtensions.x-sse}} {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{>responseType}} {{#delegate-method}}_{{/delegate-method}}{{operationId}}( {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{>cookieParams}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, @@ -285,7 +287,7 @@ public interface {{classname}} { {{>methodBody}}{{! prevent indent}} {{/isDelegate}} {{#isDelegate}} - {{^isVoid}}return {{/isVoid}}{{#isVoid}}{{#useResponseEntity}}return {{/useResponseEntity}}{{^useResponseEntity}}{{#reactive}}return {{/reactive}}{{/useResponseEntity}}{{/isVoid}}getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{^hasParams}}{{#reactive}}, {{/reactive}}{{/hasParams}}pageable{{/vendorExtensions.x-spring-paginated}}); + {{^isVoid}}return {{/isVoid}}{{#isVoid}}{{#useResponseEntity}}return {{/useResponseEntity}}{{^useResponseEntity}}{{#reactive}}return {{/reactive}}{{/useResponseEntity}}{{/isVoid}}getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{^hasParams}}{{#reactive}}, {{/reactive}}{{/hasParams}}pageable{{/vendorExtensions.x-spring-paginated}}); {{/isDelegate}} }{{/jdk8-default-interface}} diff --git a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java index cc808c538f3d..58369e47bf91 100644 --- a/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java +++ b/samples/client/petstore/spring-cloud-auth/src/main/java/org/openapitools/api/SomeApi.java @@ -31,7 +31,6 @@ public interface SomeApi { method = RequestMethod.GET, value = SomeApi.PATH_SOME_ENDPOINT_GET ) - ResponseEntity someEndpointGet( ); diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 307e4d19b48b..c0a29ca8f6d6 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -49,7 +49,6 @@ public interface DefaultApi { method = RequestMethod.GET, value = DefaultApi.PATH_GET ) - ResponseEntity get( @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, @@ -80,7 +79,6 @@ ResponseEntity get( value = DefaultApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java index 15cc7e3936db..da20f831126e 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java @@ -62,7 +62,6 @@ public interface PetApi { value = PetApi.PATH_ADD_PET, consumes = "application/json" ) - ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -93,7 +92,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -130,7 +128,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status ); @@ -169,7 +166,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ); @@ -207,7 +203,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @Parameter(name = "petId", deprecated = true, description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") @Deprecated Long petId ); @@ -242,7 +237,6 @@ ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = "application/json" ) - ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -275,7 +269,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -313,7 +306,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java index 1823f34a628d..036376def014 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java @@ -59,7 +59,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -91,7 +90,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ); @@ -126,7 +124,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -160,7 +157,6 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java index 418ea4e2778d..151a2068124f 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java @@ -61,7 +61,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -92,7 +91,6 @@ ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -123,7 +121,6 @@ ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -155,7 +152,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -190,7 +186,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -224,7 +219,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", deprecated = true, description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) @Deprecated String password @@ -254,7 +248,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ); @@ -288,7 +281,6 @@ ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git 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 index da6504c1af69..f57b7e591643 100644 --- 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 @@ -58,7 +58,6 @@ public interface PetApi { produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -92,7 +91,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -130,7 +128,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -169,7 +166,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags ); @@ -205,7 +201,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ); @@ -249,7 +244,6 @@ ResponseEntity getPetById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -285,7 +279,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -325,7 +318,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java index 1ccd7fb337be..51bea31244ba 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java @@ -48,7 +48,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId ); @@ -80,7 +79,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ); @@ -113,7 +111,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId ); @@ -145,7 +142,6 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java index a6665d483a2a..db344c029099 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java @@ -50,7 +50,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ); @@ -81,7 +80,6 @@ ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -112,7 +110,6 @@ ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -144,7 +141,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ); @@ -177,7 +173,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ); @@ -209,7 +204,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -239,7 +233,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ); @@ -273,7 +266,6 @@ ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java index c25835f87fba..103c533db2eb 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java @@ -55,7 +55,6 @@ public interface PetController { value = PetController.PATH_ADD_PET, consumes = "application/json" ) - ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ); @@ -88,7 +87,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetController.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -127,7 +125,6 @@ ResponseEntity deletePet( value = PetController.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable @@ -168,7 +165,6 @@ ResponseEntity> findPetsByStatus( value = PetController.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiIgnore final Pageable pageable @@ -205,7 +201,6 @@ ResponseEntity> findPetsByTags( value = PetController.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ); @@ -242,7 +237,6 @@ ResponseEntity getPetById( value = PetController.PATH_UPDATE_PET, consumes = "application/json" ) - ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ); @@ -277,7 +271,6 @@ ResponseEntity updatePet( value = PetController.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -316,7 +309,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java index 3a76b05a795e..301860a8c9f4 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java @@ -48,7 +48,6 @@ public interface StoreController { method = RequestMethod.DELETE, value = StoreController.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId ); @@ -80,7 +79,6 @@ ResponseEntity deleteOrder( value = StoreController.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ); @@ -113,7 +111,6 @@ ResponseEntity> getInventory( value = StoreController.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId ); @@ -143,7 +140,6 @@ ResponseEntity getOrderById( value = StoreController.PATH_PLACE_ORDER, produces = { "application/json", "application/xml" } ) - ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ); diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java index c49ae0b7c73d..7e2ee1983299 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java @@ -46,7 +46,6 @@ public interface UserController { method = RequestMethod.POST, value = UserController.PATH_CREATE_USER ) - ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ); @@ -72,7 +71,6 @@ ResponseEntity createUser( method = RequestMethod.POST, value = UserController.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) - ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ); @@ -98,7 +96,6 @@ ResponseEntity createUsersWithArrayInput( method = RequestMethod.POST, value = UserController.PATH_CREATE_USERS_WITH_LIST_INPUT ) - ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ); @@ -127,7 +124,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserController.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ); @@ -159,7 +155,6 @@ ResponseEntity deleteUser( value = UserController.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ); @@ -190,7 +185,6 @@ ResponseEntity getUserByName( value = UserController.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -216,7 +210,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserController.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ); @@ -241,7 +234,6 @@ ResponseEntity logoutUser( method = RequestMethod.OPTIONS, value = UserController.PATH_LOGOUT_USER_OPTIONS ) - ResponseEntity logoutUserOptions( ); @@ -271,7 +263,6 @@ ResponseEntity logoutUserOptions( method = RequestMethod.PUT, value = UserController.PATH_UPDATE_USER ) - ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body diff --git 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 index da6504c1af69..f57b7e591643 100644 --- 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 @@ -58,7 +58,6 @@ public interface PetApi { produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -92,7 +91,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -130,7 +128,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -169,7 +166,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags ); @@ -205,7 +201,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ); @@ -249,7 +244,6 @@ ResponseEntity getPetById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -285,7 +279,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -325,7 +318,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 1ccd7fb337be..51bea31244ba 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -48,7 +48,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId ); @@ -80,7 +79,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ); @@ -113,7 +111,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId ); @@ -145,7 +142,6 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index a6665d483a2a..db344c029099 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -50,7 +50,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ); @@ -81,7 +80,6 @@ ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -112,7 +110,6 @@ ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -144,7 +141,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ); @@ -177,7 +173,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ); @@ -209,7 +204,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -239,7 +233,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ); @@ -273,7 +266,6 @@ ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java index 49f573bca308..2a3194e68146 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java @@ -39,7 +39,6 @@ public interface PetApi { produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity addPet( @Valid @RequestBody Pet pet ); @@ -58,7 +57,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @PathVariable("petId") Long petId, @RequestHeader(value = "api_key", required = false) Optional apiKey @@ -79,7 +77,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -101,7 +98,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @Valid @RequestParam(value = "tags", required = true) List tags ); @@ -122,7 +118,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @PathVariable("petId") Long petId ); @@ -147,7 +142,6 @@ ResponseEntity getPetById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity updatePet( @Valid @RequestBody Pet pet ); @@ -168,7 +162,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @PathVariable("petId") Long petId, @Valid @RequestParam(value = "name", required = false) Optional name, @@ -192,7 +185,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @PathVariable("petId") Long petId, @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata, diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java index 0e28f5d0dc5e..13dd99c2d736 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java @@ -36,7 +36,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @PathVariable("orderId") String orderId ); @@ -54,7 +53,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ); @@ -75,7 +73,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @PathVariable("orderId") Long orderId ); @@ -96,7 +93,6 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity placeOrder( @Valid @RequestBody Order order ); diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java index 661242259e9f..12e7e509fdd2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java @@ -36,7 +36,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - ResponseEntity createUser( @Valid @RequestBody User user ); @@ -55,7 +54,6 @@ ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithArrayInput( @Valid @RequestBody List<@Valid User> user ); @@ -74,7 +72,6 @@ ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithListInput( @Valid @RequestBody List<@Valid User> user ); @@ -93,7 +90,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @PathVariable("username") String username ); @@ -114,7 +110,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @PathVariable("username") String username ); @@ -135,7 +130,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Valid @RequestParam(value = "password", required = true) String password @@ -153,7 +147,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ); @@ -174,7 +167,6 @@ ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - ResponseEntity updateUser( @NotNull @PathVariable("username") String username, @Valid @RequestBody User user diff --git 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 index f51178762080..ace782ef248c 100644 --- 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 @@ -68,7 +68,6 @@ public interface PetApi { produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -99,7 +98,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -136,7 +134,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -175,7 +172,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ); @@ -213,7 +209,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -257,7 +252,6 @@ ResponseEntity getPetById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -290,7 +284,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -328,7 +321,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java index 7b4343496c84..a2c26a7abc72 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java @@ -59,7 +59,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -91,7 +90,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ); @@ -126,7 +124,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -160,7 +157,6 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java index d65ff4f7865b..b5a19e43000f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java @@ -61,7 +61,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -92,7 +91,6 @@ ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -123,7 +121,6 @@ ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -155,7 +152,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -190,7 +186,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -224,7 +219,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -254,7 +248,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ); @@ -288,7 +281,6 @@ ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git 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 index de91862dae76..630421e0083d 100644 --- 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 @@ -69,7 +69,6 @@ public interface PetApi { produces = { "application/json", "application/xml" }, consumes = "application/json" ) - CompletableFuture> addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -100,7 +99,6 @@ CompletableFuture> addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - CompletableFuture> deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -137,7 +135,6 @@ CompletableFuture> deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - CompletableFuture>> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -176,7 +173,6 @@ CompletableFuture>> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - CompletableFuture>> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ); @@ -214,7 +210,6 @@ CompletableFuture>> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - CompletableFuture> getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -258,7 +253,6 @@ CompletableFuture> getPetById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - CompletableFuture> updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -291,7 +285,6 @@ CompletableFuture> updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - CompletableFuture> updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -329,7 +322,6 @@ CompletableFuture> updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - CompletableFuture> uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index a1344c4f99c0..8b82aaeb6d6a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -60,7 +60,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - CompletableFuture> deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -92,7 +91,6 @@ CompletableFuture> deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - CompletableFuture>> getInventory( ); @@ -127,7 +125,6 @@ CompletableFuture>> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - CompletableFuture> getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -161,7 +158,6 @@ CompletableFuture> getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - CompletableFuture> placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index 29779da970f1..8ecefe5a5ec3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -62,7 +62,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - CompletableFuture> createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -93,7 +92,6 @@ CompletableFuture> createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - CompletableFuture> createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -124,7 +122,6 @@ CompletableFuture> createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - CompletableFuture> createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -156,7 +153,6 @@ CompletableFuture> createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - CompletableFuture> deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -191,7 +187,6 @@ CompletableFuture> deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - CompletableFuture> getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -225,7 +220,6 @@ CompletableFuture> getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - CompletableFuture> loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -255,7 +249,6 @@ CompletableFuture> loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - CompletableFuture> logoutUser( ); @@ -289,7 +282,6 @@ CompletableFuture> logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - CompletableFuture> updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 4f7efdaaef22..2564ee730634 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -58,7 +58,6 @@ public interface DefaultApi { method = RequestMethod.GET, value = DefaultApi.PATH_GET ) - ResponseEntity get( @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, @@ -88,7 +87,6 @@ ResponseEntity get( value = DefaultApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @Parameter(name = "visitDate", description = "Updated last visit timestamp") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java index f69219a2aa03..9f3a89a82f5a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java @@ -66,7 +66,6 @@ public interface PetApi { produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java index c5dbacdef45d..61b0748691dc 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -60,7 +60,6 @@ public interface AnotherFakeApi { produces = { "application/json" }, consumes = "application/json" ) - ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index 1a45011e7278..084d9aa92d63 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -68,7 +68,6 @@ public interface FakeApi { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = "application/xml" ) - ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ); @@ -98,7 +97,6 @@ ResponseEntity createXmlItem( produces = { "*/*" }, consumes = "application/json" ) - ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ); @@ -128,7 +126,6 @@ ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = "application/json" ) - ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ); @@ -158,7 +155,6 @@ ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = "application/json" ) - ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ); @@ -188,7 +184,6 @@ ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = "application/json" ) - ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ); @@ -215,7 +210,6 @@ ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = "application/json" ) - ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ); @@ -241,7 +235,6 @@ ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = "application/json" ) - ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user @@ -273,7 +266,6 @@ ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = "application/json" ) - ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ); @@ -319,7 +311,6 @@ ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity testEndpointParameters( @Parameter(name = "number", description = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @Parameter(name = "double", description = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -369,7 +360,6 @@ ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity testEnumParameters( @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -408,7 +398,6 @@ ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - ResponseEntity testGroupParameters( @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -441,7 +430,6 @@ ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = "application/json" ) - ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ); @@ -470,7 +458,6 @@ ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity testJsonFormData( @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -499,7 +486,6 @@ ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = "application/json" ) - ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ); @@ -528,7 +514,6 @@ ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @@ -559,7 +544,6 @@ ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - ResponseEntity testWithResultExample( ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 48a56df70799..baf4d2056f70 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -63,7 +63,6 @@ public interface FakeClassnameTags123Api { produces = { "application/json" }, consumes = "application/json" ) - ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ); diff --git 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 index 9ea26bdb48df..89808fad5d6a 100644 --- 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 @@ -66,7 +66,6 @@ public interface PetApi { value = PetApi.PATH_ADD_PET, consumes = "application/json" ) - ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -99,7 +98,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -136,7 +134,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status ); @@ -175,7 +172,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags ); @@ -213,7 +209,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -240,7 +235,6 @@ ResponseEntity getPetById( value = PetApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -277,7 +271,6 @@ ResponseEntity responseObjectDifferentNam value = PetApi.PATH_UPDATE_PET, consumes = "application/json" ) - ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -310,7 +303,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -348,7 +340,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @@ -386,7 +377,6 @@ ResponseEntity uploadFile( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFileWithRequiredFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java index 057cdec7f349..b50420d3bcb2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java @@ -59,7 +59,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ); @@ -91,7 +90,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ); @@ -126,7 +124,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ); @@ -160,7 +157,6 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java index dad57252c744..09fb474a7e44 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java @@ -58,7 +58,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -86,7 +85,6 @@ ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -114,7 +112,6 @@ ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -143,7 +140,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -178,7 +174,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -212,7 +207,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -239,7 +233,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ); @@ -270,7 +263,6 @@ ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git 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 index 62d2613eb14d..327b4c3dd95f 100644 --- 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 @@ -62,7 +62,6 @@ public interface PetApi { value = PetApi.PATH_ADD_PET, consumes = "application/json" ) - ResponseEntity addPet( @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ); @@ -91,7 +90,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -128,7 +126,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status, @ParameterObject final Pageable pageable @@ -169,7 +166,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags, @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) @Nullable String size, @@ -209,7 +205,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -242,7 +237,6 @@ ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = "application/json" ) - ResponseEntity updatePet( @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ); @@ -273,7 +267,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -309,7 +302,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 0a9708e4a150..b3a2f187e290 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -59,7 +59,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -91,7 +90,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ); @@ -126,7 +124,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -157,7 +154,6 @@ ResponseEntity getOrderById( value = StoreApi.PATH_PLACE_ORDER, produces = { "application/json", "application/xml" } ) - ResponseEntity placeOrder( @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ); diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 43b93878d017..f08071739bc1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -57,7 +57,6 @@ public interface UserApi { method = RequestMethod.POST, value = UserApi.PATH_CREATE_USER ) - ResponseEntity createUser( @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body ); @@ -82,7 +81,6 @@ ResponseEntity createUser( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) - ResponseEntity createUsersWithArrayInput( @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ); @@ -107,7 +105,6 @@ ResponseEntity createUsersWithArrayInput( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) - ResponseEntity createUsersWithListInput( @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ); @@ -136,7 +133,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -169,7 +165,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -201,7 +196,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -226,7 +220,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ); @@ -250,7 +243,6 @@ ResponseEntity logoutUser( method = RequestMethod.OPTIONS, value = UserApi.PATH_LOGOUT_USER_OPTIONS ) - ResponseEntity logoutUserOptions( ); @@ -280,7 +272,6 @@ ResponseEntity logoutUserOptions( method = RequestMethod.PUT, value = UserApi.PATH_UPDATE_USER ) - ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body diff --git 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 index c91bfe37e5e5..4ddd92ea2f97 100644 --- 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 @@ -68,7 +68,6 @@ public interface PetApi { produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -99,7 +98,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -136,7 +134,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -175,7 +172,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ); @@ -213,7 +209,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -257,7 +252,6 @@ ResponseEntity getPetById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -290,7 +284,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -328,7 +321,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 1823f34a628d..036376def014 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -59,7 +59,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -91,7 +90,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ); @@ -126,7 +124,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -160,7 +157,6 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 1fffcbebf794..4b04bfab0d7d 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -61,7 +61,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -92,7 +91,6 @@ ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -123,7 +121,6 @@ ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -155,7 +152,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -190,7 +186,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -224,7 +219,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -254,7 +248,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ); @@ -288,7 +281,6 @@ ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git 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 index b81749039fc7..736f1edeb593 100644 --- 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 @@ -68,7 +68,6 @@ public interface PetApi { produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; @@ -99,7 +98,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -136,7 +134,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) throws Exception; @@ -175,7 +172,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ) throws Exception; @@ -213,7 +209,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) throws Exception; @@ -257,7 +252,6 @@ ResponseEntity getPetById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; @@ -290,7 +284,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -328,7 +321,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java index 1d6da4a306a6..b20cf1f5d7aa 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -59,7 +59,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) throws Exception; @@ -91,7 +90,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ) throws Exception; @@ -126,7 +124,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) throws Exception; @@ -160,7 +157,6 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) throws Exception; diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java index 640f111cd731..cde6cbc53bf1 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java @@ -61,7 +61,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) throws Exception; @@ -92,7 +91,6 @@ ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) throws Exception; @@ -123,7 +121,6 @@ ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) throws Exception; @@ -155,7 +152,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) throws Exception; @@ -190,7 +186,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) throws Exception; @@ -224,7 +219,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -254,7 +248,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ) throws Exception; @@ -288,7 +281,6 @@ ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git 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 index 9b2f8d86da9d..3f37daf3e254 100644 --- 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 @@ -75,7 +75,6 @@ default Optional getRequest() { produces = { "application/json", "application/xml" }, consumes = "application/json" ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -123,7 +122,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -163,7 +161,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/json", "application/xml" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { @@ -219,7 +216,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/json", "application/xml" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ) { @@ -274,7 +270,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/json", "application/xml" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -335,7 +330,6 @@ default ResponseEntity getPetById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -385,7 +379,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = "application/x-www-form-urlencoded" ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -426,7 +419,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = "multipart/form-data" ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index f23fb06bf120..cf3a794b0400 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { @@ -101,7 +100,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -139,7 +137,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/json", "application/xml" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { @@ -190,7 +187,6 @@ default ResponseEntity getOrderById( produces = { "application/json", "application/xml" }, consumes = "application/json" ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index 112e5daf6164..9c1cec05525f 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -68,7 +68,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = "application/json" ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -102,7 +101,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = "application/json" ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -136,7 +134,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = "application/json" ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -171,7 +168,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -209,7 +205,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/json", "application/xml" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -260,7 +255,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/json", "application/xml" } ) - default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -293,7 +287,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -330,7 +323,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = "application/json" ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java index 72d833b45c3e..1bc808177f04 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity createBar( @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate ) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java index e40509011101..d0482fc3033f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java @@ -67,7 +67,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json;charset=utf-8" } ) - default ResponseEntity createFoo( @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) @Nullable Foo foo ) { @@ -106,7 +105,6 @@ default ResponseEntity createFoo( value = FooApi.PATH_GET_ALL_FOOS, produces = { "application/json;charset=utf-8" } ) - default ResponseEntity> getAllFoos( ) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java index 72d833b45c3e..1bc808177f04 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity createBar( @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate ) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java index e40509011101..d0482fc3033f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java @@ -67,7 +67,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json;charset=utf-8" } ) - default ResponseEntity createFoo( @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) @Nullable Foo foo ) { @@ -106,7 +105,6 @@ default ResponseEntity createFoo( value = FooApi.PATH_GET_ALL_FOOS, produces = { "application/json;charset=utf-8" } ) - default ResponseEntity> getAllFoos( ) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java index 72d833b45c3e..1bc808177f04 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity createBar( @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate ) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java index e40509011101..d0482fc3033f 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java @@ -67,7 +67,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json;charset=utf-8" } ) - default ResponseEntity createFoo( @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) @Nullable Foo foo ) { @@ -106,7 +105,6 @@ default ResponseEntity createFoo( value = FooApi.PATH_GET_ALL_FOOS, produces = { "application/json;charset=utf-8" } ) - default ResponseEntity> getAllFoos( ) { diff --git 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 index 6ba5edf2563e..a4631376c6a5 100644 --- 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 @@ -75,7 +75,6 @@ default Optional getRequest() { produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -123,7 +122,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -163,7 +161,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { @@ -219,7 +216,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ) { @@ -274,7 +270,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -335,7 +330,6 @@ default ResponseEntity getPetById( produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -385,7 +379,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -426,7 +419,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java index 20a928253047..0b728722950e 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { @@ -101,7 +100,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -139,7 +137,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { @@ -190,7 +187,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java index 2e4d3d15ae63..e8f439f85b1d 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java @@ -68,7 +68,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -102,7 +101,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -136,7 +134,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -171,7 +168,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -209,7 +205,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -260,7 +255,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -293,7 +287,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -330,7 +323,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git 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 index 46227d8c5579..7b868a7a23df 100644 --- 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 @@ -75,7 +75,6 @@ default Optional getRequest() { produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -123,7 +122,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -163,7 +161,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { @@ -219,7 +216,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ) { @@ -274,7 +270,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -335,7 +330,6 @@ default ResponseEntity getPetById( produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -385,7 +379,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -426,7 +419,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java index 59ba999b5c8d..8f30c300a37c 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { @@ -101,7 +100,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -139,7 +137,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { @@ -190,7 +187,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java index 23bb60c0b121..90afaef5332c 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java @@ -68,7 +68,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -102,7 +101,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -136,7 +134,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -171,7 +168,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -209,7 +205,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -260,7 +255,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -293,7 +287,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -330,7 +323,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 367879e168be..c32097212f6a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -63,11 +63,10 @@ default AnotherFakeApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().call123testSpecialTags(client); + return getDelegate().call123testSpecialTags(client); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 153dadf21959..36ca098194ca 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -73,11 +73,10 @@ default FakeApiDelegate getDelegate() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -105,11 +104,10 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -137,11 +135,10 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite); + return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -169,11 +166,10 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -201,11 +197,10 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -230,11 +225,10 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { - return getDelegate().responseObjectDifferentNames(petId); + return getDelegate().responseObjectDifferentNames(petId); } @@ -259,11 +253,10 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -287,12 +280,11 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) { - return getDelegate().testBodyWithQueryParams(query, user); + return getDelegate().testBodyWithQueryParams(query, user); } @@ -321,11 +313,10 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClientModel(client); + return getDelegate().testClientModel(client); } @@ -369,7 +360,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @Parameter(name = "number", description = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @Parameter(name = "double", description = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -386,7 +376,7 @@ default ResponseEntity testEndpointParameters( @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -421,7 +411,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -432,7 +421,7 @@ default ResponseEntity testEnumParameters( @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -462,7 +451,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -471,7 +459,7 @@ default ResponseEntity testGroupParameters( @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -497,11 +485,10 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ) { - return getDelegate().testInlineAdditionalProperties(requestBody); + return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -528,12 +515,11 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -559,11 +545,10 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { - return getDelegate().testNullable(childWithNullable); + return getDelegate().testNullable(childWithNullable); } @@ -590,14 +575,13 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } @@ -623,11 +607,10 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { - return getDelegate().testWithResultExample(); + return getDelegate().testWithResultExample(); } @@ -661,13 +644,12 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 5139809075f1..84c32b1c3048 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -66,11 +66,10 @@ default FakeClassnameTestApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClassname(client); + return getDelegate().testClassname(client); } } diff --git 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 index 6712b8a7f573..20e92dad5a4a 100644 --- 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 @@ -68,11 +68,10 @@ default PetApiDelegate getDelegate() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -103,12 +102,11 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -142,11 +140,10 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -183,11 +180,10 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -223,11 +219,10 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -262,11 +257,10 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -297,13 +291,12 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -337,13 +330,12 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 7298d2656466..30b81268c7d0 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -62,11 +62,10 @@ default StoreApiDelegate getDelegate() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -96,11 +95,10 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -133,11 +131,10 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -169,11 +166,10 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 96c4b24639f6..ae51e8567600 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -61,11 +61,10 @@ default UserApiDelegate getDelegate() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(user); + return getDelegate().createUser(user); } @@ -91,11 +90,10 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithArrayInput(user); + return getDelegate().createUsersWithArrayInput(user); } @@ -121,11 +119,10 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithListInput(user); + return getDelegate().createUsersWithListInput(user); } @@ -152,11 +149,10 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -189,11 +185,10 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -225,12 +220,11 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -254,11 +248,10 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -287,12 +280,11 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, user); + return getDelegate().updateUser(username, user); } } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 7024d1628cd7..fbbb29270bfc 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -67,7 +67,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 47e59284993a..6f2ee8256fe4 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -77,7 +77,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { @@ -110,7 +109,6 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { @@ -143,7 +141,6 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { @@ -185,7 +182,6 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { @@ -218,7 +214,6 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { @@ -248,7 +243,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -287,7 +281,6 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { @@ -316,7 +309,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user @@ -351,7 +343,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { @@ -409,7 +400,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @Parameter(name = "number", description = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @Parameter(name = "double", description = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -464,7 +454,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, @@ -506,7 +495,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, @@ -540,7 +528,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ) { @@ -572,7 +559,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -604,7 +590,6 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { @@ -636,7 +621,6 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @@ -670,7 +654,6 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { @@ -718,7 +701,6 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index a80a6e9b8a62..a7a822e1d73c 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -70,7 +70,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { diff --git 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 index 70618d4d2851..ed905a90769b 100644 --- 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 @@ -72,7 +72,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -110,7 +109,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -149,7 +147,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status ) { @@ -205,7 +202,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags ) { @@ -260,7 +256,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -314,7 +309,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -350,7 +344,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -391,7 +384,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 34b02a05f55e..4c0c4abc7e65 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ) { @@ -101,7 +100,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -139,7 +137,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ) { @@ -190,7 +187,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 7bc4e5d94417..82624b5fe8a0 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -65,7 +65,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -96,7 +95,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -127,7 +125,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -159,7 +156,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -197,7 +193,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -248,7 +243,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -278,7 +272,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -312,7 +305,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git 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 index db5aa4ab7316..605099084c82 100644 --- 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 @@ -46,7 +46,6 @@ default Optional getRequest() { produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Valid @RequestBody Pet pet ) { @@ -82,7 +81,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @PathVariable("petId") Long petId, @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -106,7 +104,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { @@ -145,7 +142,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Valid @RequestParam(value = "tags", required = true) List tags ) { @@ -183,7 +179,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @PathVariable("petId") Long petId ) { @@ -225,7 +220,6 @@ default ResponseEntity getPetById( produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Valid @RequestBody Pet pet ) { @@ -263,7 +257,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @PathVariable("petId") Long petId, @Valid @RequestParam(value = "name", required = false) String name, @@ -290,7 +283,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @PathVariable("petId") Long petId, @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java index 7322f6a83d5a..71b0fe5b2241 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java @@ -43,7 +43,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @PathVariable("orderId") String orderId ) { @@ -64,7 +63,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -88,7 +86,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @PathVariable("orderId") Long orderId ) { @@ -126,7 +123,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Valid @RequestBody Order order ) { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java index 97a22859bee7..7e352e3345a7 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java @@ -43,7 +43,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Valid @RequestBody User user ) { @@ -65,7 +64,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Valid @RequestBody List<@Valid User> user ) { @@ -87,7 +85,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Valid @RequestBody List<@Valid User> user ) { @@ -109,7 +106,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @PathVariable("username") String username ) { @@ -133,7 +129,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @PathVariable("username") String username ) { @@ -171,7 +166,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Valid @RequestParam(value = "password", required = true) String password @@ -192,7 +186,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -216,7 +209,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @PathVariable("username") String username, @Valid @RequestBody User user diff --git 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 index 877f7a2227b3..2a6363c03949 100644 --- 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 @@ -76,7 +76,6 @@ default Optional getRequest() { produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -124,7 +123,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -164,7 +162,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { @@ -220,7 +217,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ) { @@ -275,7 +271,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -336,7 +331,6 @@ default ResponseEntity getPetById( produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -386,7 +380,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -427,7 +420,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index d0481548da25..754a65c4aef8 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -67,7 +67,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { @@ -102,7 +101,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -140,7 +138,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { @@ -191,7 +188,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index a97047a2e46e..7fb600cae42d 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -69,7 +69,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -103,7 +102,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -137,7 +135,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -172,7 +169,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -210,7 +206,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -261,7 +256,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -294,7 +288,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -331,7 +324,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java index ccaebd522b91..7283d7f9a0b5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -60,7 +60,6 @@ public interface AnotherFakeApi { produces = { "application/json" }, consumes = { "application/json" } ) - ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) throws Exception; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java index 82997195f6dc..c9be57f342d8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java @@ -70,7 +70,6 @@ public interface FakeApi { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) throws Exception; @@ -100,7 +99,6 @@ ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) throws Exception; @@ -130,7 +128,6 @@ ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) throws Exception; @@ -160,7 +157,6 @@ ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) throws Exception; @@ -190,7 +186,6 @@ ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) throws Exception; @@ -217,7 +212,6 @@ ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) throws Exception; @@ -244,7 +238,6 @@ ResponseEntity responseObjectDifferentNam value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) throws Exception; @@ -270,7 +263,6 @@ ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user @@ -302,7 +294,6 @@ ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) throws Exception; @@ -348,7 +339,6 @@ ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - ResponseEntity testEndpointParameters( @Parameter(name = "number", description = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @Parameter(name = "double", description = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -398,7 +388,6 @@ ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - ResponseEntity testEnumParameters( @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -437,7 +426,6 @@ ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - ResponseEntity testGroupParameters( @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -470,7 +458,6 @@ ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ) throws Exception; @@ -499,7 +486,6 @@ ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - ResponseEntity testJsonFormData( @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -528,7 +514,6 @@ ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) throws Exception; @@ -557,7 +542,6 @@ ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @@ -588,7 +572,6 @@ ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - ResponseEntity testWithResultExample( ) throws Exception; @@ -624,7 +607,6 @@ ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - ResponseEntity uploadFileWithRequiredFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 6bf9f34e97a5..36ccf3d1b3ca 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -63,7 +63,6 @@ public interface FakeClassnameTestApi { produces = { "application/json" }, consumes = { "application/json" } ) - ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) throws Exception; diff --git 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 index c8e09e34e9a2..b30461cba9b9 100644 --- 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 @@ -65,7 +65,6 @@ public interface PetApi { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; @@ -98,7 +97,6 @@ ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -135,7 +133,6 @@ ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status ) throws Exception; @@ -174,7 +171,6 @@ ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags ) throws Exception; @@ -212,7 +208,6 @@ ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) throws Exception; @@ -249,7 +244,6 @@ ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; @@ -282,7 +276,6 @@ ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -320,7 +313,6 @@ ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java index 008b52371d99..2593fd6f9f1e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/StoreApi.java @@ -59,7 +59,6 @@ public interface StoreApi { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ) throws Exception; @@ -91,7 +90,6 @@ ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - ResponseEntity> getInventory( ) throws Exception; @@ -126,7 +124,6 @@ ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ) throws Exception; @@ -160,7 +157,6 @@ ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) throws Exception; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java index 768dc69f1a45..41d3f20fc079 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/UserApi.java @@ -58,7 +58,6 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) throws Exception; @@ -86,7 +85,6 @@ ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) throws Exception; @@ -114,7 +112,6 @@ ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) throws Exception; @@ -143,7 +140,6 @@ ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) throws Exception; @@ -178,7 +174,6 @@ ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) throws Exception; @@ -212,7 +207,6 @@ ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - ResponseEntity loginUser( @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -239,7 +233,6 @@ ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - ResponseEntity logoutUser( ) throws Exception; @@ -270,7 +263,6 @@ ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java index 68015c98b3ae..479d1a6894a7 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/api/NullableApi.java @@ -65,7 +65,6 @@ default Optional getRequest() { value = NullableApi.PATH_NULLABLE_TEST, consumes = "application/json" ) - default ResponseEntity nullableTest( @Parameter(name = "ObjectWithUniqueItems", description = "") @Valid @RequestBody(required = false) @Nullable ObjectWithUniqueItems objectWithUniqueItems ) { diff --git a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java index 82e7bc0036e3..cadd384ff264 100644 --- a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java +++ b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java @@ -80,11 +80,10 @@ default DogsApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity createDog( @Parameter(name = "Dog", description = "") @Valid @RequestBody(required = false) @Nullable Dog dog ) { - return getDelegate().createDog(dog); + return getDelegate().createDog(dog); } } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1b48bf0275f6..2588f2f086a8 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 8e49bc950270..ac00ee51f10e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { @@ -99,7 +98,6 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { @@ -132,7 +130,6 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { @@ -174,7 +171,6 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { @@ -207,7 +203,6 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { @@ -238,7 +233,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { @@ -278,7 +272,6 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { @@ -309,7 +302,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User user @@ -343,7 +335,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { @@ -401,7 +392,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -454,7 +444,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -496,7 +485,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -532,7 +520,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { @@ -564,7 +551,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -596,7 +582,6 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { @@ -629,7 +614,6 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @@ -663,7 +647,6 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { @@ -713,7 +696,6 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 58ef49364d1c..b85253ce229d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -58,7 +58,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git 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 index ad900e6596a3..fc3b959a6ae8 100644 --- 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 @@ -64,7 +64,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -103,7 +102,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -145,7 +143,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { @@ -202,7 +199,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { @@ -255,7 +251,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { @@ -312,7 +307,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -351,7 +345,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -394,7 +387,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 9db407d6f1b2..e4a86f629aa3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { @@ -90,7 +89,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -126,7 +124,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { @@ -175,7 +172,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 1aef3451ca39..b2b46c7dcbc7 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -54,7 +54,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -85,7 +84,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -116,7 +114,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -148,7 +145,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { @@ -184,7 +180,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { @@ -233,7 +228,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -263,7 +257,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -297,7 +290,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1b48bf0275f6..2588f2f086a8 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 8e49bc950270..ac00ee51f10e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { @@ -99,7 +98,6 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { @@ -132,7 +130,6 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { @@ -174,7 +171,6 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { @@ -207,7 +203,6 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { @@ -238,7 +233,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { @@ -278,7 +272,6 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { @@ -309,7 +302,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User user @@ -343,7 +335,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { @@ -401,7 +392,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -454,7 +444,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -496,7 +485,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -532,7 +520,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { @@ -564,7 +551,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -596,7 +582,6 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { @@ -629,7 +614,6 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @@ -663,7 +647,6 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { @@ -713,7 +696,6 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 58ef49364d1c..b85253ce229d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -58,7 +58,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git 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 index ad900e6596a3..fc3b959a6ae8 100644 --- 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 @@ -64,7 +64,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -103,7 +102,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -145,7 +143,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { @@ -202,7 +199,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { @@ -255,7 +251,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { @@ -312,7 +307,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -351,7 +345,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -394,7 +387,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 9db407d6f1b2..e4a86f629aa3 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { @@ -90,7 +89,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -126,7 +124,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { @@ -175,7 +172,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index 1aef3451ca39..b2b46c7dcbc7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -54,7 +54,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -85,7 +84,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -116,7 +114,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -148,7 +145,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { @@ -184,7 +180,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { @@ -233,7 +228,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -263,7 +257,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -297,7 +290,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java index cbfa319c2e8c..7e1a18ddaf77 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java index af625d38513a..0159b2e50c92 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { @@ -99,7 +98,6 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { @@ -132,7 +130,6 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { @@ -174,7 +171,6 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { @@ -207,7 +203,6 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { @@ -238,7 +233,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { @@ -278,7 +272,6 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { @@ -309,7 +302,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User user @@ -343,7 +335,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { @@ -401,7 +392,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -454,7 +444,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -496,7 +485,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -532,7 +520,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { @@ -564,7 +551,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -596,7 +582,6 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { @@ -629,7 +614,6 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @@ -663,7 +647,6 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { @@ -713,7 +696,6 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 6903d7a3532d..557d13c3a4da 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -58,7 +58,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java index 7e3cc903a49c..95e0a482d3af 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java @@ -64,7 +64,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -103,7 +102,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -145,7 +143,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { @@ -202,7 +199,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { @@ -255,7 +251,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { @@ -312,7 +307,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -351,7 +345,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -394,7 +387,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java index 3dccadba6533..2c0cc67de548 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { @@ -90,7 +89,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -126,7 +124,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { @@ -175,7 +172,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java index 789520a53298..586a0418753b 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java @@ -54,7 +54,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -85,7 +84,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -116,7 +114,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -148,7 +145,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { @@ -184,7 +180,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { @@ -233,7 +228,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -263,7 +257,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -297,7 +290,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index d3de2cfd335d..1e52cf9b0147 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -51,11 +51,10 @@ default AnotherFakeApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().call123testSpecialTags(client); + return getDelegate().call123testSpecialTags(client); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index cfe5e622e7da..6492f46b2948 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -62,11 +62,10 @@ default FakeApiDelegate getDelegate() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -94,11 +93,10 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -126,11 +124,10 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite); + return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -158,11 +155,10 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -190,11 +186,10 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -220,11 +215,10 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().responseObjectDifferentNames(petId); + return getDelegate().responseObjectDifferentNames(petId); } @@ -250,11 +244,10 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -280,12 +273,11 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { - return getDelegate().testBodyWithQueryParams(query, user); + return getDelegate().testBodyWithQueryParams(query, user); } @@ -313,11 +305,10 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClientModel(client); + return getDelegate().testClientModel(client); } @@ -361,7 +352,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -378,7 +368,7 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -413,7 +403,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -424,7 +413,7 @@ default ResponseEntity testEnumParameters( @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -454,7 +443,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -463,7 +451,7 @@ default ResponseEntity testGroupParameters( @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -489,11 +477,10 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { - return getDelegate().testInlineAdditionalProperties(requestBody); + return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -520,12 +507,11 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -551,11 +537,10 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { - return getDelegate().testNullable(childWithNullable); + return getDelegate().testNullable(childWithNullable); } @@ -583,14 +568,13 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } @@ -616,11 +600,10 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { - return getDelegate().testWithResultExample(); + return getDelegate().testWithResultExample(); } @@ -656,13 +639,12 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 7750b51f525c..18cec0539f49 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -54,11 +54,10 @@ default FakeClassnameTestApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClassname(client); + return getDelegate().testClassname(client); } } diff --git 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 index 97ffd959b184..1393f28f4097 100644 --- 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 @@ -60,11 +60,10 @@ default PetApiDelegate getDelegate() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -98,12 +97,11 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -139,11 +137,10 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -181,11 +178,10 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -219,11 +215,10 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -261,11 +256,10 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -299,13 +293,12 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -341,13 +334,12 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 6e3674540d93..270255f70741 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -51,11 +51,10 @@ default StoreApiDelegate getDelegate() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -85,11 +84,10 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -120,11 +118,10 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -154,11 +151,10 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index 51560e6fe8b1..af160ab42ce7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -50,11 +50,10 @@ default UserApiDelegate getDelegate() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(user); + return getDelegate().createUser(user); } @@ -80,11 +79,10 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithArrayInput(user); + return getDelegate().createUsersWithArrayInput(user); } @@ -110,11 +108,10 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithListInput(user); + return getDelegate().createUsersWithListInput(user); } @@ -141,11 +138,10 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -176,11 +172,10 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -210,12 +205,11 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -239,11 +233,10 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -272,12 +265,11 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, user); + return getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java index dd28ca5b832d..84cb36148848 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java @@ -62,11 +62,10 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) @ResponseStatus(HttpStatus.OK) - default Pet addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -99,12 +98,11 @@ default Pet addPet( value = PetApi.PATH_DELETE_PET ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default void deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - getDelegate().deletePet(petId, apiKey); + getDelegate().deletePet(petId, apiKey); } @@ -140,11 +138,10 @@ default void deletePet( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default List findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -182,11 +179,10 @@ default List findPetsByStatus( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default List findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -221,11 +217,10 @@ default List findPetsByTags( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Pet getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -268,11 +263,10 @@ default Pet getPetById( consumes = { "application/json", "application/xml" } ) @ResponseStatus(HttpStatus.OK) - default Pet updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -307,13 +301,12 @@ default Pet updatePet( consumes = { "application/x-www-form-urlencoded" } ) @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) - default void updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - getDelegate().updatePetWithForm(petId, name, status); + getDelegate().updatePetWithForm(petId, name, status); } @@ -350,13 +343,12 @@ default void updatePetWithForm( consumes = { "multipart/form-data" } ) @ResponseStatus(HttpStatus.OK) - default ModelApiResponse uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java index 9ad2acb96195..006227d02006 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java @@ -52,11 +52,10 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default void deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId ) { - getDelegate().deleteOrder(orderId); + getDelegate().deleteOrder(orderId); } @@ -87,11 +86,10 @@ default void deleteOrder( produces = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Map getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -123,11 +121,10 @@ default Map getInventory( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Order getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -158,11 +155,10 @@ default Order getOrderById( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Order placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java index 0c8cfaf7c7ca..2bf398eda6bb 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java @@ -54,11 +54,10 @@ default UserApiDelegate getDelegate() { consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default void createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { - getDelegate().createUser(user); + getDelegate().createUser(user); } @@ -88,11 +87,10 @@ default void createUser( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default void createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - getDelegate().createUsersWithArrayInput(user); + getDelegate().createUsersWithArrayInput(user); } @@ -122,11 +120,10 @@ default void createUsersWithArrayInput( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default void createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - getDelegate().createUsersWithListInput(user); + getDelegate().createUsersWithListInput(user); } @@ -157,11 +154,10 @@ default void createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default void deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - getDelegate().deleteUser(username); + getDelegate().deleteUser(username); } @@ -193,11 +189,10 @@ default void deleteUser( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default User getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -228,12 +223,11 @@ default User getUserByName( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default String loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -261,11 +255,10 @@ default String loginUser( value = UserApi.PATH_LOGOUT_USER ) @ResponseStatus(HttpStatus.OK) - default void logoutUser( ) { - getDelegate().logoutUser(); + getDelegate().logoutUser(); } @@ -298,12 +291,11 @@ default void logoutUser( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default void updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { - getDelegate().updateUser(username, user); + getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index d3de2cfd335d..1e52cf9b0147 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -51,11 +51,10 @@ default AnotherFakeApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().call123testSpecialTags(client); + return getDelegate().call123testSpecialTags(client); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index cfe5e622e7da..6492f46b2948 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -62,11 +62,10 @@ default FakeApiDelegate getDelegate() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -94,11 +93,10 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -126,11 +124,10 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite); + return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -158,11 +155,10 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -190,11 +186,10 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -220,11 +215,10 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().responseObjectDifferentNames(petId); + return getDelegate().responseObjectDifferentNames(petId); } @@ -250,11 +244,10 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -280,12 +273,11 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { - return getDelegate().testBodyWithQueryParams(query, user); + return getDelegate().testBodyWithQueryParams(query, user); } @@ -313,11 +305,10 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClientModel(client); + return getDelegate().testClientModel(client); } @@ -361,7 +352,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -378,7 +368,7 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -413,7 +403,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -424,7 +413,7 @@ default ResponseEntity testEnumParameters( @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -454,7 +443,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -463,7 +451,7 @@ default ResponseEntity testGroupParameters( @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -489,11 +477,10 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { - return getDelegate().testInlineAdditionalProperties(requestBody); + return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -520,12 +507,11 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -551,11 +537,10 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { - return getDelegate().testNullable(childWithNullable); + return getDelegate().testNullable(childWithNullable); } @@ -583,14 +568,13 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } @@ -616,11 +600,10 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { - return getDelegate().testWithResultExample(); + return getDelegate().testWithResultExample(); } @@ -656,13 +639,12 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 7750b51f525c..18cec0539f49 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -54,11 +54,10 @@ default FakeClassnameTestApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClassname(client); + return getDelegate().testClassname(client); } } diff --git 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 index 97ffd959b184..1393f28f4097 100644 --- 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 @@ -60,11 +60,10 @@ default PetApiDelegate getDelegate() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -98,12 +97,11 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -139,11 +137,10 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -181,11 +178,10 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -219,11 +215,10 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -261,11 +256,10 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -299,13 +293,12 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -341,13 +334,12 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 6e3674540d93..270255f70741 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -51,11 +51,10 @@ default StoreApiDelegate getDelegate() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -85,11 +84,10 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -120,11 +118,10 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -154,11 +151,10 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 51560e6fe8b1..af160ab42ce7 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -50,11 +50,10 @@ default UserApiDelegate getDelegate() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(user); + return getDelegate().createUser(user); } @@ -80,11 +79,10 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithArrayInput(user); + return getDelegate().createUsersWithArrayInput(user); } @@ -110,11 +108,10 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithListInput(user); + return getDelegate().createUsersWithListInput(user); } @@ -141,11 +138,10 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -176,11 +172,10 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -210,12 +205,11 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -239,11 +233,10 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -272,12 +265,11 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, user); + return getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java b/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java index 4f8c05c4783d..8545aa81bce7 100644 --- a/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java +++ b/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java @@ -59,11 +59,10 @@ default DummyApiDelegate getDelegate() { value = DummyApi.PATH_UPLOAD_FILE, consumes = { "application/octet-stream" } ) - default ResponseEntity uploadFile( @Parameter(name = "body", description = "") @Valid @RequestBody(required = false) Optional body ) { - return getDelegate().uploadFile(body); + return getDelegate().uploadFile(body); } } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java index 6bd0359983aa..4eba5794d3d1 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java @@ -46,7 +46,6 @@ default Optional getRequest() { produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Valid @RequestBody Pet pet ) { @@ -81,7 +80,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @PathVariable("petId") Long petId ) { @@ -104,7 +102,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { @@ -143,7 +140,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Valid @RequestParam(value = "tags", required = true) List tags ) { @@ -181,7 +177,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @PathVariable("petId") Long petId ) { @@ -223,7 +218,6 @@ default ResponseEntity getPetById( produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Valid @RequestBody Pet pet ) { @@ -261,7 +255,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @PathVariable("petId") Long petId, @Valid @RequestParam(value = "name", required = false) String name, @@ -288,7 +281,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @PathVariable("petId") Long petId, @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java index 7322f6a83d5a..71b0fe5b2241 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java @@ -43,7 +43,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @PathVariable("orderId") String orderId ) { @@ -64,7 +63,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -88,7 +86,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @PathVariable("orderId") Long orderId ) { @@ -126,7 +123,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Valid @RequestBody Order order ) { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java index 97a22859bee7..7e352e3345a7 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java @@ -43,7 +43,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Valid @RequestBody User user ) { @@ -65,7 +64,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Valid @RequestBody List<@Valid User> user ) { @@ -87,7 +85,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Valid @RequestBody List<@Valid User> user ) { @@ -109,7 +106,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @PathVariable("username") String username ) { @@ -133,7 +129,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @PathVariable("username") String username ) { @@ -171,7 +166,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Valid @RequestParam(value = "password", required = true) String password @@ -192,7 +186,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -216,7 +209,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @PathVariable("username") String username, @Valid @RequestBody User user diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1b48bf0275f6..2588f2f086a8 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 84ded191fdad..358c73e37174 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { @@ -99,7 +98,6 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { @@ -132,7 +130,6 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { @@ -174,7 +171,6 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { @@ -207,7 +203,6 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { @@ -238,7 +233,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { @@ -278,7 +272,6 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { @@ -309,7 +302,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User user @@ -343,7 +335,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { @@ -401,7 +392,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -456,7 +446,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, @@ -498,7 +487,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group, @@ -532,7 +520,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { @@ -564,7 +551,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -596,7 +582,6 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { @@ -629,7 +614,6 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @@ -663,7 +647,6 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { @@ -713,7 +696,6 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 58ef49364d1c..b85253ce229d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -58,7 +58,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git 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 index cf07b48527d3..6ebeb57a22d7 100644 --- 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 @@ -64,7 +64,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -105,7 +104,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId ) { @@ -146,7 +144,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { @@ -203,7 +200,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { @@ -256,7 +252,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { @@ -313,7 +308,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -352,7 +346,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -395,7 +388,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 9db407d6f1b2..e4a86f629aa3 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { @@ -90,7 +89,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -126,7 +124,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { @@ -175,7 +172,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 1aef3451ca39..b2b46c7dcbc7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -54,7 +54,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -85,7 +84,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -116,7 +114,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -148,7 +145,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { @@ -184,7 +180,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { @@ -233,7 +228,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -263,7 +257,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -297,7 +290,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java index 6ba5edf2563e..a4631376c6a5 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java @@ -75,7 +75,6 @@ default Optional getRequest() { produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -123,7 +122,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -163,7 +161,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { @@ -219,7 +216,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ) { @@ -274,7 +270,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -335,7 +330,6 @@ default ResponseEntity getPetById( produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -385,7 +379,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -426,7 +419,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java index 20a928253047..0b728722950e 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { @@ -101,7 +100,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -139,7 +137,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { @@ -190,7 +187,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java index 2e4d3d15ae63..e8f439f85b1d 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java @@ -68,7 +68,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -102,7 +101,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -136,7 +134,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -171,7 +168,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -209,7 +205,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -260,7 +255,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -293,7 +287,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -330,7 +323,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java index 46227d8c5579..7b868a7a23df 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java @@ -75,7 +75,6 @@ default Optional getRequest() { produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -123,7 +122,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -163,7 +161,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { @@ -219,7 +216,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ) { @@ -274,7 +270,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -335,7 +330,6 @@ default ResponseEntity getPetById( produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -385,7 +379,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -426,7 +419,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java index 59ba999b5c8d..8f30c300a37c 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { @@ -101,7 +100,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -139,7 +137,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { @@ -190,7 +187,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java index 23bb60c0b121..90afaef5332c 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java @@ -68,7 +68,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -102,7 +101,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -136,7 +134,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -171,7 +168,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -209,7 +205,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -260,7 +255,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -293,7 +287,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -330,7 +323,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java index c19e0c69e625..75c15708e1a3 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java @@ -81,11 +81,10 @@ default PetApiDelegate getDelegate() { produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -114,12 +113,11 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -159,11 +157,10 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -200,11 +197,10 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -240,11 +236,10 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -286,11 +281,10 @@ default ResponseEntity getPetById( produces = { "application/xml", "application/json" }, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -321,13 +315,12 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -361,13 +354,12 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java index 1850bdca5561..0c1128279688 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java @@ -62,11 +62,10 @@ default StoreApiDelegate getDelegate() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -96,11 +95,10 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -133,11 +131,10 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -169,11 +166,10 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java index baad34bcd15a..85ca2f54f2f4 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java @@ -64,11 +64,10 @@ default UserApiDelegate getDelegate() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(user); + return getDelegate().createUser(user); } @@ -97,11 +96,10 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithArrayInput(user); + return getDelegate().createUsersWithArrayInput(user); } @@ -130,11 +128,10 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithListInput(user); + return getDelegate().createUsersWithListInput(user); } @@ -164,11 +161,10 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -201,11 +197,10 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -237,12 +232,11 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -269,11 +263,10 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -305,12 +298,11 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, user); + return getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java index f14139e6553a..4107ea59b2dd 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,12 +57,11 @@ default AnotherFakeApiDelegate getDelegate() { consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().call123testSpecialTags(client, exchange); + return getDelegate().call123testSpecialTags(client, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java index bbc3cdc970a7..49dc56622423 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java @@ -68,12 +68,11 @@ default FakeApiDelegate getDelegate() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) @ResponseStatus(HttpStatus.OK) - default Mono createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createXmlItem(xmlItem, exchange); + return getDelegate().createXmlItem(xmlItem, exchange); } @@ -102,12 +101,11 @@ default Mono createXmlItem( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterBooleanSerialize(body, exchange); + return getDelegate().fakeOuterBooleanSerialize(body, exchange); } @@ -136,12 +134,11 @@ default Mono fakeOuterBooleanSerialize( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono outerComposite, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); + return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); } @@ -170,12 +167,11 @@ default Mono fakeOuterCompositeSerialize( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterNumberSerialize(body, exchange); + return getDelegate().fakeOuterNumberSerialize(body, exchange); } @@ -204,12 +200,11 @@ default Mono fakeOuterNumberSerialize( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterStringSerialize(body, exchange); + return getDelegate().fakeOuterStringSerialize(body, exchange); } @@ -236,12 +231,11 @@ default Mono fakeOuterStringSerialize( produces = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().responseObjectDifferentNames(petId, exchange); + return getDelegate().responseObjectDifferentNames(petId, exchange); } @@ -268,12 +262,11 @@ default Mono responseObjectDifferentNames consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); } @@ -300,13 +293,12 @@ default Mono testBodyWithFileSchema( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithQueryParams(query, user, exchange); + return getDelegate().testBodyWithQueryParams(query, user, exchange); } @@ -335,12 +327,11 @@ default Mono testBodyWithQueryParams( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClientModel(client, exchange); + return getDelegate().testClientModel(client, exchange); } @@ -385,7 +376,6 @@ default Mono testClientModel( consumes = { "application/x-www-form-urlencoded" } ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default Mono testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestPart(value = "double", required = true) Double _double, @@ -403,7 +393,7 @@ default Mono testEndpointParameters( @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); } @@ -439,7 +429,6 @@ default Mono testEndpointParameters( consumes = { "application/x-www-form-urlencoded" } ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default Mono testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -451,7 +440,7 @@ default Mono testEnumParameters( @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestPart(value = "enum_form_string", required = false) String enumFormString, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); } @@ -482,7 +471,6 @@ default Mono testEnumParameters( value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default Mono testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -492,7 +480,7 @@ default Mono testGroupParameters( @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); } @@ -519,12 +507,11 @@ default Mono testGroupParameters( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testInlineAdditionalProperties(requestBody, exchange); + return getDelegate().testInlineAdditionalProperties(requestBody, exchange); } @@ -552,13 +539,12 @@ default Mono testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) @ResponseStatus(HttpStatus.OK) - default Mono testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestPart(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testJsonFormData(param, param2, exchange); + return getDelegate().testJsonFormData(param, param2, exchange); } @@ -585,12 +571,11 @@ default Mono testJsonFormData( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testNullable(childWithNullable, exchange); + return getDelegate().testNullable(childWithNullable, exchange); } @@ -619,7 +604,6 @@ default Mono testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) @ResponseStatus(HttpStatus.OK) - default Mono testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @@ -627,7 +611,7 @@ default Mono testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); } @@ -654,11 +638,10 @@ default Mono testQueryParameterCollectionFormat( produces = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono testWithResultExample( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testWithResultExample(exchange); + return getDelegate().testWithResultExample(exchange); } @@ -695,14 +678,13 @@ default Mono testWithResultExample( consumes = { "multipart/form-data" } ) @ResponseStatus(HttpStatus.OK) - default Mono uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) Part requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index e95ed0d8c4bd..b74536accf30 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,12 +60,11 @@ default FakeClassnameTestApiDelegate getDelegate() { consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClassname(client, exchange); + return getDelegate().testClassname(client, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java index 9c3d47c08bd8..34b6d13874e1 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java @@ -66,12 +66,11 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) @ResponseStatus(HttpStatus.OK) - default Mono addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().addPet(pet, exchange); + return getDelegate().addPet(pet, exchange); } @@ -106,13 +105,12 @@ default Mono addPet( value = PetApi.PATH_DELETE_PET ) @ResponseStatus(HttpStatus.OK) - default Mono deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deletePet(petId, apiKey, exchange); + return getDelegate().deletePet(petId, apiKey, exchange); } @@ -149,12 +147,11 @@ default Mono deletePet( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Flux findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().findPetsByStatus(status, exchange); + return getDelegate().findPetsByStatus(status, exchange); } @@ -193,12 +190,11 @@ default Flux findPetsByStatus( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Flux findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().findPetsByTags(tags, exchange); + return getDelegate().findPetsByTags(tags, exchange); } @@ -233,12 +229,11 @@ default Flux findPetsByTags( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getPetById(petId, exchange); + return getDelegate().getPetById(petId, exchange); } @@ -277,12 +272,11 @@ default Mono getPetById( consumes = { "application/json", "application/xml" } ) @ResponseStatus(HttpStatus.OK) - default Mono updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updatePet(pet, exchange); + return getDelegate().updatePet(pet, exchange); } @@ -317,14 +311,13 @@ default Mono updatePet( consumes = { "application/x-www-form-urlencoded" } ) @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) - default Mono updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestPart(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updatePetWithForm(petId, name, status, exchange); + return getDelegate().updatePetWithForm(petId, name, status, exchange); } @@ -361,14 +354,13 @@ default Mono updatePetWithForm( consumes = { "multipart/form-data" } ) @ResponseStatus(HttpStatus.OK) - default Mono uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); + return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java index 9c1f67fb7721..6873282ec2a7 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java @@ -57,12 +57,11 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default Mono deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deleteOrder(orderId, exchange); + return getDelegate().deleteOrder(orderId, exchange); } @@ -93,11 +92,10 @@ default Mono deleteOrder( produces = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono> getInventory( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getInventory(exchange); + return getDelegate().getInventory(exchange); } @@ -129,12 +127,11 @@ default Mono> getInventory( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getOrderById(orderId, exchange); + return getDelegate().getOrderById(orderId, exchange); } @@ -165,12 +162,11 @@ default Mono getOrderById( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().placeOrder(order, exchange); + return getDelegate().placeOrder(order, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java index 4faff829bb7c..d5a143cd3297 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java @@ -56,12 +56,11 @@ default UserApiDelegate getDelegate() { consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUser(user, exchange); + return getDelegate().createUser(user, exchange); } @@ -88,12 +87,11 @@ default Mono createUser( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithArrayInput(user, exchange); + return getDelegate().createUsersWithArrayInput(user, exchange); } @@ -120,12 +118,11 @@ default Mono createUsersWithArrayInput( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithListInput(user, exchange); + return getDelegate().createUsersWithListInput(user, exchange); } @@ -153,12 +150,11 @@ default Mono createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default Mono deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deleteUser(username, exchange); + return getDelegate().deleteUser(username, exchange); } @@ -190,12 +186,11 @@ default Mono deleteUser( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getUserByName(username, exchange); + return getDelegate().getUserByName(username, exchange); } @@ -226,13 +221,12 @@ default Mono getUserByName( produces = { "application/xml", "application/json" } ) @ResponseStatus(HttpStatus.OK) - default Mono loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().loginUser(username, password, exchange); + return getDelegate().loginUser(username, password, exchange); } @@ -257,11 +251,10 @@ default Mono loginUser( value = UserApi.PATH_LOGOUT_USER ) @ResponseStatus(HttpStatus.OK) - default Mono logoutUser( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().logoutUser(exchange); + return getDelegate().logoutUser(exchange); } @@ -291,13 +284,12 @@ default Mono logoutUser( consumes = { "application/json" } ) @ResponseStatus(HttpStatus.BAD_REQUEST) - default Mono updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updateUser(username, user, exchange); + return getDelegate().updateUser(username, user, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 4ebe7f87a09e..81150aa57d15 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -56,12 +56,11 @@ default AnotherFakeApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default Mono> call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().call123testSpecialTags(client, exchange); + return getDelegate().call123testSpecialTags(client, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index f627d54a4154..476e3f1714fd 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -67,12 +67,11 @@ default FakeApiDelegate getDelegate() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default Mono> createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createXmlItem(xmlItem, exchange); + return getDelegate().createXmlItem(xmlItem, exchange); } @@ -100,12 +99,11 @@ default Mono> createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default Mono> fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterBooleanSerialize(body, exchange); + return getDelegate().fakeOuterBooleanSerialize(body, exchange); } @@ -133,12 +131,11 @@ default Mono> fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default Mono> fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono outerComposite, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); + return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); } @@ -166,12 +163,11 @@ default Mono> fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default Mono> fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterNumberSerialize(body, exchange); + return getDelegate().fakeOuterNumberSerialize(body, exchange); } @@ -199,12 +195,11 @@ default Mono> fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default Mono> fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterStringSerialize(body, exchange); + return getDelegate().fakeOuterStringSerialize(body, exchange); } @@ -230,12 +225,11 @@ default Mono> fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default Mono> responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().responseObjectDifferentNames(petId, exchange); + return getDelegate().responseObjectDifferentNames(petId, exchange); } @@ -261,12 +255,11 @@ default Mono> responseObje value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default Mono> testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); } @@ -292,13 +285,12 @@ default Mono> testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default Mono> testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithQueryParams(query, user, exchange); + return getDelegate().testBodyWithQueryParams(query, user, exchange); } @@ -326,12 +318,11 @@ default Mono> testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default Mono> testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClientModel(client, exchange); + return getDelegate().testClientModel(client, exchange); } @@ -375,7 +366,6 @@ default Mono> testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default Mono> testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestPart(value = "double", required = true) Double _double, @@ -393,7 +383,7 @@ default Mono> testEndpointParameters( @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); } @@ -428,7 +418,6 @@ default Mono> testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default Mono> testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -440,7 +429,7 @@ default Mono> testEnumParameters( @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestPart(value = "enum_form_string", required = false) String enumFormString, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); } @@ -470,7 +459,6 @@ default Mono> testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default Mono> testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -480,7 +468,7 @@ default Mono> testGroupParameters( @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); } @@ -506,12 +494,11 @@ default Mono> testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default Mono> testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testInlineAdditionalProperties(requestBody, exchange); + return getDelegate().testInlineAdditionalProperties(requestBody, exchange); } @@ -538,13 +525,12 @@ default Mono> testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default Mono> testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestPart(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testJsonFormData(param, param2, exchange); + return getDelegate().testJsonFormData(param, param2, exchange); } @@ -570,12 +556,11 @@ default Mono> testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default Mono> testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testNullable(childWithNullable, exchange); + return getDelegate().testNullable(childWithNullable, exchange); } @@ -603,7 +588,6 @@ default Mono> testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default Mono> testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @@ -611,7 +595,7 @@ default Mono> testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); } @@ -637,11 +621,10 @@ default Mono> testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default Mono> testWithResultExample( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testWithResultExample(exchange); + return getDelegate().testWithResultExample(exchange); } @@ -677,14 +660,13 @@ default Mono> testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default Mono> uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) Part requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d7392a28fb31..3f8b14a898de 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -59,12 +59,11 @@ default FakeClassnameTestApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default Mono> testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClassname(client, exchange); + return getDelegate().testClassname(client, exchange); } } diff --git 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 index a906decd2ef0..19a030d5d64d 100644 --- 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 @@ -65,12 +65,11 @@ default PetApiDelegate getDelegate() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default Mono> addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().addPet(pet, exchange); + return getDelegate().addPet(pet, exchange); } @@ -104,13 +103,12 @@ default Mono> addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default Mono> deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deletePet(petId, apiKey, exchange); + return getDelegate().deletePet(petId, apiKey, exchange); } @@ -146,12 +144,11 @@ default Mono> deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default Mono>> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().findPetsByStatus(status, exchange); + return getDelegate().findPetsByStatus(status, exchange); } @@ -189,12 +186,11 @@ default Mono>> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default Mono>> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().findPetsByTags(tags, exchange); + return getDelegate().findPetsByTags(tags, exchange); } @@ -228,12 +224,11 @@ default Mono>> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default Mono> getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getPetById(petId, exchange); + return getDelegate().getPetById(petId, exchange); } @@ -271,12 +266,11 @@ default Mono> getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default Mono> updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updatePet(pet, exchange); + return getDelegate().updatePet(pet, exchange); } @@ -310,14 +304,13 @@ default Mono> updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default Mono> updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestPart(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updatePetWithForm(petId, name, status, exchange); + return getDelegate().updatePetWithForm(petId, name, status, exchange); } @@ -353,14 +346,13 @@ default Mono> updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default Mono> uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); + return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index b1b090aef442..bf688e5a25ab 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -56,12 +56,11 @@ default StoreApiDelegate getDelegate() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default Mono> deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deleteOrder(orderId, exchange); + return getDelegate().deleteOrder(orderId, exchange); } @@ -91,11 +90,10 @@ default Mono> deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default Mono>> getInventory( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getInventory(exchange); + return getDelegate().getInventory(exchange); } @@ -126,12 +124,11 @@ default Mono>> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default Mono> getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getOrderById(orderId, exchange); + return getDelegate().getOrderById(orderId, exchange); } @@ -161,12 +158,11 @@ default Mono> getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default Mono> placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().placeOrder(order, exchange); + return getDelegate().placeOrder(order, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index 4a356e9b9420..aeb960c584f2 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -55,12 +55,11 @@ default UserApiDelegate getDelegate() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default Mono> createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUser(user, exchange); + return getDelegate().createUser(user, exchange); } @@ -86,12 +85,11 @@ default Mono> createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default Mono> createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithArrayInput(user, exchange); + return getDelegate().createUsersWithArrayInput(user, exchange); } @@ -117,12 +115,11 @@ default Mono> createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default Mono> createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithListInput(user, exchange); + return getDelegate().createUsersWithListInput(user, exchange); } @@ -149,12 +146,11 @@ default Mono> createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default Mono> deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deleteUser(username, exchange); + return getDelegate().deleteUser(username, exchange); } @@ -185,12 +181,11 @@ default Mono> deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default Mono> getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getUserByName(username, exchange); + return getDelegate().getUserByName(username, exchange); } @@ -220,13 +215,12 @@ default Mono> getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default Mono> loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().loginUser(username, password, exchange); + return getDelegate().loginUser(username, password, exchange); } @@ -250,11 +244,10 @@ default Mono> loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default Mono> logoutUser( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().logoutUser(exchange); + return getDelegate().logoutUser(exchange); } @@ -283,13 +276,12 @@ default Mono> logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default Mono> updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updateUser(username, user, exchange); + return getDelegate().updateUser(username, user, exchange); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index c85e1870aca8..9a9cb7dc29be 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -51,11 +51,10 @@ default AnotherFakeApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().call123testSpecialTags(body); + return getDelegate().call123testSpecialTags(body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index ea0567452ce0..326bfe03c274 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -60,11 +60,10 @@ default FakeApiDelegate getDelegate() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -91,11 +90,10 @@ default ResponseEntity createXmlItem( value = FakeApi.PATH_FAKE_OUTER_BOOLEAN_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -122,11 +120,10 @@ default ResponseEntity fakeOuterBooleanSerialize( value = FakeApi.PATH_FAKE_OUTER_COMPOSITE_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body ) { - return getDelegate().fakeOuterCompositeSerialize(body); + return getDelegate().fakeOuterCompositeSerialize(body); } @@ -153,11 +150,10 @@ default ResponseEntity fakeOuterCompositeSerialize( value = FakeApi.PATH_FAKE_OUTER_NUMBER_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -184,11 +180,10 @@ default ResponseEntity fakeOuterNumberSerialize( value = FakeApi.PATH_FAKE_OUTER_STRING_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -214,11 +209,10 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { - return getDelegate().testBodyWithFileSchema(body); + return getDelegate().testBodyWithFileSchema(body); } @@ -244,12 +238,11 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User body ) { - return getDelegate().testBodyWithQueryParams(query, body); + return getDelegate().testBodyWithQueryParams(query, body); } @@ -277,11 +270,10 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().testClientModel(body); + return getDelegate().testClientModel(body); } @@ -325,7 +317,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -342,7 +333,7 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -377,7 +368,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -388,7 +378,7 @@ default ResponseEntity testEnumParameters( @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -418,7 +408,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -427,7 +416,7 @@ default ResponseEntity testGroupParameters( @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -452,11 +441,10 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { - return getDelegate().testInlineAdditionalProperties(param); + return getDelegate().testInlineAdditionalProperties(param); } @@ -482,12 +470,11 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -516,7 +503,6 @@ default ResponseEntity testJsonFormData( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @@ -524,7 +510,7 @@ default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); } @@ -559,13 +545,12 @@ default ResponseEntity testQueryParameterCollectionFormat( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 90e4ea0cabc8..4e192349b4a1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -54,11 +54,10 @@ default FakeClassnameTestApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().testClassname(body); + return getDelegate().testClassname(body); } } diff --git 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 index a362f744b107..70b0635f3a0d 100644 --- 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 @@ -60,11 +60,10 @@ default PetApiDelegate getDelegate() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { - return getDelegate().addPet(body); + return getDelegate().addPet(body); } @@ -97,12 +96,11 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -138,12 +136,11 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable ) { - return getDelegate().findPetsByStatus(status, pageable); + return getDelegate().findPetsByStatus(status, pageable); } @@ -182,13 +179,12 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, @ApiIgnore final Pageable pageable ) { - return getDelegate().findPetsByTags(tags, size, pageable); + return getDelegate().findPetsByTags(tags, size, pageable); } @@ -222,11 +218,10 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -260,11 +255,10 @@ default ResponseEntity getPetById( value = PetApi.PATH_LIST_ALL_PETS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> listAllPets( @ApiIgnore final Pageable pageable ) { - return getDelegate().listAllPets(pageable); + return getDelegate().listAllPets(pageable); } @@ -301,11 +295,10 @@ default ResponseEntity> listAllPets( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { - return getDelegate().updatePet(body); + return getDelegate().updatePet(body); } @@ -338,13 +331,12 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -379,13 +371,12 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index aa1454a2cb7f..ddad8a5a424c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -51,11 +51,10 @@ default StoreApiDelegate getDelegate() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -85,11 +84,10 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -120,11 +118,10 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -152,11 +149,10 @@ default ResponseEntity getOrderById( value = StoreApi.PATH_PLACE_ORDER, produces = { "application/xml", "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { - return getDelegate().placeOrder(body); + return getDelegate().placeOrder(body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index 3dd6e2fec7a0..ce11df9cd9aa 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -49,11 +49,10 @@ default UserApiDelegate getDelegate() { method = RequestMethod.POST, value = UserApi.PATH_CREATE_USER ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { - return getDelegate().createUser(body); + return getDelegate().createUser(body); } @@ -77,11 +76,10 @@ default ResponseEntity createUser( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { - return getDelegate().createUsersWithArrayInput(body); + return getDelegate().createUsersWithArrayInput(body); } @@ -105,11 +103,10 @@ default ResponseEntity createUsersWithArrayInput( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { - return getDelegate().createUsersWithListInput(body); + return getDelegate().createUsersWithListInput(body); } @@ -136,11 +133,10 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -170,11 +166,10 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -203,12 +198,11 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -231,11 +225,10 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -263,12 +256,11 @@ default ResponseEntity logoutUser( method = RequestMethod.PUT, value = UserApi.PATH_UPDATE_USER ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body ) { - return getDelegate().updateUser(username, body); + return getDelegate().updateUser(username, body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index 69096fbb568e..ac4a391d6860 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -52,13 +52,12 @@ default VersioningApiDelegate getDelegate() { produces = { "*/*" }, headers = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) - default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningHeaders(versionWithDefaultValue, versionNoDefaultValue, petId); + return getDelegate().versioningHeaders(versionWithDefaultValue, versionNoDefaultValue, petId); } @@ -90,7 +89,6 @@ default ResponseEntity versioningHeaders( headers = { "VersionWithDefaultValueHeader=V1", "VersionNoDefaultValueHeader" } , params = { "VersionWithDefaultValueQuery=V1", "VersionNoDefaultValueQuery" } ) - default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, @@ -98,7 +96,7 @@ default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValueHeader", required = true) String versionNoDefaultValueHeader, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, versionWithDefaultValueHeader, versionNoDefaultValueHeader, petId); + return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, versionWithDefaultValueHeader, versionNoDefaultValueHeader, petId); } @@ -127,13 +125,12 @@ default ResponseEntity versioningMix( produces = { "*/*" }, params = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) - default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); + return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index c85e1870aca8..9a9cb7dc29be 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -51,11 +51,10 @@ default AnotherFakeApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().call123testSpecialTags(body); + return getDelegate().call123testSpecialTags(body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index ea0567452ce0..326bfe03c274 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -60,11 +60,10 @@ default FakeApiDelegate getDelegate() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -91,11 +90,10 @@ default ResponseEntity createXmlItem( value = FakeApi.PATH_FAKE_OUTER_BOOLEAN_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -122,11 +120,10 @@ default ResponseEntity fakeOuterBooleanSerialize( value = FakeApi.PATH_FAKE_OUTER_COMPOSITE_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body ) { - return getDelegate().fakeOuterCompositeSerialize(body); + return getDelegate().fakeOuterCompositeSerialize(body); } @@ -153,11 +150,10 @@ default ResponseEntity fakeOuterCompositeSerialize( value = FakeApi.PATH_FAKE_OUTER_NUMBER_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -184,11 +180,10 @@ default ResponseEntity fakeOuterNumberSerialize( value = FakeApi.PATH_FAKE_OUTER_STRING_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -214,11 +209,10 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { - return getDelegate().testBodyWithFileSchema(body); + return getDelegate().testBodyWithFileSchema(body); } @@ -244,12 +238,11 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User body ) { - return getDelegate().testBodyWithQueryParams(query, body); + return getDelegate().testBodyWithQueryParams(query, body); } @@ -277,11 +270,10 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().testClientModel(body); + return getDelegate().testClientModel(body); } @@ -325,7 +317,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -342,7 +333,7 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -377,7 +368,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -388,7 +378,7 @@ default ResponseEntity testEnumParameters( @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -418,7 +408,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -427,7 +416,7 @@ default ResponseEntity testGroupParameters( @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -452,11 +441,10 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { - return getDelegate().testInlineAdditionalProperties(param); + return getDelegate().testInlineAdditionalProperties(param); } @@ -482,12 +470,11 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -516,7 +503,6 @@ default ResponseEntity testJsonFormData( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @@ -524,7 +510,7 @@ default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); } @@ -559,13 +545,12 @@ default ResponseEntity testQueryParameterCollectionFormat( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 90e4ea0cabc8..4e192349b4a1 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -54,11 +54,10 @@ default FakeClassnameTestApiDelegate getDelegate() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().testClassname(body); + return getDelegate().testClassname(body); } } diff --git 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 index a362f744b107..70b0635f3a0d 100644 --- 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 @@ -60,11 +60,10 @@ default PetApiDelegate getDelegate() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { - return getDelegate().addPet(body); + return getDelegate().addPet(body); } @@ -97,12 +96,11 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -138,12 +136,11 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable ) { - return getDelegate().findPetsByStatus(status, pageable); + return getDelegate().findPetsByStatus(status, pageable); } @@ -182,13 +179,12 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, @ApiIgnore final Pageable pageable ) { - return getDelegate().findPetsByTags(tags, size, pageable); + return getDelegate().findPetsByTags(tags, size, pageable); } @@ -222,11 +218,10 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -260,11 +255,10 @@ default ResponseEntity getPetById( value = PetApi.PATH_LIST_ALL_PETS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> listAllPets( @ApiIgnore final Pageable pageable ) { - return getDelegate().listAllPets(pageable); + return getDelegate().listAllPets(pageable); } @@ -301,11 +295,10 @@ default ResponseEntity> listAllPets( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { - return getDelegate().updatePet(body); + return getDelegate().updatePet(body); } @@ -338,13 +331,12 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -379,13 +371,12 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index aa1454a2cb7f..ddad8a5a424c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -51,11 +51,10 @@ default StoreApiDelegate getDelegate() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -85,11 +84,10 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -120,11 +118,10 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -152,11 +149,10 @@ default ResponseEntity getOrderById( value = StoreApi.PATH_PLACE_ORDER, produces = { "application/xml", "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { - return getDelegate().placeOrder(body); + return getDelegate().placeOrder(body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index 3dd6e2fec7a0..ce11df9cd9aa 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -49,11 +49,10 @@ default UserApiDelegate getDelegate() { method = RequestMethod.POST, value = UserApi.PATH_CREATE_USER ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { - return getDelegate().createUser(body); + return getDelegate().createUser(body); } @@ -77,11 +76,10 @@ default ResponseEntity createUser( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { - return getDelegate().createUsersWithArrayInput(body); + return getDelegate().createUsersWithArrayInput(body); } @@ -105,11 +103,10 @@ default ResponseEntity createUsersWithArrayInput( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { - return getDelegate().createUsersWithListInput(body); + return getDelegate().createUsersWithListInput(body); } @@ -136,11 +133,10 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -170,11 +166,10 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -203,12 +198,11 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -231,11 +225,10 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -263,12 +256,11 @@ default ResponseEntity logoutUser( method = RequestMethod.PUT, value = UserApi.PATH_UPDATE_USER ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body ) { - return getDelegate().updateUser(username, body); + return getDelegate().updateUser(username, body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java index 37a3a0e6c0bd..9143b6f9a25f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java @@ -54,11 +54,10 @@ default VersioningApiDelegate getDelegate() { produces = { "*/*" }, headers = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) - default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningHeaders(petId); + return getDelegate().versioningHeaders(petId); } @@ -92,13 +91,12 @@ default ResponseEntity versioningHeaders( headers = { "VersionWithDefaultValueHeader=V1", "VersionNoDefaultValueHeader" } , params = { "VersionWithDefaultValueQuery=V1", "VersionNoDefaultValueQuery" } ) - default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, petId); + return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, petId); } @@ -127,13 +125,12 @@ default ResponseEntity versioningMix( produces = { "*/*" }, params = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) - default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); + return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); } } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3268c37c3710..3970c5719b4a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 858206ed6b10..ed997b99069e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -64,7 +64,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { @@ -96,7 +95,6 @@ default ResponseEntity createXmlItem( value = FakeApi.PATH_FAKE_OUTER_BOOLEAN_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { @@ -128,7 +126,6 @@ default ResponseEntity fakeOuterBooleanSerialize( value = FakeApi.PATH_FAKE_OUTER_COMPOSITE_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body ) { @@ -169,7 +166,6 @@ default ResponseEntity fakeOuterCompositeSerialize( value = FakeApi.PATH_FAKE_OUTER_NUMBER_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { @@ -201,7 +197,6 @@ default ResponseEntity fakeOuterNumberSerialize( value = FakeApi.PATH_FAKE_OUTER_STRING_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { @@ -232,7 +227,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { @@ -263,7 +257,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User body @@ -297,7 +290,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { @@ -355,7 +347,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -408,7 +399,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -450,7 +440,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -485,7 +474,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { @@ -516,7 +504,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -551,7 +538,6 @@ default ResponseEntity testJsonFormData( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @@ -595,7 +581,6 @@ default ResponseEntity testQueryParameterCollectionFormat( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 36cc1ec12369..6609ee2a0001 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -58,7 +58,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { diff --git 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 index 603cec1b0922..b943450c6b0e 100644 --- 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 @@ -64,7 +64,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { @@ -102,7 +101,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -144,7 +142,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable @@ -203,7 +200,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, @@ -258,7 +254,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { @@ -311,7 +306,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_LIST_ALL_PETS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> listAllPets( @ApiIgnore final Pageable pageable ) { @@ -367,7 +361,6 @@ default ResponseEntity> listAllPets( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { @@ -405,7 +398,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -447,7 +439,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 3b4c9bf408f0..75f9bea15aaf 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { @@ -90,7 +89,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -126,7 +124,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { @@ -173,7 +170,6 @@ default ResponseEntity getOrderById( value = StoreApi.PATH_PLACE_ORDER, produces = { "application/xml", "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index c84f9d0e1089..81c6f550d929 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -53,7 +53,6 @@ default Optional getRequest() { method = RequestMethod.POST, value = UserApi.PATH_CREATE_USER ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { @@ -82,7 +81,6 @@ default ResponseEntity createUser( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { @@ -111,7 +109,6 @@ default ResponseEntity createUsersWithArrayInput( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { @@ -143,7 +140,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { @@ -178,7 +174,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { @@ -226,7 +221,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -255,7 +249,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -288,7 +281,6 @@ default ResponseEntity logoutUser( method = RequestMethod.PUT, value = UserApi.PATH_UPDATE_USER ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index 27a8add02309..9d25f61b9955 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -56,7 +56,6 @@ default Optional getRequest() { produces = { "*/*" }, headers = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) - default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, @@ -104,7 +103,6 @@ default ResponseEntity versioningHeaders( headers = { "VersionWithDefaultValueHeader=V1", "VersionNoDefaultValueHeader" } , params = { "VersionWithDefaultValueQuery=V1", "VersionNoDefaultValueQuery" } ) - default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, @@ -151,7 +149,6 @@ default ResponseEntity versioningMix( produces = { "*/*" }, params = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) - default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3268c37c3710..3970c5719b4a 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 858206ed6b10..ed997b99069e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -64,7 +64,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { @@ -96,7 +95,6 @@ default ResponseEntity createXmlItem( value = FakeApi.PATH_FAKE_OUTER_BOOLEAN_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { @@ -128,7 +126,6 @@ default ResponseEntity fakeOuterBooleanSerialize( value = FakeApi.PATH_FAKE_OUTER_COMPOSITE_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body ) { @@ -169,7 +166,6 @@ default ResponseEntity fakeOuterCompositeSerialize( value = FakeApi.PATH_FAKE_OUTER_NUMBER_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { @@ -201,7 +197,6 @@ default ResponseEntity fakeOuterNumberSerialize( value = FakeApi.PATH_FAKE_OUTER_STRING_SERIALIZE, produces = { "*/*" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { @@ -232,7 +227,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { @@ -263,7 +257,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User body @@ -297,7 +290,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { @@ -355,7 +347,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -408,7 +399,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -450,7 +440,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -485,7 +474,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { @@ -516,7 +504,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -551,7 +538,6 @@ default ResponseEntity testJsonFormData( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, @@ -595,7 +581,6 @@ default ResponseEntity testQueryParameterCollectionFormat( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 36cc1ec12369..6609ee2a0001 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -58,7 +58,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { diff --git 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 index 603cec1b0922..b943450c6b0e 100644 --- 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 @@ -64,7 +64,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { @@ -102,7 +101,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -144,7 +142,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable @@ -203,7 +200,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, @@ -258,7 +254,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { @@ -311,7 +306,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_LIST_ALL_PETS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> listAllPets( @ApiIgnore final Pageable pageable ) { @@ -367,7 +361,6 @@ default ResponseEntity> listAllPets( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { @@ -405,7 +398,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -447,7 +439,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 3b4c9bf408f0..75f9bea15aaf 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { @@ -90,7 +89,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -126,7 +124,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { @@ -173,7 +170,6 @@ default ResponseEntity getOrderById( value = StoreApi.PATH_PLACE_ORDER, produces = { "application/xml", "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index c84f9d0e1089..81c6f550d929 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -53,7 +53,6 @@ default Optional getRequest() { method = RequestMethod.POST, value = UserApi.PATH_CREATE_USER ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { @@ -82,7 +81,6 @@ default ResponseEntity createUser( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { @@ -111,7 +109,6 @@ default ResponseEntity createUsersWithArrayInput( method = RequestMethod.POST, value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { @@ -143,7 +140,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { @@ -178,7 +174,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { @@ -226,7 +221,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -255,7 +249,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -288,7 +281,6 @@ default ResponseEntity logoutUser( method = RequestMethod.PUT, value = UserApi.PATH_UPDATE_USER ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java index a51d6be8d2bc..bb2a4cd70972 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java @@ -58,7 +58,6 @@ default Optional getRequest() { produces = { "*/*" }, headers = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) - default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { @@ -106,7 +105,6 @@ default ResponseEntity versioningHeaders( headers = { "VersionWithDefaultValueHeader=V1", "VersionNoDefaultValueHeader" } , params = { "VersionWithDefaultValueQuery=V1", "VersionNoDefaultValueQuery" } ) - default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, @@ -151,7 +149,6 @@ default ResponseEntity versioningMix( produces = { "*/*" }, params = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) - default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java index df059b7efe03..bac64874d60b 100644 --- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/api/UserApi.java @@ -72,7 +72,6 @@ default Optional getRequest() { value = UserApi.PATH_LOGIN_USER, produces = { "application/json" } ) - default ResponseEntity loginUser( @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password, @@ -105,7 +104,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( @Parameter(hidden = true) @Value("${server.port}") String somePropertyValue, @Parameter(hidden = true) @RequestHeader(value="x-project-id", required = false) String someHeaderValue, diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1b48bf0275f6..2588f2f086a8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index 20350d1136e5..65c4dc7fdbc8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { @@ -99,7 +98,6 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Optional body ) { @@ -132,7 +130,6 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Optional outerComposite ) { @@ -174,7 +171,6 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Optional body ) { @@ -207,7 +203,6 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Optional body ) { @@ -238,7 +233,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { @@ -278,7 +272,6 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { @@ -309,7 +302,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User user @@ -343,7 +335,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { @@ -401,7 +392,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -454,7 +444,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) Optional> enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") Optional enumHeaderString, @@ -496,7 +485,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -532,7 +520,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { @@ -564,7 +551,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -596,7 +582,6 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { @@ -629,7 +614,6 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @@ -663,7 +647,6 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { @@ -713,7 +696,6 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 58ef49364d1c..b85253ce229d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -58,7 +58,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { diff --git 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 index d6751b3860d0..65b2da6269a7 100644 --- 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 @@ -64,7 +64,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -103,7 +102,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) Optional apiKey @@ -145,7 +143,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { @@ -202,7 +199,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { @@ -255,7 +251,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { @@ -312,7 +307,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -351,7 +345,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) Optional name, @@ -394,7 +387,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata, diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 9db407d6f1b2..e4a86f629aa3 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { @@ -90,7 +89,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -126,7 +124,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { @@ -175,7 +172,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index 1aef3451ca39..b2b46c7dcbc7 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -54,7 +54,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -85,7 +84,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -116,7 +114,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -148,7 +145,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { @@ -184,7 +180,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { @@ -233,7 +228,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -263,7 +257,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -297,7 +290,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index 1fb67f4382ee..fefa88d6b959 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -71,7 +71,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index 781e8ed74dd8..80e3b6246857 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -81,7 +81,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { @@ -115,7 +114,6 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { @@ -149,7 +147,6 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { @@ -192,7 +189,6 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { @@ -226,7 +222,6 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { @@ -257,7 +252,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -297,7 +291,6 @@ default ResponseEntity responseObjectDiff value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { @@ -327,7 +320,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user @@ -363,7 +355,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { @@ -422,7 +413,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @Parameter(name = "number", description = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @Parameter(name = "double", description = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -476,7 +466,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -519,7 +508,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -556,7 +544,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ) { @@ -589,7 +576,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -622,7 +608,6 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { @@ -655,7 +640,6 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List http, @@ -690,7 +674,6 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { @@ -739,7 +722,6 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index 2d6baa42904d..0fb1913eaee9 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -74,7 +74,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { diff --git 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 index 1ee94eb9929b..2785bfbc9d00 100644 --- 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 @@ -76,7 +76,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -113,7 +112,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -154,7 +152,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status ) { @@ -211,7 +208,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags ) { @@ -267,7 +263,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { @@ -322,7 +317,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { @@ -359,7 +353,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -401,7 +394,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index 43bdca95ebc5..cb0e16af7ed0 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -70,7 +70,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ) { @@ -106,7 +105,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -145,7 +143,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ) { @@ -197,7 +194,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index 870a865b38eb..4844c5c97284 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -69,7 +69,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { @@ -101,7 +100,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -133,7 +131,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { @@ -166,7 +163,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -205,7 +201,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { @@ -257,7 +252,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password @@ -288,7 +282,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -323,7 +316,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index 278e9e8b5867..e42f58b3591b 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto ) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index 4dccefae10d6..2be5fec2ede2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -66,7 +66,6 @@ default Optional getRequest() { value = FakeApi.PATH_CREATE_XML_ITEM, consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) - default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItemDto xmlItemDto ) { @@ -99,7 +98,6 @@ default ResponseEntity createXmlItem( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { @@ -132,7 +130,6 @@ default ResponseEntity fakeOuterBooleanSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterCompositeDto outerCompositeDto ) { @@ -174,7 +171,6 @@ default ResponseEntity fakeOuterCompositeSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { @@ -207,7 +203,6 @@ default ResponseEntity fakeOuterNumberSerialize( produces = { "*/*" }, consumes = { "application/json" } ) - default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { @@ -238,7 +233,6 @@ default ResponseEntity fakeOuterStringSerialize( value = FakeApi.PATH_RESPONSE_OBJECT_DIFFERENT_NAMES, produces = { "application/json" } ) - default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { @@ -278,7 +272,6 @@ default ResponseEntity responseObjectD value = FakeApi.PATH_TEST_BODY_WITH_FILE_SCHEMA, consumes = { "application/json" } ) - default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto ) { @@ -309,7 +302,6 @@ default ResponseEntity testBodyWithFileSchema( value = FakeApi.PATH_TEST_BODY_WITH_QUERY_PARAMS, consumes = { "application/json" } ) - default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody UserDto userDto @@ -343,7 +335,6 @@ default ResponseEntity testBodyWithQueryParams( produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto ) { @@ -401,7 +392,6 @@ default ResponseEntity testClientModel( value = FakeApi.PATH_TEST_ENDPOINT_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEndpointParameters( @ApiParam(value = "None", required = true) @DecimalMin("32.1") @DecimalMax("543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, @ApiParam(value = "None", required = true) @DecimalMin("67.8") @DecimalMax("123.4") @Valid @RequestParam(value = "double", required = true) Double _double, @@ -454,7 +444,6 @@ default ResponseEntity testEndpointParameters( value = FakeApi.PATH_TEST_ENUM_PARAMETERS, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testEnumParameters( @ApiParam(value = "Header parameter enum test (string array)", allowableValues = ">, $") @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @ApiParam(value = "Header parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, @@ -496,7 +485,6 @@ default ResponseEntity testEnumParameters( method = RequestMethod.DELETE, value = FakeApi.PATH_TEST_GROUP_PARAMETERS ) - default ResponseEntity testGroupParameters( @NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup, @NotNull @ApiParam(value = "Required Boolean in group parameters", required = true) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup, @@ -532,7 +520,6 @@ default ResponseEntity testGroupParameters( value = FakeApi.PATH_TEST_INLINE_ADDITIONAL_PROPERTIES, consumes = { "application/json" } ) - default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { @@ -564,7 +551,6 @@ default ResponseEntity testInlineAdditionalProperties( value = FakeApi.PATH_TEST_JSON_FORM_DATA, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 @@ -596,7 +582,6 @@ default ResponseEntity testJsonFormData( value = FakeApi.PATH_TEST_NULLABLE, consumes = { "application/json" } ) - default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullableDto childWithNullableDto ) { @@ -629,7 +614,6 @@ default ResponseEntity testNullable( method = RequestMethod.PUT, value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) - default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "pipe", required = true) List pipe, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "http", required = true) List http, @@ -663,7 +647,6 @@ default ResponseEntity testQueryParameterCollectionFormat( value = FakeApi.PATH_TEST_WITH_RESULT_EXAMPLE, produces = { "application/json" } ) - default ResponseEntity testWithResultExample( ) { @@ -713,7 +696,6 @@ default ResponseEntity testWithResultExample( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFileWithRequiredFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 6b646e440586..7f4c0397d179 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -58,7 +58,6 @@ default Optional getRequest() { produces = { "application/json" }, consumes = { "application/json" } ) - default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto ) { diff --git 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 index 9705df612554..ee03b0f9b580 100644 --- 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 @@ -64,7 +64,6 @@ default Optional getRequest() { value = PetApi.PATH_ADD_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto ) { @@ -103,7 +102,6 @@ default ResponseEntity addPet( method = RequestMethod.DELETE, value = PetApi.PATH_DELETE_PET ) - default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey @@ -145,7 +143,6 @@ default ResponseEntity deletePet( value = PetApi.PATH_FIND_PETS_BY_STATUS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { @@ -202,7 +199,6 @@ default ResponseEntity> findPetsByStatus( value = PetApi.PATH_FIND_PETS_BY_TAGS, produces = { "application/xml", "application/json" } ) - default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { @@ -255,7 +251,6 @@ default ResponseEntity> findPetsByTags( value = PetApi.PATH_GET_PET_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { @@ -312,7 +307,6 @@ default ResponseEntity getPetById( value = PetApi.PATH_UPDATE_PET, consumes = { "application/json", "application/xml" } ) - default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto ) { @@ -351,7 +345,6 @@ default ResponseEntity updatePet( value = PetApi.PATH_UPDATE_PET_WITH_FORM, consumes = { "application/x-www-form-urlencoded" } ) - default ResponseEntity updatePetWithForm( @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @@ -394,7 +387,6 @@ default ResponseEntity updatePetWithForm( produces = { "application/json" }, consumes = { "multipart/form-data" } ) - default ResponseEntity uploadFile( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index b6b7acb5075c..f06b313aa9ca 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -55,7 +55,6 @@ default Optional getRequest() { method = RequestMethod.DELETE, value = StoreApi.PATH_DELETE_ORDER ) - default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { @@ -90,7 +89,6 @@ default ResponseEntity deleteOrder( value = StoreApi.PATH_GET_INVENTORY, produces = { "application/json" } ) - default ResponseEntity> getInventory( ) { @@ -126,7 +124,6 @@ default ResponseEntity> getInventory( value = StoreApi.PATH_GET_ORDER_BY_ID, produces = { "application/xml", "application/json" } ) - default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { @@ -175,7 +172,6 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" }, consumes = { "application/json" } ) - default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody OrderDto orderDto ) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 7a880f5e79b2..a54efff980f2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -54,7 +54,6 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER, consumes = { "application/json" } ) - default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody UserDto userDto ) { @@ -85,7 +84,6 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto ) { @@ -116,7 +114,6 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT, consumes = { "application/json" } ) - default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto ) { @@ -148,7 +145,6 @@ default ResponseEntity createUsersWithListInput( method = RequestMethod.DELETE, value = UserApi.PATH_DELETE_USER ) - default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { @@ -184,7 +180,6 @@ default ResponseEntity deleteUser( value = UserApi.PATH_GET_USER_BY_NAME, produces = { "application/xml", "application/json" } ) - default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { @@ -233,7 +228,6 @@ default ResponseEntity getUserByName( value = UserApi.PATH_LOGIN_USER, produces = { "application/xml", "application/json" } ) - default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password @@ -263,7 +257,6 @@ default ResponseEntity loginUser( method = RequestMethod.GET, value = UserApi.PATH_LOGOUT_USER ) - default ResponseEntity logoutUser( ) { @@ -297,7 +290,6 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER, consumes = { "application/json" } ) - default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody UserDto userDto From 4ff91ad8e33eabcfdd283a4147bb315bcc4352a0 Mon Sep 17 00:00:00 2001 From: Bernhard Danecker Date: Thu, 16 Oct 2025 23:01:24 +0200 Subject: [PATCH 3/3] revert unintended indentation --- .../main/resources/JavaSpring/api.mustache | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 36 +++++++++---------- .../api/FakeClassnameTestApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../java/org/openapitools/api/DogsApi.java | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 36 +++++++++---------- .../api/FakeClassnameTestApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 36 +++++++++---------- .../api/FakeClassnameTestApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../java/org/openapitools/api/DummyApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 36 +++++++++---------- .../api/FakeClassnameTestApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 36 +++++++++---------- .../api/FakeClassnameTestApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 30 ++++++++-------- .../api/FakeClassnameTestApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 18 +++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../org/openapitools/api/VersioningApi.java | 6 ++-- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 30 ++++++++-------- .../api/FakeClassnameTestApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 18 +++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../org/openapitools/api/VersioningApi.java | 6 ++-- 53 files changed, 325 insertions(+), 325 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache index d646b6115d2c..2fd82b68e365 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache @@ -287,7 +287,7 @@ public interface {{classname}} { {{>methodBody}}{{! prevent indent}} {{/isDelegate}} {{#isDelegate}} - {{^isVoid}}return {{/isVoid}}{{#isVoid}}{{#useResponseEntity}}return {{/useResponseEntity}}{{^useResponseEntity}}{{#reactive}}return {{/reactive}}{{/useResponseEntity}}{{/isVoid}}getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{^hasParams}}{{#reactive}}, {{/reactive}}{{/hasParams}}pageable{{/vendorExtensions.x-spring-paginated}}); + {{^isVoid}}return {{/isVoid}}{{#isVoid}}{{#useResponseEntity}}return {{/useResponseEntity}}{{^useResponseEntity}}{{#reactive}}return {{/reactive}}{{/useResponseEntity}}{{/isVoid}}getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{^hasParams}}{{#reactive}}, {{/reactive}}{{/hasParams}}pageable{{/vendorExtensions.x-spring-paginated}}); {{/isDelegate}} }{{/jdk8-default-interface}} diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index c32097212f6a..e4e1c9848c4d 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -66,7 +66,7 @@ default AnotherFakeApiDelegate getDelegate() { default ResponseEntity call123testSpecialTags( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().call123testSpecialTags(client); + return getDelegate().call123testSpecialTags(client); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 36ca098194ca..644eba8e1477 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -76,7 +76,7 @@ default FakeApiDelegate getDelegate() { default ResponseEntity createXmlItem( @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -107,7 +107,7 @@ default ResponseEntity createXmlItem( default ResponseEntity fakeOuterBooleanSerialize( @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -138,7 +138,7 @@ default ResponseEntity fakeOuterBooleanSerialize( default ResponseEntity fakeOuterCompositeSerialize( @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite); + return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -169,7 +169,7 @@ default ResponseEntity fakeOuterCompositeSerialize( default ResponseEntity fakeOuterNumberSerialize( @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -200,7 +200,7 @@ default ResponseEntity fakeOuterNumberSerialize( default ResponseEntity fakeOuterStringSerialize( @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -228,7 +228,7 @@ default ResponseEntity fakeOuterStringSerialize( default ResponseEntity responseObjectDifferentNames( @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { - return getDelegate().responseObjectDifferentNames(petId); + return getDelegate().responseObjectDifferentNames(petId); } @@ -256,7 +256,7 @@ default ResponseEntity responseObjectDiff default ResponseEntity testBodyWithFileSchema( @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -284,7 +284,7 @@ default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) { - return getDelegate().testBodyWithQueryParams(query, user); + return getDelegate().testBodyWithQueryParams(query, user); } @@ -316,7 +316,7 @@ default ResponseEntity testBodyWithQueryParams( default ResponseEntity testClientModel( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClientModel(client); + return getDelegate().testClientModel(client); } @@ -376,7 +376,7 @@ default ResponseEntity testEndpointParameters( @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -421,7 +421,7 @@ default ResponseEntity testEnumParameters( @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -459,7 +459,7 @@ default ResponseEntity testGroupParameters( @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -488,7 +488,7 @@ default ResponseEntity testGroupParameters( default ResponseEntity testInlineAdditionalProperties( @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody ) { - return getDelegate().testInlineAdditionalProperties(requestBody); + return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -519,7 +519,7 @@ default ResponseEntity testJsonFormData( @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -548,7 +548,7 @@ default ResponseEntity testJsonFormData( default ResponseEntity testNullable( @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { - return getDelegate().testNullable(childWithNullable); + return getDelegate().testNullable(childWithNullable); } @@ -581,7 +581,7 @@ default ResponseEntity testQueryParameterCollectionFormat( @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } @@ -610,7 +610,7 @@ default ResponseEntity testQueryParameterCollectionFormat( default ResponseEntity testWithResultExample( ) { - return getDelegate().testWithResultExample(); + return getDelegate().testWithResultExample(); } @@ -649,7 +649,7 @@ default ResponseEntity uploadFileWithRequiredFile( @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 84c32b1c3048..e662344c8eff 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -69,7 +69,7 @@ default FakeClassnameTestApiDelegate getDelegate() { default ResponseEntity testClassname( @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClassname(client); + return getDelegate().testClassname(client); } } diff --git 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 index 20e92dad5a4a..1e0862d41285 100644 --- 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 @@ -71,7 +71,7 @@ default PetApiDelegate getDelegate() { default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -106,7 +106,7 @@ default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -143,7 +143,7 @@ default ResponseEntity deletePet( default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -183,7 +183,7 @@ default ResponseEntity> findPetsByStatus( default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -222,7 +222,7 @@ default ResponseEntity> findPetsByTags( default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -260,7 +260,7 @@ default ResponseEntity getPetById( default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -296,7 +296,7 @@ default ResponseEntity updatePetWithForm( @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -335,7 +335,7 @@ default ResponseEntity uploadFile( @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 30b81268c7d0..b9d16839d252 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -65,7 +65,7 @@ default StoreApiDelegate getDelegate() { default ResponseEntity deleteOrder( @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -98,7 +98,7 @@ default ResponseEntity deleteOrder( default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -134,7 +134,7 @@ default ResponseEntity> getInventory( default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -169,7 +169,7 @@ default ResponseEntity getOrderById( default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index ae51e8567600..e3686e69d7cf 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -64,7 +64,7 @@ default UserApiDelegate getDelegate() { default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(user); + return getDelegate().createUser(user); } @@ -93,7 +93,7 @@ default ResponseEntity createUser( default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithArrayInput(user); + return getDelegate().createUsersWithArrayInput(user); } @@ -122,7 +122,7 @@ default ResponseEntity createUsersWithArrayInput( default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithListInput(user); + return getDelegate().createUsersWithListInput(user); } @@ -152,7 +152,7 @@ default ResponseEntity createUsersWithListInput( default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -188,7 +188,7 @@ default ResponseEntity deleteUser( default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -224,7 +224,7 @@ default ResponseEntity loginUser( @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -251,7 +251,7 @@ default ResponseEntity loginUser( default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -284,7 +284,7 @@ default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, user); + return getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java index cadd384ff264..4d1b0ee3ac28 100644 --- a/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java +++ b/samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java @@ -83,7 +83,7 @@ default DogsApiDelegate getDelegate() { default ResponseEntity createDog( @Parameter(name = "Dog", description = "") @Valid @RequestBody(required = false) @Nullable Dog dog ) { - return getDelegate().createDog(dog); + return getDelegate().createDog(dog); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1e52cf9b0147..6f56affa854f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -54,7 +54,7 @@ default AnotherFakeApiDelegate getDelegate() { default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().call123testSpecialTags(client); + return getDelegate().call123testSpecialTags(client); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index 6492f46b2948..0eaf9bc09964 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -65,7 +65,7 @@ default FakeApiDelegate getDelegate() { default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -96,7 +96,7 @@ default ResponseEntity createXmlItem( default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -127,7 +127,7 @@ default ResponseEntity fakeOuterBooleanSerialize( default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite); + return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -158,7 +158,7 @@ default ResponseEntity fakeOuterCompositeSerialize( default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -189,7 +189,7 @@ default ResponseEntity fakeOuterNumberSerialize( default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -218,7 +218,7 @@ default ResponseEntity fakeOuterStringSerialize( default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().responseObjectDifferentNames(petId); + return getDelegate().responseObjectDifferentNames(petId); } @@ -247,7 +247,7 @@ default ResponseEntity responseObjectDiff default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -277,7 +277,7 @@ default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { - return getDelegate().testBodyWithQueryParams(query, user); + return getDelegate().testBodyWithQueryParams(query, user); } @@ -308,7 +308,7 @@ default ResponseEntity testBodyWithQueryParams( default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClientModel(client); + return getDelegate().testClientModel(client); } @@ -368,7 +368,7 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -413,7 +413,7 @@ default ResponseEntity testEnumParameters( @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -451,7 +451,7 @@ default ResponseEntity testGroupParameters( @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -480,7 +480,7 @@ default ResponseEntity testGroupParameters( default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { - return getDelegate().testInlineAdditionalProperties(requestBody); + return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -511,7 +511,7 @@ default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -540,7 +540,7 @@ default ResponseEntity testJsonFormData( default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { - return getDelegate().testNullable(childWithNullable); + return getDelegate().testNullable(childWithNullable); } @@ -574,7 +574,7 @@ default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } @@ -603,7 +603,7 @@ default ResponseEntity testQueryParameterCollectionFormat( default ResponseEntity testWithResultExample( ) { - return getDelegate().testWithResultExample(); + return getDelegate().testWithResultExample(); } @@ -644,7 +644,7 @@ default ResponseEntity uploadFileWithRequiredFile( @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 18cec0539f49..d436aea52499 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -57,7 +57,7 @@ default FakeClassnameTestApiDelegate getDelegate() { default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClassname(client); + return getDelegate().testClassname(client); } } diff --git 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 index 1393f28f4097..f1a6e8a0af80 100644 --- 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 @@ -63,7 +63,7 @@ default PetApiDelegate getDelegate() { default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -101,7 +101,7 @@ default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -140,7 +140,7 @@ default ResponseEntity deletePet( default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -181,7 +181,7 @@ default ResponseEntity> findPetsByStatus( default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -218,7 +218,7 @@ default ResponseEntity> findPetsByTags( default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -259,7 +259,7 @@ default ResponseEntity getPetById( default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -298,7 +298,7 @@ default ResponseEntity updatePetWithForm( @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -339,7 +339,7 @@ default ResponseEntity uploadFile( @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 270255f70741..b20c13411283 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -54,7 +54,7 @@ default StoreApiDelegate getDelegate() { default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -87,7 +87,7 @@ default ResponseEntity deleteOrder( default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -121,7 +121,7 @@ default ResponseEntity> getInventory( default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -154,7 +154,7 @@ default ResponseEntity getOrderById( default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index af160ab42ce7..feff084b571c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -53,7 +53,7 @@ default UserApiDelegate getDelegate() { default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(user); + return getDelegate().createUser(user); } @@ -82,7 +82,7 @@ default ResponseEntity createUser( default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithArrayInput(user); + return getDelegate().createUsersWithArrayInput(user); } @@ -111,7 +111,7 @@ default ResponseEntity createUsersWithArrayInput( default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithListInput(user); + return getDelegate().createUsersWithListInput(user); } @@ -141,7 +141,7 @@ default ResponseEntity createUsersWithListInput( default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -175,7 +175,7 @@ default ResponseEntity deleteUser( default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -209,7 +209,7 @@ default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -236,7 +236,7 @@ default ResponseEntity loginUser( default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -269,7 +269,7 @@ default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, user); + return getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java index 84cb36148848..a8e9b13064d2 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApi.java @@ -65,7 +65,7 @@ default PetApiDelegate getDelegate() { default Pet addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -102,7 +102,7 @@ default void deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - getDelegate().deletePet(petId, apiKey); + getDelegate().deletePet(petId, apiKey); } @@ -141,7 +141,7 @@ default void deletePet( default List findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -182,7 +182,7 @@ default List findPetsByStatus( default List findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -220,7 +220,7 @@ default List findPetsByTags( default Pet getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -266,7 +266,7 @@ default Pet getPetById( default Pet updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -306,7 +306,7 @@ default void updatePetWithForm( @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - getDelegate().updatePetWithForm(petId, name, status); + getDelegate().updatePetWithForm(petId, name, status); } @@ -348,7 +348,7 @@ default ModelApiResponse uploadFile( @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java index 006227d02006..439410811afa 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java @@ -55,7 +55,7 @@ default StoreApiDelegate getDelegate() { default void deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId ) { - getDelegate().deleteOrder(orderId); + getDelegate().deleteOrder(orderId); } @@ -89,7 +89,7 @@ default void deleteOrder( default Map getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -124,7 +124,7 @@ default Map getInventory( default Order getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -158,7 +158,7 @@ default Order getOrderById( default Order placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java index 2bf398eda6bb..88b1b01226ff 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java @@ -57,7 +57,7 @@ default UserApiDelegate getDelegate() { default void createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { - getDelegate().createUser(user); + getDelegate().createUser(user); } @@ -90,7 +90,7 @@ default void createUser( default void createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - getDelegate().createUsersWithArrayInput(user); + getDelegate().createUsersWithArrayInput(user); } @@ -123,7 +123,7 @@ default void createUsersWithArrayInput( default void createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - getDelegate().createUsersWithListInput(user); + getDelegate().createUsersWithListInput(user); } @@ -157,7 +157,7 @@ default void createUsersWithListInput( default void deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - getDelegate().deleteUser(username); + getDelegate().deleteUser(username); } @@ -192,7 +192,7 @@ default void deleteUser( default User getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -227,7 +227,7 @@ default String loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -258,7 +258,7 @@ default String loginUser( default void logoutUser( ) { - getDelegate().logoutUser(); + getDelegate().logoutUser(); } @@ -295,7 +295,7 @@ default void updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { - getDelegate().updateUser(username, user); + getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1e52cf9b0147..6f56affa854f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -54,7 +54,7 @@ default AnotherFakeApiDelegate getDelegate() { default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().call123testSpecialTags(client); + return getDelegate().call123testSpecialTags(client); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 6492f46b2948..0eaf9bc09964 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -65,7 +65,7 @@ default FakeApiDelegate getDelegate() { default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -96,7 +96,7 @@ default ResponseEntity createXmlItem( default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -127,7 +127,7 @@ default ResponseEntity fakeOuterBooleanSerialize( default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite); + return getDelegate().fakeOuterCompositeSerialize(outerComposite); } @@ -158,7 +158,7 @@ default ResponseEntity fakeOuterCompositeSerialize( default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -189,7 +189,7 @@ default ResponseEntity fakeOuterNumberSerialize( default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -218,7 +218,7 @@ default ResponseEntity fakeOuterStringSerialize( default ResponseEntity responseObjectDifferentNames( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().responseObjectDifferentNames(petId); + return getDelegate().responseObjectDifferentNames(petId); } @@ -247,7 +247,7 @@ default ResponseEntity responseObjectDiff default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -277,7 +277,7 @@ default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { - return getDelegate().testBodyWithQueryParams(query, user); + return getDelegate().testBodyWithQueryParams(query, user); } @@ -308,7 +308,7 @@ default ResponseEntity testBodyWithQueryParams( default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClientModel(client); + return getDelegate().testClientModel(client); } @@ -368,7 +368,7 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -413,7 +413,7 @@ default ResponseEntity testEnumParameters( @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -451,7 +451,7 @@ default ResponseEntity testGroupParameters( @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -480,7 +480,7 @@ default ResponseEntity testGroupParameters( default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { - return getDelegate().testInlineAdditionalProperties(requestBody); + return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -511,7 +511,7 @@ default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -540,7 +540,7 @@ default ResponseEntity testJsonFormData( default ResponseEntity testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { - return getDelegate().testNullable(childWithNullable); + return getDelegate().testNullable(childWithNullable); } @@ -574,7 +574,7 @@ default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } @@ -603,7 +603,7 @@ default ResponseEntity testQueryParameterCollectionFormat( default ResponseEntity testWithResultExample( ) { - return getDelegate().testWithResultExample(); + return getDelegate().testWithResultExample(); } @@ -644,7 +644,7 @@ default ResponseEntity uploadFileWithRequiredFile( @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 18cec0539f49..d436aea52499 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -57,7 +57,7 @@ default FakeClassnameTestApiDelegate getDelegate() { default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { - return getDelegate().testClassname(client); + return getDelegate().testClassname(client); } } diff --git 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 index 1393f28f4097..f1a6e8a0af80 100644 --- 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 @@ -63,7 +63,7 @@ default PetApiDelegate getDelegate() { default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -101,7 +101,7 @@ default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -140,7 +140,7 @@ default ResponseEntity deletePet( default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -181,7 +181,7 @@ default ResponseEntity> findPetsByStatus( default ResponseEntity> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -218,7 +218,7 @@ default ResponseEntity> findPetsByTags( default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -259,7 +259,7 @@ default ResponseEntity getPetById( default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -298,7 +298,7 @@ default ResponseEntity updatePetWithForm( @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -339,7 +339,7 @@ default ResponseEntity uploadFile( @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 270255f70741..b20c13411283 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -54,7 +54,7 @@ default StoreApiDelegate getDelegate() { default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -87,7 +87,7 @@ default ResponseEntity deleteOrder( default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -121,7 +121,7 @@ default ResponseEntity> getInventory( default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -154,7 +154,7 @@ default ResponseEntity getOrderById( default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index af160ab42ce7..feff084b571c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -53,7 +53,7 @@ default UserApiDelegate getDelegate() { default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(user); + return getDelegate().createUser(user); } @@ -82,7 +82,7 @@ default ResponseEntity createUser( default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithArrayInput(user); + return getDelegate().createUsersWithArrayInput(user); } @@ -111,7 +111,7 @@ default ResponseEntity createUsersWithArrayInput( default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithListInput(user); + return getDelegate().createUsersWithListInput(user); } @@ -141,7 +141,7 @@ default ResponseEntity createUsersWithListInput( default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -175,7 +175,7 @@ default ResponseEntity deleteUser( default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -209,7 +209,7 @@ default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -236,7 +236,7 @@ default ResponseEntity loginUser( default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -269,7 +269,7 @@ default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, user); + return getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java b/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java index 8545aa81bce7..c1c4b5cfde48 100644 --- a/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java +++ b/samples/server/petstore/springboot-file-delegate-optional/src/main/java/org/openapitools/api/DummyApi.java @@ -62,7 +62,7 @@ default DummyApiDelegate getDelegate() { default ResponseEntity uploadFile( @Parameter(name = "body", description = "") @Valid @RequestBody(required = false) Optional body ) { - return getDelegate().uploadFile(body); + return getDelegate().uploadFile(body); } } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java index 75c15708e1a3..0b854fe12568 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApi.java @@ -84,7 +84,7 @@ default PetApiDelegate getDelegate() { default ResponseEntity addPet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().addPet(pet); + return getDelegate().addPet(pet); } @@ -117,7 +117,7 @@ default ResponseEntity deletePet( @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -160,7 +160,7 @@ default ResponseEntity deletePet( default ResponseEntity> findPetsByStatus( @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List status ) { - return getDelegate().findPetsByStatus(status); + return getDelegate().findPetsByStatus(status); } @@ -200,7 +200,7 @@ default ResponseEntity> findPetsByStatus( default ResponseEntity> findPetsByTags( @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags ) { - return getDelegate().findPetsByTags(tags); + return getDelegate().findPetsByTags(tags); } @@ -239,7 +239,7 @@ default ResponseEntity> findPetsByTags( default ResponseEntity getPetById( @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -284,7 +284,7 @@ default ResponseEntity getPetById( default ResponseEntity updatePet( @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { - return getDelegate().updatePet(pet); + return getDelegate().updatePet(pet); } @@ -320,7 +320,7 @@ default ResponseEntity updatePetWithForm( @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -359,7 +359,7 @@ default ResponseEntity uploadFile( @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java index 0c1128279688..7cf57fd7e651 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java @@ -65,7 +65,7 @@ default StoreApiDelegate getDelegate() { default ResponseEntity deleteOrder( @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -98,7 +98,7 @@ default ResponseEntity deleteOrder( default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -134,7 +134,7 @@ default ResponseEntity> getInventory( default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -169,7 +169,7 @@ default ResponseEntity getOrderById( default ResponseEntity placeOrder( @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { - return getDelegate().placeOrder(order); + return getDelegate().placeOrder(order); } } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java index 85ca2f54f2f4..e360d56cb035 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java @@ -67,7 +67,7 @@ default UserApiDelegate getDelegate() { default ResponseEntity createUser( @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().createUser(user); + return getDelegate().createUser(user); } @@ -99,7 +99,7 @@ default ResponseEntity createUser( default ResponseEntity createUsersWithArrayInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithArrayInput(user); + return getDelegate().createUsersWithArrayInput(user); } @@ -131,7 +131,7 @@ default ResponseEntity createUsersWithArrayInput( default ResponseEntity createUsersWithListInput( @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { - return getDelegate().createUsersWithListInput(user); + return getDelegate().createUsersWithListInput(user); } @@ -164,7 +164,7 @@ default ResponseEntity createUsersWithListInput( default ResponseEntity deleteUser( @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -200,7 +200,7 @@ default ResponseEntity deleteUser( default ResponseEntity getUserByName( @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -236,7 +236,7 @@ default ResponseEntity loginUser( @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -266,7 +266,7 @@ default ResponseEntity loginUser( default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -302,7 +302,7 @@ default ResponseEntity updateUser( @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { - return getDelegate().updateUser(username, user); + return getDelegate().updateUser(username, user); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java index 4107ea59b2dd..4633afd20735 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -61,7 +61,7 @@ default Mono call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().call123testSpecialTags(client, exchange); + return getDelegate().call123testSpecialTags(client, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java index 49dc56622423..9db7ea0e9b74 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java @@ -72,7 +72,7 @@ default Mono createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createXmlItem(xmlItem, exchange); + return getDelegate().createXmlItem(xmlItem, exchange); } @@ -105,7 +105,7 @@ default Mono fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterBooleanSerialize(body, exchange); + return getDelegate().fakeOuterBooleanSerialize(body, exchange); } @@ -138,7 +138,7 @@ default Mono fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono outerComposite, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); + return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); } @@ -171,7 +171,7 @@ default Mono fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterNumberSerialize(body, exchange); + return getDelegate().fakeOuterNumberSerialize(body, exchange); } @@ -204,7 +204,7 @@ default Mono fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterStringSerialize(body, exchange); + return getDelegate().fakeOuterStringSerialize(body, exchange); } @@ -235,7 +235,7 @@ default Mono responseObjectDifferentNames @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().responseObjectDifferentNames(petId, exchange); + return getDelegate().responseObjectDifferentNames(petId, exchange); } @@ -266,7 +266,7 @@ default Mono testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); } @@ -298,7 +298,7 @@ default Mono testBodyWithQueryParams( @ApiParam(value = "", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithQueryParams(query, user, exchange); + return getDelegate().testBodyWithQueryParams(query, user, exchange); } @@ -331,7 +331,7 @@ default Mono testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClientModel(client, exchange); + return getDelegate().testClientModel(client, exchange); } @@ -393,7 +393,7 @@ default Mono testEndpointParameters( @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); } @@ -440,7 +440,7 @@ default Mono testEnumParameters( @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestPart(value = "enum_form_string", required = false) String enumFormString, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); } @@ -480,7 +480,7 @@ default Mono testGroupParameters( @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); } @@ -511,7 +511,7 @@ default Mono testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testInlineAdditionalProperties(requestBody, exchange); + return getDelegate().testInlineAdditionalProperties(requestBody, exchange); } @@ -544,7 +544,7 @@ default Mono testJsonFormData( @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testJsonFormData(param, param2, exchange); + return getDelegate().testJsonFormData(param, param2, exchange); } @@ -575,7 +575,7 @@ default Mono testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testNullable(childWithNullable, exchange); + return getDelegate().testNullable(childWithNullable, exchange); } @@ -611,7 +611,7 @@ default Mono testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); } @@ -641,7 +641,7 @@ default Mono testQueryParameterCollectionFormat( default Mono testWithResultExample( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testWithResultExample(exchange); + return getDelegate().testWithResultExample(exchange); } @@ -684,7 +684,7 @@ default Mono uploadFileWithRequiredFile( @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b74536accf30..bcffbed1c50e 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -64,7 +64,7 @@ default Mono testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClassname(client, exchange); + return getDelegate().testClassname(client, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java index 34b6d13874e1..2e00bbea81bd 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java @@ -70,7 +70,7 @@ default Mono addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().addPet(pet, exchange); + return getDelegate().addPet(pet, exchange); } @@ -110,7 +110,7 @@ default Mono deletePet( @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deletePet(petId, apiKey, exchange); + return getDelegate().deletePet(petId, apiKey, exchange); } @@ -151,7 +151,7 @@ default Flux findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().findPetsByStatus(status, exchange); + return getDelegate().findPetsByStatus(status, exchange); } @@ -194,7 +194,7 @@ default Flux findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().findPetsByTags(tags, exchange); + return getDelegate().findPetsByTags(tags, exchange); } @@ -233,7 +233,7 @@ default Mono getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getPetById(petId, exchange); + return getDelegate().getPetById(petId, exchange); } @@ -276,7 +276,7 @@ default Mono updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updatePet(pet, exchange); + return getDelegate().updatePet(pet, exchange); } @@ -317,7 +317,7 @@ default Mono updatePetWithForm( @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updatePetWithForm(petId, name, status, exchange); + return getDelegate().updatePetWithForm(petId, name, status, exchange); } @@ -360,7 +360,7 @@ default Mono uploadFile( @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); + return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java index 6873282ec2a7..b8cde63fa661 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java @@ -61,7 +61,7 @@ default Mono deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deleteOrder(orderId, exchange); + return getDelegate().deleteOrder(orderId, exchange); } @@ -95,7 +95,7 @@ default Mono deleteOrder( default Mono> getInventory( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getInventory(exchange); + return getDelegate().getInventory(exchange); } @@ -131,7 +131,7 @@ default Mono getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getOrderById(orderId, exchange); + return getDelegate().getOrderById(orderId, exchange); } @@ -166,7 +166,7 @@ default Mono placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().placeOrder(order, exchange); + return getDelegate().placeOrder(order, exchange); } } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java index d5a143cd3297..a2ccf9874170 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java @@ -60,7 +60,7 @@ default Mono createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUser(user, exchange); + return getDelegate().createUser(user, exchange); } @@ -91,7 +91,7 @@ default Mono createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithArrayInput(user, exchange); + return getDelegate().createUsersWithArrayInput(user, exchange); } @@ -122,7 +122,7 @@ default Mono createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithListInput(user, exchange); + return getDelegate().createUsersWithListInput(user, exchange); } @@ -154,7 +154,7 @@ default Mono deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deleteUser(username, exchange); + return getDelegate().deleteUser(username, exchange); } @@ -190,7 +190,7 @@ default Mono getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getUserByName(username, exchange); + return getDelegate().getUserByName(username, exchange); } @@ -226,7 +226,7 @@ default Mono loginUser( @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().loginUser(username, password, exchange); + return getDelegate().loginUser(username, password, exchange); } @@ -254,7 +254,7 @@ default Mono loginUser( default Mono logoutUser( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().logoutUser(exchange); + return getDelegate().logoutUser(exchange); } @@ -289,7 +289,7 @@ default Mono updateUser( @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updateUser(username, user, exchange); + return getDelegate().updateUser(username, user, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 81150aa57d15..77cbad8982ba 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -60,7 +60,7 @@ default Mono> call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().call123testSpecialTags(client, exchange); + return getDelegate().call123testSpecialTags(client, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index 476e3f1714fd..dcb2823da23a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -71,7 +71,7 @@ default Mono> createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createXmlItem(xmlItem, exchange); + return getDelegate().createXmlItem(xmlItem, exchange); } @@ -103,7 +103,7 @@ default Mono> fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterBooleanSerialize(body, exchange); + return getDelegate().fakeOuterBooleanSerialize(body, exchange); } @@ -135,7 +135,7 @@ default Mono> fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Mono outerComposite, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); + return getDelegate().fakeOuterCompositeSerialize(outerComposite, exchange); } @@ -167,7 +167,7 @@ default Mono> fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterNumberSerialize(body, exchange); + return getDelegate().fakeOuterNumberSerialize(body, exchange); } @@ -199,7 +199,7 @@ default Mono> fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Mono body, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().fakeOuterStringSerialize(body, exchange); + return getDelegate().fakeOuterStringSerialize(body, exchange); } @@ -229,7 +229,7 @@ default Mono> responseObje @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().responseObjectDifferentNames(petId, exchange); + return getDelegate().responseObjectDifferentNames(petId, exchange); } @@ -259,7 +259,7 @@ default Mono> testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); + return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); } @@ -290,7 +290,7 @@ default Mono> testBodyWithQueryParams( @ApiParam(value = "", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testBodyWithQueryParams(query, user, exchange); + return getDelegate().testBodyWithQueryParams(query, user, exchange); } @@ -322,7 +322,7 @@ default Mono> testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClientModel(client, exchange); + return getDelegate().testClientModel(client, exchange); } @@ -383,7 +383,7 @@ default Mono> testEndpointParameters( @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange); } @@ -429,7 +429,7 @@ default Mono> testEnumParameters( @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestPart(value = "enum_form_string", required = false) String enumFormString, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, exchange); } @@ -468,7 +468,7 @@ default Mono> testGroupParameters( @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, exchange); } @@ -498,7 +498,7 @@ default Mono> testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testInlineAdditionalProperties(requestBody, exchange); + return getDelegate().testInlineAdditionalProperties(requestBody, exchange); } @@ -530,7 +530,7 @@ default Mono> testJsonFormData( @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testJsonFormData(param, param2, exchange); + return getDelegate().testJsonFormData(param, param2, exchange); } @@ -560,7 +560,7 @@ default Mono> testNullable( @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testNullable(childWithNullable, exchange); + return getDelegate().testNullable(childWithNullable, exchange); } @@ -595,7 +595,7 @@ default Mono> testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); + return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, exchange); } @@ -624,7 +624,7 @@ default Mono> testQueryParameterCollectionFormat( default Mono> testWithResultExample( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testWithResultExample(exchange); + return getDelegate().testWithResultExample(exchange); } @@ -666,7 +666,7 @@ default Mono> uploadFileWithRequiredFile( @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 3f8b14a898de..e2f086dddcd3 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -63,7 +63,7 @@ default Mono> testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().testClassname(client, exchange); + return getDelegate().testClassname(client, exchange); } } diff --git 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 index 19a030d5d64d..68a6385d28b2 100644 --- 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 @@ -69,7 +69,7 @@ default Mono> addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().addPet(pet, exchange); + return getDelegate().addPet(pet, exchange); } @@ -108,7 +108,7 @@ default Mono> deletePet( @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deletePet(petId, apiKey, exchange); + return getDelegate().deletePet(petId, apiKey, exchange); } @@ -148,7 +148,7 @@ default Mono>> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().findPetsByStatus(status, exchange); + return getDelegate().findPetsByStatus(status, exchange); } @@ -190,7 +190,7 @@ default Mono>> findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().findPetsByTags(tags, exchange); + return getDelegate().findPetsByTags(tags, exchange); } @@ -228,7 +228,7 @@ default Mono> getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getPetById(petId, exchange); + return getDelegate().getPetById(petId, exchange); } @@ -270,7 +270,7 @@ default Mono> updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updatePet(pet, exchange); + return getDelegate().updatePet(pet, exchange); } @@ -310,7 +310,7 @@ default Mono> updatePetWithForm( @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updatePetWithForm(petId, name, status, exchange); + return getDelegate().updatePetWithForm(petId, name, status, exchange); } @@ -352,7 +352,7 @@ default Mono> uploadFile( @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); + return getDelegate().uploadFile(petId, additionalMetadata, file, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index bf688e5a25ab..ea00621225dc 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -60,7 +60,7 @@ default Mono> deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deleteOrder(orderId, exchange); + return getDelegate().deleteOrder(orderId, exchange); } @@ -93,7 +93,7 @@ default Mono> deleteOrder( default Mono>> getInventory( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getInventory(exchange); + return getDelegate().getInventory(exchange); } @@ -128,7 +128,7 @@ default Mono> getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getOrderById(orderId, exchange); + return getDelegate().getOrderById(orderId, exchange); } @@ -162,7 +162,7 @@ default Mono> placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().placeOrder(order, exchange); + return getDelegate().placeOrder(order, exchange); } } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index aeb960c584f2..d63f75f3a6ae 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -59,7 +59,7 @@ default Mono> createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUser(user, exchange); + return getDelegate().createUser(user, exchange); } @@ -89,7 +89,7 @@ default Mono> createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithArrayInput(user, exchange); + return getDelegate().createUsersWithArrayInput(user, exchange); } @@ -119,7 +119,7 @@ default Mono> createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().createUsersWithListInput(user, exchange); + return getDelegate().createUsersWithListInput(user, exchange); } @@ -150,7 +150,7 @@ default Mono> deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().deleteUser(username, exchange); + return getDelegate().deleteUser(username, exchange); } @@ -185,7 +185,7 @@ default Mono> getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().getUserByName(username, exchange); + return getDelegate().getUserByName(username, exchange); } @@ -220,7 +220,7 @@ default Mono> loginUser( @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().loginUser(username, password, exchange); + return getDelegate().loginUser(username, password, exchange); } @@ -247,7 +247,7 @@ default Mono> loginUser( default Mono> logoutUser( @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().logoutUser(exchange); + return getDelegate().logoutUser(exchange); } @@ -281,7 +281,7 @@ default Mono> updateUser( @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { - return getDelegate().updateUser(username, user, exchange); + return getDelegate().updateUser(username, user, exchange); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9a9cb7dc29be..88826c80b2b3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -54,7 +54,7 @@ default AnotherFakeApiDelegate getDelegate() { default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().call123testSpecialTags(body); + return getDelegate().call123testSpecialTags(body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 326bfe03c274..5660a7c98d35 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -63,7 +63,7 @@ default FakeApiDelegate getDelegate() { default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -93,7 +93,7 @@ default ResponseEntity createXmlItem( default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -123,7 +123,7 @@ default ResponseEntity fakeOuterBooleanSerialize( default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body ) { - return getDelegate().fakeOuterCompositeSerialize(body); + return getDelegate().fakeOuterCompositeSerialize(body); } @@ -153,7 +153,7 @@ default ResponseEntity fakeOuterCompositeSerialize( default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -183,7 +183,7 @@ default ResponseEntity fakeOuterNumberSerialize( default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -212,7 +212,7 @@ default ResponseEntity fakeOuterStringSerialize( default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { - return getDelegate().testBodyWithFileSchema(body); + return getDelegate().testBodyWithFileSchema(body); } @@ -242,7 +242,7 @@ default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User body ) { - return getDelegate().testBodyWithQueryParams(query, body); + return getDelegate().testBodyWithQueryParams(query, body); } @@ -273,7 +273,7 @@ default ResponseEntity testBodyWithQueryParams( default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().testClientModel(body); + return getDelegate().testClientModel(body); } @@ -333,7 +333,7 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -378,7 +378,7 @@ default ResponseEntity testEnumParameters( @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -416,7 +416,7 @@ default ResponseEntity testGroupParameters( @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -444,7 +444,7 @@ default ResponseEntity testGroupParameters( default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { - return getDelegate().testInlineAdditionalProperties(param); + return getDelegate().testInlineAdditionalProperties(param); } @@ -474,7 +474,7 @@ default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -510,7 +510,7 @@ default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); } @@ -550,7 +550,7 @@ default ResponseEntity uploadFileWithRequiredFile( @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 4e192349b4a1..9aa8dd3b7caf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -57,7 +57,7 @@ default FakeClassnameTestApiDelegate getDelegate() { default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().testClassname(body); + return getDelegate().testClassname(body); } } diff --git 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 index 70b0635f3a0d..2a9a5b77c956 100644 --- 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 @@ -63,7 +63,7 @@ default PetApiDelegate getDelegate() { default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { - return getDelegate().addPet(body); + return getDelegate().addPet(body); } @@ -100,7 +100,7 @@ default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -140,7 +140,7 @@ default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable ) { - return getDelegate().findPetsByStatus(status, pageable); + return getDelegate().findPetsByStatus(status, pageable); } @@ -184,7 +184,7 @@ default ResponseEntity> findPetsByTags( @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, @ApiIgnore final Pageable pageable ) { - return getDelegate().findPetsByTags(tags, size, pageable); + return getDelegate().findPetsByTags(tags, size, pageable); } @@ -221,7 +221,7 @@ default ResponseEntity> findPetsByTags( default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -258,7 +258,7 @@ default ResponseEntity getPetById( default ResponseEntity> listAllPets( @ApiIgnore final Pageable pageable ) { - return getDelegate().listAllPets(pageable); + return getDelegate().listAllPets(pageable); } @@ -298,7 +298,7 @@ default ResponseEntity> listAllPets( default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { - return getDelegate().updatePet(body); + return getDelegate().updatePet(body); } @@ -336,7 +336,7 @@ default ResponseEntity updatePetWithForm( @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -376,7 +376,7 @@ default ResponseEntity uploadFile( @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index ddad8a5a424c..6bf895db99ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -54,7 +54,7 @@ default StoreApiDelegate getDelegate() { default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -87,7 +87,7 @@ default ResponseEntity deleteOrder( default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -121,7 +121,7 @@ default ResponseEntity> getInventory( default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -152,7 +152,7 @@ default ResponseEntity getOrderById( default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { - return getDelegate().placeOrder(body); + return getDelegate().placeOrder(body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index ce11df9cd9aa..56948bf7c3d9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -52,7 +52,7 @@ default UserApiDelegate getDelegate() { default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { - return getDelegate().createUser(body); + return getDelegate().createUser(body); } @@ -79,7 +79,7 @@ default ResponseEntity createUser( default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { - return getDelegate().createUsersWithArrayInput(body); + return getDelegate().createUsersWithArrayInput(body); } @@ -106,7 +106,7 @@ default ResponseEntity createUsersWithArrayInput( default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { - return getDelegate().createUsersWithListInput(body); + return getDelegate().createUsersWithListInput(body); } @@ -136,7 +136,7 @@ default ResponseEntity createUsersWithListInput( default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -169,7 +169,7 @@ default ResponseEntity deleteUser( default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -202,7 +202,7 @@ default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -228,7 +228,7 @@ default ResponseEntity loginUser( default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -260,7 +260,7 @@ default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body ) { - return getDelegate().updateUser(username, body); + return getDelegate().updateUser(username, body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index ac4a391d6860..717f6cc7d748 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -57,7 +57,7 @@ default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningHeaders(versionWithDefaultValue, versionNoDefaultValue, petId); + return getDelegate().versioningHeaders(versionWithDefaultValue, versionNoDefaultValue, petId); } @@ -96,7 +96,7 @@ default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValueHeader", required = true) String versionNoDefaultValueHeader, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, versionWithDefaultValueHeader, versionNoDefaultValueHeader, petId); + return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, versionWithDefaultValueHeader, versionNoDefaultValueHeader, petId); } @@ -130,7 +130,7 @@ default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); + return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9a9cb7dc29be..88826c80b2b3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -54,7 +54,7 @@ default AnotherFakeApiDelegate getDelegate() { default ResponseEntity call123testSpecialTags( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().call123testSpecialTags(body); + return getDelegate().call123testSpecialTags(body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index 326bfe03c274..5660a7c98d35 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -63,7 +63,7 @@ default FakeApiDelegate getDelegate() { default ResponseEntity createXmlItem( @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { - return getDelegate().createXmlItem(xmlItem); + return getDelegate().createXmlItem(xmlItem); } @@ -93,7 +93,7 @@ default ResponseEntity createXmlItem( default ResponseEntity fakeOuterBooleanSerialize( @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body ) { - return getDelegate().fakeOuterBooleanSerialize(body); + return getDelegate().fakeOuterBooleanSerialize(body); } @@ -123,7 +123,7 @@ default ResponseEntity fakeOuterBooleanSerialize( default ResponseEntity fakeOuterCompositeSerialize( @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite body ) { - return getDelegate().fakeOuterCompositeSerialize(body); + return getDelegate().fakeOuterCompositeSerialize(body); } @@ -153,7 +153,7 @@ default ResponseEntity fakeOuterCompositeSerialize( default ResponseEntity fakeOuterNumberSerialize( @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body ) { - return getDelegate().fakeOuterNumberSerialize(body); + return getDelegate().fakeOuterNumberSerialize(body); } @@ -183,7 +183,7 @@ default ResponseEntity fakeOuterNumberSerialize( default ResponseEntity fakeOuterStringSerialize( @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body ) { - return getDelegate().fakeOuterStringSerialize(body); + return getDelegate().fakeOuterStringSerialize(body); } @@ -212,7 +212,7 @@ default ResponseEntity fakeOuterStringSerialize( default ResponseEntity testBodyWithFileSchema( @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { - return getDelegate().testBodyWithFileSchema(body); + return getDelegate().testBodyWithFileSchema(body); } @@ -242,7 +242,7 @@ default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, @ApiParam(value = "", required = true) @Valid @RequestBody User body ) { - return getDelegate().testBodyWithQueryParams(query, body); + return getDelegate().testBodyWithQueryParams(query, body); } @@ -273,7 +273,7 @@ default ResponseEntity testBodyWithQueryParams( default ResponseEntity testClientModel( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().testClientModel(body); + return getDelegate().testClientModel(body); } @@ -333,7 +333,7 @@ default ResponseEntity testEndpointParameters( @ApiParam(value = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password, @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback ) { - return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } @@ -378,7 +378,7 @@ default ResponseEntity testEnumParameters( @ApiParam(value = "Form parameter enum test (string array)", allowableValues = ">, $", defaultValue = "$") @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ) { - return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } @@ -416,7 +416,7 @@ default ResponseEntity testGroupParameters( @ApiParam(value = "Boolean in group parameters") @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup, @ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group ) { - return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); + return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } @@ -444,7 +444,7 @@ default ResponseEntity testGroupParameters( default ResponseEntity testInlineAdditionalProperties( @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { - return getDelegate().testInlineAdditionalProperties(param); + return getDelegate().testInlineAdditionalProperties(param); } @@ -474,7 +474,7 @@ default ResponseEntity testJsonFormData( @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { - return getDelegate().testJsonFormData(param, param2); + return getDelegate().testJsonFormData(param, param2); } @@ -510,7 +510,7 @@ default ResponseEntity testQueryParameterCollectionFormat( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "url", required = true) List url, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "context", required = true) List context ) { - return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); + return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); } @@ -550,7 +550,7 @@ default ResponseEntity uploadFileWithRequiredFile( @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { - return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 4e192349b4a1..9aa8dd3b7caf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -57,7 +57,7 @@ default FakeClassnameTestApiDelegate getDelegate() { default ResponseEntity testClassname( @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { - return getDelegate().testClassname(body); + return getDelegate().testClassname(body); } } diff --git 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 index 70b0635f3a0d..2a9a5b77c956 100644 --- 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 @@ -63,7 +63,7 @@ default PetApiDelegate getDelegate() { default ResponseEntity addPet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { - return getDelegate().addPet(body); + return getDelegate().addPet(body); } @@ -100,7 +100,7 @@ default ResponseEntity deletePet( @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { - return getDelegate().deletePet(petId, apiKey); + return getDelegate().deletePet(petId, apiKey); } @@ -140,7 +140,7 @@ default ResponseEntity> findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List status, @ApiIgnore final Pageable pageable ) { - return getDelegate().findPetsByStatus(status, pageable); + return getDelegate().findPetsByStatus(status, pageable); } @@ -184,7 +184,7 @@ default ResponseEntity> findPetsByTags( @ApiParam(value = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) @Nullable String size, @ApiIgnore final Pageable pageable ) { - return getDelegate().findPetsByTags(tags, size, pageable); + return getDelegate().findPetsByTags(tags, size, pageable); } @@ -221,7 +221,7 @@ default ResponseEntity> findPetsByTags( default ResponseEntity getPetById( @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().getPetById(petId); + return getDelegate().getPetById(petId); } @@ -258,7 +258,7 @@ default ResponseEntity getPetById( default ResponseEntity> listAllPets( @ApiIgnore final Pageable pageable ) { - return getDelegate().listAllPets(pageable); + return getDelegate().listAllPets(pageable); } @@ -298,7 +298,7 @@ default ResponseEntity> listAllPets( default ResponseEntity updatePet( @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { - return getDelegate().updatePet(body); + return getDelegate().updatePet(body); } @@ -336,7 +336,7 @@ default ResponseEntity updatePetWithForm( @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { - return getDelegate().updatePetWithForm(petId, name, status); + return getDelegate().updatePetWithForm(petId, name, status); } @@ -376,7 +376,7 @@ default ResponseEntity uploadFile( @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { - return getDelegate().uploadFile(petId, additionalMetadata, file); + return getDelegate().uploadFile(petId, additionalMetadata, file); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index ddad8a5a424c..6bf895db99ec 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -54,7 +54,7 @@ default StoreApiDelegate getDelegate() { default ResponseEntity deleteOrder( @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { - return getDelegate().deleteOrder(orderId); + return getDelegate().deleteOrder(orderId); } @@ -87,7 +87,7 @@ default ResponseEntity deleteOrder( default ResponseEntity> getInventory( ) { - return getDelegate().getInventory(); + return getDelegate().getInventory(); } @@ -121,7 +121,7 @@ default ResponseEntity> getInventory( default ResponseEntity getOrderById( @NotNull @Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { - return getDelegate().getOrderById(orderId); + return getDelegate().getOrderById(orderId); } @@ -152,7 +152,7 @@ default ResponseEntity getOrderById( default ResponseEntity placeOrder( @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { - return getDelegate().placeOrder(body); + return getDelegate().placeOrder(body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index ce11df9cd9aa..56948bf7c3d9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -52,7 +52,7 @@ default UserApiDelegate getDelegate() { default ResponseEntity createUser( @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { - return getDelegate().createUser(body); + return getDelegate().createUser(body); } @@ -79,7 +79,7 @@ default ResponseEntity createUser( default ResponseEntity createUsersWithArrayInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { - return getDelegate().createUsersWithArrayInput(body); + return getDelegate().createUsersWithArrayInput(body); } @@ -106,7 +106,7 @@ default ResponseEntity createUsersWithArrayInput( default ResponseEntity createUsersWithListInput( @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { - return getDelegate().createUsersWithListInput(body); + return getDelegate().createUsersWithListInput(body); } @@ -136,7 +136,7 @@ default ResponseEntity createUsersWithListInput( default ResponseEntity deleteUser( @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { - return getDelegate().deleteUser(username); + return getDelegate().deleteUser(username); } @@ -169,7 +169,7 @@ default ResponseEntity deleteUser( default ResponseEntity getUserByName( @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { - return getDelegate().getUserByName(username); + return getDelegate().getUserByName(username); } @@ -202,7 +202,7 @@ default ResponseEntity loginUser( @NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username, @NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password ) { - return getDelegate().loginUser(username, password); + return getDelegate().loginUser(username, password); } @@ -228,7 +228,7 @@ default ResponseEntity loginUser( default ResponseEntity logoutUser( ) { - return getDelegate().logoutUser(); + return getDelegate().logoutUser(); } @@ -260,7 +260,7 @@ default ResponseEntity updateUser( @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body ) { - return getDelegate().updateUser(username, body); + return getDelegate().updateUser(username, body); } } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java index 9143b6f9a25f..b405a1894fa4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java @@ -57,7 +57,7 @@ default VersioningApiDelegate getDelegate() { default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningHeaders(petId); + return getDelegate().versioningHeaders(petId); } @@ -96,7 +96,7 @@ default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, petId); + return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, petId); } @@ -130,7 +130,7 @@ default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { - return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); + return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); } }