[BUG] [Java] [Spring] Fix #16561 by marking a requestBody as @NotNull if it is required

modules/openapi-generator/src/main/resources/JavaSpring/beanValidationBodyParams.mustache

@@ -1 +1 @@
-{{^useOptional}}{{>beanValidationCore}}{{/useOptional}}{{#useOptional}}{{#required}}{{>beanValidationCore}}{{/required}}{{/useOptional}}
+{{^useOptional}}{{#required}}@NotNull {{/required}}{{>beanValidationCore}}{{/useOptional}}{{#useOptional}}{{#required}}{{>beanValidationCore}}{{/required}}{{/useOptional}}

modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache

@@ -1 +1 @@
-{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{>nullableAnnotation}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}}
+{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} {{>beanValidationBodyParams}}@Valid{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{>nullableAnnotation}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaValidationArrayPrimitivesTest.java

@@ -453,19 +453,19 @@ public void typeMappingsForCollections(Map<String, String> typeMappings, String
         JavaFileAssert.assertThat(files.get("ListOfPatternsApi.java"))
                 .fileContains("ResponseEntity<" + arrayMapping + "<String>>",
                         arrayMapping + "<@Pattern(regexp = \"([a-z]+)\")String> requestBody")
-                .fileContainsPattern("@Valid\\s*@Size\\(min = 5\\)\\s*@RequestBody");
+                .fileContainsPattern("@Size\\(min = 5\\)\\s*@Valid\\s*@RequestBody");
 
         JavaFileAssert.assertThat(files.get("ListOfStringsApi.java"))
                 .fileContains(
                         "ResponseEntity<" + arrayMapping + "<String>>",
                         arrayMapping + "<@Size(min = 2, max = 2)String> requestBody")
-                .fileContainsPattern("@Valid\\s*@Size\\(min = 5\\)\\s*@RequestBody");
+                .fileContainsPattern("@Size\\(min = 5\\)\\s*@Valid\\s*@RequestBody");
 
         JavaFileAssert.assertThat(files.get("ListOfObjectsApi.java"))
                 .fileContains(
                         "ResponseEntity<" + arrayMapping + "<ListOfObjectsInner>>",
                         arrayMapping + "<@Valid ListOfObjectsInner> listOfObjectsInner")
-                .fileContainsPattern("@Valid\\s*@Size\\(min = 5\\)\\s*@RequestBody");
+                .fileContainsPattern("@Size\\(min = 5\\)\\s*@Valid\\s*@RequestBody");
 
         String myItem = typeMappings.getOrDefault("MyItem", "MyItem");
         JavaFileAssert.assertThat(files.get("ListOfQualifiedItemApi.java"))

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<Void> addPet(
-        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 
@@ -238,7 +238,7 @@ ResponseEntity<Pet> getPetById(
         consumes = "application/json"
     )
     ResponseEntity<Void> updatePet(
-        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java

@@ -158,7 +158,7 @@ ResponseEntity<Order> getOrderById(
         consumes = "application/json"
     )
     ResponseEntity<Order> placeOrder(
-        @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
+        @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order
     );
 
 }

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<Void> createUser(
-        @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
+        @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user
     );
 
 
@@ -92,7 +92,7 @@ ResponseEntity<Void> createUser(
         consumes = "application/json"
     )
     ResponseEntity<Void> createUsersWithArrayInput(
-        @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user
     );
 
 
@@ -122,7 +122,7 @@ ResponseEntity<Void> createUsersWithArrayInput(
         consumes = "application/json"
     )
     ResponseEntity<Void> createUsersWithListInput(
-        @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user
     );
 
 
@@ -283,7 +283,7 @@ ResponseEntity<Void> logoutUser(
     )
     ResponseEntity<Void> updateUser(
         @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-        @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
+        @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user
     );
 
 }

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<Pet> addPet(
-        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 
@@ -245,7 +245,7 @@ ResponseEntity<Pet> getPetById(
         consumes = "application/json"
     )
     ResponseEntity<Pet> updatePet(
-        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java

@@ -143,7 +143,7 @@ ResponseEntity<Order> getOrderById(
         consumes = "application/json"
     )
     ResponseEntity<Order> placeOrder(
-        @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
+        @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order
     );
 
 }

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<Void> createUser(
-        @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user
+        @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user
     );
 
 
@@ -81,7 +81,7 @@ ResponseEntity<Void> createUser(
         consumes = "application/json"
     )
     ResponseEntity<Void> createUsersWithArrayInput(
-        @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user
     );
 
 
@@ -111,7 +111,7 @@ ResponseEntity<Void> createUsersWithArrayInput(
         consumes = "application/json"
     )
     ResponseEntity<Void> createUsersWithListInput(
-        @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user
     );
 
 
@@ -268,7 +268,7 @@ ResponseEntity<Void> logoutUser(
     )
     ResponseEntity<Void> updateUser(
         @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,
-        @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user
+        @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user
     );
 
 }

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<Void> addPet(
-        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body
+        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body
     );
 
 
@@ -238,7 +238,7 @@ ResponseEntity<Pet> getPetById(
         consumes = "application/json"
     )
     ResponseEntity<Void> updatePet(
-        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body
+        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet body
     );
 
 

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java

@@ -141,7 +141,7 @@ ResponseEntity<Order> getOrderById(
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<Order> placeOrder(
-        @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body
+        @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order body
     );
 
 }

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<Void> createUser(
-        @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body
+        @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User body
     );
 
 
@@ -72,7 +72,7 @@ ResponseEntity<Void> createUser(
         value = UserController.PATH_CREATE_USERS_WITH_ARRAY_INPUT
     )
     ResponseEntity<Void> createUsersWithArrayInput(
-        @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body
+        @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body
     );
 
 
@@ -97,7 +97,7 @@ ResponseEntity<Void> createUsersWithArrayInput(
         value = UserController.PATH_CREATE_USERS_WITH_LIST_INPUT
     )
     ResponseEntity<Void> createUsersWithListInput(
-        @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body
+        @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> body
     );
 
 
@@ -265,7 +265,7 @@ ResponseEntity<Void> logoutUserOptions(
     )
     ResponseEntity<Void> updateUser(
         @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,
-        @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body
+        @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User body
     );
 
 }

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java

@@ -59,7 +59,7 @@ public interface PetApi {
         consumes = "application/json"
     )
     ResponseEntity<Pet> addPet(
-        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 
@@ -245,7 +245,7 @@ ResponseEntity<Pet> getPetById(
         consumes = "application/json"
     )
     ResponseEntity<Pet> updatePet(
-        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java

@@ -143,7 +143,7 @@ ResponseEntity<Order> getOrderById(
         consumes = "application/json"
     )
     ResponseEntity<Order> placeOrder(
-        @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
+        @ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order
     );
 
 }

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java

@@ -51,7 +51,7 @@ public interface UserApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> createUser(
-        @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user
+        @ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody User user
     );
 
 
@@ -81,7 +81,7 @@ ResponseEntity<Void> createUser(
         consumes = "application/json"
     )
     ResponseEntity<Void> createUsersWithArrayInput(
-        @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user
     );
 
 
@@ -111,7 +111,7 @@ ResponseEntity<Void> createUsersWithArrayInput(
         consumes = "application/json"
     )
     ResponseEntity<Void> createUsersWithListInput(
-        @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user
     );
 
 
@@ -268,7 +268,7 @@ ResponseEntity<Void> logoutUser(
     )
     ResponseEntity<Void> updateUser(
         @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,
-        @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user
+        @ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody User user
     );
 
 }

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<Pet> addPet(
-        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 
@@ -253,7 +253,7 @@ ResponseEntity<Pet> getPetById(
         consumes = "application/json"
     )
     ResponseEntity<Pet> updatePet(
-        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 

samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java

@@ -158,7 +158,7 @@ ResponseEntity<Order> getOrderById(
         consumes = "application/json"
     )
     ResponseEntity<Order> placeOrder(
-        @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
+        @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order
     );
 
 }

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<Void> createUser(
-        @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
+        @Parameter(name = "User", description = "Created user object", required = true) @NotNull @Valid @RequestBody User user
     );
 
 
@@ -92,7 +92,7 @@ ResponseEntity<Void> createUser(
         consumes = "application/json"
     )
     ResponseEntity<Void> createUsersWithArrayInput(
-        @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user
     );
 
 
@@ -122,7 +122,7 @@ ResponseEntity<Void> createUsersWithArrayInput(
         consumes = "application/json"
     )
     ResponseEntity<Void> createUsersWithListInput(
-        @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @Parameter(name = "User", description = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid User> user
     );
 
 
@@ -283,7 +283,7 @@ ResponseEntity<Void> logoutUser(
     )
     ResponseEntity<Void> updateUser(
         @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-        @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
+        @Parameter(name = "User", description = "Updated user object", required = true) @NotNull @Valid @RequestBody User user
     );
 
 }

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<ResponseEntity<Pet>> addPet(
-        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 
@@ -254,7 +254,7 @@ CompletableFuture<ResponseEntity<Pet>> getPetById(
         consumes = "application/json"
     )
     CompletableFuture<ResponseEntity<Pet>> updatePet(
-        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody Pet pet
     );
 
 

samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java

@@ -159,7 +159,7 @@ CompletableFuture<ResponseEntity<Order>> getOrderById(
         consumes = "application/json"
     )
     CompletableFuture<ResponseEntity<Order>> placeOrder(
-        @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
+        @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody Order order
     );
 
 }