diff --git a/.github/workflows/samples-spring-jdk17.yaml b/.github/workflows/samples-spring-jdk17.yaml index 9e48ff2f74d7..70cb0eb415eb 100644 --- a/.github/workflows/samples-spring-jdk17.yaml +++ b/.github/workflows/samples-spring-jdk17.yaml @@ -3,32 +3,32 @@ name: Samples Java Spring (JDK17) on: push: paths: - - samples/openapi3/client/petstore/spring-cloud-3-with-optional - - samples/openapi3/client/petstore/spring-cloud-4-with-optional - - samples/client/petstore/spring-http-interface-springboot-4 - - samples/openapi3/server/petstore/springboot-3 - - samples/openapi3/server/petstore/springboot-4 - - samples/server/petstore/springboot-api-response-examples - - samples/server/petstore/springboot-lombok-data - - samples/server/petstore/springboot-lombok-tostring - - samples/server/petstore/springboot-file-delegate-optional - - samples/server/petstore/springboot-petstore-with-api-response-examples - - samples/server/petstore/spring-boot-oneof-sealed - - samples/openapi3/server/petstore/spring-boot-oneof-interface + - samples/openapi3/client/petstore/spring-cloud-3-with-optional/** + - samples/openapi3/client/petstore/spring-cloud-4-with-optional/** + - samples/client/petstore/spring-http-interface-springboot-4/** + - samples/openapi3/server/petstore/springboot-3/** + - samples/openapi3/server/petstore/springboot-4/** + - samples/server/petstore/springboot-api-response-examples/** + - samples/server/petstore/springboot-lombok-data/** + - samples/server/petstore/springboot-lombok-tostring/** + - samples/server/petstore/springboot-file-delegate-optional/** + - samples/server/petstore/springboot-petstore-with-api-response-examples/** + - samples/openapi3/server/petstore/spring-boot-oneof-sealed/** + - samples/openapi3/server/petstore/spring-boot-oneof-interface/** pull_request: paths: - - samples/openapi3/client/petstore/spring-cloud-3-with-optional - - samples/openapi3/client/petstore/spring-cloud-4-with-optional - - samples/client/petstore/spring-http-interface-springboot-4 - - samples/openapi3/server/petstore/springboot-3 - - samples/openapi3/server/petstore/springboot-4 - - samples/server/petstore/springboot-api-response-examples - - samples/server/petstore/springboot-lombok-data - - samples/server/petstore/springboot-lombok-tostring - - samples/server/petstore/springboot-file-delegate-optional - - samples/server/petstore/springboot-petstore-with-api-response-examples - - samples/server/petstore/spring-boot-oneof-sealed - - samples/openapi3/server/petstore/spring-boot-oneof-interface + - samples/openapi3/client/petstore/spring-cloud-3-with-optional/** + - samples/openapi3/client/petstore/spring-cloud-4-with-optional/** + - samples/client/petstore/spring-http-interface-springboot-4/** + - samples/openapi3/server/petstore/springboot-3/** + - samples/openapi3/server/petstore/springboot-4/** + - samples/server/petstore/springboot-api-response-examples/** + - samples/server/petstore/springboot-lombok-data/** + - samples/server/petstore/springboot-lombok-tostring/** + - samples/server/petstore/springboot-file-delegate-optional/** + - samples/server/petstore/springboot-petstore-with-api-response-examples/** + - samples/openapi3/server/petstore/spring-boot-oneof-sealed/** + - samples/openapi3/server/petstore/spring-boot-oneof-interface/** jobs: build: name: Build Java Spring (JDK17) @@ -49,7 +49,7 @@ jobs: - samples/server/petstore/springboot-lombok-tostring - samples/server/petstore/springboot-file-delegate-optional - samples/server/petstore/springboot-petstore-with-api-response-examples - - samples/server/petstore/spring-boot-oneof-sealed + - samples/openapi3/server/petstore/spring-boot-oneof-sealed - samples/openapi3/server/petstore/spring-boot-oneof-interface steps: - uses: actions/checkout@v5 diff --git a/bin/configs/spring-boot-x-implements-skip.yaml b/bin/configs/spring-boot-x-implements-skip.yaml index 829c029bc015..de98b7027120 100644 --- a/bin/configs/spring-boot-x-implements-skip.yaml +++ b/bin/configs/spring-boot-x-implements-skip.yaml @@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot-x-implements-skip inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-x-implements.yaml templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + additionalNotNullAnnotations: true documentationProvider: springfox artifactId: springboot snapshotVersion: "true" @@ -12,4 +13,4 @@ additionalProperties: xImplementsSkip: [ com.custompackage.InterfaceToSkip ] schemaImplements: Foo: [ com.custompackage.WithBar, com.custompackage.WithDefaultMethod ] - Animal: com.custompackage.WithColor \ No newline at end of file + Animal: com.custompackage.WithColor diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index ecddb05f4d31..b71808af91c3 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -20,6 +20,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl | ------ | ----------- | ------ | ------- | |additionalEnumTypeAnnotations|Additional annotations for enum type(class level annotations)| |null| |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| +|additionalNotNullAnnotations|Add @NotNull to path variables (required by default) and requestBody.| |false| |additionalOneOfTypeAnnotations|Additional annotations for oneOf interfaces(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| |annotationLibrary|Select the complementary documentation annotation library.|
**none**
Do not annotate Model and Api with complementary annotations.
**swagger1**
Annotate Model and Api using the Swagger Annotations 1.x library.
**swagger2**
Annotate Model and Api using the Swagger Annotations 2.x library.
|swagger2| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index aa3cf52bb706..08649ac0e6a5 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -20,6 +20,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl | ------ | ----------- | ------ | ------- | |additionalEnumTypeAnnotations|Additional annotations for enum type(class level annotations)| |null| |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| +|additionalNotNullAnnotations|Add @NotNull to path variables (required by default) and requestBody.| |false| |additionalOneOfTypeAnnotations|Additional annotations for oneOf interfaces(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| |annotationLibrary|Select the complementary documentation annotation library.|
**none**
Do not annotate Model and Api with complementary annotations.
**swagger1**
Annotate Model and Api using the Swagger Annotations 1.x library.
**swagger2**
Annotate Model and Api using the Swagger Annotations 2.x library.
|swagger2| 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 9b94407764a9..361ab9de5521 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 @@ -108,6 +108,7 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String JACKSON2_PACKAGE = "com.fasterxml.jackson"; public static final String JACKSON3_PACKAGE = "tools.jackson"; public static final String JACKSON_PACKAGE = "jacksonPackage"; + public static final String ADDITIONAL_NOT_NULL_ANNOTATIONS = "additionalNotNullAnnotations"; @Getter public enum RequestMappingMode { @@ -180,6 +181,8 @@ public enum RequestMappingMode { protected boolean useDeductionForOneOfInterfaces = false; @Getter @Setter protected boolean useJackson3 = false; + @Getter @Setter + protected boolean additionalNotNullAnnotations = false; public SpringCodegen() { super(); @@ -269,7 +272,6 @@ public SpringCodegen() { cliOptions.add(CliOption.newString(X_IMPLEMENTS_SKIP, "Ability to choose interfaces that should NOT be implemented in the models despite their presence in vendor extension `x-implements`. Takes a list of fully qualified interface names. Example: yaml `xImplementsSkip: [com.some.pack.WithPhotoUrls]` skips implementing the interface `com.some.pack.WithPhotoUrls` in any schema", "empty list")); cliOptions.add(CliOption.newString(SCHEMA_IMPLEMENTS, "Ability to supply interfaces per schema that should be implemented (serves similar purpose as vendor extension `x-implements`, but is fully decoupled from the api spec). Example: yaml `schemaImplements: {Pet: com.some.pack.WithId, Category: [com.some.pack.CategoryInterface], Dog: [com.some.pack.Canine, com.some.pack.OtherInterface]}` implements interfaces in schemas `Pet` (interface `com.some.pack.WithId`), `Category` (interface `com.some.pack.CategoryInterface`), `Dog`(interfaces `com.some.pack.Canine`, `com.some.pack.OtherInterface`)", "empty map")); - CliOption requestMappingOpt = new CliOption(REQUEST_MAPPING_OPTION, "Where to generate the class level @RequestMapping annotation.") .defaultValue(requestMappingMode.name()); @@ -325,6 +327,10 @@ public SpringCodegen() { library.setEnum(supportedLibraries); cliOptions.add(library); + cliOptions.add(CliOption.newBoolean(ADDITIONAL_NOT_NULL_ANNOTATIONS, + "Add @NotNull to path variables (required by default) and requestBody.", + additionalNotNullAnnotations)); + } @Override @@ -532,6 +538,7 @@ public void processOpts() { } convertPropertyToStringAndWriteBack(RESOURCE_FOLDER, this::setResourceFolder); + convertPropertyToBooleanAndWriteBack(ADDITIONAL_NOT_NULL_ANNOTATIONS, this::setAdditionalNotNullAnnotations); // override parent one importMapping.put("JsonDeserialize", (useJackson3 ? JACKSON3_PACKAGE : JACKSON2_PACKAGE) + ".databind.annotation.JsonDeserialize"); diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationBodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationBodyParams.mustache index 1f64c92fe34b..2aeccfa4b137 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationBodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationBodyParams.mustache @@ -1 +1 @@ -{{^useOptional}}{{#required}}@NotNull {{/required}}{{>beanValidationCore}}{{/useOptional}}{{#useOptional}}{{#required}}{{>beanValidationCore}}{{/required}}{{/useOptional}} \ No newline at end of file +{{^useOptional}}{{#additionalNotNullAnnotations}}{{#required}}@NotNull {{/required}}{{/additionalNotNullAnnotations}}{{>beanValidationCore}}{{/useOptional}}{{#useOptional}}{{#required}}{{>beanValidationCore}}{{/required}}{{/useOptional}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationPathParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationPathParams.mustache index 84b68052401c..93b6ea9671dc 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationPathParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationPathParams.mustache @@ -1 +1 @@ -{{! PathParam is always required }}@NotNull {{>beanValidationCore}} \ No newline at end of file +{{! PathParam is always required }}{{#additionalNotNullAnnotations}}@NotNull {{/additionalNotNullAnnotations}}{{>beanValidationCore}} \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index ad851c76c7ce..34b40fb977bc 100644 --- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -50,7 +50,7 @@ public interface DefaultApi { value = DefaultApi.PATH_GET ) ResponseEntity get( - @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, + @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, @NotNull @ApiParam(value = "A date header parameter", required = true, defaultValue = "1974-01-01") @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate, @ApiParam(value = "A date cookie parameter", defaultValue = "1975-01-01") @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate @@ -80,7 +80,7 @@ ResponseEntity get( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, + @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate ); diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java index 9dcaff387677..d582de53eb35 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 @@ -63,7 +63,7 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -93,7 +93,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ); @@ -204,7 +204,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", deprecated = true, description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") @Deprecated Long petId + @Parameter(name = "petId", deprecated = true, description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") @Deprecated Long petId ); @@ -238,7 +238,7 @@ ResponseEntity getPetById( consumes = "application/json" ) ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -270,7 +270,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ); @@ -307,7 +307,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java index 16ececc1b4be..a6faa8443a19 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java @@ -60,7 +60,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -125,7 +125,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -158,7 +158,7 @@ ResponseEntity getOrderById( consumes = "application/json" ) ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); } diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java index 5f02fa7d3059..ddbb2de7e07f 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 @@ -62,7 +62,7 @@ public interface UserApi { consumes = "application/json" ) ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -153,7 +153,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -187,7 +187,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -282,8 +282,8 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ); } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java index 70e1ee37b556..bd8739923c7f 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 @@ -59,7 +59,7 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -92,7 +92,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ); @@ -202,7 +202,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ); @@ -245,7 +245,7 @@ ResponseEntity getPetById( consumes = "application/json" ) ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -280,7 +280,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ); @@ -319,7 +319,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java index 1cfdc6064390..b496201aba01 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java @@ -49,7 +49,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId ); @@ -112,7 +112,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId ); @@ -143,7 +143,7 @@ ResponseEntity getOrderById( consumes = "application/json" ) ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); } diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java index 89032d4fcbf5..06593b538572 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 @@ -51,7 +51,7 @@ public interface UserApi { consumes = "application/json" ) ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ); @@ -81,7 +81,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -111,7 +111,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -142,7 +142,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ); @@ -174,7 +174,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ); @@ -267,8 +267,8 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ); } diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java index 584866fe6df7..5c9101695454 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 @@ -56,7 +56,7 @@ public interface PetController { consumes = "application/json" ) ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ); @@ -88,7 +88,7 @@ ResponseEntity addPet( value = PetController.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ); @@ -202,7 +202,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ); @@ -238,7 +238,7 @@ ResponseEntity getPetById( consumes = "application/json" ) ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ); @@ -272,7 +272,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ); @@ -310,7 +310,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java index 32befab57a3d..b19b029bb087 100644 --- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java +++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java @@ -49,7 +49,7 @@ public interface StoreController { value = StoreController.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId ); @@ -112,7 +112,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId ); @@ -141,7 +141,7 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" } ) ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ); } diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java index ca4cd3cf3258..0c07bfdea4ca 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 @@ -47,7 +47,7 @@ public interface UserController { value = UserController.PATH_CREATE_USER ) ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ); @@ -72,7 +72,7 @@ ResponseEntity createUser( value = UserController.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ); @@ -97,7 +97,7 @@ ResponseEntity createUsersWithArrayInput( value = UserController.PATH_CREATE_USERS_WITH_LIST_INPUT ) ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ); @@ -125,7 +125,7 @@ ResponseEntity createUsersWithListInput( value = UserController.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ); @@ -156,7 +156,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ); @@ -264,8 +264,8 @@ ResponseEntity logoutUserOptions( value = UserController.PATH_UPDATE_USER ) ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body ); } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index 70e1ee37b556..bd8739923c7f 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 @@ -59,7 +59,7 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -92,7 +92,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ); @@ -202,7 +202,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ); @@ -245,7 +245,7 @@ ResponseEntity getPetById( consumes = "application/json" ) ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -280,7 +280,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ); @@ -319,7 +319,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 1cfdc6064390..b496201aba01 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -49,7 +49,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId ); @@ -112,7 +112,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId ); @@ -143,7 +143,7 @@ ResponseEntity getOrderById( consumes = "application/json" ) ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); } diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 89032d4fcbf5..06593b538572 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 @@ -51,7 +51,7 @@ public interface UserApi { consumes = "application/json" ) ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ); @@ -81,7 +81,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -111,7 +111,7 @@ ResponseEntity createUsersWithArrayInput( consumes = "application/json" ) ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -142,7 +142,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ); @@ -174,7 +174,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ); @@ -267,8 +267,8 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java index a65eae9d0efd..b18425a1cf47 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 @@ -58,7 +58,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @RequestHeader(value = "api_key", required = false) Optional apiKey ); @@ -119,7 +119,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @PathVariable("petId") Long petId + @PathVariable("petId") Long petId ); @@ -163,7 +163,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @Valid @RequestParam(value = "name", required = false) Optional name, @Valid @RequestParam(value = "status", required = false) Optional status ); @@ -186,7 +186,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata, @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java index 53898b8a7738..929ea1d6b78e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java @@ -37,7 +37,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @PathVariable("orderId") String orderId + @PathVariable("orderId") String orderId ); @@ -74,7 +74,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId ); 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 78f8366e639e..319bfaed98c8 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 @@ -91,7 +91,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @PathVariable("username") String username + @PathVariable("username") String username ); @@ -111,7 +111,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @PathVariable("username") String username + @PathVariable("username") String username ); @@ -168,7 +168,7 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @PathVariable("username") String username, + @PathVariable("username") String username, @Valid @RequestBody User user ); diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java index 9391f2896069..72d16b12d503 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 @@ -69,7 +69,7 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -99,7 +99,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ); @@ -210,7 +210,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -253,7 +253,7 @@ ResponseEntity getPetById( consumes = "application/json" ) ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -285,7 +285,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ); @@ -322,7 +322,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java index 0117e8565b95..994cf26fccfb 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java @@ -60,7 +60,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -125,7 +125,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -158,7 +158,7 @@ ResponseEntity getOrderById( consumes = "application/json" ) ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java index 36bbd2429b6c..b61a3745088b 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 @@ -62,7 +62,7 @@ public interface UserApi { consumes = "application/json" ) ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -153,7 +153,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -187,7 +187,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -282,8 +282,8 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-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 a65eae9d0efd..b18425a1cf47 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 @@ -58,7 +58,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @RequestHeader(value = "api_key", required = false) Optional apiKey ); @@ -119,7 +119,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @PathVariable("petId") Long petId + @PathVariable("petId") Long petId ); @@ -163,7 +163,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @Valid @RequestParam(value = "name", required = false) Optional name, @Valid @RequestParam(value = "status", required = false) Optional status ); @@ -186,7 +186,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata, @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/StoreApi.java index 53898b8a7738..929ea1d6b78e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/api/StoreApi.java @@ -37,7 +37,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @PathVariable("orderId") String orderId + @PathVariable("orderId") String orderId ); @@ -74,7 +74,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId ); 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 78f8366e639e..319bfaed98c8 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 @@ -91,7 +91,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @PathVariable("username") String username + @PathVariable("username") String username ); @@ -111,7 +111,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @PathVariable("username") String username + @PathVariable("username") String username ); @@ -168,7 +168,7 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @PathVariable("username") String username, + @PathVariable("username") String username, @Valid @RequestBody User user ); diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index 3d8773f99dff..925764b44c3f 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 @@ -70,7 +70,7 @@ public interface PetApi { consumes = "application/json" ) CompletableFuture> addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -100,7 +100,7 @@ CompletableFuture> addPet( value = PetApi.PATH_DELETE_PET ) CompletableFuture> deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ); @@ -211,7 +211,7 @@ CompletableFuture>> findPetsByTags( produces = { "application/json", "application/xml" } ) CompletableFuture> getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -254,7 +254,7 @@ CompletableFuture> getPetById( consumes = "application/json" ) CompletableFuture> updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -286,7 +286,7 @@ CompletableFuture> updatePet( consumes = "application/x-www-form-urlencoded" ) CompletableFuture> updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ); @@ -323,7 +323,7 @@ CompletableFuture> updatePetWithForm( consumes = "multipart/form-data" ) CompletableFuture> uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index 689b44e230c0..f4956d6f73f5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -61,7 +61,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) CompletableFuture> deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -126,7 +126,7 @@ CompletableFuture>> getInventory( produces = { "application/json", "application/xml" } ) CompletableFuture> getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -159,7 +159,7 @@ CompletableFuture> getOrderById( consumes = "application/json" ) CompletableFuture> placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index 5aa7369968d2..ee16b8eac02d 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 @@ -63,7 +63,7 @@ public interface UserApi { consumes = "application/json" ) CompletableFuture> createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -93,7 +93,7 @@ CompletableFuture> createUser( consumes = "application/json" ) CompletableFuture> createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -154,7 +154,7 @@ CompletableFuture> createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) CompletableFuture> deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -188,7 +188,7 @@ CompletableFuture> deleteUser( produces = { "application/json", "application/xml" } ) CompletableFuture> getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -283,8 +283,8 @@ CompletableFuture> logoutUser( consumes = "application/json" ) CompletableFuture> updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java index 764aa12c3069..2e81ce340687 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java @@ -59,7 +59,7 @@ public interface DefaultApi { value = DefaultApi.PATH_GET ) ResponseEntity get( - @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, + @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime, @NotNull @Parameter(name = "X-Order-Date", description = "A date header parameter", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate, @Parameter(name = "loginDate", description = "A date cookie parameter", in = ParameterIn.COOKIE) @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate @@ -88,7 +88,7 @@ ResponseEntity get( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, + @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @Parameter(name = "visitDate", description = "Updated last visit timestamp") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate ); diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java index 45be3afc04b9..9f13be49bf17 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java @@ -67,7 +67,7 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java index f5923795844e..ceb087e42e14 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -61,7 +61,7 @@ public interface AnotherFakeApi { consumes = "application/json" ) ResponseEntity call123testSpecialTags( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index 81ad639ee0e9..e4677f716141 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 @@ -69,7 +69,7 @@ public interface FakeApi { consumes = "application/xml" ) ResponseEntity createXmlItem( - @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ); @@ -211,7 +211,7 @@ ResponseEntity fakeOuterStringSerialize( consumes = "application/json" ) ResponseEntity testBodyWithFileSchema( - @Parameter(name = "FileSchemaTestClass", description = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ); @@ -237,7 +237,7 @@ ResponseEntity testBodyWithFileSchema( ) ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "User", description = "", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ); @@ -267,7 +267,7 @@ ResponseEntity testBodyWithQueryParams( consumes = "application/json" ) ResponseEntity testClientModel( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ); @@ -312,10 +312,10 @@ ResponseEntity testClientModel( consumes = "application/x-www-form-urlencoded" ) ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -431,7 +431,7 @@ ResponseEntity testGroupParameters( consumes = "application/json" ) 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) @Valid @RequestBody Map requestBody ); @@ -459,8 +459,8 @@ ResponseEntity testInlineAdditionalProperties( consumes = "application/x-www-form-urlencoded" ) ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @Parameter(name = "param2", description = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ); @@ -487,7 +487,7 @@ ResponseEntity testJsonFormData( consumes = "application/json" ) ResponseEntity testNullable( - @Parameter(name = "ChildWithNullable", description = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java index 8312f732db24..1040deba436f 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -64,7 +64,7 @@ public interface FakeClassnameTags123Api { consumes = "application/json" ) ResponseEntity testClassname( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java index d0f19235f336..1f2aaee8a9dc 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 @@ -67,7 +67,7 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -99,7 +99,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ); @@ -210,7 +210,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -236,7 +236,7 @@ ResponseEntity getPetById( produces = { "application/json" } ) ResponseEntity responseObjectDifferentNames( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -272,7 +272,7 @@ ResponseEntity responseObjectDifferentNam consumes = "application/json" ) ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -304,7 +304,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ); @@ -341,7 +341,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ); @@ -378,7 +378,7 @@ ResponseEntity uploadFile( consumes = "multipart/form-data" ) ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ); diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java index 407825b70013..5efed8a781f2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java @@ -60,7 +60,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ); @@ -125,7 +125,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ); @@ -158,7 +158,7 @@ ResponseEntity getOrderById( consumes = "application/json" ) ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java index 733379af29a9..a28f265948de 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 @@ -59,7 +59,7 @@ public interface UserApi { consumes = "application/json" ) ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -86,7 +86,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -141,7 +141,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -175,7 +175,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -264,8 +264,8 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 786fcc66902a..0df4ae646ace 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 @@ -63,7 +63,7 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ); @@ -91,7 +91,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ); @@ -208,7 +208,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -275,7 +275,7 @@ ResponseEntity> listAllPets( consumes = "application/json" ) ResponseEntity updatePet( - @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ); @@ -305,7 +305,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ); @@ -340,7 +340,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 3b1632598df2..9768e25a59b9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -60,7 +60,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -125,7 +125,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -155,7 +155,7 @@ ResponseEntity getOrderById( produces = { "application/json", "application/xml" } ) ResponseEntity placeOrder( - @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order body + @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ); } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 6214f14f01bc..61e15a0eaaad 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 @@ -58,7 +58,7 @@ public interface UserApi { value = UserApi.PATH_CREATE_USER ) ResponseEntity createUser( - @Parameter(name = "body", description = "Created user object", required = true) @NotNull @Valid @RequestBody User body + @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body ); @@ -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) @NotNull @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> body + @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ); @@ -134,7 +134,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -166,7 +166,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -273,8 +273,8 @@ ResponseEntity logoutUserOptions( value = UserApi.PATH_UPDATE_USER ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "body", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User body + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body ); } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index 0cce157b77b7..fd08a49f576b 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 @@ -69,7 +69,7 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -99,7 +99,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ); @@ -210,7 +210,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ); @@ -253,7 +253,7 @@ ResponseEntity getPetById( consumes = "application/json" ) ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ); @@ -285,7 +285,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ); @@ -322,7 +322,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ); diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 16ececc1b4be..a6faa8443a19 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -60,7 +60,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ); @@ -125,7 +125,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ); @@ -158,7 +158,7 @@ ResponseEntity getOrderById( consumes = "application/json" ) ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ); } diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 5c1db8416690..f848b36eb499 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 @@ -62,7 +62,7 @@ public interface UserApi { consumes = "application/json" ) ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ); @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ); @@ -153,7 +153,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -187,7 +187,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ); @@ -282,8 +282,8 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ); } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java index 2391c770adff..c2f5fe455ef7 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 @@ -69,7 +69,7 @@ public interface PetApi { consumes = "application/json" ) ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; @@ -99,7 +99,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) throws Exception; @@ -210,7 +210,7 @@ ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) throws Exception; @@ -253,7 +253,7 @@ ResponseEntity getPetById( consumes = "application/json" ) ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; @@ -285,7 +285,7 @@ ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) throws Exception; @@ -322,7 +322,7 @@ ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) throws Exception; diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java index f6bae4312fe7..24eae3a5a4df 100644 --- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java @@ -60,7 +60,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) throws Exception; @@ -125,7 +125,7 @@ ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) throws Exception; @@ -158,7 +158,7 @@ ResponseEntity getOrderById( consumes = "application/json" ) ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) throws Exception; } diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java index 05ee7dcac18c..25438aeea4ad 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 @@ -62,7 +62,7 @@ public interface UserApi { consumes = "application/json" ) ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) throws Exception; @@ -92,7 +92,7 @@ ResponseEntity createUser( consumes = "application/json" ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) throws Exception; @@ -153,7 +153,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) throws Exception; @@ -187,7 +187,7 @@ ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) throws Exception; @@ -282,8 +282,8 @@ ResponseEntity logoutUser( consumes = "application/json" ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) throws Exception; } 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 492850aeeb45..256c9698f5dd 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 @@ -76,7 +76,7 @@ default Optional getRequest() { consumes = "application/json" ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,7 +123,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -271,7 +271,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/json", "application/xml" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -331,7 +331,7 @@ default ResponseEntity getPetById( consumes = "application/json" ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,7 +380,7 @@ default ResponseEntity updatePet( consumes = "application/x-www-form-urlencoded" ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -420,7 +420,7 @@ default ResponseEntity updatePetWithForm( consumes = "multipart/form-data" ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index 008652f34977..84fe59a19f81 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -138,7 +138,7 @@ default ResponseEntity> getInventory( produces = { "application/json", "application/xml" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -188,7 +188,7 @@ default ResponseEntity getOrderById( consumes = "application/json" ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 b1e774648da7..be7572e7e80e 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 @@ -69,7 +69,7 @@ default Optional getRequest() { consumes = "application/json" ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = "application/json" ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -169,7 +169,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -206,7 +206,7 @@ default ResponseEntity deleteUser( produces = { "application/json", "application/xml" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -324,8 +324,8 @@ default ResponseEntity logoutUser( consumes = "application/json" ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java index e26607420fb2..332492e0ec93 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createBar( - @Parameter(name = "BarCreate", description = "", required = true) @NotNull @Valid @RequestBody BarCreate barCreate + @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java index e26607420fb2..332492e0ec93 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createBar( - @Parameter(name = "BarCreate", description = "", required = true) @NotNull @Valid @RequestBody BarCreate barCreate + @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java index e26607420fb2..332492e0ec93 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createBar( - @Parameter(name = "BarCreate", description = "", required = true) @NotNull @Valid @RequestBody BarCreate barCreate + @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate ) { 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/PetApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java index b7e7a6dbd9e8..a9105db3a171 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 @@ -76,7 +76,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,7 +123,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -271,7 +271,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -331,7 +331,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,7 +380,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -420,7 +420,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java index 1e90dc987b6a..45131437f861 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -138,7 +138,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -188,7 +188,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 082b47958861..36078824baa0 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 @@ -69,7 +69,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -169,7 +169,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -206,7 +206,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -324,8 +324,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 8ae718731ba5..148e396b5d92 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 @@ -73,7 +73,7 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet, + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().addPet(pet, servletRequest); @@ -106,7 +106,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { @@ -226,7 +226,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().getPetById(petId, servletRequest); @@ -272,7 +272,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet, + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().updatePet(pet, servletRequest); @@ -307,7 +307,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status, @Parameter(hidden = true) final HttpServletRequest servletRequest @@ -347,7 +347,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file, @Parameter(hidden = true) final HttpServletRequest servletRequest diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java index 854611e2c1ff..75c5be22192a 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java @@ -64,7 +64,7 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId, + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().deleteOrder(orderId, servletRequest); @@ -134,7 +134,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId, + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().getOrderById(orderId, servletRequest); @@ -170,7 +170,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order, + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().placeOrder(order, 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 38a31b132b3c..586e5c4273d0 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 @@ -66,7 +66,7 @@ default UserApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user, + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().createUser(user, servletRequest); @@ -99,7 +99,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user, + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user, + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().createUsersWithListInput(user, servletRequest); @@ -166,7 +166,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().deleteUser(username, servletRequest); @@ -203,7 +203,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().getUserByName(username, servletRequest); @@ -306,8 +306,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user, + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user, @Parameter(hidden = true) final HttpServletRequest servletRequest ) { return getDelegate().updateUser(username, user, servletRequest); 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 6ed3c5c666fa..68b37b9e4285 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 @@ -76,7 +76,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,7 +123,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -271,7 +271,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -331,7 +331,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,7 +380,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -420,7 +420,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java index aacd2d1d9eb5..bc16be3e57f0 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -138,7 +138,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -188,7 +188,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 aac1fb84f636..f959a15df39c 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 @@ -69,7 +69,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -169,7 +169,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -206,7 +206,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -324,8 +324,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 6ed3c5c666fa..68b37b9e4285 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 @@ -76,7 +76,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,7 +123,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -271,7 +271,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -331,7 +331,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,7 +380,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -420,7 +420,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApi.java index aacd2d1d9eb5..bc16be3e57f0 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -138,7 +138,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -188,7 +188,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 aac1fb84f636..f959a15df39c 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 @@ -69,7 +69,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -169,7 +169,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -206,7 +206,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -324,8 +324,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index b252206b1dad..d16358fd8162 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -64,7 +64,7 @@ default AnotherFakeApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { return getDelegate().call123testSpecialTags(client); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index f60e07d765ed..a7e9a410a2b5 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 @@ -74,7 +74,7 @@ default FakeApiDelegate getDelegate() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return getDelegate().createXmlItem(xmlItem); } @@ -226,7 +226,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { return getDelegate().responseObjectDifferentNames(petId); } @@ -254,7 +254,7 @@ default ResponseEntity responseObjectDiff consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @Parameter(name = "FileSchemaTestClass", description = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -282,7 +282,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "User", description = "", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) { return getDelegate().testBodyWithQueryParams(query, user); } @@ -314,7 +314,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { return getDelegate().testClientModel(client); } @@ -361,10 +361,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -486,7 +486,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) @Valid @RequestBody Map requestBody ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -516,8 +516,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @Parameter(name = "param2", description = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return getDelegate().testJsonFormData(param, param2); } @@ -546,7 +546,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @Parameter(name = "ChildWithNullable", description = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { return getDelegate().testNullable(childWithNullable); } @@ -645,7 +645,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index dfdc9ab56a30..ea64a6ded979 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -67,7 +67,7 @@ default FakeClassnameTestApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { return getDelegate().testClassname(client); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index a9d118ba4a78..fd4b68a0469b 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 @@ -69,7 +69,7 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().addPet(pet); } @@ -103,7 +103,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return getDelegate().deletePet(petId, apiKey); @@ -220,7 +220,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { return getDelegate().getPetById(petId); } @@ -258,7 +258,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().updatePet(pet); } @@ -292,7 +292,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -331,7 +331,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index bab4b073e362..0fd8220f6e74 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -63,7 +63,7 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ) { return getDelegate().deleteOrder(orderId); } @@ -132,7 +132,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ) { return getDelegate().getOrderById(orderId); } @@ -167,7 +167,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { return getDelegate().placeOrder(order); } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 9021bd675e3b..7ce48030a454 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 @@ -62,7 +62,7 @@ default UserApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return getDelegate().createUser(user); } @@ -91,7 +91,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithListInput(user); } @@ -150,7 +150,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return getDelegate().deleteUser(username); } @@ -186,7 +186,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return getDelegate().getUserByName(username); } @@ -281,8 +281,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return getDelegate().updateUser(username, user); } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index d14a9eab393d..109727169a95 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -68,7 +68,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { 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/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 005a21edcbd4..aae7f89ce332 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 @@ -78,7 +78,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -244,7 +244,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -282,7 +282,7 @@ default ResponseEntity responseObjectDiff consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @Parameter(name = "FileSchemaTestClass", description = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -311,7 +311,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "User", description = "", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -344,7 +344,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -401,10 +401,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -529,7 +529,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) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -560,8 +560,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @Parameter(name = "param2", description = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -591,7 +591,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @Parameter(name = "ChildWithNullable", description = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -702,7 +702,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index b3f185397831..38082e99ec88 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -71,7 +71,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { 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/PetApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index a6873fc3285d..ac34fe3c7e11 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 @@ -73,7 +73,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -110,7 +110,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -257,7 +257,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -310,7 +310,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -345,7 +345,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -385,7 +385,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 9d5e5982151e..26bb56b39575 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -138,7 +138,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -188,7 +188,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 edc02a9eea93..8e54ff471a7e 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 @@ -66,7 +66,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -96,7 +96,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -157,7 +157,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -194,7 +194,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -306,8 +306,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 35503681c6d1..578a193374b9 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 @@ -47,7 +47,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @NotNull @Valid @RequestBody Pet pet + @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -82,7 +82,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -180,7 +180,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @PathVariable("petId") Long petId + @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -221,7 +221,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @NotNull @Valid @RequestBody Pet pet + @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -258,7 +258,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @Valid @RequestParam(value = "name", required = false) String name, @Valid @RequestParam(value = "status", required = false) String status ) { @@ -284,7 +284,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java index fa7485d4d9ab..acd4901b38e9 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java @@ -44,7 +44,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @PathVariable("orderId") String orderId + @PathVariable("orderId") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -87,7 +87,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -124,7 +124,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @NotNull @Valid @RequestBody Order order + @Valid @RequestBody Order order ) { 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 65d7f331829e..c45585a262ed 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 @@ -44,7 +44,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @NotNull @Valid @RequestBody User user + @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -65,7 +65,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @NotNull @Valid @RequestBody List<@Valid User> user + @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,7 +86,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @NotNull @Valid @RequestBody List<@Valid User> user + @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -107,7 +107,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @PathVariable("username") String username + @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -130,7 +130,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @PathVariable("username") String username + @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -210,8 +210,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @PathVariable("username") String username, - @NotNull @Valid @RequestBody User user + @PathVariable("username") String username, + @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 e664c3de5e03..af51a2f0e540 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 @@ -77,7 +77,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -124,7 +124,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -272,7 +272,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -332,7 +332,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -381,7 +381,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -421,7 +421,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index 5a5015e3081d..088cbff6b150 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -68,7 +68,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -139,7 +139,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -189,7 +189,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 bf67051ea4a1..47040cd502f0 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 @@ -70,7 +70,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,7 +103,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -170,7 +170,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -207,7 +207,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -325,8 +325,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/AnotherFakeApi.java index a0bd6eada5f9..6bc1c1f5db1a 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -61,7 +61,7 @@ public interface AnotherFakeApi { consumes = { "application/json" } ) ResponseEntity call123testSpecialTags( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) throws Exception; } 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 e963f190c3b8..019ca804362c 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 @@ -71,7 +71,7 @@ public interface FakeApi { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) ResponseEntity createXmlItem( - @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) throws Exception; @@ -213,7 +213,7 @@ ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) ResponseEntity responseObjectDifferentNames( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) throws Exception; @@ -239,7 +239,7 @@ ResponseEntity responseObjectDifferentNam consumes = { "application/json" } ) ResponseEntity testBodyWithFileSchema( - @Parameter(name = "FileSchemaTestClass", description = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) throws Exception; @@ -265,7 +265,7 @@ ResponseEntity testBodyWithFileSchema( ) ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "User", description = "", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) throws Exception; @@ -295,7 +295,7 @@ ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) ResponseEntity testClientModel( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) throws Exception; @@ -340,10 +340,10 @@ ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -459,7 +459,7 @@ ResponseEntity testGroupParameters( consumes = { "application/json" } ) 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) @Valid @RequestBody Map requestBody ) throws Exception; @@ -487,8 +487,8 @@ ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @Parameter(name = "param2", description = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) throws Exception; @@ -515,7 +515,7 @@ ResponseEntity testJsonFormData( consumes = { "application/json" } ) ResponseEntity testNullable( - @Parameter(name = "ChildWithNullable", description = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) throws Exception; @@ -608,7 +608,7 @@ ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) throws Exception; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index d29b1fdc93e1..c3a0ed3ad1a0 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -64,7 +64,7 @@ public interface FakeClassnameTestApi { consumes = { "application/json" } ) ResponseEntity testClassname( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) 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 aa0ac6a15773..ebe756811741 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 @@ -66,7 +66,7 @@ public interface PetApi { consumes = { "application/json", "application/xml" } ) ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; @@ -98,7 +98,7 @@ ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) throws Exception; @@ -209,7 +209,7 @@ ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) throws Exception; @@ -245,7 +245,7 @@ ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) throws Exception; @@ -277,7 +277,7 @@ ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) throws Exception; @@ -314,7 +314,7 @@ ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) throws Exception; diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/StoreApi.java index b8b95167b630..031290fc578c 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api/StoreApi.java @@ -60,7 +60,7 @@ public interface StoreApi { value = StoreApi.PATH_DELETE_ORDER ) ResponseEntity deleteOrder( - @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ) throws Exception; @@ -125,7 +125,7 @@ ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ) throws Exception; @@ -158,7 +158,7 @@ ResponseEntity getOrderById( consumes = { "application/json" } ) ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) throws Exception; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-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 dfcc009439fd..be61db339f84 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 @@ -59,7 +59,7 @@ public interface UserApi { consumes = { "application/json" } ) ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) throws Exception; @@ -86,7 +86,7 @@ ResponseEntity createUser( consumes = { "application/json" } ) ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) throws Exception; @@ -141,7 +141,7 @@ ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) throws Exception; @@ -175,7 +175,7 @@ ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) throws Exception; @@ -264,8 +264,8 @@ ResponseEntity logoutUser( consumes = { "application/json" } ) ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) throws Exception; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9499a2f88b40..ed272236ed9b 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { 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/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index e7121add0662..66d029d86844 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 @@ -67,7 +67,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -234,7 +234,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -273,7 +273,7 @@ default ResponseEntity responseObjectDiff consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -304,7 +304,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -336,7 +336,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,10 +393,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -521,7 +521,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +552,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -583,7 +583,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,7 +697,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8f0ae21e79f0..878513a1a30c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -59,7 +59,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { 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/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index ce42a20e677c..b3d3861e2a45 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 @@ -65,7 +65,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,7 +103,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -252,7 +252,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -308,7 +308,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,7 +346,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -388,7 +388,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 36b47301129b..317a6c2dd8ed 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,7 +173,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 6d40fd61251c..19182a0968d7 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 @@ -55,7 +55,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -85,7 +85,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -115,7 +115,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -146,7 +146,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -181,7 +181,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -291,8 +291,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9499a2f88b40..ed272236ed9b 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { 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/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index e7121add0662..66d029d86844 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 @@ -67,7 +67,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -234,7 +234,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -273,7 +273,7 @@ default ResponseEntity responseObjectDiff consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -304,7 +304,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -336,7 +336,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,10 +393,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -521,7 +521,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +552,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -583,7 +583,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,7 +697,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8f0ae21e79f0..878513a1a30c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -59,7 +59,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { 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/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index ce42a20e677c..b3d3861e2a45 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 @@ -65,7 +65,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,7 +103,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -252,7 +252,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -308,7 +308,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,7 +346,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -388,7 +388,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 36b47301129b..317a6c2dd8ed 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,7 +173,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 6d40fd61251c..19182a0968d7 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 @@ -55,7 +55,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -85,7 +85,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -115,7 +115,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -146,7 +146,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -181,7 +181,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -291,8 +291,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java index 1d477557653d..255b967dd223 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { 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/FakeApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java index 1a360fa5b587..d67695f72da6 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 @@ -67,7 +67,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -234,7 +234,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -273,7 +273,7 @@ default ResponseEntity responseObjectDiff consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -304,7 +304,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -336,7 +336,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,10 +393,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -521,7 +521,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +552,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -583,7 +583,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,7 +697,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 7a617067f27d..d22beb5b96af 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -59,7 +59,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { 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/PetApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java index f205ef18fd4b..82c2298d83e1 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 @@ -65,7 +65,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,7 +103,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -252,7 +252,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -308,7 +308,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,7 +346,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -388,7 +388,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java index 208cd6b6f056..e86068f09175 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,7 +173,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 e0361fccb805..ba19f8f80306 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 @@ -55,7 +55,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -85,7 +85,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -115,7 +115,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -146,7 +146,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -181,7 +181,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -291,8 +291,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 727c0e0de0cc..83a097e36e90 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -52,7 +52,7 @@ default AnotherFakeApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { return getDelegate().call123testSpecialTags(client); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index 05e48ace9a29..5061839983bd 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 @@ -63,7 +63,7 @@ default FakeApiDelegate getDelegate() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return getDelegate().createXmlItem(xmlItem); } @@ -216,7 +216,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { return getDelegate().responseObjectDifferentNames(petId); } @@ -245,7 +245,7 @@ default ResponseEntity responseObjectDiff consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -275,7 +275,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return getDelegate().testBodyWithQueryParams(query, user); } @@ -306,7 +306,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { return getDelegate().testClientModel(client); } @@ -353,10 +353,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -478,7 +478,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -508,8 +508,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return getDelegate().testJsonFormData(param, param2); } @@ -538,7 +538,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { return getDelegate().testNullable(childWithNullable); } @@ -640,7 +640,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9e90a5aa20a6..50d706663cb6 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -55,7 +55,7 @@ default FakeClassnameTestApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { return getDelegate().testClassname(client); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index c8a9be44afe8..86fa601ab409 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 @@ -61,7 +61,7 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().addPet(pet); } @@ -98,7 +98,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return getDelegate().deletePet(petId, apiKey); @@ -216,7 +216,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { return getDelegate().getPetById(petId); } @@ -257,7 +257,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().updatePet(pet); } @@ -294,7 +294,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -335,7 +335,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 323b46cd7f4b..4c941c2018c9 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -52,7 +52,7 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return getDelegate().deleteOrder(orderId); } @@ -119,7 +119,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { return getDelegate().getOrderById(orderId); } @@ -152,7 +152,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { return getDelegate().placeOrder(order); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index e0fd838775db..63a3458382fb 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 @@ -51,7 +51,7 @@ default UserApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return getDelegate().createUser(user); } @@ -80,7 +80,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithArrayInput(user); } @@ -109,7 +109,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithListInput(user); } @@ -139,7 +139,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return getDelegate().deleteUser(username); } @@ -173,7 +173,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { return getDelegate().getUserByName(username); } @@ -266,8 +266,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return getDelegate().updateUser(username, user); } 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 98dd1b17167f..aa093ce5a483 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 @@ -63,7 +63,7 @@ default PetApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Pet addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().addPet(pet); } @@ -99,7 +99,7 @@ default Pet addPet( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default void deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { getDelegate().deletePet(petId, apiKey); @@ -218,7 +218,7 @@ default List findPetsByTags( ) @ResponseStatus(HttpStatus.OK) default Pet getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { return getDelegate().getPetById(petId); } @@ -264,7 +264,7 @@ default Pet getPetById( ) @ResponseStatus(HttpStatus.OK) default Pet updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().updatePet(pet); } @@ -302,7 +302,7 @@ default Pet updatePet( ) @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) default void updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -344,7 +344,7 @@ default void updatePetWithForm( ) @ResponseStatus(HttpStatus.OK) default ModelApiResponse uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java index 65ac4a0cd3a9..d47e504a76de 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApi.java @@ -53,7 +53,7 @@ default StoreApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.BAD_REQUEST) default void deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId ) { getDelegate().deleteOrder(orderId); } @@ -122,7 +122,7 @@ default Map getInventory( ) @ResponseStatus(HttpStatus.OK) default Order getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId ) { return getDelegate().getOrderById(orderId); } @@ -156,7 +156,7 @@ default Order getOrderById( ) @ResponseStatus(HttpStatus.OK) default Order placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { return getDelegate().placeOrder(order); } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApi.java index f1fb366e453d..df9e6cb868a9 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 @@ -55,7 +55,7 @@ default UserApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default void createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { getDelegate().createUser(user); } @@ -88,7 +88,7 @@ default void createUser( ) @ResponseStatus(HttpStatus.OK) default void createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { getDelegate().createUsersWithArrayInput(user); } @@ -121,7 +121,7 @@ default void createUsersWithArrayInput( ) @ResponseStatus(HttpStatus.OK) default void createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { getDelegate().createUsersWithListInput(user); } @@ -155,7 +155,7 @@ default void createUsersWithListInput( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default void deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { getDelegate().deleteUser(username); } @@ -190,7 +190,7 @@ default void deleteUser( ) @ResponseStatus(HttpStatus.OK) default User getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { return getDelegate().getUserByName(username); } @@ -292,8 +292,8 @@ default void logoutUser( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default void updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { getDelegate().updateUser(username, user); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 727c0e0de0cc..83a097e36e90 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -52,7 +52,7 @@ default AnotherFakeApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { return getDelegate().call123testSpecialTags(client); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 05e48ace9a29..5061839983bd 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 @@ -63,7 +63,7 @@ default FakeApiDelegate getDelegate() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return getDelegate().createXmlItem(xmlItem); } @@ -216,7 +216,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { return getDelegate().responseObjectDifferentNames(petId); } @@ -245,7 +245,7 @@ default ResponseEntity responseObjectDiff consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -275,7 +275,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return getDelegate().testBodyWithQueryParams(query, user); } @@ -306,7 +306,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { return getDelegate().testClientModel(client); } @@ -353,10 +353,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -478,7 +478,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -508,8 +508,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return getDelegate().testJsonFormData(param, param2); } @@ -538,7 +538,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { return getDelegate().testNullable(childWithNullable); } @@ -640,7 +640,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 9e90a5aa20a6..50d706663cb6 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -55,7 +55,7 @@ default FakeClassnameTestApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { return getDelegate().testClassname(client); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index c8a9be44afe8..86fa601ab409 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 @@ -61,7 +61,7 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().addPet(pet); } @@ -98,7 +98,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return getDelegate().deletePet(petId, apiKey); @@ -216,7 +216,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { return getDelegate().getPetById(petId); } @@ -257,7 +257,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().updatePet(pet); } @@ -294,7 +294,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -335,7 +335,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 323b46cd7f4b..4c941c2018c9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -52,7 +52,7 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return getDelegate().deleteOrder(orderId); } @@ -119,7 +119,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { return getDelegate().getOrderById(orderId); } @@ -152,7 +152,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { return getDelegate().placeOrder(order); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index e0fd838775db..63a3458382fb 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 @@ -51,7 +51,7 @@ default UserApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return getDelegate().createUser(user); } @@ -80,7 +80,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithArrayInput(user); } @@ -109,7 +109,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithListInput(user); } @@ -139,7 +139,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return getDelegate().deleteUser(username); } @@ -173,7 +173,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { return getDelegate().getUserByName(username); } @@ -266,8 +266,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return getDelegate().updateUser(username, user); } 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 8831f0cdc571..0b4136f227f3 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 @@ -47,7 +47,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @NotNull @Valid @RequestBody Pet pet + @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -81,7 +81,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @PathVariable("petId") Long petId + @PathVariable("petId") Long petId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -178,7 +178,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @PathVariable("petId") Long petId + @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -219,7 +219,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @NotNull @Valid @RequestBody Pet pet + @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -256,7 +256,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @Valid @RequestParam(value = "name", required = false) String name, @Valid @RequestParam(value = "status", required = false) String status ) { @@ -282,7 +282,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @PathVariable("petId") Long petId, + @PathVariable("petId") Long petId, @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java index fa7485d4d9ab..acd4901b38e9 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java @@ -44,7 +44,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @PathVariable("orderId") String orderId + @PathVariable("orderId") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -87,7 +87,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @PathVariable("orderId") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -124,7 +124,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @NotNull @Valid @RequestBody Order order + @Valid @RequestBody Order order ) { 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 65d7f331829e..c45585a262ed 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 @@ -44,7 +44,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @NotNull @Valid @RequestBody User user + @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -65,7 +65,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @NotNull @Valid @RequestBody List<@Valid User> user + @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -86,7 +86,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @NotNull @Valid @RequestBody List<@Valid User> user + @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -107,7 +107,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @PathVariable("username") String username + @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -130,7 +130,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @PathVariable("username") String username + @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -210,8 +210,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @PathVariable("username") String username, - @NotNull @Valid @RequestBody User user + @PathVariable("username") String username, + @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 9499a2f88b40..ed272236ed9b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { 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/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 3c0258bd5bc3..0db11a7c3b74 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 @@ -67,7 +67,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -234,7 +234,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -273,7 +273,7 @@ default ResponseEntity responseObjectDiff consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -304,7 +304,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -336,7 +336,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,10 +393,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -521,7 +521,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +552,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -583,7 +583,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,7 +697,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8f0ae21e79f0..878513a1a30c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -59,7 +59,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client client ) { 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/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 47813cc18260..e7616b821f38 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 @@ -65,7 +65,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -105,7 +105,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -253,7 +253,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -309,7 +309,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -347,7 +347,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -389,7 +389,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 36b47301129b..317a6c2dd8ed 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,7 +173,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 6d40fd61251c..19182a0968d7 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 @@ -55,7 +55,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -85,7 +85,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -115,7 +115,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -146,7 +146,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -181,7 +181,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -291,8 +291,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/AnotherFakeApi.java index d795e65b0cbc..87936b7a977d 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -58,7 +58,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody ClientDto clientDto, + @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto, @ApiIgnore final HttpServletRequest servletRequest ) { getRequest().ifPresent(request -> { 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 6a92b33cd19c..0c0afbab4ba3 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 @@ -69,7 +69,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItemDto xmlItemDto, + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItemDto xmlItemDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -241,7 +241,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiIgnore final HttpServletRequest servletRequest ) { getRequest().ifPresent(request -> { @@ -281,7 +281,7 @@ default ResponseEntity responseObjectD consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto, + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -313,7 +313,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody UserDto userDto, + @ApiParam(value = "", required = true) @Valid @RequestBody UserDto userDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,7 +346,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody ClientDto clientDto, + @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto, @ApiIgnore final HttpServletRequest servletRequest ) { getRequest().ifPresent(request -> { @@ -404,10 +404,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -535,7 +535,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody, + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -567,8 +567,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2, + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -599,7 +599,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullableDto childWithNullableDto, + @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullableDto childWithNullableDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -715,7 +715,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiIgnore final HttpServletRequest servletRequest diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 838d2ab15ebb..2ca174a50c2f 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -61,7 +61,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody ClientDto clientDto, + @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto, @ApiIgnore final HttpServletRequest servletRequest ) { getRequest().ifPresent(request -> { 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 dca453f5af5b..40cc10c91d3d 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 @@ -67,7 +67,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody PetDto petDto, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -106,7 +106,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey, @ApiIgnore final HttpServletRequest servletRequest ) { @@ -258,7 +258,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, @ApiIgnore final HttpServletRequest servletRequest ) { getRequest().ifPresent(request -> { @@ -315,7 +315,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody PetDto petDto, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -354,7 +354,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status, @ApiIgnore final HttpServletRequest servletRequest @@ -397,7 +397,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file, @ApiIgnore final HttpServletRequest servletRequest diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java index e2a0d8b1a247..d739a21bdad8 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java @@ -58,7 +58,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -128,7 +128,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, @ApiIgnore final HttpServletRequest servletRequest ) { getRequest().ifPresent(request -> { @@ -177,7 +177,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody OrderDto orderDto, + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody OrderDto orderDto, @ApiIgnore 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 b5dc55ea0853..3c547d623f55 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 @@ -57,7 +57,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody UserDto userDto, + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody UserDto userDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -88,7 +88,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid UserDto> userDto, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -119,7 +119,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid UserDto> userDto, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -151,7 +151,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -187,7 +187,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, @ApiIgnore final HttpServletRequest servletRequest ) { getRequest().ifPresent(request -> { @@ -299,8 +299,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody UserDto userDto, + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody UserDto userDto, @ApiIgnore final HttpServletRequest servletRequest ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 b7e7a6dbd9e8..a9105db3a171 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 @@ -76,7 +76,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,7 +123,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -271,7 +271,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -331,7 +331,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,7 +380,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -420,7 +420,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java index 1e90dc987b6a..45131437f861 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -138,7 +138,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -188,7 +188,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 082b47958861..36078824baa0 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 @@ -69,7 +69,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -169,7 +169,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -206,7 +206,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -324,8 +324,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return 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 6ed3c5c666fa..68b37b9e4285 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 @@ -76,7 +76,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -123,7 +123,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -271,7 +271,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -331,7 +331,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -380,7 +380,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -420,7 +420,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java index aacd2d1d9eb5..bc16be3e57f0 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java @@ -67,7 +67,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -138,7 +138,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -188,7 +188,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 aac1fb84f636..f959a15df39c 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 @@ -69,7 +69,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,7 +102,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -169,7 +169,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -206,7 +206,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -324,8 +324,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); 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 af1dd2eddbc9..189f347a6257 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 @@ -82,7 +82,7 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().addPet(pet); } @@ -114,7 +114,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return getDelegate().deletePet(petId, apiKey); @@ -237,7 +237,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { return getDelegate().getPetById(petId); } @@ -282,7 +282,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return getDelegate().updatePet(pet); } @@ -316,7 +316,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -355,7 +355,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java index 66b1a307ce66..36bd69f22966 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApi.java @@ -63,7 +63,7 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId + @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId ) { return getDelegate().deleteOrder(orderId); } @@ -132,7 +132,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId ) { return getDelegate().getOrderById(orderId); } @@ -167,7 +167,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { return getDelegate().placeOrder(order); } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApi.java index 4e5bf6e3c3d7..ec2460ba3c87 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 @@ -65,7 +65,7 @@ default UserApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return getDelegate().createUser(user); } @@ -97,7 +97,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return getDelegate().createUsersWithListInput(user); } @@ -162,7 +162,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return getDelegate().deleteUser(username); } @@ -198,7 +198,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return getDelegate().getUserByName(username); } @@ -299,8 +299,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return getDelegate().updateUser(username, user); } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java index d20c450bbced..5a7f072c3a40 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -56,7 +56,7 @@ default AnotherFakeApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Mono client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client ) { return getDelegate().call123testSpecialTags(client); } 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 aa331d8b8298..1562cf5814f5 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 @@ -67,7 +67,7 @@ default FakeApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody Mono xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem ) { return getDelegate().createXmlItem(xmlItem); } @@ -225,7 +225,7 @@ default Mono fakeOuterStringSerialize( ) @ResponseStatus(HttpStatus.OK) default Mono responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { return getDelegate().responseObjectDifferentNames(petId); } @@ -255,7 +255,7 @@ default Mono responseObjectDifferentNames ) @ResponseStatus(HttpStatus.OK) default Mono testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody Mono fileSchemaTestClass + @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass); } @@ -286,7 +286,7 @@ default Mono testBodyWithFileSchema( @ResponseStatus(HttpStatus.OK) default Mono testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody Mono user + @ApiParam(value = "", required = true) @Valid @RequestBody Mono user ) { return getDelegate().testBodyWithQueryParams(query, user); } @@ -318,7 +318,7 @@ default Mono testBodyWithQueryParams( ) @ResponseStatus(HttpStatus.OK) default Mono testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Mono client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client ) { return getDelegate().testClientModel(client); } @@ -366,10 +366,10 @@ default Mono testClientModel( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestPart(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestPart(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestPart(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestPart(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestPart(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestPart(value = "int64", required = false) Long int64, @@ -494,7 +494,7 @@ default Mono testGroupParameters( ) @ResponseStatus(HttpStatus.OK) default Mono testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Mono> requestBody + @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody ) { return getDelegate().testInlineAdditionalProperties(requestBody); } @@ -525,8 +525,8 @@ default Mono testInlineAdditionalProperties( ) @ResponseStatus(HttpStatus.OK) default Mono testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestPart(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestPart(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestPart(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2 ) { return getDelegate().testJsonFormData(param, param2); } @@ -556,7 +556,7 @@ default Mono testJsonFormData( ) @ResponseStatus(HttpStatus.OK) default Mono testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Mono childWithNullable + @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable ) { return getDelegate().testNullable(childWithNullable); } @@ -661,7 +661,7 @@ default Mono testWithResultExample( ) @ResponseStatus(HttpStatus.OK) default Mono uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) Part requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 4832363c9523..dd5597fcd632 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -59,7 +59,7 @@ default FakeClassnameTestApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Mono client + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client ) { return getDelegate().testClassname(client); } 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 b509a6e27e46..8f716e9cc229 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 @@ -65,7 +65,7 @@ default PetApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Mono pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet ) { return getDelegate().addPet(pet); } @@ -103,7 +103,7 @@ default Mono addPet( ) @ResponseStatus(HttpStatus.OK) default Mono deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return getDelegate().deletePet(petId, apiKey); @@ -224,7 +224,7 @@ default Flux findPetsByTags( ) @ResponseStatus(HttpStatus.OK) default Mono getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { return getDelegate().getPetById(petId); } @@ -266,7 +266,7 @@ default Mono getPetById( ) @ResponseStatus(HttpStatus.OK) default Mono updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Mono pet + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet ) { return getDelegate().updatePet(pet); } @@ -304,7 +304,7 @@ default Mono updatePet( ) @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) default Mono updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestPart(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status ) { @@ -346,7 +346,7 @@ default Mono updatePetWithForm( ) @ResponseStatus(HttpStatus.OK) default Mono uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file ) { diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java index 71417d9141c0..1f6f9e741638 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ default StoreApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return getDelegate().deleteOrder(orderId); } @@ -125,7 +125,7 @@ default Mono> getInventory( ) @ResponseStatus(HttpStatus.OK) default Mono getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { return getDelegate().getOrderById(orderId); } @@ -159,7 +159,7 @@ default Mono getOrderById( ) @ResponseStatus(HttpStatus.OK) default Mono placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Mono order + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order ) { return getDelegate().placeOrder(order); } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java index 3d44022b5ae7..a146595ef2b9 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java @@ -55,7 +55,7 @@ default UserApiDelegate getDelegate() { ) @ResponseStatus(HttpStatus.OK) default Mono createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody Mono user + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user ) { return getDelegate().createUser(user); } @@ -85,7 +85,7 @@ default Mono createUser( ) @ResponseStatus(HttpStatus.OK) default Mono createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody Flux user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user ) { return getDelegate().createUsersWithArrayInput(user); } @@ -115,7 +115,7 @@ default Mono createUsersWithArrayInput( ) @ResponseStatus(HttpStatus.OK) default Mono createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody Flux user + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user ) { return getDelegate().createUsersWithListInput(user); } @@ -146,7 +146,7 @@ default Mono createUsersWithListInput( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return getDelegate().deleteUser(username); } @@ -181,7 +181,7 @@ default Mono deleteUser( ) @ResponseStatus(HttpStatus.OK) default Mono getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { return getDelegate().getUserByName(username); } @@ -277,8 +277,8 @@ default Mono logoutUser( ) @ResponseStatus(HttpStatus.BAD_REQUEST) default Mono updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody Mono user + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user ) { return getDelegate().updateUser(username, user); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 23d42660320b..6e0666593256 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -57,7 +57,7 @@ default AnotherFakeApiDelegate getDelegate() { consumes = { "application/json" } ) default Mono> call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Mono client, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().call123testSpecialTags(client, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index bae0f552d2a6..1a6443fc888b 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 @@ -68,7 +68,7 @@ default FakeApiDelegate getDelegate() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default Mono> createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody Mono xmlItem, + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody Mono xmlItem, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createXmlItem(xmlItem, exchange); @@ -226,7 +226,7 @@ default Mono> fakeOuterStringSerialize( produces = { "application/json" } ) default Mono> responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().responseObjectDifferentNames(petId, exchange); @@ -256,7 +256,7 @@ default Mono> responseObje consumes = { "application/json" } ) default Mono> testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody Mono fileSchemaTestClass, + @ApiParam(value = "", required = true) @Valid @RequestBody Mono fileSchemaTestClass, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testBodyWithFileSchema(fileSchemaTestClass, exchange); @@ -287,7 +287,7 @@ default Mono> testBodyWithFileSchema( ) default Mono> testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody Mono user, + @ApiParam(value = "", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testBodyWithQueryParams(query, user, exchange); @@ -319,7 +319,7 @@ default Mono> testBodyWithQueryParams( consumes = { "application/json" } ) default Mono> testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Mono client, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testClientModel(client, exchange); @@ -367,10 +367,10 @@ default Mono> testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default Mono> testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestPart(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestPart(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestPart(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestPart(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestPart(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestPart(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestPart(value = "int64", required = false) Long int64, @@ -495,7 +495,7 @@ default Mono> testGroupParameters( consumes = { "application/json" } ) default Mono> testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Mono> requestBody, + @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono> requestBody, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testInlineAdditionalProperties(requestBody, exchange); @@ -526,8 +526,8 @@ default Mono> testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default Mono> testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestPart(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestPart(value = "param2", required = true) String param2, + @ApiParam(value = "field1", required = true) @Valid @RequestPart(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestPart(value = "param2", required = true) String param2, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testJsonFormData(param, param2, exchange); @@ -557,7 +557,7 @@ default Mono> testJsonFormData( consumes = { "application/json" } ) default Mono> testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Mono childWithNullable, + @ApiParam(value = "request body", required = true) @Valid @RequestBody Mono childWithNullable, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testNullable(childWithNullable, exchange); @@ -661,7 +661,7 @@ default Mono> testWithResultExample( consumes = { "multipart/form-data" } ) default Mono> uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) Part requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, @ApiIgnore final ServerWebExchange exchange diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index a33f89784191..ae34c5b6bd6b 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -60,7 +60,7 @@ default FakeClassnameTestApiDelegate getDelegate() { consumes = { "application/json" } ) default Mono> testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Mono client, + @ApiParam(value = "client model", required = true) @Valid @RequestBody Mono client, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().testClassname(client, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index e94b654a5b17..113748a6edd3 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 @@ -66,7 +66,7 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) default Mono> addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Mono pet, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().addPet(pet, exchange); @@ -104,7 +104,7 @@ default Mono> addPet( value = PetApi.PATH_DELETE_PET ) default Mono> deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey, @ApiIgnore final ServerWebExchange exchange ) { @@ -225,7 +225,7 @@ default Mono>> findPetsByTags( produces = { "application/xml", "application/json" } ) default Mono> getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().getPetById(petId, exchange); @@ -267,7 +267,7 @@ default Mono> getPetById( consumes = { "application/json", "application/xml" } ) default Mono> updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Mono pet, + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Mono pet, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().updatePet(pet, exchange); @@ -305,7 +305,7 @@ default Mono> updatePet( consumes = { "application/x-www-form-urlencoded" } ) default Mono> updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestPart(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestPart(value = "status", required = false) String status, @ApiIgnore final ServerWebExchange exchange @@ -347,7 +347,7 @@ default Mono> updatePetWithForm( consumes = { "multipart/form-data" } ) default Mono> uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) Part file, @ApiIgnore final ServerWebExchange exchange diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 30b584c3ec14..a7640c326933 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -57,7 +57,7 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) default Mono> deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().deleteOrder(orderId, exchange); @@ -125,7 +125,7 @@ default Mono>> getInventory( produces = { "application/xml", "application/json" } ) default Mono> getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().getOrderById(orderId, exchange); @@ -159,7 +159,7 @@ default Mono> getOrderById( consumes = { "application/json" } ) default Mono> placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Mono order, + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Mono order, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().placeOrder(order, exchange); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index 00b53d45aeee..808cc7970b6a 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -56,7 +56,7 @@ default UserApiDelegate getDelegate() { consumes = { "application/json" } ) default Mono> createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody Mono user, + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createUser(user, exchange); @@ -86,7 +86,7 @@ default Mono> createUser( consumes = { "application/json" } ) default Mono> createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody Flux user, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createUsersWithArrayInput(user, exchange); @@ -116,7 +116,7 @@ default Mono> createUsersWithArrayInput( consumes = { "application/json" } ) default Mono> createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody Flux user, + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody Flux user, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().createUsersWithListInput(user, exchange); @@ -147,7 +147,7 @@ default Mono> createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default Mono> deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().deleteUser(username, exchange); @@ -182,7 +182,7 @@ default Mono> deleteUser( produces = { "application/xml", "application/json" } ) default Mono> getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().getUserByName(username, exchange); @@ -277,8 +277,8 @@ default Mono> logoutUser( consumes = { "application/json" } ) default Mono> updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody Mono user, + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody Mono user, @ApiIgnore final ServerWebExchange exchange ) { return getDelegate().updateUser(username, user, exchange); diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 7e317c778299..9623b89cec76 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -52,7 +52,7 @@ default AnotherFakeApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { return getDelegate().call123testSpecialTags(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 0d276a250668..09ae50cd9f8a 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 @@ -61,7 +61,7 @@ default FakeApiDelegate getDelegate() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return getDelegate().createXmlItem(xmlItem); } @@ -210,7 +210,7 @@ default ResponseEntity fakeOuterStringSerialize( consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { return getDelegate().testBodyWithFileSchema(body); } @@ -240,7 +240,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User body ) { return getDelegate().testBodyWithQueryParams(query, body); } @@ -271,7 +271,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { return getDelegate().testClientModel(body); } @@ -318,10 +318,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -442,7 +442,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { return getDelegate().testInlineAdditionalProperties(param); } @@ -471,8 +471,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return getDelegate().testJsonFormData(param, param2); } @@ -546,7 +546,7 @@ default ResponseEntity testQueryParameterCollectionFormat( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index ca761b1d7128..94d649b96b2c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -55,7 +55,7 @@ default FakeClassnameTestApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { return getDelegate().testClassname(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java index af474ef48bd5..1dc6bd20193f 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 @@ -61,7 +61,7 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { return getDelegate().addPet(body); } @@ -97,7 +97,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return getDelegate().deletePet(petId, apiKey); @@ -219,7 +219,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { return getDelegate().getPetById(petId); } @@ -296,7 +296,7 @@ default ResponseEntity> listAllPets( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { return getDelegate().updatePet(body); } @@ -332,7 +332,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -372,7 +372,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 63e85e489f7e..c374a22d9e81 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -52,7 +52,7 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return getDelegate().deleteOrder(orderId); } @@ -119,7 +119,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { return getDelegate().getOrderById(orderId); } @@ -150,7 +150,7 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { return getDelegate().placeOrder(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index c425e56a5c36..21e1acd37aaf 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 @@ -50,7 +50,7 @@ default UserApiDelegate getDelegate() { value = UserApi.PATH_CREATE_USER ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { return getDelegate().createUser(body); } @@ -77,7 +77,7 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { return getDelegate().createUsersWithArrayInput(body); } @@ -104,7 +104,7 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { return getDelegate().createUsersWithListInput(body); } @@ -134,7 +134,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return getDelegate().deleteUser(username); } @@ -167,7 +167,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { return getDelegate().getUserByName(username); } @@ -257,8 +257,8 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body ) { return getDelegate().updateUser(username, body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index 553a8f4b7cfb..f512a47cb7e9 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -55,7 +55,7 @@ default VersioningApiDelegate getDelegate() { default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { return getDelegate().versioningHeaders(versionWithDefaultValue, versionNoDefaultValue, petId); } @@ -94,7 +94,7 @@ default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValueHeader", required = true, defaultValue = "V1") String versionWithDefaultValueHeader, @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValueHeader", required = true) String versionNoDefaultValueHeader, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, versionWithDefaultValueHeader, versionNoDefaultValueHeader, petId); } @@ -128,7 +128,7 @@ default ResponseEntity versioningMix( default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index 7e317c778299..9623b89cec76 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -52,7 +52,7 @@ default AnotherFakeApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { return getDelegate().call123testSpecialTags(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index 0d276a250668..09ae50cd9f8a 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 @@ -61,7 +61,7 @@ default FakeApiDelegate getDelegate() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return getDelegate().createXmlItem(xmlItem); } @@ -210,7 +210,7 @@ default ResponseEntity fakeOuterStringSerialize( consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { return getDelegate().testBodyWithFileSchema(body); } @@ -240,7 +240,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User body ) { return getDelegate().testBodyWithQueryParams(query, body); } @@ -271,7 +271,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { return getDelegate().testClientModel(body); } @@ -318,10 +318,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -442,7 +442,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { return getDelegate().testInlineAdditionalProperties(param); } @@ -471,8 +471,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return getDelegate().testJsonFormData(param, param2); } @@ -546,7 +546,7 @@ default ResponseEntity testQueryParameterCollectionFormat( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index ca761b1d7128..94d649b96b2c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -55,7 +55,7 @@ default FakeClassnameTestApiDelegate getDelegate() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { return getDelegate().testClassname(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java index af474ef48bd5..1dc6bd20193f 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 @@ -61,7 +61,7 @@ default PetApiDelegate getDelegate() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { return getDelegate().addPet(body); } @@ -97,7 +97,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return getDelegate().deletePet(petId, apiKey); @@ -219,7 +219,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { return getDelegate().getPetById(petId); } @@ -296,7 +296,7 @@ default ResponseEntity> listAllPets( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { return getDelegate().updatePet(body); } @@ -332,7 +332,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -372,7 +372,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index 63e85e489f7e..c374a22d9e81 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -52,7 +52,7 @@ default StoreApiDelegate getDelegate() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return getDelegate().deleteOrder(orderId); } @@ -119,7 +119,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { return getDelegate().getOrderById(orderId); } @@ -150,7 +150,7 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { return getDelegate().placeOrder(body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index c425e56a5c36..21e1acd37aaf 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 @@ -50,7 +50,7 @@ default UserApiDelegate getDelegate() { value = UserApi.PATH_CREATE_USER ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { return getDelegate().createUser(body); } @@ -77,7 +77,7 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { return getDelegate().createUsersWithArrayInput(body); } @@ -104,7 +104,7 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { return getDelegate().createUsersWithListInput(body); } @@ -134,7 +134,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return getDelegate().deleteUser(username); } @@ -167,7 +167,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { return getDelegate().getUserByName(username); } @@ -257,8 +257,8 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body ) { return getDelegate().updateUser(username, body); } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java index fe490a861eec..8e2143389ad5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApi.java @@ -55,7 +55,7 @@ default VersioningApiDelegate getDelegate() { headers = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) default ResponseEntity versioningHeaders( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { return getDelegate().versioningHeaders(petId); } @@ -94,7 +94,7 @@ default ResponseEntity versioningHeaders( default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { return getDelegate().versioningMix(versionWithDefaultValueQuery, versionNoDefaultValueQuery, petId); } @@ -128,7 +128,7 @@ default ResponseEntity versioningMix( default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { return getDelegate().versioningQueryParams(versionWithDefaultValue, versionNoDefaultValue, petId); } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index b65d8cf564e8..edcfe82c908b 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 1a936830734a..c2aac684497c 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 @@ -65,7 +65,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -228,7 +228,7 @@ default ResponseEntity fakeOuterStringSerialize( consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -259,7 +259,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -291,7 +291,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -348,10 +348,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -475,7 +475,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -505,8 +505,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -582,7 +582,7 @@ default ResponseEntity testQueryParameterCollectionFormat( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 253a1c65f838..096ede4fc021 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -59,7 +59,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 52f97028dd25..1d1f1e6003e6 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 @@ -65,7 +65,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,7 +102,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -255,7 +255,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -362,7 +362,7 @@ default ResponseEntity> listAllPets( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -399,7 +399,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -440,7 +440,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index d5aefcb5b423..ec4f4a2a6afd 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -171,7 +171,7 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 269c1447cb3a..6cbfa272c0fc 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 @@ -54,7 +54,7 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -82,7 +82,7 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -110,7 +110,7 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -141,7 +141,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -175,7 +175,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -282,8 +282,8 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java index 85758f871802..c0e260919919 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/VersioningApi.java @@ -59,7 +59,7 @@ default Optional getRequest() { default ResponseEntity versioningHeaders( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -108,7 +108,7 @@ default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @RequestHeader(value = "VersionWithDefaultValueHeader", required = true, defaultValue = "V1") String versionWithDefaultValueHeader, @NotNull @ApiParam(value = "", required = true) @RequestHeader(value = "VersionNoDefaultValueHeader", required = true) String versionNoDefaultValueHeader, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -152,7 +152,7 @@ default ResponseEntity versioningMix( default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index b65d8cf564e8..edcfe82c908b 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 1a936830734a..c2aac684497c 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 @@ -65,7 +65,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -228,7 +228,7 @@ default ResponseEntity fakeOuterStringSerialize( consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass body + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClass body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -259,7 +259,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "", required = true) @Valid @RequestBody User body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -291,7 +291,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -348,10 +348,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -475,7 +475,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map param + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map param ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -505,8 +505,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -582,7 +582,7 @@ default ResponseEntity testQueryParameterCollectionFormat( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 253a1c65f838..096ede4fc021 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -59,7 +59,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody Client body + @ApiParam(value = "client model", required = true) @Valid @RequestBody Client body ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 52f97028dd25..1d1f1e6003e6 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 @@ -65,7 +65,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -102,7 +102,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -255,7 +255,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -362,7 +362,7 @@ default ResponseEntity> listAllPets( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -399,7 +399,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -440,7 +440,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index d5aefcb5b423..ec4f4a2a6afd 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -171,7 +171,7 @@ default ResponseEntity getOrderById( produces = { "application/xml", "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order body + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 269c1447cb3a..6cbfa272c0fc 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 @@ -54,7 +54,7 @@ default Optional getRequest() { value = UserApi.PATH_CREATE_USER ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -82,7 +82,7 @@ default ResponseEntity createUser( value = UserApi.PATH_CREATE_USERS_WITH_ARRAY_INPUT ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -110,7 +110,7 @@ default ResponseEntity createUsersWithArrayInput( value = UserApi.PATH_CREATE_USERS_WITH_LIST_INPUT ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -141,7 +141,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -175,7 +175,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -282,8 +282,8 @@ default ResponseEntity logoutUser( value = UserApi.PATH_UPDATE_USER ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User body + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java index 4cf30731aa6d..e50a9faeb09f 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/VersioningApi.java @@ -59,7 +59,7 @@ default Optional getRequest() { headers = { "VersionWithDefaultValue=V1", "VersionNoDefaultValue" } ) default ResponseEntity versioningHeaders( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -108,7 +108,7 @@ default ResponseEntity versioningHeaders( default ResponseEntity versioningMix( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValueQuery", required = true, defaultValue = "V1") String versionWithDefaultValueQuery, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValueQuery", required = true) String versionNoDefaultValueQuery, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -152,7 +152,7 @@ default ResponseEntity versioningMix( default ResponseEntity versioningQueryParams( @NotNull @ApiParam(value = "", required = true, defaultValue = "V1") @Valid @RequestParam(value = "VersionWithDefaultValue", required = true, defaultValue = "V1") String versionWithDefaultValue, @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "VersionNoDefaultValue", required = true) String versionNoDefaultValue, - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { 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/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index c08ad7d1391c..18f5d6d2277b 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 @@ -234,7 +234,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -697,7 +697,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata ) { 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 94a3ace8280f..4c9fb36d5c3a 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 @@ -103,7 +103,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) Optional apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -252,7 +252,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -346,7 +346,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) Optional name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) Optional status ) { @@ -388,7 +388,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) Optional additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 9dbc95138450..317a6c2dd8ed 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { 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 ebf90dfa36da..19182a0968d7 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 @@ -146,7 +146,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -181,7 +181,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -291,7 +291,7 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index b5ea42245747..121d615c2eb1 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -72,7 +72,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { 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/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index d3d8a8593954..e2d3d58858da 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 @@ -82,7 +82,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItem xmlItem + @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -253,7 +253,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -292,7 +292,7 @@ default ResponseEntity responseObjectDiff consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @Parameter(name = "FileSchemaTestClass", description = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass + @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -322,7 +322,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query, - @Parameter(name = "User", description = "", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -356,7 +356,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -414,10 +414,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @Parameter(name = "number", description = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @Parameter(name = "double", description = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @Parameter(name = "byte", description = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -545,7 +545,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) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -577,8 +577,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @Parameter(name = "param", description = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @Parameter(name = "param2", description = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -609,7 +609,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @Parameter(name = "ChildWithNullable", description = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullable childWithNullable + @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -723,7 +723,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index 761b1406789f..f8b370ec3110 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -75,7 +75,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @Parameter(name = "Client", description = "client model", required = true) @NotNull @Valid @RequestBody Client client + @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client ) { 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/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index 0b3e1fe2bd29..2c812735c4d3 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 @@ -77,7 +77,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -113,7 +113,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -264,7 +264,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId + @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -318,7 +318,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet + @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -354,7 +354,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -395,7 +395,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, + @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId, @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index 09b394613165..992a55469482 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -71,7 +71,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId + @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -144,7 +144,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -195,7 +195,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order + @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order ) { 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 aeaf72c2379e..55db92041d12 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 @@ -70,7 +70,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -101,7 +101,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @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) @NotNull @Valid @RequestBody List<@Valid User> user + @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -164,7 +164,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -202,7 +202,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username + @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -317,8 +317,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, - @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user + @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username, + @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index 4de5bcc13cbb..5742f5cb6374 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity call123testSpecialTags( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody ClientDto clientDto + @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 79318f7456f4..6b4cd2e1a754 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 @@ -67,7 +67,7 @@ default Optional getRequest() { consumes = { "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" } ) default ResponseEntity createXmlItem( - @ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid @RequestBody XmlItemDto xmlItemDto + @ApiParam(value = "XmlItem Body", required = true) @Valid @RequestBody XmlItemDto xmlItemDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -234,7 +234,7 @@ default ResponseEntity fakeOuterStringSerialize( produces = { "application/json" } ) default ResponseEntity responseObjectDifferentNames( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -273,7 +273,7 @@ default ResponseEntity responseObjectD consumes = { "application/json" } ) default ResponseEntity testBodyWithFileSchema( - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto + @ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -304,7 +304,7 @@ default ResponseEntity testBodyWithFileSchema( ) default ResponseEntity testBodyWithQueryParams( @NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query, - @ApiParam(value = "", required = true) @NotNull @Valid @RequestBody UserDto userDto + @ApiParam(value = "", required = true) @Valid @RequestBody UserDto userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -336,7 +336,7 @@ default ResponseEntity testBodyWithQueryParams( consumes = { "application/json" } ) default ResponseEntity testClientModel( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody ClientDto clientDto + @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -393,10 +393,10 @@ default ResponseEntity testClientModel( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testEndpointParameters( - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, - @ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, - @ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, - @ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte, + @ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number, + @ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double, + @ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter, + @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte, @ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer, @ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32, @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64, @@ -521,7 +521,7 @@ default ResponseEntity testGroupParameters( consumes = { "application/json" } ) default ResponseEntity testInlineAdditionalProperties( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map requestBody + @ApiParam(value = "request body", required = true) @Valid @RequestBody Map requestBody ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -552,8 +552,8 @@ default ResponseEntity testInlineAdditionalProperties( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity testJsonFormData( - @ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param, - @ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2 + @ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param, + @ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2 ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -583,7 +583,7 @@ default ResponseEntity testJsonFormData( consumes = { "application/json" } ) default ResponseEntity testNullable( - @ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullableDto childWithNullableDto + @ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullableDto childWithNullableDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -697,7 +697,7 @@ default ResponseEntity testWithResultExample( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFileWithRequiredFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata ) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 64fe63926e4f..ff6e96fef9e6 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -59,7 +59,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity testClassname( - @ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody ClientDto clientDto + @ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { 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 c08e889983c7..d67a255070ac 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 @@ -65,7 +65,7 @@ default Optional getRequest() { consumes = { "application/json", "application/xml" } ) default ResponseEntity addPet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody PetDto petDto + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -103,7 +103,7 @@ default ResponseEntity addPet( value = PetApi.PATH_DELETE_PET ) default ResponseEntity deletePet( - @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -252,7 +252,7 @@ default ResponseEntity> findPetsByTags( produces = { "application/xml", "application/json" } ) default ResponseEntity getPetById( - @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId + @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -308,7 +308,7 @@ default ResponseEntity getPetById( consumes = { "application/json", "application/xml" } ) default ResponseEntity updatePet( - @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody PetDto petDto + @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -346,7 +346,7 @@ default ResponseEntity updatePet( consumes = { "application/x-www-form-urlencoded" } ) default ResponseEntity updatePetWithForm( - @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name, @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status ) { @@ -388,7 +388,7 @@ default ResponseEntity updatePetWithForm( consumes = { "multipart/form-data" } ) default ResponseEntity uploadFile( - @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, + @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId, @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata, @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file ) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index c748862c9d3e..c593ab30a8ee 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ default Optional getRequest() { value = StoreApi.PATH_DELETE_ORDER ) default ResponseEntity deleteOrder( - @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId + @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ default ResponseEntity> getInventory( produces = { "application/xml", "application/json" } ) default ResponseEntity getOrderById( - @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId + @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -173,7 +173,7 @@ default ResponseEntity getOrderById( consumes = { "application/json" } ) default ResponseEntity placeOrder( - @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody OrderDto orderDto + @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody OrderDto orderDto ) { 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 51a8e3711719..16adec1deb67 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 @@ -55,7 +55,7 @@ default Optional getRequest() { consumes = { "application/json" } ) default ResponseEntity createUser( - @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody UserDto userDto + @ApiParam(value = "Created user object", required = true) @Valid @RequestBody UserDto userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -85,7 +85,7 @@ default ResponseEntity createUser( consumes = { "application/json" } ) default ResponseEntity createUsersWithArrayInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid UserDto> userDto + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -115,7 +115,7 @@ default ResponseEntity createUsersWithArrayInput( consumes = { "application/json" } ) default ResponseEntity createUsersWithListInput( - @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid UserDto> userDto + @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -146,7 +146,7 @@ default ResponseEntity createUsersWithListInput( value = UserApi.PATH_DELETE_USER ) default ResponseEntity deleteUser( - @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -181,7 +181,7 @@ default ResponseEntity deleteUser( produces = { "application/xml", "application/json" } ) default ResponseEntity getUserByName( - @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username + @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { @@ -291,8 +291,8 @@ default ResponseEntity logoutUser( consumes = { "application/json" } ) default ResponseEntity updateUser( - @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, - @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody UserDto userDto + @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username, + @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody UserDto userDto ) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);