Add optional parameter for request body (#16972)

* Add optional parameter for request body * Adapt Test
OpenAPITools · Nov 4, 2023 · f83cb60 · f83cb60
1 parent 61629ae
commit f83cb60
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationBodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationBodyParams.mustache
@@ -1 +1 @@
-{{! RequestBody required param is responsible for optional and nullability }}{{>beanValidationCore}}
+{{^useOptional}}{{>beanValidationCore}}{{/useOptional}}{{#useOptional}}{{#required}}{{>beanValidationCore}}{{/required}}{{/useOptional}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache
@@ -1 +1 @@
-{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}}
+{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isBodyParam}}
diff --git a/...es/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/...es/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -98,7 +98,7 @@ default ResponseEntity<Void> createXmlItem(
     )
 
     default ResponseEntity<Boolean> fakeOuterBooleanSerialize(
-        @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Boolean body
+        @ApiParam(value = "Input boolean as post body") @Valid @RequestBody(required = false) Optional<Boolean> body
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -130,7 +130,7 @@ default ResponseEntity<Boolean> fakeOuterBooleanSerialize(
     )
 
     default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(
-        @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) OuterComposite outerComposite
+        @ApiParam(value = "Input composite as post body") @Valid @RequestBody(required = false) Optional<OuterComposite> outerComposite
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -171,7 +171,7 @@ default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(
     )
 
     default ResponseEntity<BigDecimal> fakeOuterNumberSerialize(
-        @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) BigDecimal body
+        @ApiParam(value = "Input number as post body") @Valid @RequestBody(required = false) Optional<BigDecimal> body
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -203,7 +203,7 @@ default ResponseEntity<BigDecimal> fakeOuterNumberSerialize(
     )
 
     default ResponseEntity<String> fakeOuterStringSerialize(
-        @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) String body
+        @ApiParam(value = "Input string as post body") @Valid @RequestBody(required = false) Optional<String> body
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);