Skip to content

Commit 4ff91ad

Browse files
committed
revert unintended indentation
1 parent 49219e1 commit 4ff91ad

53 files changed

Lines changed: 325 additions & 325 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public interface {{classname}} {
287287
{{>methodBody}}{{! prevent indent}}
288288
{{/isDelegate}}
289289
{{#isDelegate}}
290-
{{^isVoid}}return {{/isVoid}}{{#isVoid}}{{#useResponseEntity}}return {{/useResponseEntity}}{{^useResponseEntity}}{{#reactive}}return {{/reactive}}{{/useResponseEntity}}{{/isVoid}}getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{^hasParams}}{{#reactive}}, {{/reactive}}{{/hasParams}}pageable{{/vendorExtensions.x-spring-paginated}});
290+
{{^isVoid}}return {{/isVoid}}{{#isVoid}}{{#useResponseEntity}}return {{/useResponseEntity}}{{^useResponseEntity}}{{#reactive}}return {{/reactive}}{{/useResponseEntity}}{{/isVoid}}getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}{{#hasParams}}, {{/hasParams}}{{^hasParams}}{{#reactive}}, {{/reactive}}{{/hasParams}}pageable{{/vendorExtensions.x-spring-paginated}});
291291
{{/isDelegate}}
292292
}{{/jdk8-default-interface}}
293293

samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ default AnotherFakeApiDelegate getDelegate() {
6666
default ResponseEntity<Client> call123testSpecialTags(
6767
@Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client
6868
) {
69-
return getDelegate().call123testSpecialTags(client);
69+
return getDelegate().call123testSpecialTags(client);
7070
}
7171

7272
}

samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ default FakeApiDelegate getDelegate() {
7676
default ResponseEntity<Void> createXmlItem(
7777
@Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem
7878
) {
79-
return getDelegate().createXmlItem(xmlItem);
79+
return getDelegate().createXmlItem(xmlItem);
8080
}
8181

8282

@@ -107,7 +107,7 @@ default ResponseEntity<Void> createXmlItem(
107107
default ResponseEntity<Boolean> fakeOuterBooleanSerialize(
108108
@Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body
109109
) {
110-
return getDelegate().fakeOuterBooleanSerialize(body);
110+
return getDelegate().fakeOuterBooleanSerialize(body);
111111
}
112112

113113

@@ -138,7 +138,7 @@ default ResponseEntity<Boolean> fakeOuterBooleanSerialize(
138138
default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(
139139
@Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite
140140
) {
141-
return getDelegate().fakeOuterCompositeSerialize(outerComposite);
141+
return getDelegate().fakeOuterCompositeSerialize(outerComposite);
142142
}
143143

144144

@@ -169,7 +169,7 @@ default ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(
169169
default ResponseEntity<BigDecimal> fakeOuterNumberSerialize(
170170
@Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body
171171
) {
172-
return getDelegate().fakeOuterNumberSerialize(body);
172+
return getDelegate().fakeOuterNumberSerialize(body);
173173
}
174174

175175

@@ -200,7 +200,7 @@ default ResponseEntity<BigDecimal> fakeOuterNumberSerialize(
200200
default ResponseEntity<String> fakeOuterStringSerialize(
201201
@Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body
202202
) {
203-
return getDelegate().fakeOuterStringSerialize(body);
203+
return getDelegate().fakeOuterStringSerialize(body);
204204
}
205205

206206

@@ -228,7 +228,7 @@ default ResponseEntity<String> fakeOuterStringSerialize(
228228
default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
229229
@NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
230230
) {
231-
return getDelegate().responseObjectDifferentNames(petId);
231+
return getDelegate().responseObjectDifferentNames(petId);
232232
}
233233

234234

@@ -256,7 +256,7 @@ default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDiff
256256
default ResponseEntity<Void> testBodyWithFileSchema(
257257
@Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass
258258
) {
259-
return getDelegate().testBodyWithFileSchema(fileSchemaTestClass);
259+
return getDelegate().testBodyWithFileSchema(fileSchemaTestClass);
260260
}
261261

262262

@@ -284,7 +284,7 @@ default ResponseEntity<Void> testBodyWithQueryParams(
284284
@NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query,
285285
@Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user
286286
) {
287-
return getDelegate().testBodyWithQueryParams(query, user);
287+
return getDelegate().testBodyWithQueryParams(query, user);
288288
}
289289

290290

@@ -316,7 +316,7 @@ default ResponseEntity<Void> testBodyWithQueryParams(
316316
default ResponseEntity<Client> testClientModel(
317317
@Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client
318318
) {
319-
return getDelegate().testClientModel(client);
319+
return getDelegate().testClientModel(client);
320320
}
321321

322322

@@ -376,7 +376,7 @@ default ResponseEntity<Void> testEndpointParameters(
376376
@Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password,
377377
@Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
378378
) {
379-
return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
379+
return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
380380
}
381381

382382

@@ -421,7 +421,7 @@ default ResponseEntity<Void> testEnumParameters(
421421
@Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false) List<String> enumFormStringArray,
422422
@Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString
423423
) {
424-
return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
424+
return getDelegate().testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
425425
}
426426

427427

@@ -459,7 +459,7 @@ default ResponseEntity<Void> testGroupParameters(
459459
@Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup,
460460
@Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group
461461
) {
462-
return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
462+
return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
463463
}
464464

465465

@@ -488,7 +488,7 @@ default ResponseEntity<Void> testGroupParameters(
488488
default ResponseEntity<Void> testInlineAdditionalProperties(
489489
@Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map<String, String> requestBody
490490
) {
491-
return getDelegate().testInlineAdditionalProperties(requestBody);
491+
return getDelegate().testInlineAdditionalProperties(requestBody);
492492
}
493493

494494

@@ -519,7 +519,7 @@ default ResponseEntity<Void> testJsonFormData(
519519
@Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param,
520520
@Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2
521521
) {
522-
return getDelegate().testJsonFormData(param, param2);
522+
return getDelegate().testJsonFormData(param, param2);
523523
}
524524

525525

@@ -548,7 +548,7 @@ default ResponseEntity<Void> testJsonFormData(
548548
default ResponseEntity<Void> testNullable(
549549
@Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable
550550
) {
551-
return getDelegate().testNullable(childWithNullable);
551+
return getDelegate().testNullable(childWithNullable);
552552
}
553553

554554

@@ -581,7 +581,7 @@ default ResponseEntity<Void> testQueryParameterCollectionFormat(
581581
@NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List<String> url,
582582
@NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List<String> context
583583
) {
584-
return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context);
584+
return getDelegate().testQueryParameterCollectionFormat(pipe, http, url, context);
585585
}
586586

587587

@@ -610,7 +610,7 @@ default ResponseEntity<Void> testQueryParameterCollectionFormat(
610610
default ResponseEntity<Integer> testWithResultExample(
611611

612612
) {
613-
return getDelegate().testWithResultExample();
613+
return getDelegate().testWithResultExample();
614614
}
615615

616616

@@ -649,7 +649,7 @@ default ResponseEntity<ModelApiResponse> uploadFileWithRequiredFile(
649649
@Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile,
650650
@Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
651651
) {
652-
return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
652+
return getDelegate().uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
653653
}
654654

655655
}

samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ default FakeClassnameTestApiDelegate getDelegate() {
6969
default ResponseEntity<Client> testClassname(
7070
@Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client
7171
) {
72-
return getDelegate().testClassname(client);
72+
return getDelegate().testClassname(client);
7373
}
7474

7575
}

samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ default PetApiDelegate getDelegate() {
7171
default ResponseEntity<Void> addPet(
7272
@Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
7373
) {
74-
return getDelegate().addPet(pet);
74+
return getDelegate().addPet(pet);
7575
}
7676

7777

@@ -106,7 +106,7 @@ default ResponseEntity<Void> deletePet(
106106
@NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
107107
@Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
108108
) {
109-
return getDelegate().deletePet(petId, apiKey);
109+
return getDelegate().deletePet(petId, apiKey);
110110
}
111111

112112

@@ -143,7 +143,7 @@ default ResponseEntity<Void> deletePet(
143143
default ResponseEntity<List<Pet>> findPetsByStatus(
144144
@NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List<String> status
145145
) {
146-
return getDelegate().findPetsByStatus(status);
146+
return getDelegate().findPetsByStatus(status);
147147
}
148148

149149

@@ -183,7 +183,7 @@ default ResponseEntity<List<Pet>> findPetsByStatus(
183183
default ResponseEntity<Set<Pet>> findPetsByTags(
184184
@NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set<String> tags
185185
) {
186-
return getDelegate().findPetsByTags(tags);
186+
return getDelegate().findPetsByTags(tags);
187187
}
188188

189189

@@ -222,7 +222,7 @@ default ResponseEntity<Set<Pet>> findPetsByTags(
222222
default ResponseEntity<Pet> getPetById(
223223
@NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
224224
) {
225-
return getDelegate().getPetById(petId);
225+
return getDelegate().getPetById(petId);
226226
}
227227

228228

@@ -260,7 +260,7 @@ default ResponseEntity<Pet> getPetById(
260260
default ResponseEntity<Void> updatePet(
261261
@Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
262262
) {
263-
return getDelegate().updatePet(pet);
263+
return getDelegate().updatePet(pet);
264264
}
265265

266266

@@ -296,7 +296,7 @@ default ResponseEntity<Void> updatePetWithForm(
296296
@Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
297297
@Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
298298
) {
299-
return getDelegate().updatePetWithForm(petId, name, status);
299+
return getDelegate().updatePetWithForm(petId, name, status);
300300
}
301301

302302

@@ -335,7 +335,7 @@ default ResponseEntity<ModelApiResponse> uploadFile(
335335
@Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
336336
@Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
337337
) {
338-
return getDelegate().uploadFile(petId, additionalMetadata, file);
338+
return getDelegate().uploadFile(petId, additionalMetadata, file);
339339
}
340340

341341
}

samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ default StoreApiDelegate getDelegate() {
6565
default ResponseEntity<Void> deleteOrder(
6666
@NotNull @Parameter(name = "order_id", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("order_id") String orderId
6767
) {
68-
return getDelegate().deleteOrder(orderId);
68+
return getDelegate().deleteOrder(orderId);
6969
}
7070

7171

@@ -98,7 +98,7 @@ default ResponseEntity<Void> deleteOrder(
9898
default ResponseEntity<Map<String, Integer>> getInventory(
9999

100100
) {
101-
return getDelegate().getInventory();
101+
return getDelegate().getInventory();
102102
}
103103

104104

@@ -134,7 +134,7 @@ default ResponseEntity<Map<String, Integer>> getInventory(
134134
default ResponseEntity<Order> getOrderById(
135135
@NotNull @Min(1L) @Max(5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId
136136
) {
137-
return getDelegate().getOrderById(orderId);
137+
return getDelegate().getOrderById(orderId);
138138
}
139139

140140

@@ -169,7 +169,7 @@ default ResponseEntity<Order> getOrderById(
169169
default ResponseEntity<Order> placeOrder(
170170
@Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
171171
) {
172-
return getDelegate().placeOrder(order);
172+
return getDelegate().placeOrder(order);
173173
}
174174

175175
}

samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ default UserApiDelegate getDelegate() {
6464
default ResponseEntity<Void> createUser(
6565
@Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
6666
) {
67-
return getDelegate().createUser(user);
67+
return getDelegate().createUser(user);
6868
}
6969

7070

@@ -93,7 +93,7 @@ default ResponseEntity<Void> createUser(
9393
default ResponseEntity<Void> createUsersWithArrayInput(
9494
@Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
9595
) {
96-
return getDelegate().createUsersWithArrayInput(user);
96+
return getDelegate().createUsersWithArrayInput(user);
9797
}
9898

9999

@@ -122,7 +122,7 @@ default ResponseEntity<Void> createUsersWithArrayInput(
122122
default ResponseEntity<Void> createUsersWithListInput(
123123
@Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
124124
) {
125-
return getDelegate().createUsersWithListInput(user);
125+
return getDelegate().createUsersWithListInput(user);
126126
}
127127

128128

@@ -152,7 +152,7 @@ default ResponseEntity<Void> createUsersWithListInput(
152152
default ResponseEntity<Void> deleteUser(
153153
@NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
154154
) {
155-
return getDelegate().deleteUser(username);
155+
return getDelegate().deleteUser(username);
156156
}
157157

158158

@@ -188,7 +188,7 @@ default ResponseEntity<Void> deleteUser(
188188
default ResponseEntity<User> getUserByName(
189189
@NotNull @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
190190
) {
191-
return getDelegate().getUserByName(username);
191+
return getDelegate().getUserByName(username);
192192
}
193193

194194

@@ -224,7 +224,7 @@ default ResponseEntity<String> loginUser(
224224
@NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
225225
@NotNull @Parameter(name = "password", description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) String password
226226
) {
227-
return getDelegate().loginUser(username, password);
227+
return getDelegate().loginUser(username, password);
228228
}
229229

230230

@@ -251,7 +251,7 @@ default ResponseEntity<String> loginUser(
251251
default ResponseEntity<Void> logoutUser(
252252

253253
) {
254-
return getDelegate().logoutUser();
254+
return getDelegate().logoutUser();
255255
}
256256

257257

@@ -284,7 +284,7 @@ default ResponseEntity<Void> updateUser(
284284
@NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
285285
@Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
286286
) {
287-
return getDelegate().updateUser(username, user);
287+
return getDelegate().updateUser(username, user);
288288
}
289289

290290
}

samples/server/petstore/springboot-api-response-examples/src/main/java/org/openapitools/api/DogsApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ default DogsApiDelegate getDelegate() {
8383
default ResponseEntity<Dog> createDog(
8484
@Parameter(name = "Dog", description = "") @Valid @RequestBody(required = false) @Nullable Dog dog
8585
) {
86-
return getDelegate().createDog(dog);
86+
return getDelegate().createDog(dog);
8787
}
8888

8989
}

0 commit comments

Comments
 (0)