Skip to content

Commit 6ee5e67

Browse files
smassetsmasset
committed
Moved example string to a dedicated variable in Spring's methodBody template
1 parent cbe39ba commit 6ee5e67

File tree

64 files changed

+390
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+390
-195
lines changed

‎modules/openapi-generator/src/main/resources/JavaSpring/methodBody.mustache

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ return CompletableFuture.supplyAsync(()-> {
88
{{#async}} {{/async}} {{/jdk8}}for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
99
{{/-first}}
1010
{{#async}} {{/async}}{{^async}}{{#jdk8}} {{/jdk8}}{{/async}} if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) {
11-
{{#async}} {{/async}}{{^async}}{{#jdk8}} {{/jdk8}}{{/async}} ApiUtil.setExampleResponse(request, "{{{contentType}}}", "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{example}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}");
11+
{{#async}} {{/async}}{{^async}}{{#jdk8}} {{/jdk8}}{{/async}} String exampleString = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{example}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}";
12+
{{#async}} {{/async}}{{^async}}{{#jdk8}} {{/jdk8}}{{/async}} ApiUtil.setExampleResponse(request, "{{{contentType}}}", exampleString);
1213
{{#async}} {{/async}}{{^async}}{{#jdk8}} {{/jdk8}}{{/async}} break;
1314
{{#async}} {{/async}}{{^async}}{{#jdk8}} {{/jdk8}}{{/async}} }
1415
{{#-last}}
@@ -36,7 +37,8 @@ Mono<Void> result = Mono.empty();
3637
for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
3738
{{/-first}}
3839
if (mediaType.isCompatibleWith(MediaType.valueOf("{{{contentType}}}"))) {
39-
result = ApiUtil.getExampleResponse(exchange, "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{example}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}");
40+
String exampleString = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{example}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}";
41+
result = ApiUtil.getExampleResponse(exchange, exampleString);
4042
break;
4143
}
4244
{{#-last}}

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,13 @@ default ResponseEntity<List<Pet>> findPetsByStatus(@NotNull @ApiParam(value = "S
8686
getRequest().ifPresent(request -> {
8787
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
8888
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
89-
ApiUtil.setExampleResponse(request, "application/json", "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}");
89+
String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }";
90+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
9091
break;
9192
}
9293
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
93-
ApiUtil.setExampleResponse(request, "application/xml", "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status></Pet>");
94+
String exampleString = "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status> </Pet>";
95+
ApiUtil.setExampleResponse(request, "application/xml", exampleString);
9496
break;
9597
}
9698
}
@@ -116,11 +118,13 @@ default ResponseEntity<List<Pet>> findPetsByTags(@NotNull @ApiParam(value = "Tag
116118
getRequest().ifPresent(request -> {
117119
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
118120
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
119-
ApiUtil.setExampleResponse(request, "application/json", "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}");
121+
String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }";
122+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
120123
break;
121124
}
122125
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
123-
ApiUtil.setExampleResponse(request, "application/xml", "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status></Pet>");
126+
String exampleString = "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status> </Pet>";
127+
ApiUtil.setExampleResponse(request, "application/xml", exampleString);
124128
break;
125129
}
126130
}
@@ -144,11 +148,13 @@ default ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return",r
144148
getRequest().ifPresent(request -> {
145149
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
146150
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
147-
ApiUtil.setExampleResponse(request, "application/json", "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}");
151+
String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }";
152+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
148153
break;
149154
}
150155
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
151-
ApiUtil.setExampleResponse(request, "application/xml", "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status></Pet>");
156+
String exampleString = "<Pet> <id>123456789</id> <name>doggie</name> <photoUrls> <photoUrls>aeiou</photoUrls> </photoUrls> <tags> </tags> <status>aeiou</status> </Pet>";
157+
ApiUtil.setExampleResponse(request, "application/xml", exampleString);
152158
break;
153159
}
154160
}
@@ -210,7 +216,8 @@ default ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet
210216
getRequest().ifPresent(request -> {
211217
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
212218
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
213-
ApiUtil.setExampleResponse(request, "application/json", "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}");
219+
String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\" }";
220+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
214221
break;
215222
}
216223
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,13 @@ default ResponseEntity<Order> getOrderById(@Min(1L) @Max(5L) @ApiParam(value = "
7474
getRequest().ifPresent(request -> {
7575
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
7676
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
77-
ApiUtil.setExampleResponse(request, "application/json", "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}");
77+
String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
78+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
7879
break;
7980
}
8081
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
81-
ApiUtil.setExampleResponse(request, "application/xml", "<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>");
82+
String exampleString = "<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>";
83+
ApiUtil.setExampleResponse(request, "application/xml", exampleString);
8284
break;
8385
}
8486
}
@@ -99,11 +101,13 @@ default ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for pur
99101
getRequest().ifPresent(request -> {
100102
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
101103
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
102-
ApiUtil.setExampleResponse(request, "application/json", "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}");
104+
String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
105+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
103106
break;
104107
}
105108
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
106-
ApiUtil.setExampleResponse(request, "application/xml", "<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>");
109+
String exampleString = "<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>";
110+
ApiUtil.setExampleResponse(request, "application/xml", exampleString);
107111
break;
108112
}
109113
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,13 @@ default ResponseEntity<User> getUserByName(@ApiParam(value = "The name that need
9393
getRequest().ifPresent(request -> {
9494
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
9595
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
96-
ApiUtil.setExampleResponse(request, "application/json", "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}");
96+
String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }";
97+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
9798
break;
9899
}
99100
if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) {
100-
ApiUtil.setExampleResponse(request, "application/xml", "<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>");
101+
String exampleString = "<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>";
102+
ApiUtil.setExampleResponse(request, "application/xml", exampleString);
101103
break;
102104
}
103105
}

‎samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ default CompletableFuture<ResponseEntity<Client>> call123testSpecialTags(@ApiPar
4848
getRequest().ifPresent(request -> {
4949
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
5050
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
51-
ApiUtil.setExampleResponse(request, "application/json", "{ \"client\" : \"client\"}");
51+
String exampleString = "{ \"client\" : \"client\"}";
52+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
5253
break;
5354
}
5455
}

‎samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ default CompletableFuture<ResponseEntity<OuterComposite>> fakeOuterCompositeSeri
8181
getRequest().ifPresent(request -> {
8282
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
8383
if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) {
84-
ApiUtil.setExampleResponse(request, "*/*", "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true}");
84+
String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true}";
85+
ApiUtil.setExampleResponse(request, "*/*", exampleString);
8586
break;
8687
}
8788
}
@@ -152,7 +153,8 @@ default CompletableFuture<ResponseEntity<Client>> testClientModel(@ApiParam(valu
152153
getRequest().ifPresent(request -> {
153154
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
154155
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
155-
ApiUtil.setExampleResponse(request, "application/json", "{ \"client\" : \"client\"}");
156+
String exampleString = "{ \"client\" : \"client\"}";
157+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
156158
break;
157159
}
158160
}
@@ -243,7 +245,8 @@ default CompletableFuture<ResponseEntity<ModelApiResponse>> uploadFileWithRequir
243245
getRequest().ifPresent(request -> {
244246
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
245247
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
246-
ApiUtil.setExampleResponse(request, "application/json", "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}");
248+
String exampleString = "{ \"code\" : 0, \"type\" : \"type\", \"message\" : \"message\"}";
249+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
247250
break;
248251
}
249252
}

‎samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ default CompletableFuture<ResponseEntity<Client>> testClassname(@ApiParam(value
5050
getRequest().ifPresent(request -> {
5151
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
5252
if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
53-
ApiUtil.setExampleResponse(request, "application/json", "{ \"client\" : \"client\"}");
53+
String exampleString = "{ \"client\" : \"client\"}";
54+
ApiUtil.setExampleResponse(request, "application/json", exampleString);
5455
break;
5556
}
5657
}

0 commit comments

Comments
 (0)