Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add optional parameter for request body #16972

Merged
merged 2 commits into from
Nov 4, 2023
Merged

Add optional parameter for request body #16972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9413493
Add optional parameter for request body
MelleD Nov 3, 2023
0706222
Adapt Test
MelleD Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaSpring/beanValidationBodyParams.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{! RequestBody required param is responsible for optional and nullability }}{{>beanValidationCore}}
{{^useOptional}}{{>beanValidationCore}}{{/useOptional}}{{#useOptional}}{{#required}}{{>beanValidationCore}}{{/required}}{{/useOptional}}
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}
8 changes: 4 additions & 4 deletions ...es/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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"))) {
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
Loading