From 53bed74153cbddcf8908f37b117154026f6ebde3 Mon Sep 17 00:00:00 2001
From: cbornet <cbornet@hotmail.com>
Date: Tue, 28 Aug 2018 00:00:26 +0200
Subject: [PATCH] Use better return types for the reactive option
---
.../codegen/languages/SpringCodegen.java | 3 +
.../resources/JavaSpring/methodBody.mustache | 8 +-
.../resources/JavaSpring/returnTypes.mustache | 2 +-
.../org/openapitools/api/AnotherFakeApi.java | 10 +--
.../java/org/openapitools/api/FakeApi.java | 90 ++++++++++---------
.../api/FakeClassnameTestApi.java | 10 +--
.../java/org/openapitools/api/PetApi.java | 69 +++++++-------
.../java/org/openapitools/api/StoreApi.java | 38 ++++----
.../java/org/openapitools/api/UserApi.java | 50 ++++++-----
9 files changed, 148 insertions(+), 132 deletions(-)
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 5e6f269880e..dda528c8d1d 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
@@ -354,6 +354,9 @@ public class SpringCodegen extends AbstractJavaCodegen
if (this.async) {
additionalProperties.put(RESPONSE_WRAPPER, "CompletableFuture");
}
+ if (this.reactive) {
+ additionalProperties.put(RESPONSE_WRAPPER, "Mono");
+ }
} else if (this.async) {
additionalProperties.put(RESPONSE_WRAPPER, "Callable");
}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache
index 0c2de9868ef..8597a7419ca 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache
@@ -29,19 +29,19 @@ return {{#jdk8}}{{#async}}CompletableFuture.completedFuture({{/async}}{{/jdk8}}n
{{/examples}}
{{/reactive}}
{{#reactive}}
-{{>returnTypes}} result = {{#isListContainer}}Flux{{/isListContainer}}{{^isListContainer}}Mono{{/isListContainer}}.empty();
+exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
{{#examples}}
{{#-first}}
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
{{/-first}}
if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) {
- result = ApiUtil.getExampleResponse(exchange, "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{example}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}")
- .then{{#isListContainer}}Many{{/isListContainer}}(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{example}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}");
break;
}
{{#-last}}
}
{{/-last}}
{{/examples}}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body({{^isListContainer}}{{#allParams}}{{#isBodyParam}}{{paramName}}.then({{/isBodyParam}}{{/allParams}}{{/isListContainer}}{{#isListContainer}}{{#allParams}}{{#isBodyParam}}{{paramName}}.thenMany({{/isBodyParam}}{{/allParams}}{{/isListContainer}}result{{#allParams}}{{#isBodyParam}}){{/isBodyParam}}{{/allParams}});
+ return result.then(Mono.empty());
{{/reactive}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache
index 67d79cc198c..bd6283296da 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache
@@ -1 +1 @@
-{{#isMapContainer}}{{#reactive}}Mono<{{/reactive}}Map<String, {{{returnType}}}{{#reactive}}>{{/reactive}}>{{/isMapContainer}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}List{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{#reactive}}Mono<{{{returnType}}}>{{/reactive}}{{^reactive}}{{{returnType}}}{{/reactive}}{{/returnContainer}}
\ No newline at end of file
+{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}List{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
\ No newline at end of file
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 68ddcc57de8..267150c2f1e 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
@@ -40,16 +40,16 @@ public interface AnotherFakeApi {
produces = { "application/json" },
consumes = { "application/json" },
method = RequestMethod.PATCH)
- default ResponseEntity<Mono<Client>> call123testSpecialTags(@ApiParam(value = "client model" ,required=true ) @Valid @RequestBody Mono<Client> client, ServerWebExchange exchange) {
- Mono<Client> result = Mono.empty();
+ default Mono<ResponseEntity<Client>> call123testSpecialTags(@ApiParam(value = "client model" ,required=true ) @Valid @RequestBody Mono<Client> client, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"client\" : \"client\"}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"client\" : \"client\"}");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(client.then(result));
+ return result.then(Mono.empty());
}
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 115fe4da570..72eb6045bcd 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
@@ -48,16 +48,16 @@ public interface FakeApi {
@RequestMapping(value = "/fake/outer/boolean",
produces = { "*/*" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<Boolean>> fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) @Valid @RequestBody Mono<Boolean> body, ServerWebExchange exchange) {
- Mono<Boolean> result = Mono.empty();
+ default Mono<ResponseEntity<Boolean>> fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) @Valid @RequestBody Mono<Boolean> body, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
- result = ApiUtil.getExampleResponse(exchange, "null")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "null");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(body.then(result));
+ return result.then(Mono.empty());
}
@@ -68,16 +68,16 @@ public interface FakeApi {
@RequestMapping(value = "/fake/outer/composite",
produces = { "*/*" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<OuterComposite>> fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body" ) @Valid @RequestBody Mono<OuterComposite> outerComposite, ServerWebExchange exchange) {
- Mono<OuterComposite> result = Mono.empty();
+ default Mono<ResponseEntity<OuterComposite>> fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body" ) @Valid @RequestBody Mono<OuterComposite> outerComposite, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"my_string\" : \"my_string\", \"my_number\" : 0.80082819046101150206595775671303272247314453125, \"my_boolean\" : true}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"my_string\" : \"my_string\", \"my_number\" : 0.80082819046101150206595775671303272247314453125, \"my_boolean\" : true}");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(outerComposite.then(result));
+ return result.then(Mono.empty());
}
@@ -88,16 +88,16 @@ public interface FakeApi {
@RequestMapping(value = "/fake/outer/number",
produces = { "*/*" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<BigDecimal>> fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) @Valid @RequestBody Mono<BigDecimal> body, ServerWebExchange exchange) {
- Mono<BigDecimal> result = Mono.empty();
+ default Mono<ResponseEntity<BigDecimal>> fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) @Valid @RequestBody Mono<BigDecimal> body, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
- result = ApiUtil.getExampleResponse(exchange, "null")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "null");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(body.then(result));
+ return result.then(Mono.empty());
}
@@ -108,16 +108,16 @@ public interface FakeApi {
@RequestMapping(value = "/fake/outer/string",
produces = { "*/*" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<String>> fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) @Valid @RequestBody Mono<String> body, ServerWebExchange exchange) {
- Mono<String> result = Mono.empty();
+ default Mono<ResponseEntity<String>> fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) @Valid @RequestBody Mono<String> body, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
- result = ApiUtil.getExampleResponse(exchange, "null")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "null");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(body.then(result));
+ return result.then(Mono.empty());
}
@@ -128,9 +128,10 @@ public interface FakeApi {
@RequestMapping(value = "/fake/body-with-file-schema",
consumes = { "application/json" },
method = RequestMethod.PUT)
- default ResponseEntity<Mono<Void>> testBodyWithFileSchema(@ApiParam(value = "" ,required=true ) @Valid @RequestBody Mono<FileSchemaTestClass> fileSchemaTestClass, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> testBodyWithFileSchema(@ApiParam(value = "" ,required=true ) @Valid @RequestBody Mono<FileSchemaTestClass> fileSchemaTestClass, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(fileSchemaTestClass.then(result));
+ return result.then(Mono.empty());
}
@@ -141,9 +142,10 @@ public interface FakeApi {
@RequestMapping(value = "/fake/body-with-query-params",
consumes = { "application/json" },
method = RequestMethod.PUT)
- default ResponseEntity<Mono<Void>> testBodyWithQueryParams(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query,@ApiParam(value = "" ,required=true ) @Valid @RequestBody Mono<User> user, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> testBodyWithQueryParams(@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query,@ApiParam(value = "" ,required=true ) @Valid @RequestBody Mono<User> user, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(user.then(result));
+ return result.then(Mono.empty());
}
@@ -155,16 +157,16 @@ public interface FakeApi {
produces = { "application/json" },
consumes = { "application/json" },
method = RequestMethod.PATCH)
- default ResponseEntity<Mono<Client>> testClientModel(@ApiParam(value = "client model" ,required=true ) @Valid @RequestBody Mono<Client> client, ServerWebExchange exchange) {
- Mono<Client> result = Mono.empty();
+ default Mono<ResponseEntity<Client>> testClientModel(@ApiParam(value = "client model" ,required=true ) @Valid @RequestBody Mono<Client> client, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"client\" : \"client\"}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"client\" : \"client\"}");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(client.then(result));
+ return result.then(Mono.empty());
}
@@ -178,9 +180,10 @@ public interface FakeApi {
@RequestMapping(value = "/fake",
consumes = { "application/x-www-form-urlencoded" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<Void>> testEndpointParameters(@ApiParam(value = "None", required=true, defaultValue="null") @RequestParam(value="number", required=true) BigDecimal number,@ApiParam(value = "None", required=true, defaultValue="null") @RequestParam(value="double", required=true) Double _double,@ApiParam(value = "None", required=true, defaultValue="null") @RequestParam(value="pattern_without_delimiter", required=true) String patternWithoutDelimiter,@ApiParam(value = "None", required=true, defaultValue="null") @RequestParam(value="byte", required=true) byte[] _byte,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="integer", required=false) Integer integer,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="int32", required=false) Integer int32,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="int64", required=false) Long int64,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="float", required=false) Float _float,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="string", required=false) String string,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile binary,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="date", required=false) LocalDate date,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="dateTime", required=false) OffsetDateTime dateTime,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="password", required=false) String password,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="callback", required=false) String paramCallback, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> testEndpointParameters(@ApiParam(value = "None", required=true, defaultValue="null") @RequestParam(value="number", required=true) BigDecimal number,@ApiParam(value = "None", required=true, defaultValue="null") @RequestParam(value="double", required=true) Double _double,@ApiParam(value = "None", required=true, defaultValue="null") @RequestParam(value="pattern_without_delimiter", required=true) String patternWithoutDelimiter,@ApiParam(value = "None", required=true, defaultValue="null") @RequestParam(value="byte", required=true) byte[] _byte,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="integer", required=false) Integer integer,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="int32", required=false) Integer int32,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="int64", required=false) Long int64,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="float", required=false) Float _float,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="string", required=false) String string,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile binary,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="date", required=false) LocalDate date,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="dateTime", required=false) OffsetDateTime dateTime,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="password", required=false) String password,@ApiParam(value = "None", defaultValue="null") @RequestParam(value="callback", required=false) String paramCallback, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -192,9 +195,10 @@ public interface FakeApi {
@RequestMapping(value = "/fake",
consumes = { "application/x-www-form-urlencoded" },
method = RequestMethod.GET)
- default ResponseEntity<Mono<Void>> testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) Double enumQueryDouble,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @RequestParam(value="enum_form_string_array", required=false) List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestParam(value="enum_form_string", required=false) String enumFormString, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $") @RequestHeader(value="enum_header_string_array", required=false) List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)", allowableValues = ">, $") @Valid @RequestParam(value = "enum_query_string_array", required = false) List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues = "_abc, -efg, (xyz)", defaultValue = "-efg") @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue="-efg") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1, -2") @Valid @RequestParam(value = "enum_query_integer", required = false) Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues = "1.1, -1.2") @Valid @RequestParam(value = "enum_query_double", required = false) Double enumQueryDouble,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @RequestParam(value="enum_form_string_array", required=false) List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @RequestParam(value="enum_form_string", required=false) String enumFormString, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -205,9 +209,10 @@ public interface FakeApi {
@RequestMapping(value = "/fake/inline-additionalProperties",
consumes = { "application/json" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<Void>> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true ) @Valid @RequestBody Mono<String> requestBody, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true ) @Valid @RequestBody Mono<String> requestBody, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(requestBody.then(result));
+ return result.then(Mono.empty());
}
@@ -218,9 +223,10 @@ public interface FakeApi {
@RequestMapping(value = "/fake/jsonFormData",
consumes = { "application/x-www-form-urlencoded" },
method = RequestMethod.GET)
- default ResponseEntity<Mono<Void>> testJsonFormData(@ApiParam(value = "field1", required=true, defaultValue="null") @RequestParam(value="param", required=true) String param,@ApiParam(value = "field2", required=true, defaultValue="null") @RequestParam(value="param2", required=true) String param2, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> testJsonFormData(@ApiParam(value = "field1", required=true, defaultValue="null") @RequestParam(value="param", required=true) String param,@ApiParam(value = "field2", required=true, defaultValue="null") @RequestParam(value="param2", required=true) String param2, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -237,16 +243,16 @@ public interface FakeApi {
produces = { "application/json" },
consumes = { "multipart/form-data" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<ModelApiResponse>> uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile requiredFile,@ApiParam(value = "Additional data to pass to server", defaultValue="null") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata, ServerWebExchange exchange) {
- Mono<ModelApiResponse> result = Mono.empty();
+ default Mono<ResponseEntity<ModelApiResponse>> uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile requiredFile,@ApiParam(value = "Additional data to pass to server", defaultValue="null") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
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 1d5c47f13e2..fb0be2d6092 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
@@ -42,16 +42,16 @@ public interface FakeClassnameTestApi {
produces = { "application/json" },
consumes = { "application/json" },
method = RequestMethod.PATCH)
- default ResponseEntity<Mono<Client>> testClassname(@ApiParam(value = "client model" ,required=true ) @Valid @RequestBody Mono<Client> client, ServerWebExchange exchange) {
- Mono<Client> result = Mono.empty();
+ default Mono<ResponseEntity<Client>> testClassname(@ApiParam(value = "client model" ,required=true ) @Valid @RequestBody Mono<Client> client, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"client\" : \"client\"}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"client\" : \"client\"}");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(client.then(result));
+ return result.then(Mono.empty());
}
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 697853f4f0b..4cccd6631a0 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
@@ -46,9 +46,10 @@ public interface PetApi {
@RequestMapping(value = "/pet",
consumes = { "application/json", "application/xml" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<Void>> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody Mono<Pet> pet, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody Mono<Pet> pet, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(pet.then(result));
+ return result.then(Mono.empty());
}
@@ -63,9 +64,10 @@ public interface PetApi {
@ApiResponse(code = 400, message = "Invalid pet value") })
@RequestMapping(value = "/pet/{petId}",
method = RequestMethod.DELETE)
- default ResponseEntity<Mono<Void>> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "" ) @RequestHeader(value="api_key", required=false) String apiKey, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -82,21 +84,20 @@ public interface PetApi {
@RequestMapping(value = "/pet/findByStatus",
produces = { "application/xml", "application/json" },
method = RequestMethod.GET)
- default ResponseEntity<Flux<Pet>> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List<String> status, ServerWebExchange exchange) {
- Flux<Pet> result = Flux.empty();
+ default Mono<ResponseEntity<Flux<Pet>>> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List<String> status, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}")
- .thenMany(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}");
break;
}
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
- result = ApiUtil.getExampleResponse(exchange, "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status></Pet>")
- .thenMany(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status></Pet>");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -113,21 +114,20 @@ public interface PetApi {
@RequestMapping(value = "/pet/findByTags",
produces = { "application/xml", "application/json" },
method = RequestMethod.GET)
- default ResponseEntity<Flux<Pet>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags, ServerWebExchange exchange) {
- Flux<Pet> result = Flux.empty();
+ default Mono<ResponseEntity<Flux<Pet>>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}")
- .thenMany(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}");
break;
}
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
- result = ApiUtil.getExampleResponse(exchange, "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status></Pet>")
- .thenMany(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status></Pet>");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -142,21 +142,20 @@ public interface PetApi {
@RequestMapping(value = "/pet/{petId}",
produces = { "application/xml", "application/json" },
method = RequestMethod.GET)
- default ResponseEntity<Mono<Pet>> getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathVariable("petId") Long petId, ServerWebExchange exchange) {
- Mono<Pet> result = Mono.empty();
+ default Mono<ResponseEntity<Pet>> getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathVariable("petId") Long petId, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}");
break;
}
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
- result = ApiUtil.getExampleResponse(exchange, "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status></Pet>")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status></Pet>");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -174,9 +173,10 @@ public interface PetApi {
@RequestMapping(value = "/pet",
consumes = { "application/json", "application/xml" },
method = RequestMethod.PUT)
- default ResponseEntity<Mono<Void>> updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody Mono<Pet> pet, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true ) @Valid @RequestBody Mono<Pet> pet, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(pet.then(result));
+ return result.then(Mono.empty());
}
@@ -192,9 +192,10 @@ public interface PetApi {
@RequestMapping(value = "/pet/{petId}",
consumes = { "application/x-www-form-urlencoded" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<Void>> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "Updated name of the pet", defaultValue="null") @RequestParam(value="name", required=false) String name,@ApiParam(value = "Updated status of the pet", defaultValue="null") @RequestParam(value="status", required=false) String status, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "Updated name of the pet", defaultValue="null") @RequestParam(value="name", required=false) String name,@ApiParam(value = "Updated status of the pet", defaultValue="null") @RequestParam(value="status", required=false) String status, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -211,16 +212,16 @@ public interface PetApi {
produces = { "application/json" },
consumes = { "multipart/form-data" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<ModelApiResponse>> uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server", defaultValue="null") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile file, ServerWebExchange exchange) {
- Mono<ModelApiResponse> result = Mono.empty();
+ default Mono<ResponseEntity<ModelApiResponse>> uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server", defaultValue="null") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile file, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
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 89e2625b25b..f1f2e13048e 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
@@ -40,9 +40,10 @@ public interface StoreApi {
@ApiResponse(code = 404, message = "Order not found") })
@RequestMapping(value = "/store/order/{order_id}",
method = RequestMethod.DELETE)
- default ResponseEntity<Mono<Void>> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathVariable("order_id") String orderId, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -55,9 +56,10 @@ public interface StoreApi {
@RequestMapping(value = "/store/inventory",
produces = { "application/json" },
method = RequestMethod.GET)
- default ResponseEntity<Mono<Map<String, Integer>>> getInventory(ServerWebExchange exchange) {
- Mono<Map<String, Integer>> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ default Mono<ResponseEntity<Map<String, Integer>>> getInventory(ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
+ return result.then(Mono.empty());
}
@@ -70,21 +72,20 @@ public interface StoreApi {
@RequestMapping(value = "/store/order/{order_id}",
produces = { "application/xml", "application/json" },
method = RequestMethod.GET)
- default ResponseEntity<Mono<Order>> getOrderById(@Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathVariable("order_id") Long orderId, ServerWebExchange exchange) {
- Mono<Order> result = Mono.empty();
+ default Mono<ResponseEntity<Order>> getOrderById(@Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathVariable("order_id") Long orderId, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}");
break;
}
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
- result = ApiUtil.getExampleResponse(exchange, "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete></Order>")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete></Order>");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -96,21 +97,20 @@ public interface StoreApi {
@RequestMapping(value = "/store/order",
produces = { "application/xml", "application/json" },
method = RequestMethod.POST)
- default ResponseEntity<Mono<Order>> placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @Valid @RequestBody Mono<Order> order, ServerWebExchange exchange) {
- Mono<Order> result = Mono.empty();
+ default Mono<ResponseEntity<Order>> placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true ) @Valid @RequestBody Mono<Order> order, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}");
break;
}
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
- result = ApiUtil.getExampleResponse(exchange, "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete></Order>")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete></Order>");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(order.then(result));
+ return result.then(Mono.empty());
}
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 0979c6a167b..4376dfb97b9 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
@@ -39,9 +39,10 @@ public interface UserApi {
@ApiResponse(code = 200, message = "successful operation") })
@RequestMapping(value = "/user",
method = RequestMethod.POST)
- default ResponseEntity<Mono<Void>> createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody Mono<User> user, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> createUser(@ApiParam(value = "Created user object" ,required=true ) @Valid @RequestBody Mono<User> user, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(user.then(result));
+ return result.then(Mono.empty());
}
@@ -51,9 +52,10 @@ public interface UserApi {
@ApiResponse(code = 200, message = "successful operation") })
@RequestMapping(value = "/user/createWithArray",
method = RequestMethod.POST)
- default ResponseEntity<Mono<Void>> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody Flux<List> user, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody Flux<List> user, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(user.then(result));
+ return result.then(Mono.empty());
}
@@ -63,9 +65,10 @@ public interface UserApi {
@ApiResponse(code = 200, message = "successful operation") })
@RequestMapping(value = "/user/createWithList",
method = RequestMethod.POST)
- default ResponseEntity<Mono<Void>> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody Flux<List> user, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true ) @Valid @RequestBody Flux<List> user, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(user.then(result));
+ return result.then(Mono.empty());
}
@@ -76,9 +79,10 @@ public interface UserApi {
@ApiResponse(code = 404, message = "User not found") })
@RequestMapping(value = "/user/{username}",
method = RequestMethod.DELETE)
- default ResponseEntity<Mono<Void>> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathVariable("username") String username, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -91,21 +95,20 @@ public interface UserApi {
@RequestMapping(value = "/user/{username}",
produces = { "application/xml", "application/json" },
method = RequestMethod.GET)
- default ResponseEntity<Mono<User>> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathVariable("username") String username, ServerWebExchange exchange) {
- Mono<User> result = Mono.empty();
+ default Mono<ResponseEntity<User>> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathVariable("username") String username, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
- result = ApiUtil.getExampleResponse(exchange, "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}");
break;
}
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
- result = ApiUtil.getExampleResponse(exchange, "<User> <id>123456789</id> <username>aeiou</username> <firstName>aeiou</firstName> <lastName>aeiou</lastName> <email>aeiou</email> <password>aeiou</password> <phone>aeiou</phone> <userStatus>123</userStatus></User>")
- .then(Mono.empty());
+ result = ApiUtil.getExampleResponse(exchange, "<User> <id>123456789</id> <username>aeiou</username> <firstName>aeiou</firstName> <lastName>aeiou</lastName> <email>aeiou</email> <password>aeiou</password> <phone>aeiou</phone> <userStatus>123</userStatus></User>");
break;
}
}
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -117,9 +120,10 @@ public interface UserApi {
@RequestMapping(value = "/user/login",
produces = { "application/xml", "application/json" },
method = RequestMethod.GET)
- default ResponseEntity<Mono<String>> loginUser(@NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username,@NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password, ServerWebExchange exchange) {
- Mono<String> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ default Mono<ResponseEntity<String>> loginUser(@NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username,@NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+ Mono<Void> result = Mono.empty();
+ return result.then(Mono.empty());
}
@@ -129,9 +133,10 @@ public interface UserApi {
@ApiResponse(code = 200, message = "successful operation") })
@RequestMapping(value = "/user/logout",
method = RequestMethod.GET)
- default ResponseEntity<Mono<Void>> logoutUser(ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> logoutUser(ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(result);
+ return result.then(Mono.empty());
}
@@ -142,9 +147,10 @@ public interface UserApi {
@ApiResponse(code = 404, message = "User not found") })
@RequestMapping(value = "/user/{username}",
method = RequestMethod.PUT)
- default ResponseEntity<Mono<Void>> updateUser(@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> user, ServerWebExchange exchange) {
+ default Mono<ResponseEntity<Void>> updateUser(@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> user, ServerWebExchange exchange) {
+ exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
Mono<Void> result = Mono.empty();
- return ResponseEntity.status(HttpStatus.NOT_IMPLEMENTED).body(user.then(result));
+ return result.then(Mono.empty());
}
--
GitLab