From 81f2a3b369ff2dda56c49f0dfeae8a71d546b10d Mon Sep 17 00:00:00 2001 From: Alexander Kose Date: Wed, 1 Jul 2026 14:36:12 +0200 Subject: [PATCH] fix(java): place bean-validation @Valid on the type argument instead of the container (HV000271) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hibernate Validator 9.1+ (bundled with Spring Boot 4) logs HV000271 ("Using @Valid on a container is deprecated. You should apply the annotation on the type argument(s)") for every @Valid-annotated List/Set/Map — on both model properties and API parameters. This relocates @Valid from the container to its type argument — the Bean-Validation-2.0 form (List<@Valid T>, Map) — which cascades identically but is not deprecated. Backward-compatible: element validation is preserved, never dropped; single-object @Valid is untouched. Verified on Spring Boot 3.3 (Spring 6.1) and 4.1 (Spring 7): a container parameter carrying only the type-argument @Valid still triggers element validation via method validation, with no HV000271. Scope (Java family): spring, java client, JAX-RS (jersey, resteasy(+eap), cxf(+extended/cdi), spec), java-camel, java-msf4j. Models (property/getter): the container @Valid is moved to the type argument. Map values are gated behind a new AbstractJavaCodegen#useBeanValidationOnMapValueType() (default false; overridden true in Spring/JavaClient/JAX-RS) so untouched generators don't silently gain map-value validation. Arrays/sets already injected the type-argument form. Parameters (@RequestBody/@RequestParam/@RequestPart): the redundant container-level @Valid is dropped for container parameters; element validation is driven by the type-argument @Valid. Single-object parameters keep @Valid. Reactive Mono/Flux bodies are intentionally untouched (not Jakarta containers, so no HV000271). Regenerated all affected samples and added/updated codegen tests in SpringCodegenTest, JavaClientCodegenTest, JavaJAXRSSpecServerCodegenTest and JavaValidationArrayPrimitivesTest. --- .../languages/AbstractJavaCodegen.java | 42 ++++++++++++-- .../AbstractJavaJAXRSServerCodegen.java | 8 +++ .../codegen/languages/JavaClientCodegen.java | 8 +++ .../codegen/languages/SpringCodegen.java | 8 +++ .../resources/Java/beanValidation.mustache | 7 --- .../microprofile/bodyParams.mustache | 2 +- .../JavaJaxRS/beanValidation.mustache | 2 +- .../JavaJaxRS/cxf-ext/bodyParams.mustache | 2 +- .../resources/JavaJaxRS/cxf-ext/pojo.mustache | 4 +- .../JavaJaxRS/cxf/bodyParams.mustache | 2 +- .../resources/JavaJaxRS/cxf/pojo.mustache | 4 +- .../JavaJaxRS/resteasy/bodyParams.mustache | 2 +- .../resteasy/eap/bodyParams.mustache | 2 +- .../JavaJaxRS/resteasy/pojo.mustache | 4 +- .../JavaJaxRS/spec/beanValidation.mustache | 2 +- .../JavaJaxRS/spec/bodyParams.mustache | 2 +- .../resources/JavaJaxRS/spec/pojo.mustache | 2 +- .../JavaSpring/beanValidation.mustache | 2 +- .../resources/JavaSpring/bodyParams.mustache | 2 +- .../resources/JavaSpring/formParams.mustache | 2 +- .../resources/JavaSpring/queryParams.mustache | 2 +- .../resources/java-camel-server/pojo.mustache | 1 - .../codegen/java/JavaClientCodegenTest.java | 26 +++++++++ .../JavaValidationArrayPrimitivesTest.java | 11 ++-- .../jaxrs/JavaJAXRSSpecServerCodegenTest.java | 8 +-- .../java/spring/SpringCodegenTest.java | 57 ++++++++++++++++++- .../model/AdditionalPropertiesClass.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 2 - .../openapitools/client/model/Drawing.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 9 ++- .../org/openapitools/client/model/Pet.java | 1 - .../model/AdditionalPropertiesClass.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 2 - .../openapitools/client/model/Drawing.java | 1 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 9 ++- .../org/openapitools/client/model/Pet.java | 1 - .../model/AdditionalPropertiesClass.java | 5 -- .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 2 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 9 ++- .../org/openapitools/client/model/Pet.java | 1 - .../model/AdditionalPropertiesClass.java | 5 -- .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 2 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 9 ++- .../org/openapitools/client/model/Pet.java | 1 - .../model/AdditionalPropertiesClass.java | 5 -- .../model/ArrayOfArrayOfNumberOnly.java | 1 - .../client/model/ArrayOfNumberOnly.java | 1 - .../openapitools/client/model/ArrayTest.java | 2 - .../client/model/FileSchemaTestClass.java | 1 - .../openapitools/client/model/MapTest.java | 1 - ...ropertiesAndAdditionalPropertiesClass.java | 9 ++- .../org/openapitools/client/model/Pet.java | 1 - .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../org/openapitools/api/PetController.java | 4 +- .../org/openapitools/api/UserController.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClassDto.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 4 +- .../model/FileSchemaTestClassDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 2 +- ...ertiesAndAdditionalPropertiesClassDto.java | 10 ++-- .../java/org/openapitools/model/PetDto.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 12 ++-- .../java/org/openapitools/api/PetApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClassDto.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 4 +- .../model/FileSchemaTestClassDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 2 +- ...ertiesAndAdditionalPropertiesClassDto.java | 10 ++-- .../java/org/openapitools/model/PetDto.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Foo.java | 4 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 4 +- ...ropertiesAndAdditionalPropertiesClass.java | 8 +-- .../java/org/openapitools/api/UserApi.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 2 - .../java/org/openapitools/api/UserApi.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 2 - .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ---- .../model/ArrayOfArrayOfNumberOnly.java | 2 - .../openapitools/model/ArrayOfNumberOnly.java | 2 - .../org/openapitools/model/ArrayTest.java | 4 -- .../model/FileSchemaTestClass.java | 2 - .../java/org/openapitools/model/MapTest.java | 2 - ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../gen/java/org/openapitools/model/Pet.java | 2 - .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 2 +- .../model/FakeBigDecimalMap200Response.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 1 - .../java/org/openapitools/api/UserApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 1 - .../java/org/openapitools/api/UserApi.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 1 - .../java/org/openapitools/api/FakeApi.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 8 +-- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FakeBigDecimalMap200Response.java | 4 +- .../model/FileSchemaTestClass.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 8 +-- .../org/openapitools/model/NullableClass.java | 12 ++-- .../model/ObjectWithDeprecatedFields.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 18 +++--- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 8 +-- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FileSchemaTestClass.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 8 +-- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../openapitools/model/TypeHolderDefault.java | 2 +- .../openapitools/model/TypeHolderExample.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 18 +++--- .../java/org/openapitools/api/UserApi.java | 4 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/FakeApi.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 8 +-- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FakeBigDecimalMap200Response.java | 4 +- .../model/FileSchemaTestClass.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 8 +-- .../org/openapitools/model/NullableClass.java | 12 ++-- .../model/ObjectWithDeprecatedFields.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/FakeApi.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 8 +-- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FakeBigDecimalMap200Response.java | 4 +- .../model/FileSchemaTestClass.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 8 +-- .../org/openapitools/model/NullableClass.java | 12 ++-- .../model/ObjectWithDeprecatedFields.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/FakeApi.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 8 +-- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FakeBigDecimalMap200Response.java | 4 +- .../model/FileSchemaTestClass.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 8 +-- .../org/openapitools/model/NullableClass.java | 12 ++-- .../model/ObjectWithDeprecatedFields.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/FakeApi.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 8 +-- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FakeBigDecimalMap200Response.java | 4 +- .../model/FileSchemaTestClass.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 8 +-- .../org/openapitools/model/NullableClass.java | 12 ++-- .../model/ObjectWithDeprecatedFields.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/FakeApi.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 8 +-- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FakeBigDecimalMap200Response.java | 4 +- .../model/FileSchemaTestClass.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 8 +-- .../org/openapitools/model/NullableClass.java | 12 ++-- .../model/ObjectWithDeprecatedFields.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/FakeApi.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 8 +-- .../org/openapitools/model/EnumArrays.java | 2 +- .../model/FakeBigDecimalMap200Response.java | 4 +- .../model/FileSchemaTestClass.java | 4 +- .../java/org/openapitools/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 8 +-- .../org/openapitools/model/NullableClass.java | 12 ++-- .../model/ObjectWithDeprecatedFields.java | 2 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 2 +- .../model/FakeBigDecimalMap200Response.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../gen/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 12 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClassDto.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 4 +- .../model/FileSchemaTestClassDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 2 +- ...ertiesAndAdditionalPropertiesClassDto.java | 10 ++-- .../java/org/openapitools/model/PetDto.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../java/org/openapitools/model/UserList.java | 2 +- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 12 ++-- .../java/org/openapitools/api/PetApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 12 ++-- .../java/org/openapitools/api/PetApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 16 +++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 16 +++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 16 +++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 16 +++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../model/FileSchemaTestClass.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../main/java/org/openapitools/model/Pet.java | 2 +- .../openapitools/virtualan/api/FakeApi.java | 14 ++--- .../openapitools/virtualan/api/PetApi.java | 4 +- .../openapitools/virtualan/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClass.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayOfNumberOnly.java | 2 +- .../virtualan/model/ArrayTest.java | 4 +- .../virtualan/model/FileSchemaTestClass.java | 2 +- .../openapitools/virtualan/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 10 ++-- .../org/openapitools/virtualan/model/Pet.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 24 ++++---- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClassDto.java | 2 +- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 4 +- .../FakeBigDecimalMap200ResponseDto.java | 2 +- .../model/FileSchemaTestClassDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 2 +- ...ertiesAndAdditionalPropertiesClassDto.java | 10 ++-- .../java/org/openapitools/model/PetDto.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 14 ++--- .../java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/UserApi.java | 4 +- .../model/AdditionalPropertiesClassDto.java | 10 ++-- .../model/ArrayOfArrayOfNumberOnlyDto.java | 2 +- .../model/ArrayOfNumberOnlyDto.java | 2 +- .../org/openapitools/model/ArrayTestDto.java | 4 +- .../model/FileSchemaTestClassDto.java | 2 +- .../org/openapitools/model/MapTestDto.java | 2 +- ...ertiesAndAdditionalPropertiesClassDto.java | 10 ++-- .../java/org/openapitools/model/PetDto.java | 2 +- 595 files changed, 1426 insertions(+), 1392 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 13f5f47ad537..dacb04bcc0f3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -1096,7 +1096,7 @@ public String getTypeDeclaration(Schema p) { Schema target = ModelUtils.isGenerateAliasAsModel() ? p : schema; if (ModelUtils.isArraySchema(target)) { Schema items = getSchemaItems(schema); - String typeDeclaration = getTypeDeclarationForArray(items); + String typeDeclaration = getTypeDeclarationWithBeanValidation(items); return getSchemaType(target) + "<" + typeDeclaration + ">"; } else if (ModelUtils.isMapSchema(target)) { // Note: ModelUtils.isMapSchema(p) returns true when p is a composed schema that also defines @@ -1107,12 +1107,43 @@ public String getTypeDeclaration(Schema p) { inner = new StringSchema().description("TODO default missing map inner type to string"); p.setAdditionalProperties(inner); } - return getSchemaType(target) + ""; + // Unlike arrays/sets, map values never received a type-argument bean + // validation before, so this is gated: only generators that have dropped the + // deprecated container-level @Valid (HV000271) opt in, to avoid silently adding + // new validation to generators that still cascade via the container. + String valueDeclaration = useBeanValidationOnMapValueType() + ? getTypeDeclarationWithBeanValidation(inner) + : getTypeDeclaration(inner); + return getSchemaType(target) + ""; } return super.getTypeDeclaration(target); } - private String getTypeDeclarationForArray(Schema items) { + /** + * Whether bean validation of map values is expressed on the value type argument + * ({@code Map}) instead of on the map itself. Generators that have migrated + * off the deprecated container-level {@code @Valid} (Hibernate Validator HV000271) + * override this to return {@code true}. Arrays/sets always place bean validation on the + * type argument, so they are not gated by this method. + * + * @return {@code true} to emit map-value bean validation on the type argument; + * {@code false} by default + */ + protected boolean useBeanValidationOnMapValueType() { + return false; + } + + /** + * Renders the type declaration of a container element (array/set item or map value) with its + * bean validation applied to the type argument, e.g. {@code @Valid Pet} or + * {@code @Size(max = 3) String}. Hibernate Validator 9.1+ expects cascade/constraints on the + * type argument; a container-level {@code @Valid} is deprecated and logs HV000271, so the + * annotation is placed here instead of on the container. + * + * @param items the array/set item or map value schema + * @return the element type declaration prefixed with its bean validation (no prefix if none) + */ + private String getTypeDeclarationWithBeanValidation(Schema items) { String typeDeclaration = getTypeDeclaration(items); String beanValidation = getBeanValidation(items); @@ -1136,11 +1167,12 @@ private String getTypeDeclarationForArray(Schema items) { } /** - * This method stand for resolve bean validation for container(array, set). + * This method stand for resolve bean validation for a container element + * (array/set item or map value). * Return empty if there's no bean validation for requested type or prop useBeanValidation false or missed. * * @param items type - * @return BeanValidation for declared type in container(array, set) + * @return BeanValidation for declared element type of a container (array, set, map value) */ private String getBeanValidation(Schema items) { if (!isUseBeanValidation()) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java index 224ac1f36077..4abb6a4ae5c2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java @@ -132,6 +132,14 @@ public CodegenType getTag() { return CodegenType.SERVER; } + @Override + protected boolean useBeanValidationOnMapValueType() { + // The JAX-RS templates place container element validation on the type argument + // (List<@Valid T>, Map) rather than the deprecated + // container-level @Valid (HV000271). + return true; + } + @Override public void processOpts() { super.processOpts(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index de4fc647f0d9..80b397e43ef7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -201,6 +201,14 @@ public DocumentationProvider defaultDocumentationProvider() { return DocumentationProvider.SOURCE; } + @Override + protected boolean useBeanValidationOnMapValueType() { + // The Java templates place container element validation on the type argument + // (List<@Valid T>, Map) rather than the deprecated + // container-level @Valid (HV000271). + return true; + } + @Override public List supportedDocumentationProvider() { List documentationProviders = new ArrayList<>(); 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 1ab10fd19d09..10e86069eff3 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 @@ -1568,6 +1568,14 @@ public List getSupportedVendorExtensions() { return extensions; } + @Override + protected boolean useBeanValidationOnMapValueType() { + // The Spring templates place container element validation on the type argument + // (List<@Valid T>, Map) rather than the deprecated + // container-level @Valid (HV000271). + return true; + } + protected boolean isSpringCodegen() { return getName().contains("spring"); } diff --git a/modules/openapi-generator/src/main/resources/Java/beanValidation.mustache b/modules/openapi-generator/src/main/resources/Java/beanValidation.mustache index 47f7109e5bc4..f1b3a0070e38 100644 --- a/modules/openapi-generator/src/main/resources/Java/beanValidation.mustache +++ b/modules/openapi-generator/src/main/resources/Java/beanValidation.mustache @@ -3,13 +3,6 @@ @NotNull {{/isReadOnly}} {{/required}} -{{#isContainer}} -{{^isPrimitiveType}} -{{^isEnum}} - @Valid -{{/isEnum}} -{{/isPrimitiveType}} -{{/isContainer}} {{^isContainer}} {{^isPrimitiveType}} @Valid diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/bodyParams.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/bodyParams.mustache index be56da7535be..dd9489f81e62 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{#useBeanValidation}}{{^isContainer}}@Valid {{/isContainer}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidation.mustache index a7f264654822..ff71a3713407 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidation.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidation.mustache @@ -1 +1 @@ -{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{#isContainer}}{{^items.isPrimitiveType}}{{^items.isDate}}{{^items.isDateTime}}{{^items.isString}}{{^items.isFile}}{{^items.isEnumOrRef}}@Valid {{/items.isEnumOrRef}}{{/items.isFile}}{{/items.isString}}{{/items.isDateTime}}{{/items.isDate}}{{/items.isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{^isEnumOrRef}}@Valid {{/isEnumOrRef}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}} \ No newline at end of file +{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{^isEnumOrRef}}@Valid {{/isEnumOrRef}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/bodyParams.mustache index be56da7535be..dd9489f81e62 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{#useBeanValidation}}{{^isContainer}}@Valid {{/isContainer}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache index 4ea4171817b8..e696e2f0913c 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache @@ -40,8 +40,8 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi {{#withXml}} @XmlElement(name="{{baseName}}"{{#required}}, required = {{required}}{{/required}}) {{/withXml}} - @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{#useBeanValidation}} - @Valid{{/useBeanValidation}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}} + @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{#useBeanValidation}} + @Valid{{/useBeanValidation}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}} {{#isDate}} @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") {{/isDate}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/bodyParams.mustache index ced2fd398f10..11bdaa6f8e0c 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#useBeanValidation}}@Valid {{#required}}{{^isNullable}}@NotNull {{/isNullable}}{{/required}}{{/useBeanValidation}}{{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection{{/collectionFormat}}{{^collectionFormat}}InputStream{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{#useBeanValidation}}{{^isContainer}}@Valid {{/isContainer}}{{#required}}{{^isNullable}}@NotNull {{/isNullable}}{{/required}}{{/useBeanValidation}}{{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection{{/collectionFormat}}{{^collectionFormat}}InputStream{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache index 47ff05f2788b..b44a4068f4d0 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -52,9 +52,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi {{#swagger2AnnotationLibrary}} @Schema(description = "{{{description}}}"{{#example}}, example = "{{{example}}}"{{/example}}{{#required}}, requiredMode = Schema.RequiredMode.REQUIRED{{/required}}) {{/swagger2AnnotationLibrary}} -{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{#useBeanValidation}} +{{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{#useBeanValidation}} @Valid -{{/useBeanValidation}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}} +{{/useBeanValidation}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}} {{#vendorExtensions.x-field-extra-annotation}} {{{.}}} {{/vendorExtensions.x-field-extra-annotation}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/bodyParams.mustache index 879b7f2fc0cc..3715e8e6dd40 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{.}}}"{{/defaultValue}}){{#useBeanValidation}}{{#required}} @NotNull{{/required}} @Valid{{/useBeanValidation}} {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{.}}}"{{/defaultValue}}){{#useBeanValidation}}{{#required}} @NotNull{{/required}}{{^isContainer}} @Valid{{/isContainer}}{{/useBeanValidation}} {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/bodyParams.mustache index 879b7f2fc0cc..3715e8e6dd40 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{.}}}"{{/defaultValue}}){{#useBeanValidation}}{{#required}} @NotNull{{/required}} @Valid{{/useBeanValidation}} {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{.}}}"{{/defaultValue}}){{#useBeanValidation}}{{#required}} @NotNull{{/required}}{{^isContainer}} @Valid{{/isContainer}}{{/useBeanValidation}} {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache index a80b70ec9e1f..6990469e1500 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache @@ -33,8 +33,8 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") @JsonProperty("{{baseName}}") -{{#useBeanValidation}}{{>beanValidation}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}} @Valid -{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() { +{{#useBeanValidation}}{{>beanValidation}}{{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}} @Valid +{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; } {{#vendorExtensions.x-setter-extra-annotation}}{{{vendorExtensions.x-setter-extra-annotation}}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache index a7f264654822..ff71a3713407 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/beanValidation.mustache @@ -1 +1 @@ -{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{#isContainer}}{{^items.isPrimitiveType}}{{^items.isDate}}{{^items.isDateTime}}{{^items.isString}}{{^items.isFile}}{{^items.isEnumOrRef}}@Valid {{/items.isEnumOrRef}}{{/items.isFile}}{{/items.isString}}{{/items.isDateTime}}{{/items.isDate}}{{/items.isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{^isEnumOrRef}}@Valid {{/isEnumOrRef}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}} \ No newline at end of file +{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{^isContainer}}{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{^isEnumOrRef}}@Valid {{/isEnumOrRef}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/bodyParams.mustache index ad24da52660b..31347e63d901 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#isDeprecated}}@Deprecated {{/isDeprecated}}{{#useBeanValidation}}@Valid {{#required}}{{^isNullable}}@NotNull {{/isNullable}}{{/required}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{#isDeprecated}}@Deprecated {{/isDeprecated}}{{#useBeanValidation}}{{^isContainer}}@Valid {{/isContainer}}{{#required}}{{^isNullable}}@NotNull {{/isNullable}}{{/required}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache index 0f10c01b3273..0a4f718fa63c 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache @@ -80,7 +80,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#v {{/isContainer}} {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} - private {{#isContainer}}{{#useBeanValidation}}@Valid {{/useBeanValidation}}{{/isContainer}}{{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; + private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; {{/vendorExtensions.x-is-jackson-optional-nullable}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidation.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidation.mustache index 0aed4a92d734..3dc56d04e5aa 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidation.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidation.mustache @@ -1 +1 @@ -{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}@Valid {{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{^openApiNullable}}{{>beanValidationCore}}{{/openApiNullable}}{{#openApiNullable}}{{^useOptional}}{{>beanValidationCore}}{{/useOptional}}{{/openApiNullable}}{{#useOptional}}{{#openApiNullable}}{{#isContainer}}{{^required}}{{>beanValidationCore}}{{/required}}{{/isContainer}}{{/openApiNullable}}{{#openApiNullable}}{{#required}}{{>beanValidationCore}}{{/required}}{{/openApiNullable}}{{/useOptional}} \ No newline at end of file +{{#required}}{{^isReadOnly}}@NotNull {{/isReadOnly}}{{/required}}{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{^openApiNullable}}{{>beanValidationCore}}{{/openApiNullable}}{{#openApiNullable}}{{^useOptional}}{{>beanValidationCore}}{{/useOptional}}{{/openApiNullable}}{{#useOptional}}{{#openApiNullable}}{{#isContainer}}{{^required}}{{>beanValidationCore}}{{/required}}{{/isContainer}}{{/openApiNullable}}{{#openApiNullable}}{{#required}}{{>beanValidationCore}}{{/required}}{{/openApiNullable}}{{/useOptional}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache index 26bea8c9b706..411135a6f963 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} {{>beanValidationBodyParams}}@Valid{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{>nullableAnnotation}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} {{>beanValidationBodyParams}}{{#reactive}}@Valid {{/reactive}}{{^reactive}}{{^isContainer}}@Valid {{/isContainer}}{{/reactive}}{{/useBeanValidation}}{{^useBeanValidation}} {{/useBeanValidation}}@RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{>nullableAnnotation}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache index e71ccf22e28d..a734cd3e206f 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}{{>paramDoc}}{{#useBeanValidation}} {{>beanValidationBodyParams}}@Valid{{/useBeanValidation}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}{{#isArray}}@RequestPart{{/isArray}}{{^isArray}}{{#reactive}}@RequestPart{{/reactive}}{{^reactive}}@RequestParam{{/reactive}}{{/isArray}}{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}){{>dateTimeParam}} {{^required}}{{#useOptional}}Optional<{{/useOptional}}{{/required}}{{{dataType}}}{{^required}}{{#useOptional}}>{{/useOptional}}{{/required}} {{paramName}}{{/isFile}}{{#isFile}}{{>paramDoc}} {{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}@RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#reactive}}{{#isArray}}Flux<{{/isArray}}Part{{#isArray}}>{{/isArray}}{{/reactive}}{{^reactive}}{{#isArray}}List<{{/isArray}}MultipartFile{{#isArray}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}{{>paramDoc}}{{#useBeanValidation}} {{>beanValidationBodyParams}}{{^isContainer}}@Valid {{/isContainer}}{{/useBeanValidation}}{{^useBeanValidation}} {{/useBeanValidation}}{{#isModel}}@RequestPart{{/isModel}}{{^isModel}}{{#isArray}}@RequestPart{{/isArray}}{{^isArray}}{{#reactive}}@RequestPart{{/reactive}}{{^reactive}}@RequestParam{{/reactive}}{{/isArray}}{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}){{>dateTimeParam}} {{^required}}{{#useOptional}}Optional<{{/useOptional}}{{/required}}{{{dataType}}}{{^required}}{{#useOptional}}>{{/useOptional}}{{/required}} {{paramName}}{{/isFile}}{{#isFile}}{{>paramDoc}} {{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}@RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#reactive}}{{#isArray}}Flux<{{/isArray}}Part{{#isArray}}>{{/isArray}}{{/reactive}}{{^reactive}}{{#isArray}}List<{{/isArray}}MultipartFile{{#isArray}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache index 56f7527eb92a..74fa57542d81 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMap}}""{{/isMap}}{{^isMap}}"{{baseName}}"{{/isMap}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/isModel}}{{>dateTimeParam}}{{#isDeprecated}} @Deprecated{{/isDeprecated}} {{>nullableAnnotation}}{{>optionalDataType}} {{paramName}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}{{#vendorExtensions.x-field-extra-annotation}}{{{.}}} {{/vendorExtensions.x-field-extra-annotation}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{>paramDoc}}{{#useBeanValidation}}{{^isContainer}} @Valid{{/isContainer}}{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMap}}""{{/isMap}}{{^isMap}}"{{baseName}}"{{/isMap}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/isModel}}{{>dateTimeParam}}{{#isDeprecated}} @Deprecated{{/isDeprecated}} {{>nullableAnnotation}}{{>optionalDataType}} {{paramName}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache b/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache index 257e6ee3e817..0796b64635c6 100644 --- a/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache @@ -76,7 +76,6 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} @Deprecated {{/deprecated}} {{#isContainer}} - {{#useBeanValidation}}@Valid{{/useBeanValidation}} {{#openApiNullable}} private {{#isNullable}}{{>nullableDataTypeBeanValidation}} {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>undefined();{{/isNullable}}{{^required}}{{^isNullable}}{{>nullableDataTypeBeanValidation}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};{{/isNullable}}{{/required}}{{#required}}{{^isNullable}}{{>nullableDataTypeBeanValidation}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};{{/isNullable}}{{/required}} {{/openApiNullable}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 0e4d9033c831..008a299b381d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -2524,6 +2524,32 @@ public void testRestTemplateWithUseBeanValidationDisabled() { TestUtils.assertFileNotContains(output.resolve("src/main/java/org/openapitools/client/model/Pet.java"), "@Valid"); } + @Test + public void testBeanValidationOnContainerTypeArgument_issue23614() { + final Path output = newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName(JAVA_GENERATOR) + .setLibrary(JavaClientCodegen.RESTTEMPLATE) + .addAdditionalProperty(JavaClientCodegen.USE_BEANVALIDATION, true) + .setInputSpec("src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml") + .setOutputDir(output.toString().replace("\\", "/")); + + List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); + validateJavaSourceFiles(files); + + // Array elements keep @Valid on the type argument; the container itself is no longer + // annotated with @Valid, which Hibernate Validator 9.1+ deprecates (HV000271). + Path pet = output.resolve("src/main/java/org/openapitools/client/model/Pet.java"); + assertFileContains(pet, "List<@Valid Tag> getTags()"); + TestUtils.assertFileNotContains(pet, "@Valid List<"); + + // Map values carry @Valid on the value type argument rather than on the map itself, + // preserving cascade validation without the deprecated container-level annotation. + Path mixed = output.resolve("src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java"); + assertFileContains(mixed, "Map getMap()"); + TestUtils.assertFileNotContains(mixed, "@Valid Map"); + } + @Test public void testRestTemplateWithPerformBeanValidationEnabled() { final Path output = newTempFolder(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaValidationArrayPrimitivesTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaValidationArrayPrimitivesTest.java index 0b707f43dec8..1624088ba4e2 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaValidationArrayPrimitivesTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaValidationArrayPrimitivesTest.java @@ -448,24 +448,25 @@ public void typeMappingsForCollections(Map typeMappings, String .collect(Collectors.toMap(File::getName, Function.identity())); String arrayMapping = typeMappings.getOrDefault("array", "List"); - // @Valid@Size(min = 5) is not nice, but not related to this fix - // adding a space would probably break many other tests + // The container parameter no longer carries a parameter-level @Valid: Hibernate Validator 9.1+ + // deprecates @Valid on a container (HV000271). Element validation is preserved via the + // type-argument @Valid / element constraints; the @Size list-size constraint stays on the parameter. JavaFileAssert.assertThat(files.get("ListOfPatternsApi.java")) .fileContains("ResponseEntity<" + arrayMapping + ">", arrayMapping + "<@Pattern(regexp = \"([a-z]+)\")String> requestBody") - .fileContainsPattern("@Size\\(min = 5\\)\\s*@Valid\\s*@RequestBody"); + .fileContainsPattern("@Size\\(min = 5\\)\\s*@RequestBody"); JavaFileAssert.assertThat(files.get("ListOfStringsApi.java")) .fileContains( "ResponseEntity<" + arrayMapping + ">", arrayMapping + "<@Size(min = 2, max = 2)String> requestBody") - .fileContainsPattern("@Size\\(min = 5\\)\\s*@Valid\\s*@RequestBody"); + .fileContainsPattern("@Size\\(min = 5\\)\\s*@RequestBody"); JavaFileAssert.assertThat(files.get("ListOfObjectsApi.java")) .fileContains( "ResponseEntity<" + arrayMapping + ">", arrayMapping + "<@Valid ListOfObjectsInner> listOfObjectsInner") - .fileContainsPattern("@Size\\(min = 5\\)\\s*@Valid\\s*@RequestBody"); + .fileContainsPattern("@Size\\(min = 5\\)\\s*@RequestBody"); String myItem = typeMappings.getOrDefault("MyItem", "MyItem"); JavaFileAssert.assertThat(files.get("ListOfQualifiedItemApi.java")) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java index 28e85f3dc654..28c545b1e452 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java @@ -770,7 +770,7 @@ public void testValidAnnotation_issue14432() throws Exception { .collect(Collectors.toMap(File::getName, Function.identity())); JavaFileAssert.assertThat(files.get("ComplexObject.java")) - .fileContains("private @Valid List dates") + .fileContains("private List dates") .fileDoesNotContain("private @Valid SymbolTypeEnum symbolType") .fileDoesNotContain("@Valid String") .fileDoesNotContain("@Valid Double"); @@ -801,17 +801,17 @@ public void arrayNullableDefaultValueTests() throws Exception { //And the generated model contains correct default value for array properties (optional) TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/model/Body.java"); assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/model/Body.java"), - "\nprivate @Valid List arrayThatIsNull;\n"); + "\nprivate List arrayThatIsNull;\n"); //And the generated model contains correct default value for array properties (required, nullable) TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/model/BodyWithRequiredNullable.java"); assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/model/BodyWithRequiredNullable.java"), - "\nprivate @Valid List arrayThatIsNull;\n"); + "\nprivate List arrayThatIsNull;\n"); //And the generated model contains correct default value for array properties (required) TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/model/BodyWithRequired.java"); assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/model/BodyWithRequired.java"), - "\nprivate @Valid List arrayThatIsNotNull = new ArrayList<>();\n"); + "\nprivate List arrayThatIsNotNull = new ArrayList<>();\n"); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 2193ee5c9f9f..d23d3d458557 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -1040,6 +1040,56 @@ public void testAdditionalProperties_issue1466() throws IOException { .assertMethod("getAdditionalProperty", "String").hasReturnType("Integer"); } + @Test + public void beanValidationOnContainerTypeArgument_issue23614() throws IOException { + final SpringCodegen codegen = new SpringCodegen(); + codegen.setUseBeanValidation(true); + + final Map files = generateFiles(codegen, + "src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml"); + + // Array elements keep @Valid on the type argument; the container itself is no longer + // annotated with @Valid, which Hibernate Validator 9.1+ deprecates (HV000271). + JavaFileAssert.assertThat(files.get("Pet.java")) + .fileContains("List<@Valid Tag> getTags()") + .fileDoesNotContain("@Valid List<"); + + // Map values carry @Valid on the value type argument rather than on the map itself, + // preserving cascade validation without the deprecated container-level annotation. + JavaFileAssert.assertThat(files.get("MixedPropertiesAndAdditionalPropertiesClass.java")) + .fileContains("Map getMap()") + .fileDoesNotContain("@Valid Map"); + } + + @Test + public void beanValidationOnContainerParameter_issue23614() throws IOException { + final SpringCodegen codegen = new SpringCodegen(); + codegen.setUseBeanValidation(true); + + final Map files = generateFiles(codegen, + "src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml"); + + // A list request body keeps @Valid on the element type argument, but the parameter itself is no + // longer annotated with the container-level @Valid that Hibernate Validator 9.1+ deprecates (HV000271). + JavaFileAssert.assertThat(files.get("UserApi.java")) + .fileContains("@RequestBody List<@Valid User> user") + .fileDoesNotContain("@Valid @RequestBody List"); + + // A map request body drops the container-level @Valid too. + JavaFileAssert.assertThat(files.get("FakeApi.java")) + .fileContains("@RequestBody Map requestBody") + .fileDoesNotContain("@Valid @RequestBody Map"); + + // A list query parameter loses the container-level @Valid, while a single-object request body + // still cascades via the parameter-level @Valid (non-containers are unaffected). + JavaFileAssert.assertThat(files.get("PetApi.java")) + .fileContains("@RequestParam(value = \"status\", required = true) List status") + .fileContains("@Valid @RequestBody Pet pet") + // The scalar "status" form parameter of updatePetWithForm still keeps its (harmless) @Valid, + // so the negative assertion must target the container form specifically. + .fileDoesNotContain("@Valid @RequestParam(value = \"status\", required = true) List"); + } + @Test public void testXImplements() throws IOException { final SpringCodegen codegen = new SpringCodegen(); @@ -1680,10 +1730,13 @@ public void reactiveMapTypeRequestMonoTest() throws IOException { generator.opts(input).generate(); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/SomeApi.java")) - .fileContains("Mono>") + .fileContains("Mono>") + // Reactive bodies keep the parameter-level @Valid: Mono/Flux are not + // Jakarta containers, so they do not trigger HV000271 (issue #23614). + .fileContains("@Valid @RequestBody Mono>") .fileDoesNotContain("Mono"); JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/SomeApiDelegate.java")) - .fileContains("Mono>") + .fileContains("Mono>") .fileDoesNotContain("Mono"); } diff --git a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index bc0ee6511084..e629470d9429 100644 --- a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -136,7 +136,6 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map arrayAr * @return arrayArrayNumber */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 850401f63420..b83fa255fc71 100644 --- a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -65,7 +65,6 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * @return arrayNumber */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/ArrayTest.java index 49a0d597255a..0568e3f129a0 100644 --- a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -109,7 +109,6 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * @return arrayArrayOfInteger */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -144,7 +143,6 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * @return arrayArrayOfModel */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/Drawing.java index 5e52a3b9865f..729df650419e 100644 --- a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/Drawing.java @@ -186,7 +186,6 @@ public Drawing addShapesItem(Shape shapesItem) { * @return shapes */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_SHAPES, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 7482f4c3504a..506dbd2b638c 100644 --- a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -97,7 +97,6 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { * @return files */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_FILES, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/MapTest.java index 85a2b766e6e9..45f37d636ca8 100644 --- a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/MapTest.java @@ -114,7 +114,6 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * @return mapMapOfString */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP_MAP_OF_STRING, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 637859471743..1f88bfd8a791 100644 --- a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -54,7 +54,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @jakarta.annotation.Nullable - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } @@ -113,7 +113,7 @@ public void setDateTime(@jakarta.annotation.Nullable OffsetDateTime dateTime) { } - public MixedPropertiesAndAdditionalPropertiesClass map(@jakarta.annotation.Nullable Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(@jakarta.annotation.Nullable Map map) { this.map = map; return this; } @@ -131,19 +131,18 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * @return map */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Map getMap() { + public Map getMap() { return map; } @JsonProperty(value = JSON_PROPERTY_MAP, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(@jakarta.annotation.Nullable Map map) { + public void setMap(@jakarta.annotation.Nullable Map map) { this.map = map; } diff --git a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/Pet.java index a7335c2faf3e..99bff500ba09 100644 --- a/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/Pet.java @@ -243,7 +243,6 @@ public Pet addTagsItem(Tag tagsItem) { * @return tags */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_TAGS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 5ccf8c764f89..58f676786562 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -137,7 +137,6 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map arrayAr * @return arrayArrayNumber */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index f3e7a7cb998c..499a70eb9c86 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -66,7 +66,6 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * @return arrayNumber */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java index 5914514d48b4..ad5ce5bc9655 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -110,7 +110,6 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * @return arrayArrayOfInteger */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -145,7 +144,6 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * @return arrayArrayOfModel */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java index d4ad1e99e84f..a88ea33c8e0e 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Drawing.java @@ -187,7 +187,6 @@ public Drawing addShapesItem(Shape shapesItem) { * @return shapes */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_SHAPES, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 2a8b351e3727..dcd9633452d9 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -98,7 +98,6 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { * @return files */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_FILES, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java index b4972729a469..7fce6636431b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MapTest.java @@ -115,7 +115,6 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * @return mapMapOfString */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP_MAP_OF_STRING, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6c83f362c1a7..c48819423747 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -55,7 +55,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @jakarta.annotation.Nullable - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } @@ -114,7 +114,7 @@ public void setDateTime(@jakarta.annotation.Nullable OffsetDateTime dateTime) { } - public MixedPropertiesAndAdditionalPropertiesClass map(@jakarta.annotation.Nullable Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(@jakarta.annotation.Nullable Map map) { this.map = map; return this; } @@ -132,19 +132,18 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * @return map */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Map getMap() { + public Map getMap() { return map; } @JsonProperty(value = JSON_PROPERTY_MAP, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(@jakarta.annotation.Nullable Map map) { + public void setMap(@jakarta.annotation.Nullable Map map) { this.map = map; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java index d7778ee2df5c..aa53a2614c6a 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pet.java @@ -244,7 +244,6 @@ public Pet addTagsItem(Tag tagsItem) { * @return tags */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_TAGS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 793d14b63536..0fcdf42cf83d 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -148,7 +148,6 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * @return mapNumber */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -251,7 +250,6 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List * @return mapArrayAnytype */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP_ARRAY_ANYTYPE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -321,7 +318,6 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map arrayAr * @return arrayArrayNumber */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 13df111cad2f..a1f9b35b63a7 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -64,7 +64,6 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * @return arrayNumber */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java index 65eb30d87975..e246ca8e0ba4 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -108,7 +108,6 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * @return arrayArrayOfInteger */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -143,7 +142,6 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * @return arrayArrayOfModel */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index ed092819ce52..c5e68646c797 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -96,7 +96,6 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { * @return files */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_FILES, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java index fad3a805ce5f..876595671cfd 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java @@ -112,7 +112,6 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * @return mapMapOfString */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP_MAP_OF_STRING, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 7c5e22a51633..a3d135428df8 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -51,7 +51,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @javax.annotation.Nullable - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } @@ -110,7 +110,7 @@ public void setDateTime(@javax.annotation.Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(@javax.annotation.Nullable Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(@javax.annotation.Nullable Map map) { this.map = map; return this; @@ -129,19 +129,18 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * @return map */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Map getMap() { + public Map getMap() { return map; } @JsonProperty(value = JSON_PROPERTY_MAP, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(@javax.annotation.Nullable Map map) { + public void setMap(@javax.annotation.Nullable Map map) { this.map = map; } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java index 79b030d88613..c93d1115c5b7 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java @@ -246,7 +246,6 @@ public Pet addTagsItem(Tag tagsItem) { * @return tags */ @javax.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_TAGS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index dcb81fe20d64..8d3e546e04ff 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -141,7 +141,6 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * @return mapNumber */ @javax.annotation.Nullable - @Valid public Map getMapNumber() { @@ -232,7 +231,6 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -263,7 +261,6 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * @return mapArrayAnytype */ @javax.annotation.Nullable - @Valid public Map> getMapArrayAnytype() { @@ -294,7 +291,6 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -325,7 +321,6 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index c8b7755c9b28..b82c0848e55c 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -61,7 +61,6 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * @return arrayArrayNumber */ @javax.annotation.Nullable - @Valid public List> getArrayArrayNumber() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index c2654d6dba2e..0cd3093cb28f 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -61,7 +61,6 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * @return arrayNumber */ @javax.annotation.Nullable - @Valid public List getArrayNumber() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java index c7254ae3ed07..e79e40f8e133 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -101,7 +101,6 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * @return arrayArrayOfInteger */ @javax.annotation.Nullable - @Valid public List> getArrayArrayOfInteger() { @@ -132,7 +131,6 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * @return arrayArrayOfModel */ @javax.annotation.Nullable - @Valid public List> getArrayArrayOfModel() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 41bb15fe78aa..5c896f6375f5 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -89,7 +89,6 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { * @return files */ @javax.annotation.Nullable - @Valid public List<@Valid ModelFile> getFiles() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java index 95af710cef6c..a72bf9840b4c 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java @@ -121,7 +121,6 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * @return mapMapOfString */ @javax.annotation.Nullable - @Valid public Map> getMapMapOfString() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index ec33f63110a2..409845eb99d5 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -48,7 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) @javax.annotation.Nullable - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } @@ -99,7 +99,7 @@ public void setDateTime(@javax.annotation.Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(@javax.annotation.Nullable Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(@javax.annotation.Nullable Map map) { this.map = map; return this; @@ -118,15 +118,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * @return map */ @javax.annotation.Nullable - @Valid - public Map getMap() { + public Map getMap() { return map; } - public void setMap(@javax.annotation.Nullable Map map) { + public void setMap(@javax.annotation.Nullable Map map) { this.map = map; } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java index 89a4dc19f90c..eebc3bea91af 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java @@ -237,7 +237,6 @@ public Pet addTagsItem(Tag tagsItem) { * @return tags */ @javax.annotation.Nullable - @Valid public List<@Valid Tag> getTags() { diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 9b2450158142..edfe2292ff97 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -147,7 +147,6 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * @return mapNumber */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -250,7 +249,6 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List * @return mapArrayAnytype */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP_ARRAY_ANYTYPE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -320,7 +317,6 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map arrayAr * @return arrayArrayNumber */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index bd8a0e1e4e13..1addbd4d2fa7 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -63,7 +63,6 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * @return arrayNumber */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_NUMBER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java index aed85ee3aa2d..015295178789 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -107,7 +107,6 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * @return arrayArrayOfInteger */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -142,7 +141,6 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * @return arrayArrayOfModel */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index ef21dc27a5af..81b19d475dee 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -95,7 +95,6 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { * @return files */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_FILES, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java index f5f70b898571..54ec3de58a06 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java @@ -111,7 +111,6 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * @return mapMapOfString */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP_MAP_OF_STRING, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 848138759096..46fbfa784546 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @jakarta.annotation.Nullable - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } @@ -109,7 +109,7 @@ public void setDateTime(@jakarta.annotation.Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(@jakarta.annotation.Nullable Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(@jakarta.annotation.Nullable Map map) { this.map = map; return this; @@ -128,19 +128,18 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * @return map */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_MAP, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Map getMap() { + public Map getMap() { return map; } @JsonProperty(value = JSON_PROPERTY_MAP, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setMap(@jakarta.annotation.Nullable Map map) { + public void setMap(@jakarta.annotation.Nullable Map map) { this.map = map; } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java index e703dcfeb959..35d8888d7fd0 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java @@ -245,7 +245,6 @@ public Pet addTagsItem(Tag tagsItem) { * @return tags */ @jakarta.annotation.Nullable - @Valid @JsonProperty(value = JSON_PROPERTY_TAGS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) 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 64b7d9c0e4fc..089763e0878b 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 @@ -129,7 +129,7 @@ ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ); @@ -167,7 +167,7 @@ ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ); 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 e26bcff19c15..c1f76faaa695 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 @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); @@ -122,7 +122,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java index 0d9d99f20e09..55d52ffb65f0 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java @@ -211,7 +211,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 b19f8b502ca9..7faa8a1b3f9e 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 @@ -135,7 +135,7 @@ ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -173,7 +173,7 @@ ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ); 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 b8a626e1b03b..5e1cb8ea8895 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 @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); @@ -122,7 +122,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 51ab2edcf7d9..46c3befb4bed 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 @@ -125,7 +125,7 @@ ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ); @@ -163,7 +163,7 @@ ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ); 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 a55badb0ccaf..1e73d5eaa5f9 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 @@ -82,7 +82,7 @@ ResponseEntity createUser( value = UserController.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ); @@ -106,7 +106,7 @@ ResponseEntity createUsersWithArrayInput( value = UserController.PATH_CREATE_USERS_WITH_LIST_INPUT ) ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ); diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java index f655d26b20a7..cfffa20f7ac2 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java @@ -204,7 +204,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 b19f8b502ca9..7faa8a1b3f9e 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 @@ -135,7 +135,7 @@ ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -173,7 +173,7 @@ ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ); 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 b8a626e1b03b..5e1cb8ea8895 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 @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); @@ -122,7 +122,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/FakeApi.java index 7358c6c39e53..5b277d015201 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/FakeApi.java @@ -249,11 +249,11 @@ ResponseEntity testEndpointParameters( ResponseEntity testEnumParameters( @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, + @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, + @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ); @@ -299,7 +299,7 @@ ResponseEntity testGroupParameters( contentType = "application/json" ) ResponseEntity testInlineAdditionalProperties( - @Valid @RequestBody Map requestBody + @RequestBody Map requestBody ); @@ -357,10 +357,10 @@ ResponseEntity testNullable( accept = { "application/json" } ) ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Valid @RequestParam(value = "url", required = true) List url, - @NotNull @Valid @RequestParam(value = "context", required = true) List context + @NotNull @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @RequestParam(value = "http", required = true) List http, + @NotNull @RequestParam(value = "url", required = true) List url, + @NotNull @RequestParam(value = "context", required = true) List context ); diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/PetApi.java index 21e78e8832ae..9fc7317bb6c3 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/PetApi.java @@ -81,7 +81,7 @@ ResponseEntity deletePet( accept = { "application/json", "application/xml" } ) ResponseEntity> findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) List status + @NotNull @RequestParam(value = "status", required = true) List status ); @@ -101,7 +101,7 @@ ResponseEntity> findPetsByStatus( accept = { "application/json", "application/xml" } ) ResponseEntity> findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) Set tags + @NotNull @RequestParam(value = "tags", required = true) Set tags ); diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/UserApi.java index 7f673fcb70c0..80b16539363c 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/api/UserApi.java @@ -57,7 +57,7 @@ ResponseEntity createUser( contentType = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Valid @RequestBody List<@Valid UserDto> userDto + @RequestBody List<@Valid UserDto> userDto ); @@ -75,7 +75,7 @@ ResponseEntity createUsersWithArrayInput( contentType = "application/json" ) ResponseEntity createUsersWithListInput( - @Valid @RequestBody List<@Valid UserDto> userDto + @RequestBody List<@Valid UserDto> userDto ); diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 46a16d7fe21d..d25e551d4ee3 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN * Get mapNumber * @return mapNumber */ - @Valid + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; @@ -193,7 +193,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; @@ -221,7 +221,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List> getMapArrayAnytype() { return mapArrayAnytype; @@ -249,7 +249,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; @@ -277,7 +277,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 1302d3c84ad6..d49df1e96ad9 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -48,7 +48,7 @@ public ArrayOfArrayOfNumberOnlyDto addArrayArrayNumberItem(List arra * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 656e2d802f3b..e74d13b99b4c 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -48,7 +48,7 @@ public ArrayOfNumberOnlyDto addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayTestDto.java index 802a19d1f683..104dc99e8dc4 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -82,7 +82,7 @@ public ArrayTestDto addArrayArrayOfIntegerItem(List arrayArrayOfIntegerIte * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; @@ -110,7 +110,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<@Valid ReadOnlyFirstDto> array * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index eb7d6e45c9f5..9ce055483851 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -71,7 +71,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) { * Get files * @return files */ - @Valid + @JsonProperty("files") public List<@Valid FileDto> getFiles() { return files; diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MapTestDto.java index bea5213283f1..46193afc2633 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MapTestDto.java @@ -91,7 +91,7 @@ public MapTestDto putMapMapOfStringItem(String key, Map mapMapOf * Get mapMapOfString * @return mapMapOfString */ - @Valid + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 185e777b68e9..9052ae71b032 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -38,7 +38,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -80,7 +80,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { this.map = map; return this; } @@ -97,14 +97,14 @@ public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, Ani * Get map * @return map */ - @Valid + @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java index 2052979417f7..5ad85c1c3857 100644 --- a/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface-bean-validation/src/main/java/org/openapitools/model/PetDto.java @@ -197,7 +197,7 @@ public PetDto addTagsItem(TagDto tagsItem) { * Get tags * @return tags */ - @Valid + @JsonProperty("tags") public List<@Valid TagDto> getTags() { return tags; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/api/FakeApi.java index 749cc042e246..62a4263687b5 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/api/FakeApi.java @@ -253,11 +253,11 @@ Mono> testEndpointParameters( Mono> testEnumParameters( @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, + @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, + @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Valid @RequestPart(value = "enum_form_string", required = false) String enumFormString ); @@ -361,10 +361,10 @@ Mono> testNullable( accept = { "application/json" } ) Mono> testQueryParameterCollectionFormat( - @NotNull @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Valid @RequestParam(value = "url", required = true) List url, - @NotNull @Valid @RequestParam(value = "context", required = true) List context + @NotNull @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @RequestParam(value = "http", required = true) List http, + @NotNull @RequestParam(value = "url", required = true) List url, + @NotNull @RequestParam(value = "context", required = true) List context ); diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/api/PetApi.java index ebdb7cb322bf..98492ea00bad 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/api/PetApi.java @@ -85,7 +85,7 @@ Mono> deletePet( accept = { "application/json", "application/xml" } ) Mono>> findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) List status + @NotNull @RequestParam(value = "status", required = true) List status ); @@ -105,7 +105,7 @@ Mono>> findPetsByStatus( accept = { "application/json", "application/xml" } ) Mono>> findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) Set tags + @NotNull @RequestParam(value = "tags", required = true) Set tags ); diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 0cd4c4edbd58..2ebf613eecc4 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -107,7 +107,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; @@ -191,7 +191,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; @@ -219,7 +219,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; @@ -247,7 +247,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; @@ -275,7 +275,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 1efee220f79c..2da857dc6b74 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -46,7 +46,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index e11670fd8583..32d798a4a456 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -46,7 +46,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayTest.java index 12bba4684f17..1316e9c206b8 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/ArrayTest.java @@ -80,7 +80,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; @@ -108,7 +108,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 81c9051dedbc..dd98d2dd5dc6 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -69,7 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @JsonProperty("files") public List<@Valid File> getFiles() { return files; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MapTest.java index a1efb10089a8..4d65fa1fb0e6 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MapTest.java @@ -89,7 +89,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1fb2d7e1681f..986b1e20291c 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -78,7 +78,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -95,14 +95,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java index be762175a56b..cf95599b686c 100644 --- a/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-http-interface-reactive-bean-validation/src/main/java/org/openapitools/model/Pet.java @@ -203,7 +203,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/FakeApi.java index 7358c6c39e53..5b277d015201 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/FakeApi.java @@ -249,11 +249,11 @@ ResponseEntity testEndpointParameters( ResponseEntity testEnumParameters( @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, + @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, + @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ); @@ -299,7 +299,7 @@ ResponseEntity testGroupParameters( contentType = "application/json" ) ResponseEntity testInlineAdditionalProperties( - @Valid @RequestBody Map requestBody + @RequestBody Map requestBody ); @@ -357,10 +357,10 @@ ResponseEntity testNullable( accept = { "application/json" } ) ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Valid @RequestParam(value = "url", required = true) List url, - @NotNull @Valid @RequestParam(value = "context", required = true) List context + @NotNull @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @RequestParam(value = "http", required = true) List http, + @NotNull @RequestParam(value = "url", required = true) List url, + @NotNull @RequestParam(value = "context", required = true) List context ); diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/PetApi.java index 21e78e8832ae..9fc7317bb6c3 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/PetApi.java @@ -81,7 +81,7 @@ ResponseEntity deletePet( accept = { "application/json", "application/xml" } ) ResponseEntity> findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) List status + @NotNull @RequestParam(value = "status", required = true) List status ); @@ -101,7 +101,7 @@ ResponseEntity> findPetsByStatus( accept = { "application/json", "application/xml" } ) ResponseEntity> findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) Set tags + @NotNull @RequestParam(value = "tags", required = true) Set tags ); diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/UserApi.java index 7f673fcb70c0..80b16539363c 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/api/UserApi.java @@ -57,7 +57,7 @@ ResponseEntity createUser( contentType = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Valid @RequestBody List<@Valid UserDto> userDto + @RequestBody List<@Valid UserDto> userDto ); @@ -75,7 +75,7 @@ ResponseEntity createUsersWithArrayInput( contentType = "application/json" ) ResponseEntity createUsersWithListInput( - @Valid @RequestBody List<@Valid UserDto> userDto + @RequestBody List<@Valid UserDto> userDto ); diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 2ea6bd2cd002..e03f4e57b381 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -108,7 +108,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN * Get mapNumber * @return mapNumber */ - @Valid + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; @@ -195,7 +195,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; @@ -224,7 +224,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List> getMapArrayAnytype() { return mapArrayAnytype; @@ -253,7 +253,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; @@ -282,7 +282,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index fa600276dd17..08968244d531 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -50,7 +50,7 @@ public ArrayOfArrayOfNumberOnlyDto addArrayArrayNumberItem(List arra * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 59a9a5cf1f8f..46d9d7a7b2e0 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -50,7 +50,7 @@ public ArrayOfNumberOnlyDto addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java index 9d892b04ccdb..192f0239384d 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -85,7 +85,7 @@ public ArrayTestDto addArrayArrayOfIntegerItem(List arrayArrayOfIntegerIte * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; @@ -114,7 +114,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<@Valid ReadOnlyFirstDto> array * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index e64265eb2f4c..00df78578162 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -74,7 +74,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) { * Get files * @return files */ - @Valid + @JsonProperty("files") public List<@Valid FileDto> getFiles() { return files; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java index 09940c4522d0..d6f32498de1d 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MapTestDto.java @@ -93,7 +93,7 @@ public MapTestDto putMapMapOfStringItem(String key, Map mapMapOf * Get mapMapOfString * @return mapMapOfString */ - @Valid + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index e3ffa8984cf9..3c48aaa388d1 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -40,7 +40,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -84,7 +84,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { this.map = map; return this; } @@ -101,15 +101,15 @@ public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, Ani * Get map * @return map */ - @Valid + @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java index 30524a3fe8d0..c55316a855c5 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/PetDto.java @@ -201,7 +201,7 @@ public PetDto addTagsItem(TagDto tagsItem) { * Get tags * @return tags */ - @Valid + @JsonProperty("tags") public List<@Valid TagDto> getTags() { return tags; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/FakeApi.java index 49e2652ea1aa..e653f72a563c 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/FakeApi.java @@ -249,11 +249,11 @@ ResponseEntity testEndpointParameters( ResponseEntity testEnumParameters( @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List enumHeaderStringArray, @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString, - @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, + @RequestParam(value = "enum_query_string_array", required = false) @Nullable List enumQueryStringArray, @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString, @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Valid @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, + @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString ); @@ -299,7 +299,7 @@ ResponseEntity testGroupParameters( contentType = "application/json" ) ResponseEntity testInlineAdditionalProperties( - @Valid @RequestBody Map requestBody + @RequestBody Map requestBody ); @@ -357,10 +357,10 @@ ResponseEntity testNullable( accept = { "application/json" } ) ResponseEntity testQueryParameterCollectionFormat( - @NotNull @Valid @RequestParam(value = "pipe", required = true) List pipe, - @NotNull @Valid @RequestParam(value = "http", required = true) List http, - @NotNull @Valid @RequestParam(value = "url", required = true) List url, - @NotNull @Valid @RequestParam(value = "context", required = true) List context + @NotNull @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @RequestParam(value = "http", required = true) List http, + @NotNull @RequestParam(value = "url", required = true) List url, + @NotNull @RequestParam(value = "context", required = true) List context ); diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/PetApi.java index ed97b8feed7a..3fecd9bb190b 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/PetApi.java @@ -81,7 +81,7 @@ ResponseEntity deletePet( accept = { "application/json", "application/xml" } ) ResponseEntity> findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) List status + @NotNull @RequestParam(value = "status", required = true) List status ); @@ -101,7 +101,7 @@ ResponseEntity> findPetsByStatus( accept = { "application/json", "application/xml" } ) ResponseEntity> findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) Set tags + @NotNull @RequestParam(value = "tags", required = true) Set tags ); diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/UserApi.java index a4eff3581f75..c29b7792c1f1 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/api/UserApi.java @@ -57,7 +57,7 @@ ResponseEntity createUser( contentType = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ); @@ -75,7 +75,7 @@ ResponseEntity createUsersWithArrayInput( contentType = "application/json" ) ResponseEntity createUsersWithListInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ); diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 5daca86cbb74..1914f2c04e4e 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -108,7 +108,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @JsonProperty("map_number") public Map getMapNumber() { return mapNumber; @@ -192,7 +192,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; @@ -220,7 +220,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { return mapArrayAnytype; @@ -248,7 +248,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; @@ -276,7 +276,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 2f035d99c5cb..dd544b97c87c 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 0f421a4df7e0..173955b50cd1 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayTest.java index 554b15ab3cf0..8cf86177b9f8 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ArrayTest.java @@ -81,7 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; @@ -109,7 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 0eee22443042..82ff3c3deadc 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -70,7 +70,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @JsonProperty("files") public List<@Valid File> getFiles() { return files; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MapTest.java index 00158afc58e2..bdb81368acb8 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index b815102e433a..57ff0da43b91 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -79,7 +79,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -96,14 +96,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java index f4272d0f6c80..268cf7a117fc 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/Pet.java @@ -204,7 +204,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; 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 12942f290947..fd1ae377bec7 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 @@ -78,7 +78,7 @@ ResponseEntity deletePet( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status + @NotNull @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -99,7 +99,7 @@ ResponseEntity> findPetsByStatus( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) List tags + @NotNull @RequestParam(value = "tags", required = true) List tags ); 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 58f39395076d..01b95597001b 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 @@ -55,7 +55,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ); @@ -73,7 +73,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ); diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java index 819444909ebb..f041dee8b6cf 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java @@ -199,7 +199,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; 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 b19f8b502ca9..7faa8a1b3f9e 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 @@ -135,7 +135,7 @@ ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -173,7 +173,7 @@ ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ); 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 b8a626e1b03b..5e1cb8ea8895 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 @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); @@ -122,7 +122,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/PetApi.java index 12942f290947..fd1ae377bec7 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/PetApi.java @@ -78,7 +78,7 @@ ResponseEntity deletePet( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status + @NotNull @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -99,7 +99,7 @@ ResponseEntity> findPetsByStatus( produces = { "application/json", "application/xml" } ) ResponseEntity> findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) List tags + @NotNull @RequestParam(value = "tags", required = true) List tags ); diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/UserApi.java index 58f39395076d..01b95597001b 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/UserApi.java @@ -55,7 +55,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ); @@ -73,7 +73,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ); diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java index e7ed1e26b8fa..8333b98360b9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java @@ -202,7 +202,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; 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 434628c567a9..b8b125dd643d 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 @@ -136,7 +136,7 @@ CompletableFuture> deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -174,7 +174,7 @@ CompletableFuture>> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ); 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 1d7533843885..039eb5662208 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 @@ -93,7 +93,7 @@ CompletableFuture> createUser( consumes = "application/json" ) CompletableFuture> createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); @@ -123,7 +123,7 @@ CompletableFuture> createUsersWithArrayInput( consumes = "application/json" ) CompletableFuture> createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 6c863353bd37..fc5af2d9e6d4 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 @@ -363,11 +363,11 @@ ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 ); @@ -431,7 +431,7 @@ ResponseEntity testGroupParameters( consumes = "application/json" ) ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ); @@ -515,10 +515,10 @@ ResponseEntity testNullable( 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, - @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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ); 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 33159afa53e6..9d5104d758a7 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 @@ -135,7 +135,7 @@ ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ); @@ -173,7 +173,7 @@ ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ); 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 efba43fa6fee..622dba1910b9 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 @@ -86,7 +86,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); @@ -113,7 +113,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4798bc0c028d..1931bfe2c8c7 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java index ab6a00effad0..fed6d9d7b87f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java @@ -200,7 +200,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 1ca89551bae3..eb8898b53d97 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 @@ -127,7 +127,7 @@ ResponseEntity deletePet( @org.springframework.validation.annotation.Validated @org.springframework.security.access.prepost.PreAuthorize("hasRole('ADMIN')") 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ); @@ -169,7 +169,7 @@ ResponseEntity> findPetsByStatus( 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, + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags, @NotNull @Min(value = 1) @Parameter(name = "size", description = "The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "size", required = true, defaultValue = "20") Integer size2, @NotNull @Min(value = 0) @Parameter(name = "page", description = "The page to return, starting with page 0. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "page", required = true, defaultValue = "0") Integer page, @NotNull @Parameter(name = "sort", description = "The sorting to apply to the Pageable object. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "sort", required = true, defaultValue = "id,asc") String sort, 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 5867e3c47ae4..9041051869c9 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 @@ -82,7 +82,7 @@ ResponseEntity createUser( 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 + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ); @@ -106,7 +106,7 @@ ResponseEntity createUsersWithArrayInput( 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 + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ); diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java index f655d26b20a7..cfffa20f7ac2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -204,7 +204,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 b19f8b502ca9..7faa8a1b3f9e 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 @@ -135,7 +135,7 @@ ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ); @@ -173,7 +173,7 @@ ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ); 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 b8a626e1b03b..5e1cb8ea8895 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 @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); @@ -122,7 +122,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ); diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 83f93904ef5e..a6e1bb437e3d 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 @@ -135,7 +135,7 @@ ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) throws Exception; @@ -173,7 +173,7 @@ ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) 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 038a7284b62e..6b64809e305c 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 @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) throws Exception; @@ -122,7 +122,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) throws Exception; diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 49582dd7dbed..b97bb409ee24 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 @@ -162,7 +162,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -217,7 +217,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 3801a95cf7a6..698e9eb04959 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 @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = "application/json" ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -135,7 +135,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 41d88c5dfc82..cf60f36bfcdf 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 @@ -162,7 +162,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -217,7 +217,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 6090783f5cda..d5ecbec88368 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 @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -135,7 +135,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java index 7764e0f49acf..9fd5db1d4682 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java @@ -145,7 +145,7 @@ default ResponseEntity deletePet( 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, + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().findPetsByStatus(status, servletRequest); @@ -186,7 +186,7 @@ default ResponseEntity> findPetsByStatus( 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, + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().findPetsByTags(tags, servletRequest); diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java index fc70c9fd51ef..7b89f21482a7 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java @@ -99,7 +99,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user, + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().createUsersWithArrayInput(user, servletRequest); @@ -132,7 +132,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user, + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().createUsersWithListInput(user, servletRequest); diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java index 34fefa217937..ea5750159770 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/model/Pet.java @@ -240,7 +240,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") @JacksonXmlProperty(localName = "Tag") 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 41d88c5dfc82..cf60f36bfcdf 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 @@ -162,7 +162,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -217,7 +217,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 6090783f5cda..d5ecbec88368 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 @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -135,7 +135,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java index 76e94c5b80a7..44d16e9c505b 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java @@ -239,7 +239,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") @JacksonXmlProperty(localName = "Tag") diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java index 38e257be4546..283208811378 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java @@ -146,7 +146,7 @@ public Foo addListOfDtItem(OffsetDateTime listOfDtItem) { * Get listOfDt * @return listOfDt */ - @Valid + @Schema(name = "listOfDt", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("listOfDt") @JacksonXmlProperty(localName = "listOfDt") @@ -181,7 +181,7 @@ public Foo addListMinIntemsItem(OffsetDateTime listMinIntemsItem) { * Get listMinIntems * @return listMinIntems */ - @Valid @Size(min = 1) + @Size(min = 1) @Schema(name = "listMinIntems", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("listMinIntems") @JacksonXmlProperty(localName = "listMinIntems") diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java index 41d88c5dfc82..cf60f36bfcdf 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java @@ -162,7 +162,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -217,7 +217,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApi.java index 6090783f5cda..d5ecbec88368 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApi.java @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -135,7 +135,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java index ce7523e6fee7..c3afed1dd858 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/model/Pet.java @@ -243,7 +243,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") @JacksonXmlProperty(localName = "Tag") 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 7d5e7d4215e9..e0ff4c7c5663 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 @@ -414,11 +414,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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); @@ -486,7 +486,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -576,10 +576,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } 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 43a2b2e21e37..b678c0cec51b 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 @@ -141,7 +141,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { return getDelegate().findPetsByStatus(status); } @@ -181,7 +181,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { return getDelegate().findPetsByTags(tags); } 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 fe59ebf27458..6e3201a7ed22 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 @@ -91,7 +91,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithArrayInput(user); } @@ -120,7 +120,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithListInput(user); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4798bc0c028d..1931bfe2c8c7 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index 673bb2e90254..d8e9666eabea 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 455de334f014..7aabee43acd6 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 @@ -455,11 +455,11 @@ default ResponseEntity testEndpointParameters( 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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -529,7 +529,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -622,10 +622,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 1b0fe34519f0..9b143f37c57f 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 @@ -148,7 +148,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -203,7 +203,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 c4eb595e53e9..4478ad38404b 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 @@ -96,7 +96,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,7 +126,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4798bc0c028d..1931bfe2c8c7 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index 673bb2e90254..d8e9666eabea 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 e7ca0bd5e117..3e2ad545e04e 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 @@ -105,7 +105,7 @@ default ResponseEntity deletePet( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status + @NotNull @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -143,7 +143,7 @@ default ResponseEntity> findPetsByStatus( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) List tags + @NotNull @RequestParam(value = "tags", required = true) List tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 5cafc12d702c..440cd2798ecc 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 @@ -65,7 +65,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,7 +86,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java index aa7e8049ad41..7a61243a7d70 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java @@ -199,7 +199,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; 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 d2560333d25f..a6e81cfe6582 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 @@ -163,7 +163,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -218,7 +218,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 f3c66039590d..4954b9c287d2 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 @@ -103,7 +103,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -136,7 +136,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java index 30902a60c2df..1526a2fe9b60 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java @@ -43,10 +43,8 @@ public class Pet { private String name; - @Valid private List photoUrls = new ArrayList<>(); - @Valid private List<@Valid Tag> tags = new ArrayList<>(); /** @@ -211,7 +209,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") @JacksonXmlProperty(localName = "Tag") diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fb2d379d0c8d..ca1314d97761 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -23,7 +23,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private Date dateTime; @JsonProperty("map") - private Map map = null; + private Map map = null; public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; @@ -61,7 +61,7 @@ public void setDateTime(Date dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -79,11 +79,11 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * @return map **/ @ApiModelProperty(value = "") - public Map getMap() { + public Map getMap() { return map; } - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/UserApi.java index 71f3028317f3..79d2b88ddb7e 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/UserApi.java @@ -48,7 +48,7 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - public void createUsersWithArrayInput(@Valid @NotNull List<@Valid User> body); + public void createUsersWithArrayInput(@NotNull List<@Valid User> body); /** * Creates list of users with given input array @@ -59,7 +59,7 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - public void createUsersWithListInput(@Valid @NotNull List<@Valid User> body); + public void createUsersWithListInput(@NotNull List<@Valid User> body); /** * Delete user diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java index 14f3a22e91fc..654082285449 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java @@ -42,8 +42,6 @@ public class Pet { @ApiModelProperty(value = "") - @Valid - private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/UserApi.java index 06e581ae5709..57d6f6f01cbb 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/UserApi.java @@ -48,7 +48,7 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - public void createUsersWithArrayInput(@Valid @NotNull List<@Valid User> body); + public void createUsersWithArrayInput(@NotNull List<@Valid User> body); /** * Creates list of users with given input array @@ -59,7 +59,7 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - public void createUsersWithListInput(@Valid @NotNull List<@Valid User> body); + public void createUsersWithListInput(@NotNull List<@Valid User> body); /** * Delete user diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java index 14f3a22e91fc..654082285449 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java @@ -42,8 +42,6 @@ public class Pet { @ApiModelProperty(value = "") - @Valid - private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java index c54871e99dc3..2b416d76aaaf 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java @@ -167,7 +167,7 @@ public interface FakeApi { @ApiOperation(value = "test inline additionalProperties", tags={ "fake" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - public void testInlineAdditionalProperties(@Valid @NotNull Map param); + public void testInlineAdditionalProperties(@NotNull Map param); /** * test json serialization of form data diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/UserApi.java index df7df60c82f6..42d41e87663e 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/UserApi.java @@ -48,7 +48,7 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - public void createUsersWithArrayInput(@Valid @NotNull List<@Valid User> body); + public void createUsersWithArrayInput(@NotNull List<@Valid User> body); /** * Creates list of users with given input array @@ -59,7 +59,7 @@ public interface UserApi { @ApiOperation(value = "Creates list of users with given input array", tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation") }) - public void createUsersWithListInput(@Valid @NotNull List<@Valid User> body); + public void createUsersWithListInput(@NotNull List<@Valid User> body); /** * Delete user diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 67fe33ebafd7..6370f85aade2 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -20,8 +20,6 @@ public class AdditionalPropertiesClass { @ApiModelProperty(value = "") - @Valid - private Map mapNumber = new HashMap<>(); @ApiModelProperty(value = "") @@ -34,26 +32,18 @@ public class AdditionalPropertiesClass { @ApiModelProperty(value = "") - @Valid - private Map> mapArrayInteger = new HashMap<>(); @ApiModelProperty(value = "") - @Valid - private Map> mapArrayAnytype = new HashMap<>(); @ApiModelProperty(value = "") - @Valid - private Map> mapMapString = new HashMap<>(); @ApiModelProperty(value = "") - @Valid - private Map> mapMapAnytype = new HashMap<>(); @ApiModelProperty(value = "") diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index b6898cbc5132..d3681d5c097b 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -16,8 +16,6 @@ public class ArrayOfArrayOfNumberOnly { @ApiModelProperty(value = "") - @Valid - private List> arrayArrayNumber = new ArrayList<>(); /** * Get arrayArrayNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 883cc638189c..82d1c1f65992 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -16,8 +16,6 @@ public class ArrayOfNumberOnly { @ApiModelProperty(value = "") - @Valid - private List arrayNumber = new ArrayList<>(); /** * Get arrayNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java index fbc2e7a24bd7..aba3ad21125a 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java @@ -20,14 +20,10 @@ public class ArrayTest { @ApiModelProperty(value = "") - @Valid - private List> arrayArrayOfInteger = new ArrayList<>(); @ApiModelProperty(value = "") - @Valid - private List> arrayArrayOfModel = new ArrayList<>(); /** * Get arrayOfString diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index b2b151ec800f..9ecb3b633fa1 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,8 +22,6 @@ public class FileSchemaTestClass { @ApiModelProperty(value = "") - @Valid - private List<@Valid ModelFile> files = new ArrayList<>(); /** * Get _file diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java index 7cb3f921f3b6..82377062a007 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java @@ -16,8 +16,6 @@ public class MapTest { @ApiModelProperty(value = "") - @Valid - private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e4d74c1d6e32..07ac6f1411cb 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -25,9 +25,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @ApiModelProperty(value = "") - @Valid - - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); /** * Get uuid * @return uuid @@ -69,15 +67,15 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { * @return map **/ @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java index b2f457534704..fd2ad2db4ae8 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java @@ -40,8 +40,6 @@ public class Pet { @ApiModelProperty(value = "") - @Valid - private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java index e45875b148cd..7abab5032864 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java @@ -75,7 +75,7 @@ public Response createUser(@ApiParam(value = "Created user object", required = t @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(body, securityContext); } @@ -87,7 +87,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(body, securityContext); } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 1a313c9a1e99..7c10dd1ec079 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -136,7 +136,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb **/ @JsonProperty(value = "map_number") @ApiModelProperty(value = "") - @Valid + public Map getMapNumber() { return mapNumber; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 262990eab19d..13ab53c19cec 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -58,7 +58,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr **/ @JsonProperty(value = "ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index d18ab33d3b3d..66900947a79a 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -58,7 +58,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { **/ @JsonProperty(value = "ArrayNumber") @ApiModelProperty(value = "") - @Valid + public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java index cbc6a86fc383..2554c67c84ec 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java @@ -124,7 +124,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO **/ @JsonProperty(value = "array_array_of_model") @ApiModelProperty(value = "") - @Valid + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index c0e7dc9c0351..2082c59bcfc5 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -83,7 +83,7 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { **/ @JsonProperty(value = "files") @ApiModelProperty(value = "") - @Valid + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 0868b899659f..421ad0260bf2 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -48,7 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; @@ -90,7 +90,7 @@ public void setDateTime(OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -109,12 +109,12 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal **/ @JsonProperty(value = "map") @ApiModelProperty(value = "") - @Valid - public Map getMap() { + + public Map getMap() { return map; } - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java index 81a544c55ee3..3526b6ca1947 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java @@ -214,7 +214,7 @@ public Pet addTagsItem(Tag tagsItem) { **/ @JsonProperty(value = "tags") @ApiModelProperty(value = "") - @Valid + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java index 50b240a569a0..d773a818e2ac 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java @@ -75,7 +75,7 @@ public Response createUser(@ApiParam(value = "Created user object", required = t @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<@Valid User> user,@Context SecurityContext securityContext) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull List<@Valid User> user,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(user, securityContext); } @@ -87,7 +87,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<@Valid User> user,@Context SecurityContext securityContext) + public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull List<@Valid User> user,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(user, securityContext); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 56058fee985f..f5664d0add0d 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -57,7 +57,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr **/ @JsonProperty(value = "ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 6dd02f45196e..06263cb4e6c3 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -57,7 +57,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { **/ @JsonProperty(value = "ArrayNumber") @ApiModelProperty(value = "") - @Valid + public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java index 1dc82b6bafd9..c31fdfadd622 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java @@ -123,7 +123,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO **/ @JsonProperty(value = "array_array_of_model") @ApiModelProperty(value = "") - @Valid + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index 98faf50de321..d9adee4ea1bc 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -82,7 +82,7 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa **/ @JsonProperty(value = "someMap") @ApiModelProperty(value = "") - @Valid + public Map getSomeMap() { return someMap; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 55dee8297ae1..14b06ad76cf0 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -82,7 +82,7 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { **/ @JsonProperty(value = "files") @ApiModelProperty(value = "") - @Valid + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index defa98be26f9..d28e66bcaf35 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,7 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; @@ -89,7 +89,7 @@ public void setDateTime(Date dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -108,12 +108,12 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal **/ @JsonProperty(value = "map") @ApiModelProperty(value = "") - @Valid - public Map getMap() { + + public Map getMap() { return map; } - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java index 59dcb6f46435..10cbc3baca38 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java @@ -213,7 +213,7 @@ public Pet addTagsItem(Tag tagsItem) { **/ @JsonProperty(value = "tags") @ApiModelProperty(value = "") - @Valid + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApi.java index 715087ebf30c..30d8e51f9839 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/api/UserApi.java @@ -51,7 +51,7 @@ public Response createUser(@ApiParam(value = "Created user object" ,required=tru @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return service.createUsersWithArrayInput(body,securityContext); } @@ -62,7 +62,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return service.createUsersWithListInput(body,securityContext); } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java index 076e6548d500..c3a5bbfc9e30 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/org/openapitools/model/Pet.java @@ -105,7 +105,6 @@ public void setPhotoUrls(List photoUrls) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/UserApi.java index ff1c47af0635..82265fd4df44 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/org/openapitools/api/UserApi.java @@ -42,7 +42,7 @@ public interface UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext); + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext); @POST @Path("/createWithList") @@ -50,7 +50,7 @@ public interface UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext); + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext); @DELETE @Path("/{username}") diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/UserApi.java index af733f323fc7..3fc2ff2042da 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/src/gen/java/org/openapitools/api/UserApi.java @@ -42,7 +42,7 @@ public interface UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext); + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext); @POST @Path("/createWithList") @@ -50,7 +50,7 @@ public interface UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext); + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext); @DELETE @Path("/{username}") diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/UserApi.java index 9f3151d514ab..d8524fb13dd2 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/gen/java/org/openapitools/api/UserApi.java @@ -42,7 +42,7 @@ public interface UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext); + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext); @POST @Path("/createWithList") @@ -50,7 +50,7 @@ public interface UserApi { @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext); + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext); @DELETE @Path("/{username}") diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApi.java index 588eceaa7f8d..c019d760b0d7 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/api/UserApi.java @@ -51,7 +51,7 @@ public Response createUser(@ApiParam(value = "Created user object" ,required=tru @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return service.createUsersWithArrayInput(body,securityContext); } @@ -62,7 +62,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return service.createUsersWithListInput(body,securityContext); } diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java index 076e6548d500..c3a5bbfc9e30 100644 --- a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/org/openapitools/model/Pet.java @@ -105,7 +105,6 @@ public void setPhotoUrls(List photoUrls) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApi.java index d5cc5684b977..970febd71dc0 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/api/UserApi.java @@ -51,7 +51,7 @@ public Response createUser(@ApiParam(value = "Created user object" ,required=tru @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return service.createUsersWithArrayInput(body,securityContext); } @@ -62,7 +62,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return service.createUsersWithListInput(body,securityContext); } diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java index 076e6548d500..c3a5bbfc9e30 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/org/openapitools/model/Pet.java @@ -105,7 +105,6 @@ public void setPhotoUrls(List photoUrls) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/api/FakeApi.java index 2a42907696c8..5fec8f9a2f0a 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/api/FakeApi.java @@ -152,7 +152,7 @@ public Response fakeTestsDefaults() { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testAdditionalPropertiesReference(@Valid @NotNull Map requestBody) { + public Response testAdditionalPropertiesReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -247,7 +247,7 @@ public Response testGroupParameters(@QueryParam("required_string_group") @NotNul @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testInlineAdditionalProperties(@Valid @NotNull Map requestBody) { + public Response testInlineAdditionalProperties(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -301,7 +301,7 @@ public Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testStringMapReference(@Valid @NotNull Map requestBody) { + public Response testStringMapReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/api/UserApi.java index be9e4420b9a0..29c3457d955d 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/api/UserApi.java @@ -39,7 +39,7 @@ public Response createUser(@Valid @NotNull User user) { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithArrayInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } @@ -50,7 +50,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithListInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index f281cf35c76c..2bcaa497a720 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -21,8 +21,8 @@ @JsonTypeName("AdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapProperty = new HashMap<>(); - private @Valid Map> mapOfMapProperty = new HashMap<>(); + private Map mapProperty = new HashMap<>(); + private Map> mapOfMapProperty = new HashMap<>(); protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapProperty = b.mapProperty; diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 3c90d6570020..1c355063abbc 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -23,7 +23,7 @@ @JsonTypeName("ArrayOfArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber = new ArrayList<>(); protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -42,7 +42,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index da6e7c8a4202..7c1982fb17aa 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -23,7 +23,7 @@ @JsonTypeName("ArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private List arrayNumber = new ArrayList<>(); protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -42,7 +42,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - @Valid public List<@Valid BigDecimal> getArrayNumber() { + public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayTest.java index 066639716422..d4f88d865e67 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ArrayTest.java @@ -23,9 +23,9 @@ @JsonTypeName("ArrayTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString = new ArrayList<>(); + private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfModel = new ArrayList<>(); protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -116,7 +116,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/EnumArrays.java index 792335dd2cc6..a23756295c30 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/EnumArrays.java @@ -117,7 +117,7 @@ public static ArrayEnumEnum fromValue(String value) { } } - private @Valid List arrayEnum = new ArrayList<>(); + private List arrayEnum = new ArrayList<>(); protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index d3f847789499..36f55a47d4aa 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -24,7 +24,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FakeBigDecimalMap200Response implements Serializable { private BigDecimal someId; - private @Valid Map someMap = new HashMap<>(); + private Map someMap = new HashMap<>(); protected FakeBigDecimalMap200Response(FakeBigDecimalMap200ResponseBuilder b) { this.someId = b.someId; @@ -63,7 +63,7 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { @ApiModelProperty(value = "") @JsonProperty("someMap") - @Valid public Map getSomeMap() { + public Map getSomeMap() { return someMap; } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 03b1fc2aee3f..225a1432c8bf 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,7 +24,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { private ModelFile _file; - private @Valid List<@Valid ModelFile> files = new ArrayList<>(); + private List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -63,7 +63,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @ApiModelProperty(value = "") @JsonProperty("files") - @Valid public List<@Valid ModelFile> getFiles() { + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/MapTest.java index a1bcb74c5198..a5c15a46fd90 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/MapTest.java @@ -21,7 +21,7 @@ @JsonTypeName("MapTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = new HashMap<>(); + private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -69,9 +69,9 @@ public static InnerEnum fromValue(String value) { } } - private @Valid Map mapOfEnumString = new HashMap<>(); - private @Valid Map directMap = new HashMap<>(); - private @Valid Map indirectMap = new HashMap<>(); + private Map mapOfEnumString = new HashMap<>(); + private Map directMap = new HashMap<>(); + private Map indirectMap = new HashMap<>(); protected MapTest(MapTestBuilder b) { this.mapMapOfString = b.mapMapOfString; diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 03e1374ad5b3..344bd36709dc 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -26,7 +26,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private UUID uuid; private Date dateTime; - private @Valid Map map = new HashMap<>(); + private Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { this.uuid = b.uuid; @@ -77,7 +77,7 @@ public void setDateTime(Date dateTime) { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -85,12 +85,12 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") - @Valid public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/NullableClass.java index e14ab5c119d3..89d32d51ff90 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/NullableClass.java @@ -40,12 +40,12 @@ public class NullableClass extends HashMap implements Serializab private String stringProp; private LocalDate dateProp; private Date datetimeProp; - private @Valid List arrayNullableProp; - private @Valid List arrayAndItemsNullableProp; - private @Valid List arrayItemsNullable = new ArrayList<>(); - private @Valid Map objectNullableProp; - private @Valid Map objectAndItemsNullableProp; - private @Valid Map objectItemsNullable = new HashMap<>(); + private List arrayNullableProp; + private List arrayAndItemsNullableProp; + private List arrayItemsNullable = new ArrayList<>(); + private Map objectNullableProp; + private Map objectAndItemsNullableProp; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index aea37f72cd90..0c3c1b6f5bfb 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -30,7 +30,7 @@ public class ObjectWithDeprecatedFields implements Serializable { @Deprecated private DeprecatedObject deprecatedRef; @Deprecated - private @Valid List bars = new ArrayList<>(); + private List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { this.uuid = b.uuid; diff --git a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/Pet.java index f1e86413ae62..4c6e21d08b9b 100644 --- a/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-enum/src/gen/java/org/openapitools/model/Pet.java @@ -30,8 +30,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -205,7 +205,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java index 475398797528..fd01a2b81e81 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java @@ -54,7 +54,7 @@ public interface UserApi { }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user); + Response createUsersWithArrayInput(@NotNull List<@Valid User> user); /** @@ -72,7 +72,7 @@ public interface UserApi { }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user); + Response createUsersWithListInput(@NotNull List<@Valid User> user); /** diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java index cf5b7af7d800..9c6d6cedd14a 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java @@ -29,8 +29,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid List photoUrls = new ArrayList<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private List photoUrls = new ArrayList<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -195,7 +195,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java index 3907ce205ca8..993a9383ca24 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java @@ -54,7 +54,7 @@ public interface UserApi { }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - void createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user); + void createUsersWithArrayInput(@NotNull List<@Valid User> user); /** @@ -72,7 +72,7 @@ public interface UserApi { }, tags={ "user" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - void createUsersWithListInput(@Valid @NotNull List<@Valid User> user); + void createUsersWithListInput(@NotNull List<@Valid User> user); /** diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java index cf5b7af7d800..9c6d6cedd14a 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java @@ -29,8 +29,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid List photoUrls = new ArrayList<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private List photoUrls = new ArrayList<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -195,7 +195,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java index 41923e639aae..81a423fcbb7b 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java @@ -163,7 +163,7 @@ public Response testGroupParameters(@QueryParam("required_string_group") @NotNul @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testInlineAdditionalProperties(@Valid @NotNull Map param) { + public Response testInlineAdditionalProperties(@NotNull Map param) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/UserApi.java index 0db4354ad537..3afc9829e953 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/UserApi.java @@ -37,7 +37,7 @@ public Response createUser(@Valid @NotNull User body) { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> body) { + public Response createUsersWithArrayInput(@NotNull List<@Valid User> body) { return Response.ok().entity("magic!").build(); } @@ -47,7 +47,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> body @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> body) { + public Response createUsersWithListInput(@NotNull List<@Valid User> body) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 0c75d1c8d26d..8e515f9508d5 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -23,14 +23,14 @@ @JsonTypeName("AdditionalPropertiesClass") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapString = new HashMap<>(); - private @Valid Map mapNumber = new HashMap<>(); - private @Valid Map mapInteger = new HashMap<>(); - private @Valid Map mapBoolean = new HashMap<>(); - private @Valid Map> mapArrayInteger = new HashMap<>(); - private @Valid Map> mapArrayAnytype = new HashMap<>(); - private @Valid Map> mapMapString = new HashMap<>(); - private @Valid Map> mapMapAnytype = new HashMap<>(); + private Map mapString = new HashMap<>(); + private Map mapNumber = new HashMap<>(); + private Map mapInteger = new HashMap<>(); + private Map mapBoolean = new HashMap<>(); + private Map> mapArrayInteger = new HashMap<>(); + private Map> mapArrayAnytype = new HashMap<>(); + private Map> mapMapString = new HashMap<>(); + private Map> mapMapAnytype = new HashMap<>(); private Object anytype1; private Object anytype2; private Object anytype3; @@ -97,7 +97,7 @@ public AdditionalPropertiesClass mapNumber(Map mapNumber) { @ApiModelProperty(value = "") @JsonProperty("map_number") - @Valid public Map getMapNumber() { + public Map getMapNumber() { return mapNumber; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d7ca8b43ef43..c0c74ba8027e 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -23,7 +23,7 @@ @JsonTypeName("ArrayOfArrayOfNumberOnly") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber = new ArrayList<>(); protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -42,7 +42,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index ba9bc5be992b..9241580c87f5 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -23,7 +23,7 @@ @JsonTypeName("ArrayOfNumberOnly") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private List arrayNumber = new ArrayList<>(); protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -42,7 +42,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - @Valid public List<@Valid BigDecimal> getArrayNumber() { + public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java index d360c5f9c061..632b307f04a6 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java @@ -23,9 +23,9 @@ @JsonTypeName("ArrayTest") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString = new ArrayList<>(); + private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfModel = new ArrayList<>(); protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -116,7 +116,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java index da3312ac2bee..4d7fee0df60d 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java @@ -117,7 +117,7 @@ public static ArrayEnumEnum fromValue(String value) { } } - private @Valid List arrayEnum = new ArrayList<>(); + private List arrayEnum = new ArrayList<>(); protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 038093dc1a57..240ac6186a30 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,7 +24,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { private ModelFile _file; - private @Valid List<@Valid ModelFile> files = new ArrayList<>(); + private List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -63,7 +63,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @ApiModelProperty(value = "") @JsonProperty("files") - @Valid public List<@Valid ModelFile> getFiles() { + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java index b7776c77441d..0d77612b2368 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java @@ -21,7 +21,7 @@ @JsonTypeName("MapTest") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = new HashMap<>(); + private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -69,9 +69,9 @@ public static InnerEnum fromValue(String value) { } } - private @Valid Map mapOfEnumString = new HashMap<>(); - private @Valid Map directMap = new HashMap<>(); - private @Valid Map indirectMap = new HashMap<>(); + private Map mapOfEnumString = new HashMap<>(); + private Map directMap = new HashMap<>(); + private Map indirectMap = new HashMap<>(); protected MapTest(MapTestBuilder b) { this.mapMapOfString = b.mapMapOfString; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index f6b34c5b08a8..650d8f9fed8b 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -26,7 +26,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private UUID uuid; private Date dateTime; - private @Valid Map map = new HashMap<>(); + private Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { this.uuid = b.uuid; @@ -77,7 +77,7 @@ public void setDateTime(Date dateTime) { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -85,12 +85,12 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") - @Valid public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java index 10ebb59db2bc..5419ecab8d06 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java @@ -30,8 +30,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -205,7 +205,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 847bd22aa08e..6e9c1fbf5085 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -27,7 +27,7 @@ public class TypeHolderDefault implements Serializable { private BigDecimal numberItem; private Integer integerItem; private Boolean boolItem = true; - private @Valid List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(); protected TypeHolderDefault(TypeHolderDefaultBuilder b) { this.stringItem = b.stringItem; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderExample.java index 3953350e7f00..535656180e19 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -28,7 +28,7 @@ public class TypeHolderExample implements Serializable { private Float floatItem; private Integer integerItem; private Boolean boolItem; - private @Valid List arrayItem = new ArrayList<>(); + private List arrayItem = new ArrayList<>(); protected TypeHolderExample(TypeHolderExampleBuilder b) { this.stringItem = b.stringItem; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java index cdacb5593971..b832850c262c 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java @@ -27,31 +27,31 @@ public class XmlItem implements Serializable { private BigDecimal attributeNumber; private Integer attributeInteger; private Boolean attributeBoolean; - private @Valid List wrappedArray = new ArrayList<>(); + private List wrappedArray = new ArrayList<>(); private String nameString; private BigDecimal nameNumber; private Integer nameInteger; private Boolean nameBoolean; - private @Valid List nameArray = new ArrayList<>(); - private @Valid List nameWrappedArray = new ArrayList<>(); + private List nameArray = new ArrayList<>(); + private List nameWrappedArray = new ArrayList<>(); private String prefixString; private BigDecimal prefixNumber; private Integer prefixInteger; private Boolean prefixBoolean; - private @Valid List prefixArray = new ArrayList<>(); - private @Valid List prefixWrappedArray = new ArrayList<>(); + private List prefixArray = new ArrayList<>(); + private List prefixWrappedArray = new ArrayList<>(); private String namespaceString; private BigDecimal namespaceNumber; private Integer namespaceInteger; private Boolean namespaceBoolean; - private @Valid List namespaceArray = new ArrayList<>(); - private @Valid List namespaceWrappedArray = new ArrayList<>(); + private List namespaceArray = new ArrayList<>(); + private List namespaceWrappedArray = new ArrayList<>(); private String prefixNsString; private BigDecimal prefixNsNumber; private Integer prefixNsInteger; private Boolean prefixNsBoolean; - private @Valid List prefixNsArray = new ArrayList<>(); - private @Valid List prefixNsWrappedArray = new ArrayList<>(); + private List prefixNsArray = new ArrayList<>(); + private List prefixNsWrappedArray = new ArrayList<>(); protected XmlItem(XmlItemBuilder b) { this.attributeString = b.attributeString; diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java index 33d4a6774234..7dda8034ac5f 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java @@ -77,7 +77,7 @@ public Response createUser(@Valid @NotNull User user) { }) }) - public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithArrayInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } @@ -95,7 +95,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user }) }) - public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithListInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java index d8cd3c5efd26..e55dbb8e95f8 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java @@ -27,8 +27,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid List photoUrls = new ArrayList<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private List photoUrls = new ArrayList<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -202,7 +202,7 @@ public Pet tags(List<@Valid Tag> tags) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java index 2f154583c8f1..1feb0d0b92bc 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java @@ -224,7 +224,7 @@ public Response fakePropertyEnumIntegerSerialize(@Valid @NotNull OuterObjectWith }) }) - public Response testAdditionalPropertiesReference(@Valid @NotNull Map requestBody) { + public Response testAdditionalPropertiesReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -358,7 +358,7 @@ public Response testGroupParameters(@QueryParam("required_string_group") @NotNul }) }) - public Response testInlineAdditionalProperties(@Valid @NotNull Map requestBody) { + public Response testInlineAdditionalProperties(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -437,7 +437,7 @@ public Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull }) }) - public Response testStringMapReference(@Valid @NotNull Map requestBody) { + public Response testStringMapReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/UserApi.java index a3ad917674f1..1e1cf7889b55 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/UserApi.java @@ -89,7 +89,7 @@ public Response createUser(@Valid @NotNull User user) { }) }) - public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithArrayInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } @@ -105,7 +105,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user }) }) - public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithListInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 2e6b1a93965c..8afb16fcdac9 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -19,8 +19,8 @@ @JsonTypeName("AdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapProperty = new HashMap<>(); - private @Valid Map> mapOfMapProperty = new HashMap<>(); + private Map mapProperty = new HashMap<>(); + private Map> mapOfMapProperty = new HashMap<>(); protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapProperty = b.mapProperty; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 6177e17d8cd3..4fb7a845c800 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -21,7 +21,7 @@ @JsonTypeName("ArrayOfArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber = new ArrayList<>(); protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -40,7 +40,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("ArrayArrayNumber") - @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 284743dc63c6..33494ab19fd4 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -21,7 +21,7 @@ @JsonTypeName("ArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private List arrayNumber = new ArrayList<>(); protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -40,7 +40,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("ArrayNumber") - @Valid public List<@Valid BigDecimal> getArrayNumber() { + public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayTest.java index 9932bbc93c37..460ccaeeb90a 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayTest.java @@ -21,9 +21,9 @@ @JsonTypeName("ArrayTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString = new ArrayList<>(); + private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfModel = new ArrayList<>(); protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -114,7 +114,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("array_array_of_model") - @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/EnumArrays.java index c5bd3ea73861..29c13492e9b8 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/EnumArrays.java @@ -115,7 +115,7 @@ public static ArrayEnumEnum fromValue(String value) { } } - private @Valid List arrayEnum = new ArrayList<>(); + private List arrayEnum = new ArrayList<>(); protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index 7584bb885080..f2f5c8592586 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -22,7 +22,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FakeBigDecimalMap200Response implements Serializable { private BigDecimal someId; - private @Valid Map someMap = new HashMap<>(); + private Map someMap = new HashMap<>(); protected FakeBigDecimalMap200Response(FakeBigDecimalMap200ResponseBuilder b) { this.someId = b.someId; @@ -61,7 +61,7 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("someMap") - @Valid public Map getSomeMap() { + public Map getSomeMap() { return someMap; } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 04c84ef164b5..4a0248ae6510 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -22,7 +22,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { private ModelFile _file; - private @Valid List<@Valid ModelFile> files = new ArrayList<>(); + private List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -61,7 +61,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("files") - @Valid public List<@Valid ModelFile> getFiles() { + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MapTest.java index 2fa89c524d6a..d9995bd66b5c 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MapTest.java @@ -19,7 +19,7 @@ @JsonTypeName("MapTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = new HashMap<>(); + private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -67,9 +67,9 @@ public static InnerEnum fromValue(String value) { } } - private @Valid Map mapOfEnumString = new HashMap<>(); - private @Valid Map directMap = new HashMap<>(); - private @Valid Map indirectMap = new HashMap<>(); + private Map mapOfEnumString = new HashMap<>(); + private Map directMap = new HashMap<>(); + private Map indirectMap = new HashMap<>(); protected MapTest(MapTestBuilder b) { this.mapMapOfString = b.mapMapOfString; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6a9250f17b71..71f0da4a5e7a 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -24,7 +24,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private UUID uuid; private LocalDateTime dateTime; - private @Valid Map map = new HashMap<>(); + private Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { this.uuid = b.uuid; @@ -75,7 +75,7 @@ public void setDateTime(LocalDateTime dateTime) { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -83,12 +83,12 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("map") - @Valid public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/NullableClass.java index 078b7f4b0e60..f8f98c217ae4 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/NullableClass.java @@ -38,12 +38,12 @@ public class NullableClass extends HashMap implements Serializab private String stringProp; private LocalDate dateProp; private LocalDateTime datetimeProp; - private @Valid List arrayNullableProp; - private @Valid List arrayAndItemsNullableProp; - private @Valid List arrayItemsNullable = new ArrayList<>(); - private @Valid Map objectNullableProp; - private @Valid Map objectAndItemsNullableProp; - private @Valid Map objectItemsNullable = new HashMap<>(); + private List arrayNullableProp; + private List arrayAndItemsNullableProp; + private List arrayItemsNullable = new ArrayList<>(); + private Map objectNullableProp; + private Map objectAndItemsNullableProp; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 4bfc8fbafa74..b56ec5384e82 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -28,7 +28,7 @@ public class ObjectWithDeprecatedFields implements Serializable { @Deprecated private DeprecatedObject deprecatedRef; @Deprecated - private @Valid List bars = new ArrayList<>(); + private List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { this.uuid = b.uuid; diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Pet.java index c8cae98bdb37..9848bfd590da 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Pet.java @@ -28,8 +28,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -203,7 +203,7 @@ public Pet tags(List<@Valid Tag> tags) { @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/FakeApi.java index 2a42907696c8..5fec8f9a2f0a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/FakeApi.java @@ -152,7 +152,7 @@ public Response fakeTestsDefaults() { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testAdditionalPropertiesReference(@Valid @NotNull Map requestBody) { + public Response testAdditionalPropertiesReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -247,7 +247,7 @@ public Response testGroupParameters(@QueryParam("required_string_group") @NotNul @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testInlineAdditionalProperties(@Valid @NotNull Map requestBody) { + public Response testInlineAdditionalProperties(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -301,7 +301,7 @@ public Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testStringMapReference(@Valid @NotNull Map requestBody) { + public Response testStringMapReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/UserApi.java index be9e4420b9a0..29c3457d955d 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/UserApi.java @@ -39,7 +39,7 @@ public Response createUser(@Valid @NotNull User user) { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithArrayInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } @@ -50,7 +50,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithListInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index f281cf35c76c..2bcaa497a720 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -21,8 +21,8 @@ @JsonTypeName("AdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapProperty = new HashMap<>(); - private @Valid Map> mapOfMapProperty = new HashMap<>(); + private Map mapProperty = new HashMap<>(); + private Map> mapOfMapProperty = new HashMap<>(); protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapProperty = b.mapProperty; diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 3c90d6570020..1c355063abbc 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -23,7 +23,7 @@ @JsonTypeName("ArrayOfArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber = new ArrayList<>(); protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -42,7 +42,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index da6e7c8a4202..7c1982fb17aa 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -23,7 +23,7 @@ @JsonTypeName("ArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private List arrayNumber = new ArrayList<>(); protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -42,7 +42,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - @Valid public List<@Valid BigDecimal> getArrayNumber() { + public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayTest.java index 066639716422..d4f88d865e67 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ArrayTest.java @@ -23,9 +23,9 @@ @JsonTypeName("ArrayTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString = new ArrayList<>(); + private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfModel = new ArrayList<>(); protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -116,7 +116,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/EnumArrays.java index edafcd8211f3..2b6983fc3930 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/EnumArrays.java @@ -117,7 +117,7 @@ public static ArrayEnumEnum fromValue(String value) { } } - private @Valid List arrayEnum = new ArrayList<>(); + private List arrayEnum = new ArrayList<>(); protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index d3f847789499..36f55a47d4aa 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -24,7 +24,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FakeBigDecimalMap200Response implements Serializable { private BigDecimal someId; - private @Valid Map someMap = new HashMap<>(); + private Map someMap = new HashMap<>(); protected FakeBigDecimalMap200Response(FakeBigDecimalMap200ResponseBuilder b) { this.someId = b.someId; @@ -63,7 +63,7 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { @ApiModelProperty(value = "") @JsonProperty("someMap") - @Valid public Map getSomeMap() { + public Map getSomeMap() { return someMap; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 03b1fc2aee3f..225a1432c8bf 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,7 +24,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { private ModelFile _file; - private @Valid List<@Valid ModelFile> files = new ArrayList<>(); + private List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -63,7 +63,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @ApiModelProperty(value = "") @JsonProperty("files") - @Valid public List<@Valid ModelFile> getFiles() { + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/MapTest.java index 0d197a0d3a7d..37129cf7bb9f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/MapTest.java @@ -21,7 +21,7 @@ @JsonTypeName("MapTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = new HashMap<>(); + private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -69,9 +69,9 @@ public static InnerEnum fromValue(String value) { } } - private @Valid Map mapOfEnumString = new HashMap<>(); - private @Valid Map directMap = new HashMap<>(); - private @Valid Map indirectMap = new HashMap<>(); + private Map mapOfEnumString = new HashMap<>(); + private Map directMap = new HashMap<>(); + private Map indirectMap = new HashMap<>(); protected MapTest(MapTestBuilder b) { this.mapMapOfString = b.mapMapOfString; diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 03e1374ad5b3..344bd36709dc 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -26,7 +26,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private UUID uuid; private Date dateTime; - private @Valid Map map = new HashMap<>(); + private Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { this.uuid = b.uuid; @@ -77,7 +77,7 @@ public void setDateTime(Date dateTime) { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -85,12 +85,12 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") - @Valid public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/NullableClass.java index e14ab5c119d3..89d32d51ff90 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/NullableClass.java @@ -40,12 +40,12 @@ public class NullableClass extends HashMap implements Serializab private String stringProp; private LocalDate dateProp; private Date datetimeProp; - private @Valid List arrayNullableProp; - private @Valid List arrayAndItemsNullableProp; - private @Valid List arrayItemsNullable = new ArrayList<>(); - private @Valid Map objectNullableProp; - private @Valid Map objectAndItemsNullableProp; - private @Valid Map objectItemsNullable = new HashMap<>(); + private List arrayNullableProp; + private List arrayAndItemsNullableProp; + private List arrayItemsNullable = new ArrayList<>(); + private Map objectNullableProp; + private Map objectAndItemsNullableProp; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index aea37f72cd90..0c3c1b6f5bfb 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -30,7 +30,7 @@ public class ObjectWithDeprecatedFields implements Serializable { @Deprecated private DeprecatedObject deprecatedRef; @Deprecated - private @Valid List bars = new ArrayList<>(); + private List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { this.uuid = b.uuid; diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Pet.java index 8e117672e5c0..2402d9db2f46 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/Pet.java @@ -30,8 +30,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -205,7 +205,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java index 37da3fae506d..50cedcaa0cde 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java @@ -152,7 +152,7 @@ public Response fakeTestsDefaults() { @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response testAdditionalPropertiesReference(@Valid @NotNull Map requestBody) { + public Response testAdditionalPropertiesReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -238,7 +238,7 @@ public Response testGroupParameters(@QueryParam("required_string_group") @NotNul @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response testInlineAdditionalProperties(@Valid @NotNull Map requestBody) { + public Response testInlineAdditionalProperties(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -292,7 +292,7 @@ public Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response testStringMapReference(@Valid @NotNull Map requestBody) { + public Response testStringMapReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java index cc5bd18c73ae..00e291dc5c94 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java @@ -42,7 +42,7 @@ public Response createUser(@Valid @NotNull User user) { @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithArrayInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } @@ -53,7 +53,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithListInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 39358c9983e8..ee6bba046d6b 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -20,8 +20,8 @@ @JsonTypeName("AdditionalPropertiesClass") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapProperty = new HashMap<>(); - private @Valid Map> mapOfMapProperty = new HashMap<>(); + private Map mapProperty = new HashMap<>(); + private Map> mapOfMapProperty = new HashMap<>(); protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapProperty = b.mapProperty; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 9d7a502315b8..f82fc27a5407 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -22,7 +22,7 @@ @JsonTypeName("ArrayOfArrayOfNumberOnly") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber = new ArrayList<>(); protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -41,7 +41,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @Schema(description = "") @JsonProperty("ArrayArrayNumber") - @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index b29a94c29c1a..26032a7e1e3a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -22,7 +22,7 @@ @JsonTypeName("ArrayOfNumberOnly") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private List arrayNumber = new ArrayList<>(); protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -41,7 +41,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @Schema(description = "") @JsonProperty("ArrayNumber") - @Valid public List<@Valid BigDecimal> getArrayNumber() { + public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java index 0b25f940563a..1fbb3b36138f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java @@ -22,9 +22,9 @@ @JsonTypeName("ArrayTest") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString = new ArrayList<>(); + private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfModel = new ArrayList<>(); protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -115,7 +115,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @Schema(description = "") @JsonProperty("array_array_of_model") - @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java index bdffd9a347ea..65c3fd20177a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java @@ -116,7 +116,7 @@ public static ArrayEnumEnum fromValue(String value) { } } - private @Valid List arrayEnum = new ArrayList<>(); + private List arrayEnum = new ArrayList<>(); protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index 93c895e93694..af0446660c49 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -23,7 +23,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FakeBigDecimalMap200Response implements Serializable { private BigDecimal someId; - private @Valid Map someMap = new HashMap<>(); + private Map someMap = new HashMap<>(); protected FakeBigDecimalMap200Response(FakeBigDecimalMap200ResponseBuilder b) { this.someId = b.someId; @@ -62,7 +62,7 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { @Schema(description = "") @JsonProperty("someMap") - @Valid public Map getSomeMap() { + public Map getSomeMap() { return someMap; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 6ec440d9b818..abc51b29ceeb 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -23,7 +23,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { private ModelFile _file; - private @Valid List<@Valid ModelFile> files = new ArrayList<>(); + private List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -62,7 +62,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @Schema(description = "") @JsonProperty("files") - @Valid public List<@Valid ModelFile> getFiles() { + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java index 48757f251871..74dac62b0438 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java @@ -20,7 +20,7 @@ @JsonTypeName("MapTest") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = new HashMap<>(); + private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -68,9 +68,9 @@ public static InnerEnum fromValue(String value) { } } - private @Valid Map mapOfEnumString = new HashMap<>(); - private @Valid Map directMap = new HashMap<>(); - private @Valid Map indirectMap = new HashMap<>(); + private Map mapOfEnumString = new HashMap<>(); + private Map directMap = new HashMap<>(); + private Map indirectMap = new HashMap<>(); protected MapTest(MapTestBuilder b) { this.mapMapOfString = b.mapMapOfString; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index dfe5a18b6dac..944f8cb4a529 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -25,7 +25,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private UUID uuid; private Date dateTime; - private @Valid Map map = new HashMap<>(); + private Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { this.uuid = b.uuid; @@ -76,7 +76,7 @@ public void setDateTime(Date dateTime) { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -84,12 +84,12 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @Schema(description = "") @JsonProperty("map") - @Valid public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java index f677cded999d..be7fb2ce875d 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java @@ -39,12 +39,12 @@ public class NullableClass extends HashMap implements Serializab private String stringProp; private LocalDate dateProp; private Date datetimeProp; - private @Valid List arrayNullableProp; - private @Valid List arrayAndItemsNullableProp; - private @Valid List arrayItemsNullable = new ArrayList<>(); - private @Valid Map objectNullableProp; - private @Valid Map objectAndItemsNullableProp; - private @Valid Map objectItemsNullable = new HashMap<>(); + private List arrayNullableProp; + private List arrayAndItemsNullableProp; + private List arrayItemsNullable = new ArrayList<>(); + private Map objectNullableProp; + private Map objectAndItemsNullableProp; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 58b659e3fb75..fc1ecbaf250f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -29,7 +29,7 @@ public class ObjectWithDeprecatedFields implements Serializable { @Deprecated private DeprecatedObject deprecatedRef; @Deprecated - private @Valid List bars = new ArrayList<>(); + private List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { this.uuid = b.uuid; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java index 13dbd7597834..3ebaeb4d4082 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java @@ -29,8 +29,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -204,7 +204,7 @@ public Pet tags(List<@Valid Tag> tags) { @Schema(description = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java index b472cd4f9b42..8eaa347df4e6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java @@ -152,7 +152,7 @@ public Response fakeTestsDefaults() { @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response testAdditionalPropertiesReference(@Valid @NotNull Map requestBody) { + public Response testAdditionalPropertiesReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -238,7 +238,7 @@ public Response testGroupParameters(@QueryParam("required_string_group") @NotNul @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response testInlineAdditionalProperties(@Valid @NotNull Map requestBody) { + public Response testInlineAdditionalProperties(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -292,7 +292,7 @@ public Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response testStringMapReference(@Valid @NotNull Map requestBody) { + public Response testStringMapReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java index db9fb60d13b4..e96d3f1d1527 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java @@ -42,7 +42,7 @@ public Response createUser(@Valid @NotNull User user) { @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithArrayInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } @@ -53,7 +53,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithListInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 2c917bfb5487..4552d46de5a0 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -20,8 +20,8 @@ @JsonTypeName("AdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapProperty = new HashMap<>(); - private @Valid Map> mapOfMapProperty = new HashMap<>(); + private Map mapProperty = new HashMap<>(); + private Map> mapOfMapProperty = new HashMap<>(); protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapProperty = b.mapProperty; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 193807d2ad78..dc652e26c1a8 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -22,7 +22,7 @@ @JsonTypeName("ArrayOfArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber = new ArrayList<>(); protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -41,7 +41,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @Schema(description = "") @JsonProperty("ArrayArrayNumber") - @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 1a885c0d0277..a263a21d569e 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -22,7 +22,7 @@ @JsonTypeName("ArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private List arrayNumber = new ArrayList<>(); protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -41,7 +41,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @Schema(description = "") @JsonProperty("ArrayNumber") - @Valid public List<@Valid BigDecimal> getArrayNumber() { + public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java index 9c0bafe64c70..4f5b69ab0040 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java @@ -22,9 +22,9 @@ @JsonTypeName("ArrayTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString = new ArrayList<>(); + private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfModel = new ArrayList<>(); protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -115,7 +115,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @Schema(description = "") @JsonProperty("array_array_of_model") - @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java index 2321f72a3a28..899f339997d6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java @@ -116,7 +116,7 @@ public static ArrayEnumEnum fromValue(String value) { } } - private @Valid List arrayEnum = new ArrayList<>(); + private List arrayEnum = new ArrayList<>(); protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index 4b8d6520dee7..3e2c3bb9e86b 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -23,7 +23,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FakeBigDecimalMap200Response implements Serializable { private BigDecimal someId; - private @Valid Map someMap = new HashMap<>(); + private Map someMap = new HashMap<>(); protected FakeBigDecimalMap200Response(FakeBigDecimalMap200ResponseBuilder b) { this.someId = b.someId; @@ -62,7 +62,7 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { @Schema(description = "") @JsonProperty("someMap") - @Valid public Map getSomeMap() { + public Map getSomeMap() { return someMap; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 8bac2b4abf34..4550bdc0f58f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -23,7 +23,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { private ModelFile _file; - private @Valid List<@Valid ModelFile> files = new ArrayList<>(); + private List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -62,7 +62,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @Schema(description = "") @JsonProperty("files") - @Valid public List<@Valid ModelFile> getFiles() { + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java index 6b8ff858e77a..a3a93a3d7742 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java @@ -20,7 +20,7 @@ @JsonTypeName("MapTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = new HashMap<>(); + private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -68,9 +68,9 @@ public static InnerEnum fromValue(String value) { } } - private @Valid Map mapOfEnumString = new HashMap<>(); - private @Valid Map directMap = new HashMap<>(); - private @Valid Map indirectMap = new HashMap<>(); + private Map mapOfEnumString = new HashMap<>(); + private Map directMap = new HashMap<>(); + private Map indirectMap = new HashMap<>(); protected MapTest(MapTestBuilder b) { this.mapMapOfString = b.mapMapOfString; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 4ab66cd70ab4..c8b74636deda 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -25,7 +25,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private UUID uuid; private Date dateTime; - private @Valid Map map = new HashMap<>(); + private Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { this.uuid = b.uuid; @@ -76,7 +76,7 @@ public void setDateTime(Date dateTime) { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -84,12 +84,12 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @Schema(description = "") @JsonProperty("map") - @Valid public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java index b3a6579fac40..465646abe602 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java @@ -39,12 +39,12 @@ public class NullableClass extends HashMap implements Serializab private String stringProp; private LocalDate dateProp; private Date datetimeProp; - private @Valid List arrayNullableProp; - private @Valid List arrayAndItemsNullableProp; - private @Valid List arrayItemsNullable = new ArrayList<>(); - private @Valid Map objectNullableProp; - private @Valid Map objectAndItemsNullableProp; - private @Valid Map objectItemsNullable = new HashMap<>(); + private List arrayNullableProp; + private List arrayAndItemsNullableProp; + private List arrayItemsNullable = new ArrayList<>(); + private Map objectNullableProp; + private Map objectAndItemsNullableProp; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 4034ad61616c..089479accf09 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -29,7 +29,7 @@ public class ObjectWithDeprecatedFields implements Serializable { @Deprecated private DeprecatedObject deprecatedRef; @Deprecated - private @Valid List bars = new ArrayList<>(); + private List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { this.uuid = b.uuid; diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java index 7fd8e1feeb21..8f477c882ec6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java @@ -29,8 +29,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -204,7 +204,7 @@ public Pet tags(List<@Valid Tag> tags) { @Schema(description = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/FakeApi.java index 72f68a8d6e94..f33ed776848f 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/FakeApi.java @@ -152,7 +152,7 @@ public Response fakeTestsDefaults() { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testAdditionalPropertiesReference(@Valid @NotNull Map requestBody) { + public Response testAdditionalPropertiesReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -244,7 +244,7 @@ public Response testGroupParameters(@QueryParam("required_string_group") @NotNul @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testInlineAdditionalProperties(@Valid @NotNull Map requestBody) { + public Response testInlineAdditionalProperties(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -298,7 +298,7 @@ public Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testStringMapReference(@Valid @NotNull Map requestBody) { + public Response testStringMapReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/UserApi.java index be9e4420b9a0..29c3457d955d 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/UserApi.java @@ -39,7 +39,7 @@ public Response createUser(@Valid @NotNull User user) { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithArrayInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } @@ -50,7 +50,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithListInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 063a80c35b72..7d88048f10f3 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -34,8 +34,8 @@ @XmlRootElement(name="AdditionalPropertiesClass") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapProperty = new HashMap<>(); - private @Valid Map> mapOfMapProperty = new HashMap<>(); + private Map mapProperty = new HashMap<>(); + private Map> mapOfMapProperty = new HashMap<>(); protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapProperty = b.mapProperty; diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index fc867a2fa09c..b2701a47ffbe 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -36,7 +36,7 @@ @XmlRootElement(name="ArrayOfArrayOfNumberOnly") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber = new ArrayList<>(); protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -56,7 +56,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index db00c70ae55a..ed82a7a1feb0 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -36,7 +36,7 @@ @XmlRootElement(name="ArrayOfNumberOnly") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private List arrayNumber = new ArrayList<>(); protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -56,7 +56,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - @Valid public List<@Valid BigDecimal> getArrayNumber() { + public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayTest.java index 1c904a95b3d1..5b311f2e6164 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ArrayTest.java @@ -36,9 +36,9 @@ @XmlRootElement(name="ArrayTest") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString = new ArrayList<>(); + private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfModel = new ArrayList<>(); protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -132,7 +132,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/EnumArrays.java index 1c7ef07f7de8..b7dd7e38c23b 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/EnumArrays.java @@ -134,7 +134,7 @@ public static ArrayEnumEnum fromValue(String value) { } } - private @Valid List arrayEnum = new ArrayList<>(); + private List arrayEnum = new ArrayList<>(); protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index 596c08df919d..a3ef4f4140db 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -37,7 +37,7 @@ public class FakeBigDecimalMap200Response implements Serializable { private BigDecimal someId; - private @Valid Map someMap = new HashMap<>(); + private Map someMap = new HashMap<>(); protected FakeBigDecimalMap200Response(FakeBigDecimalMap200ResponseBuilder b) { this.someId = b.someId; @@ -78,7 +78,7 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { @ApiModelProperty(value = "") @JsonProperty("someMap") - @Valid public Map getSomeMap() { + public Map getSomeMap() { return someMap; } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index f43301ef0874..65425a1afed5 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -37,7 +37,7 @@ public class FileSchemaTestClass implements Serializable { private ModelFile _file; - private @Valid List<@Valid ModelFile> files = new ArrayList<>(); + private List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -78,7 +78,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @ApiModelProperty(value = "") @JsonProperty("files") - @Valid public List<@Valid ModelFile> getFiles() { + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/MapTest.java index 2e1d60d9a2f9..95159373f182 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/MapTest.java @@ -34,7 +34,7 @@ @XmlRootElement(name="MapTest") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = new HashMap<>(); + private Map> mapMapOfString = new HashMap<>(); @XmlType(name="InnerEnum") @XmlEnum(String.class) public enum InnerEnum { @@ -84,9 +84,9 @@ public static InnerEnum fromValue(String value) { } } - private @Valid Map mapOfEnumString = new HashMap<>(); - private @Valid Map directMap = new HashMap<>(); - private @Valid Map indirectMap = new HashMap<>(); + private Map mapOfEnumString = new HashMap<>(); + private Map directMap = new HashMap<>(); + private Map indirectMap = new HashMap<>(); protected MapTest(MapTestBuilder b) { this.mapMapOfString = b.mapMapOfString; diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 5a1eb677175e..916b5483c9f9 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -39,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private UUID uuid; private Date dateTime; - private @Valid Map map = new HashMap<>(); + private Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { this.uuid = b.uuid; @@ -92,7 +92,7 @@ public void setDateTime(Date dateTime) { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -101,12 +101,12 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") - @Valid public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/NullableClass.java index aae5721c1f2b..275e4adcce19 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/NullableClass.java @@ -53,12 +53,12 @@ public class NullableClass extends HashMap implements Serializab private String stringProp; private LocalDate dateProp; private Date datetimeProp; - private @Valid List arrayNullableProp; - private @Valid List arrayAndItemsNullableProp; - private @Valid List arrayItemsNullable = new ArrayList<>(); - private @Valid Map objectNullableProp; - private @Valid Map objectAndItemsNullableProp; - private @Valid Map objectItemsNullable = new HashMap<>(); + private List arrayNullableProp; + private List arrayAndItemsNullableProp; + private List arrayItemsNullable = new ArrayList<>(); + private Map objectNullableProp; + private Map objectAndItemsNullableProp; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index f2bfa1af3ff3..57641847e8ce 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -43,7 +43,7 @@ public class ObjectWithDeprecatedFields implements Serializable { @Deprecated private DeprecatedObject deprecatedRef; @Deprecated - private @Valid List bars = new ArrayList<>(); + private List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { this.uuid = b.uuid; diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Pet.java index 237f5abebe3b..c9fb0ce07b47 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/Pet.java @@ -43,8 +43,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); + private List<@Valid Tag> tags = new ArrayList<>(); @XmlType(name="StatusEnum") @XmlEnum(String.class) public enum StatusEnum { @@ -225,7 +225,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java index 2a42907696c8..5fec8f9a2f0a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java @@ -152,7 +152,7 @@ public Response fakeTestsDefaults() { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testAdditionalPropertiesReference(@Valid @NotNull Map requestBody) { + public Response testAdditionalPropertiesReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -247,7 +247,7 @@ public Response testGroupParameters(@QueryParam("required_string_group") @NotNul @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testInlineAdditionalProperties(@Valid @NotNull Map requestBody) { + public Response testInlineAdditionalProperties(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } @@ -301,7 +301,7 @@ public Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response testStringMapReference(@Valid @NotNull Map requestBody) { + public Response testStringMapReference(@NotNull Map requestBody) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java index be9e4420b9a0..29c3457d955d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java @@ -39,7 +39,7 @@ public Response createUser(@Valid @NotNull User user) { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithArrayInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } @@ -50,7 +50,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) { + public Response createUsersWithListInput(@NotNull List<@Valid User> user) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index f281cf35c76c..2bcaa497a720 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -21,8 +21,8 @@ @JsonTypeName("AdditionalPropertiesClass") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class AdditionalPropertiesClass implements Serializable { - private @Valid Map mapProperty = new HashMap<>(); - private @Valid Map> mapOfMapProperty = new HashMap<>(); + private Map mapProperty = new HashMap<>(); + private Map> mapOfMapProperty = new HashMap<>(); protected AdditionalPropertiesClass(AdditionalPropertiesClassBuilder b) { this.mapProperty = b.mapProperty; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 3c90d6570020..1c355063abbc 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -23,7 +23,7 @@ @JsonTypeName("ArrayOfArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfArrayOfNumberOnly implements Serializable { - private @Valid List> arrayArrayNumber = new ArrayList<>(); + private List> arrayArrayNumber = new ArrayList<>(); protected ArrayOfArrayOfNumberOnly(ArrayOfArrayOfNumberOnlyBuilder b) { this.arrayArrayNumber = b.arrayArrayNumber; @@ -42,7 +42,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") - @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index da6e7c8a4202..7c1982fb17aa 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -23,7 +23,7 @@ @JsonTypeName("ArrayOfNumberOnly") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayOfNumberOnly implements Serializable { - private @Valid List arrayNumber = new ArrayList<>(); + private List arrayNumber = new ArrayList<>(); protected ArrayOfNumberOnly(ArrayOfNumberOnlyBuilder b) { this.arrayNumber = b.arrayNumber; @@ -42,7 +42,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") - @Valid public List<@Valid BigDecimal> getArrayNumber() { + public List<@Valid BigDecimal> getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java index 066639716422..d4f88d865e67 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java @@ -23,9 +23,9 @@ @JsonTypeName("ArrayTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class ArrayTest implements Serializable { - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); + private List arrayOfString = new ArrayList<>(); + private List> arrayArrayOfInteger = new ArrayList<>(); + private List> arrayArrayOfModel = new ArrayList<>(); protected ArrayTest(ArrayTestBuilder b) { this.arrayOfString = b.arrayOfString; @@ -116,7 +116,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") - @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java index edafcd8211f3..2b6983fc3930 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java @@ -117,7 +117,7 @@ public static ArrayEnumEnum fromValue(String value) { } } - private @Valid List arrayEnum = new ArrayList<>(); + private List arrayEnum = new ArrayList<>(); protected EnumArrays(EnumArraysBuilder b) { this.justSymbol = b.justSymbol; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index d3f847789499..36f55a47d4aa 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -24,7 +24,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FakeBigDecimalMap200Response implements Serializable { private BigDecimal someId; - private @Valid Map someMap = new HashMap<>(); + private Map someMap = new HashMap<>(); protected FakeBigDecimalMap200Response(FakeBigDecimalMap200ResponseBuilder b) { this.someId = b.someId; @@ -63,7 +63,7 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { @ApiModelProperty(value = "") @JsonProperty("someMap") - @Valid public Map getSomeMap() { + public Map getSomeMap() { return someMap; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 03b1fc2aee3f..225a1432c8bf 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -24,7 +24,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class FileSchemaTestClass implements Serializable { private ModelFile _file; - private @Valid List<@Valid ModelFile> files = new ArrayList<>(); + private List<@Valid ModelFile> files = new ArrayList<>(); protected FileSchemaTestClass(FileSchemaTestClassBuilder b) { this._file = b._file; @@ -63,7 +63,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { @ApiModelProperty(value = "") @JsonProperty("files") - @Valid public List<@Valid ModelFile> getFiles() { + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java index 0d197a0d3a7d..37129cf7bb9f 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java @@ -21,7 +21,7 @@ @JsonTypeName("MapTest") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class MapTest implements Serializable { - private @Valid Map> mapMapOfString = new HashMap<>(); + private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -69,9 +69,9 @@ public static InnerEnum fromValue(String value) { } } - private @Valid Map mapOfEnumString = new HashMap<>(); - private @Valid Map directMap = new HashMap<>(); - private @Valid Map indirectMap = new HashMap<>(); + private Map mapOfEnumString = new HashMap<>(); + private Map directMap = new HashMap<>(); + private Map indirectMap = new HashMap<>(); protected MapTest(MapTestBuilder b) { this.mapMapOfString = b.mapMapOfString; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 03e1374ad5b3..344bd36709dc 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -26,7 +26,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private UUID uuid; private Date dateTime; - private @Valid Map map = new HashMap<>(); + private Map map = new HashMap<>(); protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder b) { this.uuid = b.uuid; @@ -77,7 +77,7 @@ public void setDateTime(Date dateTime) { /** **/ - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -85,12 +85,12 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) @ApiModelProperty(value = "") @JsonProperty("map") - @Valid public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NullableClass.java index e14ab5c119d3..89d32d51ff90 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NullableClass.java @@ -40,12 +40,12 @@ public class NullableClass extends HashMap implements Serializab private String stringProp; private LocalDate dateProp; private Date datetimeProp; - private @Valid List arrayNullableProp; - private @Valid List arrayAndItemsNullableProp; - private @Valid List arrayItemsNullable = new ArrayList<>(); - private @Valid Map objectNullableProp; - private @Valid Map objectAndItemsNullableProp; - private @Valid Map objectItemsNullable = new HashMap<>(); + private List arrayNullableProp; + private List arrayAndItemsNullableProp; + private List arrayItemsNullable = new ArrayList<>(); + private Map objectNullableProp; + private Map objectAndItemsNullableProp; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index aea37f72cd90..0c3c1b6f5bfb 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -30,7 +30,7 @@ public class ObjectWithDeprecatedFields implements Serializable { @Deprecated private DeprecatedObject deprecatedRef; @Deprecated - private @Valid List bars = new ArrayList<>(); + private List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { this.uuid = b.uuid; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java index 8e117672e5c0..2402d9db2f46 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java @@ -30,8 +30,8 @@ public class Pet implements Serializable { private Long id; private Category category; private String name; - private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List<@Valid Tag> tags = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); + private List<@Valid Tag> tags = new ArrayList<>(); public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -205,7 +205,7 @@ public Pet tags(List<@Valid Tag> tags) { @ApiModelProperty(value = "") @JsonProperty("tags") - @Valid public List<@Valid Tag> getTags() { + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java index ca412e4c96f4..834133a8709a 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java @@ -75,7 +75,7 @@ public Response createUser(@ApiParam(value = "Created user object", required = t @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(body, securityContext); } @@ -87,7 +87,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(body, securityContext); } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index e1e76729309e..03b4c758ac95 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -135,7 +135,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb **/ @JsonProperty(value = "map_number") @ApiModelProperty(value = "") - @Valid + public Map getMapNumber() { return mapNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 56058fee985f..f5664d0add0d 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -57,7 +57,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr **/ @JsonProperty(value = "ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 6dd02f45196e..06263cb4e6c3 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -57,7 +57,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { **/ @JsonProperty(value = "ArrayNumber") @ApiModelProperty(value = "") - @Valid + public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java index 9f442a252aeb..69b3b189eaf4 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/ArrayTest.java @@ -123,7 +123,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO **/ @JsonProperty(value = "array_array_of_model") @ApiModelProperty(value = "") - @Valid + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 55dee8297ae1..14b06ad76cf0 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -82,7 +82,7 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { **/ @JsonProperty(value = "files") @ApiModelProperty(value = "") - @Valid + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index defa98be26f9..d28e66bcaf35 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,7 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; @@ -89,7 +89,7 @@ public void setDateTime(Date dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -108,12 +108,12 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal **/ @JsonProperty(value = "map") @ApiModelProperty(value = "") - @Valid - public Map getMap() { + + public Map getMap() { return map; } - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java index 59dcb6f46435..10cbc3baca38 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -213,7 +213,7 @@ public Pet addTagsItem(Tag tagsItem) { **/ @JsonProperty(value = "tags") @ApiModelProperty(value = "") - @Valid + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java index 63e51923b007..a480d1e40b29 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java @@ -75,7 +75,7 @@ public Response createUser(@ApiParam(value = "Created user object", required = t @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(body, securityContext); } @@ -87,7 +87,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) }) - public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<@Valid User> body,@Context SecurityContext securityContext) + public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull List<@Valid User> body,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(body, securityContext); } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index e1e76729309e..03b4c758ac95 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -135,7 +135,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb **/ @JsonProperty(value = "map_number") @ApiModelProperty(value = "") - @Valid + public Map getMapNumber() { return mapNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 56058fee985f..f5664d0add0d 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -57,7 +57,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr **/ @JsonProperty(value = "ArrayArrayNumber") @ApiModelProperty(value = "") - @Valid + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 6dd02f45196e..06263cb4e6c3 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -57,7 +57,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { **/ @JsonProperty(value = "ArrayNumber") @ApiModelProperty(value = "") - @Valid + public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java index 9f442a252aeb..69b3b189eaf4 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/ArrayTest.java @@ -123,7 +123,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO **/ @JsonProperty(value = "array_array_of_model") @ApiModelProperty(value = "") - @Valid + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 55dee8297ae1..14b06ad76cf0 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -82,7 +82,7 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { **/ @JsonProperty(value = "files") @ApiModelProperty(value = "") - @Valid + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index defa98be26f9..d28e66bcaf35 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,7 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; @@ -89,7 +89,7 @@ public void setDateTime(Date dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -108,12 +108,12 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal **/ @JsonProperty(value = "map") @ApiModelProperty(value = "") - @Valid - public Map getMap() { + + public Map getMap() { return map; } - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java index 59dcb6f46435..10cbc3baca38 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java @@ -213,7 +213,7 @@ public Pet addTagsItem(Tag tagsItem) { **/ @JsonProperty(value = "tags") @ApiModelProperty(value = "") - @Valid + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/UserApi.java index 162b9db380f7..b757e14c8fe4 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/UserApi.java @@ -79,7 +79,7 @@ public Response createUser(@Schema(description = "Created user object", required @ApiResponse(responseCode = "200", description = "successful operation", content = @Content(schema = @Schema(implementation = Void.class))), }, tags={ "user", }) - public Response createUsersWithArrayInput(@Schema(description = "List of user object", required = true) @NotNull @Valid List<@Valid User> user,@Context SecurityContext securityContext) + public Response createUsersWithArrayInput(@Schema(description = "List of user object", required = true) @NotNull List<@Valid User> user,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithArrayInput(user, securityContext); } @@ -91,7 +91,7 @@ public Response createUsersWithArrayInput(@Schema(description = "List of user ob @ApiResponse(responseCode = "200", description = "successful operation", content = @Content(schema = @Schema(implementation = Void.class))), }, tags={ "user", }) - public Response createUsersWithListInput(@Schema(description = "List of user object", required = true) @NotNull @Valid List<@Valid User> user,@Context SecurityContext securityContext) + public Response createUsersWithListInput(@Schema(description = "List of user object", required = true) @NotNull List<@Valid User> user,@Context SecurityContext securityContext) throws NotFoundException { return delegate.createUsersWithListInput(user, securityContext); } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 0e2515db732d..b53a929c6ed1 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -56,7 +56,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr **/ @JsonProperty(value = "ArrayArrayNumber") @Schema(description = "") - @Valid + public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index f525fcfdac4c..dfa0de44c035 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -56,7 +56,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { **/ @JsonProperty(value = "ArrayNumber") @Schema(description = "") - @Valid + public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayTest.java index ea426b122b9b..4e937abe36d0 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ArrayTest.java @@ -122,7 +122,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO **/ @JsonProperty(value = "array_array_of_model") @Schema(description = "") - @Valid + public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index 32ea8cdce70d..63f43f767a26 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -81,7 +81,7 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa **/ @JsonProperty(value = "someMap") @Schema(description = "") - @Valid + public Map getSomeMap() { return someMap; } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 3f7d2cceeb15..3d3cd5d790e9 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -81,7 +81,7 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { **/ @JsonProperty(value = "files") @Schema(description = "") - @Valid + public List<@Valid ModelFile> getFiles() { return files; } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 65099dd09352..8fcf7456b366 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -46,7 +46,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP = "map"; @JsonProperty(JSON_PROPERTY_MAP) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = uuid; @@ -88,7 +88,7 @@ public void setDateTime(Date dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -107,12 +107,12 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal **/ @JsonProperty(value = "map") @Schema(description = "") - @Valid - public Map getMap() { + + public Map getMap() { return map; } - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Pet.java index fd525b1b2988..2e0ef4016807 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Pet.java @@ -212,7 +212,7 @@ public Pet addTagsItem(Tag tagsItem) { **/ @JsonProperty(value = "tags") @Schema(description = "") - @Valid + public List<@Valid Tag> getTags() { return tags; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeApi.java index b1e79cf43dae..db52b88df476 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeApi.java @@ -391,11 +391,11 @@ ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 ) throws Exception; @@ -459,7 +459,7 @@ ResponseEntity testGroupParameters( consumes = { "application/json" } ) ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) throws Exception; @@ -543,10 +543,10 @@ ResponseEntity testNullable( 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, - @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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) throws Exception; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/PetApi.java index b2785e0a0620..f102472bed42 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/PetApi.java @@ -134,7 +134,7 @@ ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) throws Exception; @@ -172,7 +172,7 @@ ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) throws Exception; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/UserApi.java index eaa62046ba3e..0d0aedaaf7df 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/UserApi.java @@ -86,7 +86,7 @@ ResponseEntity createUser( consumes = { "application/json" } ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) throws Exception; @@ -113,7 +113,7 @@ ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) throws Exception; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4798bc0c028d..1931bfe2c8c7 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java index 673bb2e90254..d8e9666eabea 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 49bb8dc0733d..8a3dfd16085a 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 @@ -455,11 +455,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -529,7 +529,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -622,10 +622,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 331a9fae256a..b3f557d6902a 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 @@ -147,7 +147,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -202,7 +202,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 c4eb595e53e9..4478ad38404b 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 @@ -96,7 +96,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,7 +126,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index dabffe7b93a1..65a9edd35884 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -107,7 +107,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -197,7 +197,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -227,7 +227,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -257,7 +257,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -287,7 +287,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 3580fffc402f..054d5764972d 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -48,7 +48,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 424ea6ded9b5..f03ee49dc61c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -48,7 +48,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java index 2a1da8ab2c7a..74a79be9af05 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java @@ -84,7 +84,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -114,7 +114,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 85da24365011..3e29a9c4e5de 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -73,7 +73,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java index 20a4b78b97f4..d950971180bc 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java @@ -91,7 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 4a1a2fafc376..a4951f317b84 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -38,7 +38,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -84,7 +84,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -101,16 +101,16 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java index 6a20ec90e83f..1827ea56da18 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java @@ -211,7 +211,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 49bb8dc0733d..8a3dfd16085a 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 @@ -455,11 +455,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -529,7 +529,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -622,10 +622,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 331a9fae256a..b3f557d6902a 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 @@ -147,7 +147,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -202,7 +202,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 c4eb595e53e9..4478ad38404b 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 @@ -96,7 +96,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,7 +126,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4798bc0c028d..1931bfe2c8c7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java index 673bb2e90254..d8e9666eabea 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 49522fe02799..7e0727ef3ae5 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 @@ -455,11 +455,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -529,7 +529,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -622,10 +622,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 d022567c5918..d2ca394fe94b 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 @@ -147,7 +147,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -202,7 +202,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 d22b3d8543e2..7a1ba1a734ea 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 @@ -96,7 +96,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,7 +126,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4798bc0c028d..1931bfe2c8c7 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java index 673bb2e90254..d8e9666eabea 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 7d5e7d4215e9..e0ff4c7c5663 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 @@ -414,11 +414,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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); @@ -486,7 +486,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -576,10 +576,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } 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 43a2b2e21e37..b678c0cec51b 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 @@ -141,7 +141,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { return getDelegate().findPetsByStatus(status); } @@ -181,7 +181,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { return getDelegate().findPetsByTags(tags); } 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 fe59ebf27458..6e3201a7ed22 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 @@ -91,7 +91,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithArrayInput(user); } @@ -120,7 +120,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithListInput(user); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4798bc0c028d..1931bfe2c8c7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java index 673bb2e90254..d8e9666eabea 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 a937c8fe1a24..8d5956961f24 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 @@ -145,7 +145,7 @@ default void deletePet( ) @ResponseStatus(HttpStatus.OK) default List 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { return getDelegate().findPetsByStatus(status); } @@ -186,7 +186,7 @@ default List findPetsByStatus( ) @ResponseStatus(HttpStatus.OK) default List findPetsByTags( - @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List tags + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) { return getDelegate().findPetsByTags(tags); } 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 7cbac2a9c0fc..db311d7b9484 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 @@ -99,7 +99,7 @@ default void createUser( ) @ResponseStatus(HttpStatus.OK) default void createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { getDelegate().createUsersWithArrayInput(user); } @@ -132,7 +132,7 @@ default void createUsersWithArrayInput( ) @ResponseStatus(HttpStatus.OK) default void createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { getDelegate().createUsersWithListInput(user); } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 7d5e7d4215e9..e0ff4c7c5663 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 @@ -414,11 +414,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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); @@ -486,7 +486,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -576,10 +576,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } 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 43a2b2e21e37..b678c0cec51b 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 @@ -141,7 +141,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { return getDelegate().findPetsByStatus(status); } @@ -181,7 +181,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { return getDelegate().findPetsByTags(tags); } 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 fe59ebf27458..6e3201a7ed22 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 @@ -91,7 +91,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithArrayInput(user); } @@ -120,7 +120,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithListInput(user); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 86be6e693c91..46d297d15451 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -130,7 +130,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -217,7 +217,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -246,7 +246,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -275,7 +275,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -304,7 +304,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 9a92cd526ace..0097826e924d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -58,7 +58,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index baadabd27a2c..ca0e114264c5 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -58,7 +58,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java index c86262a3c62d..d439a804904f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java @@ -95,7 +95,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -124,7 +124,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 12b3a130c8b3..254c0dc4ab23 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -83,7 +83,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java index 6434a14935bd..31454e7b0a45 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java @@ -104,7 +104,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 45cd6f3e51ed..e171ada92f5c 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { super(); @@ -46,7 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass() { /** * Constructor with all args parameters */ - public MixedPropertiesAndAdditionalPropertiesClass(@Nullable UUID uuid, @Nullable OffsetDateTime dateTime, Map map) { + public MixedPropertiesAndAdditionalPropertiesClass(@Nullable UUID uuid, @Nullable OffsetDateTime dateTime, Map map) { this.uuid = uuid; this.dateTime = dateTime; this.map = map; @@ -94,7 +94,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -111,15 +111,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index 4a92bd5c7782..d7294ebbd4e0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -220,7 +220,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 bbf8dec223f4..8878ac6d7547 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 @@ -103,7 +103,7 @@ default ResponseEntity deletePet( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByStatus( - @NotNull @Valid @RequestParam(value = "status", required = true) @Deprecated List status + @NotNull @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -141,7 +141,7 @@ default ResponseEntity> findPetsByStatus( produces = { "application/xml", "application/json" } ) default ResponseEntity> findPetsByTags( - @NotNull @Valid @RequestParam(value = "tags", required = true) List tags + @NotNull @RequestParam(value = "tags", required = true) List tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 9b2138c75199..59413d187b5b 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 @@ -65,7 +65,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,7 +86,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Valid @RequestBody List<@Valid User> user + @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java index c4d654ac44a6..7fb95597f18b 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java @@ -199,7 +199,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @JsonProperty("tags") public List<@Valid Tag> getTags() { return tags; 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 46073fd2ae37..61a6b3c7f9d1 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 @@ -455,11 +455,11 @@ default ResponseEntity testEndpointParameters( 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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -529,7 +529,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -622,10 +622,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 aea040bc803c..9cf82beefdff 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 @@ -148,7 +148,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -203,7 +203,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 5c846f0f28a4..f9403acad2ab 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 @@ -96,7 +96,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,7 +126,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 3a1809dfa191..ea9d677e1005 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 470b76a19ef8..0432ecbe15b0 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 84a91551dcec..1d77497276be 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java index b6571aa9814f..ad6d1dfab7c9 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java index ec05ace89cde..aa720f1067bd 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java index 1f755e8a4354..b9571cdf46a0 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 49c3684beb9e..70c260cd20d6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index cf4719096fb0..7af4a9bb5a55 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApi.java index 849be5967afc..7aac205630c4 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApi.java @@ -466,11 +466,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { @@ -542,7 +542,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody, + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -638,10 +638,10 @@ default ResponseEntity testNullable( 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, + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java index 47c4a9a71f82..7b97f44de398 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java @@ -150,7 +150,7 @@ default ResponseEntity deletePet( 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, + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { getRequest().ifPresent(request -> { @@ -206,7 +206,7 @@ default ResponseEntity> findPetsByStatus( 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, + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { getRequest().ifPresent(request -> { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java index 32d1ee373544..d06add9e7d9b 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java @@ -98,7 +98,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "UserDto", description = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto, + @Parameter(name = "UserDto", description = "List of user object", required = true) @RequestBody List<@Valid UserDto> userDto, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -129,7 +129,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "UserDto", description = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto, + @Parameter(name = "UserDto", description = "List of user object", required = true) @RequestBody List<@Valid UserDto> userDto, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 37d3f00f767f..867348e04869 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -111,7 +111,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -198,7 +198,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -227,7 +227,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List> getMapArrayAnytype() { @@ -256,7 +256,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map> getMapMapString() { @@ -285,7 +285,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 21a3327942b8..168f28b92b2a 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -49,7 +49,7 @@ public ArrayOfArrayOfNumberOnlyDto addArrayArrayNumberItem(List arra * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 3c2e76e5a48f..1922161d84d5 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -49,7 +49,7 @@ public ArrayOfNumberOnlyDto addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayTestDto.java index 6ca9048f3a9d..cb98e3a95b6a 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -84,7 +84,7 @@ public ArrayTestDto addArrayArrayOfIntegerItem(List arrayArrayOfIntegerIte * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -113,7 +113,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<@Valid ReadOnlyFirstDto> array * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index d9db95ad76ae..109192af3722 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -73,7 +73,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid FileDto> getFiles() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MapTestDto.java index f3124a4a864a..e81057994ec5 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MapTestDto.java @@ -92,7 +92,7 @@ public MapTestDto putMapMapOfStringItem(String key, Map mapMapOf * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 4c095937428f..11c08f593712 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -39,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -83,7 +83,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { this.map = map; return this; } @@ -100,15 +100,15 @@ public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, Ani * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java index a760602c8d73..be1f1c67bb3e 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/PetDto.java @@ -210,7 +210,7 @@ public PetDto addTagsItem(TagDto tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid TagDto> getTags() { 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 41d88c5dfc82..cf60f36bfcdf 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 @@ -162,7 +162,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -217,7 +217,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 6090783f5cda..d5ecbec88368 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 @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -135,7 +135,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 41d88c5dfc82..cf60f36bfcdf 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 @@ -162,7 +162,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -217,7 +217,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 6090783f5cda..d5ecbec88368 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 @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -135,7 +135,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/UserList.java b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/UserList.java index b8aa8b27af7c..c0d5353baf35 100644 --- a/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/UserList.java +++ b/samples/server/petstore/springboot-paged-model/src/main/java/org/openapitools/model/UserList.java @@ -52,7 +52,7 @@ public UserList addContentItem(User contentItem) { * Get content * @return content */ - @Valid + @JsonProperty("content") public List<@Valid User> getContent() { return content; 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 b0ef4b828d8b..d663e1e2e986 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 @@ -158,7 +158,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { return getDelegate().findPetsByStatus(status); } @@ -198,7 +198,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) List tags ) { return getDelegate().findPetsByTags(tags); } 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 c50628e24bb8..ee54c3b77006 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 @@ -97,7 +97,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithArrayInput(user); } @@ -129,7 +129,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithListInput(user); } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java index 37d29c32b8da..9dbe6c4aa806 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/model/Pet.java @@ -205,7 +205,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 3c50249c0006..4507b7fb5601 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 @@ -428,11 +428,11 @@ default Mono testEndpointParameters( default Mono 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestPart(value = "enum_form_string", required = false) String enumFormString ) { return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); @@ -595,10 +595,10 @@ default Mono testNullable( ) @ResponseStatus(HttpStatus.OK) default Mono 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context); } 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 201eb53a536a..71b02f346ed9 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 @@ -147,7 +147,7 @@ default Mono deletePet( ) @ResponseStatus(HttpStatus.OK) default Flux 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { return getDelegate().findPetsByStatus(status); } @@ -188,7 +188,7 @@ default Flux findPetsByStatus( ) @ResponseStatus(HttpStatus.OK) default Flux findPetsByTags( - @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { return getDelegate().findPetsByTags(tags); } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4798bc0c028d..1931bfe2c8c7 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java index 673bb2e90254..d8e9666eabea 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 e8d29b1ec1b7..fce06ba7c4f4 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 @@ -428,11 +428,11 @@ default Mono> testEndpointParameters( default Mono> 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @RequestPart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestPart(value = "enum_form_string", required = false) String enumFormString, @Parameter(hidden = true) final ServerWebExchange exchange ) { @@ -595,10 +595,10 @@ default Mono> testNullable( value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT ) default Mono> 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, + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context, @Parameter(hidden = true) final ServerWebExchange exchange ) { return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context, 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 1f8498763306..276f8f92bfee 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 @@ -147,7 +147,7 @@ default Mono> deletePet( produces = { "application/xml", "application/json" } ) default Mono>> 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, + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status, @Parameter(hidden = true) final ServerWebExchange exchange ) { return getDelegate().findPetsByStatus(status, exchange); @@ -188,7 +188,7 @@ default Mono>> findPetsByStatus( produces = { "application/xml", "application/json" } ) default Mono>> findPetsByTags( - @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set tags, + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags, @Parameter(hidden = true) final ServerWebExchange exchange ) { return getDelegate().findPetsByTags(tags, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 4798bc0c028d..1931bfe2c8c7 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index 673bb2e90254..d8e9666eabea 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 035758e8403a..b68a3b8dea3b 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 @@ -380,11 +380,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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); @@ -450,7 +450,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param + @Parameter(name = "param", description = "request body", required = true) @RequestBody Map param ) { return getDelegate().testInlineAdditionalProperties(param); } @@ -510,11 +510,11 @@ default ResponseEntity testJsonFormData( 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 = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "ioutil", required = true) List ioutil, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); } 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 0bf47f8b74a8..f15298f66be1 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 @@ -141,7 +141,7 @@ default ResponseEntity deletePet( 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, + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status, @ParameterObject final Pageable pageable ) { return getDelegate().findPetsByStatus(status, pageable); @@ -183,7 +183,7 @@ default ResponseEntity> findPetsByStatus( 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, + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @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, @PageableDefault(page = 0, size = 20) @SortDefault.SortDefaults({@SortDefault(sort = {"id"}, direction = Sort.Direction.ASC)}) @ParameterObject final Pageable pageable ) { 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 bc888ef3791a..1f6b990df4ad 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 @@ -87,7 +87,7 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ) { return getDelegate().createUsersWithArrayInput(body); } @@ -113,7 +113,7 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ) { return getDelegate().createUsersWithListInput(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index be90a2e1cd14..a66862e21bfb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -106,7 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -193,7 +193,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -222,7 +222,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -251,7 +251,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -280,7 +280,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java index e58434a4f202..f41f581948d6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -203,7 +203,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 035758e8403a..b68a3b8dea3b 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 @@ -380,11 +380,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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); @@ -450,7 +450,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param + @Parameter(name = "param", description = "request body", required = true) @RequestBody Map param ) { return getDelegate().testInlineAdditionalProperties(param); } @@ -510,11 +510,11 @@ default ResponseEntity testJsonFormData( 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 = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "ioutil", required = true) List ioutil, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return getDelegate().testQueryParameterCollectionFormat(pipe, ioutil, http, url, context); } 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 0bf47f8b74a8..f15298f66be1 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 @@ -141,7 +141,7 @@ default ResponseEntity deletePet( 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, + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status, @ParameterObject final Pageable pageable ) { return getDelegate().findPetsByStatus(status, pageable); @@ -183,7 +183,7 @@ default ResponseEntity> findPetsByStatus( 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, + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @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, @PageableDefault(page = 0, size = 20) @SortDefault.SortDefaults({@SortDefault(sort = {"id"}, direction = Sort.Direction.ASC)}) @ParameterObject final Pageable pageable ) { 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 bc888ef3791a..1f6b990df4ad 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 @@ -87,7 +87,7 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ) { return getDelegate().createUsersWithArrayInput(body); } @@ -113,7 +113,7 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ) { return getDelegate().createUsersWithListInput(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index be90a2e1cd14..a66862e21bfb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -106,7 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -193,7 +193,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -222,7 +222,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -251,7 +251,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -280,7 +280,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java index e58434a4f202..f41f581948d6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java @@ -203,7 +203,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 b5d4bd12e5bc..06385c2cb9e8 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 @@ -411,11 +411,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -483,7 +483,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param + @Parameter(name = "param", description = "request body", required = true) @RequestBody Map param ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -545,11 +545,11 @@ default ResponseEntity testJsonFormData( 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 = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "ioutil", required = true) List ioutil, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 bb90fbf5af5f..9322d357e492 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 @@ -147,7 +147,7 @@ default ResponseEntity deletePet( 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, + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status, @ParameterObject final Pageable pageable ) { getRequest().ifPresent(request -> { @@ -204,7 +204,7 @@ default ResponseEntity> findPetsByStatus( 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, + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @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, @PageableDefault(page = 0, size = 20) @SortDefault.SortDefaults({@SortDefault(sort = {"id"}, direction = Sort.Direction.ASC)}) @ParameterObject final Pageable pageable ) { 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 8a23f7186f88..75074e1778f9 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 @@ -92,7 +92,7 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -119,7 +119,7 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index be90a2e1cd14..a66862e21bfb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -106,7 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -193,7 +193,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -222,7 +222,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -251,7 +251,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -280,7 +280,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java index e58434a4f202..f41f581948d6 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java @@ -203,7 +203,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 b5d4bd12e5bc..06385c2cb9e8 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 @@ -411,11 +411,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -483,7 +483,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "param", description = "request body", required = true) @Valid @RequestBody Map param + @Parameter(name = "param", description = "request body", required = true) @RequestBody Map param ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -545,11 +545,11 @@ default ResponseEntity testJsonFormData( 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 = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "ioutil", required = true) List ioutil, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 bb90fbf5af5f..9322d357e492 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 @@ -147,7 +147,7 @@ default ResponseEntity deletePet( 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, + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status, @ParameterObject final Pageable pageable ) { getRequest().ifPresent(request -> { @@ -204,7 +204,7 @@ default ResponseEntity> findPetsByStatus( 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, + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @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, @PageableDefault(page = 0, size = 20) @SortDefault.SortDefaults({@SortDefault(sort = {"id"}, direction = Sort.Direction.ASC)}) @ParameterObject final Pageable pageable ) { 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 8a23f7186f88..75074e1778f9 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 @@ -92,7 +92,7 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -119,7 +119,7 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @RequestBody List<@Valid User> body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index be90a2e1cd14..a66862e21bfb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -106,7 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -193,7 +193,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -222,7 +222,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -251,7 +251,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -280,7 +280,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d1a197de6068..3e195be217b5 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 091813f62458..71c5e4ad22c9 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java index 910f371a7f2b..3e09dfc6c177 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java index a4778403f518..870179ee3c1e 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java index 40f9ff9b39b0..729b1bd31fcf 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index fbe00f3600c5..1700b9f167fb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java index e58434a4f202..f41f581948d6 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java @@ -203,7 +203,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java index e58434a4f202..f41f581948d6 100644 --- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java @@ -203,7 +203,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 c5a9eec845c7..4aa1e1f4e02f 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 @@ -455,11 +455,11 @@ default ResponseEntity testEndpointParameters( 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) Optional> enumHeaderStringArray, @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") Optional enumHeaderString, - @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) Optional> enumQueryStringArray, + @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @RequestParam(value = "enum_query_string_array", required = false) Optional> 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") Optional enumQueryString, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) Optional enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) Optional enumQueryDouble, - @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) Optional> enumFormStringArray, + @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @RequestPart(value = "enum_form_string_array", required = false) Optional> enumFormStringArray, @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) Optional enumFormString ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -529,7 +529,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -622,10 +622,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 630811cf5f6e..6a37fd3aa70a 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 @@ -147,7 +147,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -202,7 +202,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 c4eb595e53e9..4478ad38404b 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 @@ -96,7 +96,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,7 +126,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 1b93d77f015d..29b341f551c8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index eb02803d61a2..197c01cc88a5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 908d304908fa..1f8eb38ecf44 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index c30acc0cc68d..0b608d7e14e8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 429e0226689b..5ccb245bfc1d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java index 76f8c3918acc..57b3934c5d62 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 80f964b29671..766308130d53 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private Optional dateTime = Optional.empty(); @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { this.uuid = Optional.ofNullable(uuid); @@ -81,7 +81,7 @@ public void setDateTime(Optional dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index 8d3f1d0cf422..7c94b9940e55 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { 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 a27cea08069e..419157d6d0fb 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 @@ -469,11 +469,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -545,7 +545,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -641,10 +641,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 addbb38e43d7..95d9bcac979e 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 @@ -153,7 +153,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -209,7 +209,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 36dabfa315aa..7b044f052341 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 @@ -101,7 +101,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -132,7 +132,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java index a38602c22da4..1930725a6338 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java @@ -109,7 +109,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -196,7 +196,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -225,7 +225,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * Get mapArrayAnytype * @return mapArrayAnytype */ - @Valid + @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -254,7 +254,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -283,7 +283,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java index f63d20f820cf..c9f593b114c6 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java index 10c7cf0aeaa7..325d863a7070 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java @@ -47,7 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java index 41557fa75eb2..6b5fa417f9fb 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java @@ -82,7 +82,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -111,7 +111,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java index 87e387835e05..14b482a05229 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java @@ -71,7 +71,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid File> getFiles() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java index 31574261e044..6067698a9798 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java @@ -90,7 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java index 34650661543e..22aa619fd594 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -37,7 +37,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -81,7 +81,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; return this; } @@ -98,15 +98,15 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java index 68c3ebd77107..39ffc9dcb1f1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java @@ -208,7 +208,7 @@ public Pet addTagsItem(Tag tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid Tag> getTags() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApi.java index 86ebe6cd2175..280e3b86aa49 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApi.java @@ -372,7 +372,7 @@ default ResponseEntity fakePropertyEnumIntegerSe consumes = { "application/json" } ) default ResponseEntity testAdditionalPropertiesReference( - @Parameter(name = "request_body", description = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @NotNull @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -604,12 +604,12 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @Parameter(name = "enum_query_model_array", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_model_array", required = false) @Nullable List enumQueryModelArray, - @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_query_model_array", description = "", in = ParameterIn.QUERY) @RequestParam(value = "enum_query_model_array", required = false) @Nullable List enumQueryModelArray, + @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -682,7 +682,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @NotNull @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -808,13 +808,13 @@ default ResponseEntity testNullable( 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 = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "ioutil", required = true) List ioutil, - @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, + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "ioutil", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "ioutil", required = true) List ioutil, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context, @NotNull @Parameter(name = "allowEmpty", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "allowEmpty", required = true) String allowEmpty, - @Parameter(name = "language", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "", required = false) @Nullable Map language + @Parameter(name = "language", description = "", in = ParameterIn.QUERY) @RequestParam(value = "", required = false) @Nullable Map language ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -844,7 +844,7 @@ default ResponseEntity testQueryParameterCollectionFormat( consumes = { "application/json" } ) default ResponseEntity testStringMapReference( - @Parameter(name = "request_body", description = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @NotNull @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApi.java index 998774498466..1fb5e5450b8d 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApi.java @@ -147,7 +147,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) @Deprecated List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -202,7 +202,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApi.java index fbcd77c1fa6b..8176f6595179 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApi.java @@ -96,7 +96,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "UserDto", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid UserDto> userDto + @Parameter(name = "UserDto", description = "List of user object", required = true) @NotNull @RequestBody List<@Valid UserDto> userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,7 +126,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "UserDto", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid UserDto> userDto + @Parameter(name = "UserDto", description = "List of user object", required = true) @NotNull @RequestBody List<@Valid UserDto> userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 8e3d16dcc8c3..8ba691faccd0 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -79,7 +79,7 @@ public AdditionalPropertiesClassDto putMapOfMapPropertyItem(String key, Map> getMapOfMapProperty() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 21a3327942b8..168f28b92b2a 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -49,7 +49,7 @@ public ArrayOfArrayOfNumberOnlyDto addArrayArrayNumberItem(List arra * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 3c2e76e5a48f..1922161d84d5 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -49,7 +49,7 @@ public ArrayOfNumberOnlyDto addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayTestDto.java index e38f789a0f6f..784c276f72c5 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -84,7 +84,7 @@ public ArrayTestDto addArrayArrayOfIntegerItem(List arrayArrayOfIntegerIte * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -113,7 +113,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<@Valid ReadOnlyFirstDto> array * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FakeBigDecimalMap200ResponseDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FakeBigDecimalMap200ResponseDto.java index 51c97df4966d..123a9cb18ae7 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FakeBigDecimalMap200ResponseDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FakeBigDecimalMap200ResponseDto.java @@ -72,7 +72,7 @@ public FakeBigDecimalMap200ResponseDto putSomeMapItem(String key, BigDecimal som * Get someMap * @return someMap */ - @Valid + @Schema(name = "someMap", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("someMap") public Map getSomeMap() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index d9db95ad76ae..109192af3722 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -73,7 +73,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid FileDto> getFiles() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MapTestDto.java index f3124a4a864a..e81057994ec5 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MapTestDto.java @@ -92,7 +92,7 @@ public MapTestDto putMapMapOfStringItem(String key, Map mapMapOf * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index 4c095937428f..11c08f593712 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -39,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -83,7 +83,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { this.map = map; return this; } @@ -100,15 +100,15 @@ public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, Ani * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/PetDto.java index 77a5d6571d54..a256daf55a73 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/PetDto.java @@ -209,7 +209,7 @@ public PetDto addTagsItem(TagDto tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid TagDto> getTags() { 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 e2a813eb6e7e..51e23189e62d 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 @@ -455,11 +455,11 @@ default ResponseEntity testEndpointParameters( 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, - @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_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @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, @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger, @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble, - @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_array", description = "Form parameter enum test (string array)") @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 new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -529,7 +529,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map requestBody + @Parameter(name = "request_body", description = "request body", required = true) @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -622,10 +622,10 @@ default ResponseEntity testNullable( 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 + @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "pipe", required = true) List pipe, + @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "http", required = true) List http, + @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "url", required = true) List url, + @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @RequestParam(value = "context", required = true) List context ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 2ad61c047b1f..05d09b28a39b 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 @@ -147,7 +147,7 @@ default ResponseEntity deletePet( 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 + @NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status", required = true) List status ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -202,7 +202,7 @@ default ResponseEntity> findPetsByStatus( 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 + @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags", required = true) Set tags ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 90bed8bc6dc8..ae8a7ae20cca 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 @@ -96,7 +96,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "UserDto", description = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto + @Parameter(name = "UserDto", description = "List of user object", required = true) @RequestBody List<@Valid UserDto> userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -126,7 +126,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @Parameter(name = "UserDto", description = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto + @Parameter(name = "UserDto", description = "List of user object", required = true) @RequestBody List<@Valid UserDto> userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index d04080bd138a..4a02c28ebe8e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -111,7 +111,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN * Get mapNumber * @return mapNumber */ - @Valid + @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_number") public Map getMapNumber() { @@ -198,7 +198,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -227,7 +227,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List> getMapArrayAnytype() { @@ -256,7 +256,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map> getMapMapString() { @@ -285,7 +285,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java index 65c2c9b6a8f1..13e0d83076bb 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java @@ -49,7 +49,7 @@ public ArrayOfArrayOfNumberOnlyDto addArrayArrayNumberItem(List arra * Get arrayArrayNumber * @return arrayArrayNumber */ - @Valid + @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java index 84c663d18a50..65e7f5e2771a 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java @@ -49,7 +49,7 @@ public ArrayOfNumberOnlyDto addArrayNumberItem(BigDecimal arrayNumberItem) { * Get arrayNumber * @return arrayNumber */ - @Valid + @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java index b6187f29559e..808fe7e5c751 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java @@ -84,7 +84,7 @@ public ArrayTestDto addArrayArrayOfIntegerItem(List arrayArrayOfIntegerIte * Get arrayArrayOfInteger * @return arrayArrayOfInteger */ - @Valid + @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -113,7 +113,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<@Valid ReadOnlyFirstDto> array * Get arrayArrayOfModel * @return arrayArrayOfModel */ - @Valid + @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java index c7ff6805ae2a..29c2be591f27 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java @@ -73,7 +73,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) { * Get files * @return files */ - @Valid + @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("files") public List<@Valid FileDto> getFiles() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java index 85f1e6fe7dbe..2e4dbc61b00b 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java @@ -92,7 +92,7 @@ public MapTestDto putMapMapOfStringItem(String key, Map mapMapOf * Get mapMapOfString * @return mapMapOfString */ - @Valid + @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java index ebd4a33b6a3f..270dcf8d87e3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java @@ -39,7 +39,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto { private @Nullable OffsetDateTime dateTime; @JsonInclude(JsonInclude.Include.NON_NULL) - private Map map = new HashMap<>(); + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClassDto uuid(@Nullable UUID uuid) { this.uuid = uuid; @@ -83,7 +83,7 @@ public void setDateTime(@Nullable OffsetDateTime dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { + public MixedPropertiesAndAdditionalPropertiesClassDto map(Map map) { this.map = map; return this; } @@ -100,15 +100,15 @@ public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, Ani * Get map * @return map */ - @Valid + @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("map") - public Map getMap() { + public Map getMap() { return map; } @JsonProperty("map") - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java index 3953250b4693..96f7888bdd97 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java @@ -211,7 +211,7 @@ public PetDto addTagsItem(TagDto tagsItem) { * Get tags * @return tags */ - @Valid + @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("tags") public List<@Valid TagDto> getTags() {