v7.17.0 release (#22248)

Fixes: #10438

modules/openapi-generator-cli/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.17.0-SNAPSHOT</version>
+        <version>7.17.0</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator-core/pom.xml

@@ -6,7 +6,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <groupId>org.openapitools</groupId>
     <!-- RELEASE_VERSION -->
-    <version>7.17.0-SNAPSHOT</version>
+    <version>7.17.0</version>
     <!-- /RELEASE_VERSION -->
     <relativePath>../../pom.xml</relativePath>
   </parent>

modules/openapi-generator-gradle-plugin/gradle.properties

@@ -1,5 +1,5 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.17.0-SNAPSHOT
+openApiGeneratorVersion=7.17.0
 # /RELEASE_VERSION
 
 # BEGIN placeholders

modules/openapi-generator-gradle-plugin/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.17.0-SNAPSHOT</version>
+        <version>7.17.0</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties

@@ -1,3 +1,3 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.17.0-SNAPSHOT
+openApiGeneratorVersion=7.17.0
 # /RELEASE_VERSION

modules/openapi-generator-maven-plugin/examples/java-client.xml

@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.17.0-SNAPSHOT</version>
+                <version>7.17.0</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/examples/kotlin.xml

@@ -15,7 +15,7 @@
 				<groupId>org.openapitools</groupId>
 				<artifactId>openapi-generator-maven-plugin</artifactId>
 				<!-- RELEASE_VERSION -->
-				<version>7.17.0-SNAPSHOT</version>
+				<version>7.17.0</version>
 				<!-- /RELEASE_VERSION -->
 				<executions>
 					<execution>

modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml

@@ -19,7 +19,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.17.0-SNAPSHOT</version>
+                <version>7.17.0</version>
                 <!-- /RELEASE_VERSION -->
                 <dependencies>
                     <dependency>

modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml

@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.17.0-SNAPSHOT</version>
+                <version>7.17.0</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/examples/non-java.xml

@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.17.0-SNAPSHOT</version>
+                <version>7.17.0</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/examples/spring.xml

@@ -20,7 +20,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.17.0-SNAPSHOT</version>
+                <version>7.17.0</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/pom.xml

@@ -5,7 +5,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.17.0-SNAPSHOT</version>
+        <version>7.17.0</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator-online/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.17.0-SNAPSHOT</version>
+        <version>7.17.0</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.17.0-SNAPSHOT</version>
+        <version>7.17.0</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

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

@@ -1 +1 @@
-{{#isFormParam}}{{^isFile}}{{>paramDoc}}{{#useBeanValidation}} {{>beanValidationBodyParams}}@Valid{{/useBeanValidation}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}{{#isArray}}@RequestPart{{/isArray}}{{^isArray}}{{#reactive}}@RequestPart{{/reactive}}{{^reactive}}@RequestParam{{/reactive}}{{/isArray}}{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{>dateTimeParam}} {{^required}}{{#useOptional}}Optional<{{/useOptional}}{{/required}}{{{dataType}}}{{^required}}{{#useOptional}}>{{/useOptional}}{{/required}} {{paramName}}{{/isFile}}{{#isFile}}{{>paramDoc}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#reactive}}{{#isArray}}Flux<{{/isArray}}Part{{#isArray}}>{{/isArray}}{{/reactive}}{{^reactive}}{{#isArray}}List<{{/isArray}}MultipartFile{{#isArray}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isFile}}{{/isFormParam}}
+{{#isFormParam}}{{^isFile}}{{>paramDoc}}{{#useBeanValidation}} {{>beanValidationBodyParams}}@Valid{{/useBeanValidation}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}{{#isArray}}@RequestPart{{/isArray}}{{^isArray}}{{#reactive}}@RequestPart{{/reactive}}{{^reactive}}@RequestParam{{/reactive}}{{/isArray}}{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}){{>dateTimeParam}} {{^required}}{{#useOptional}}Optional<{{/useOptional}}{{/required}}{{{dataType}}}{{^required}}{{#useOptional}}>{{/useOptional}}{{/required}} {{paramName}}{{/isFile}}{{#isFile}}{{>paramDoc}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#reactive}}{{#isArray}}Flux<{{/isArray}}Part{{#isArray}}>{{/isArray}}{{/reactive}}{{^reactive}}{{#isArray}}List<{{/isArray}}MultipartFile{{#isArray}}>{{/isArray}}{{/reactive}} {{paramName}}{{/isFile}}{{/isFormParam}}

modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache

@@ -133,6 +133,17 @@ export class {{classname}} extends runtime.BaseAPI {
         {{/isArray}}
         {{^isArray}}
         if (requestParameters['{{paramName}}'] != null) {
+            {{#isExplode}}
+            {{#isContainer}}
+            for (let key of Object.keys(requestParameters['{{paramName}}'])) {
+                queryParameters[key] = requestParameters['{{paramName}}'][key];
+            }
+            {{/isContainer}}
+            {{^isContainer}}
+            queryParameters['{{baseName}}'] = requestParameters['{{paramName}}'];
+            {{/isContainer}}
+            {{/isExplode}}
+            {{^isExplode}}
             {{#isDateTimeType}}
             queryParameters['{{baseName}}'] = (requestParameters['{{paramName}}'] as any).toISOString();
             {{/isDateTimeType}}
@@ -144,6 +155,7 @@ export class {{classname}} extends runtime.BaseAPI {
             queryParameters['{{baseName}}'] = requestParameters['{{paramName}}'];
             {{/isDateType}}
             {{/isDateTimeType}}
+            {{/isExplode}}
         }
 
         {{/isArray}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -5316,29 +5316,6 @@ public class SpringCodegenTest {
                 .doesNotHaveAnnotation("Deprecated");
     }
 
-    @Test
-    public void testRequestBodyFormParamsDefaultValue() {
-        final var tempDir = TestUtils.newTempFolder();
-        final CodegenConfigurator configurator = new CodegenConfigurator()
-                .setInputSpec("src/test/resources/3_0/spring/formParams_defaultValue.yaml")
-                .setGeneratorName("spring")
-                .setOutputDir(tempDir.toString());
-
-        new DefaultGenerator().opts(configurator.toClientOptInput()).generate();
-
-        JavaFileAssert.assertThat(tempDir.resolve("src/main/java/org/openapitools/api/SomeApi.java"))
-                .assertMethod("someDummyEndpoint", "String", "String")
-                .assertParameter("productId")
-                .assertParameterAnnotations()
-                .containsWithNameAndAttributes("RequestParam",
-                        Map.of("value", "\"product_id\"", "required", "true"))
-                .toParameter().toMethod()
-                .assertParameter("locale")
-                .assertParameterAnnotations()
-                .containsWithNameAndAttributes("RequestParam",
-                        Map.of("value", "\"locale\"", "required", "false", "defaultValue", "\"en_US\""));
-    }
-
     @Test
     public void shouldAnnotateNonRequiredFieldsAsNullable() throws IOException {
         SpringCodegen codegen = new SpringCodegen();

modules/openapi-generator/src/test/resources/3_0/spring/formParams_defaultValue.yaml

@@ -1,42 +0,0 @@
-openapi: 3.0.0
-info:
-  version: "1.0.0"
-  title: formParams-defaultValue-test
-paths:
-  /some/dummy/endpoint:
-    post:
-      operationId: someDummyEndpoint
-      requestBody:
-        required: true
-        content:
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/DummyRequest'
-      responses:
-        200:
-          description: Successfully created
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties:
-                  $ref: '#/components/schemas/DummyResponse'
-components:
-  schemas:
-    DummyResponse:
-      required:
-        - status
-      type: object
-      properties:
-        status:
-          type: string
-    DummyRequest:
-      required:
-        - product_id
-      type: object
-      properties:
-        product_id:
-          type: string
-        locale:
-          type: string
-          default: "en_US"

pom.xml

@@ -15,7 +15,7 @@
     <packaging>pom</packaging>
     <name>openapi-generator-project</name>
     <!-- RELEASE_VERSION -->
-    <version>7.17.0-SNAPSHOT</version>
+    <version>7.17.0</version>
     <!-- /RELEASE_VERSION -->
     <url>https://github.com/openapitools/openapi-generator</url>
     <scm>

samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java

@@ -50,14 +50,10 @@ public interface DefaultApi {
         value = DefaultApi.PATH_GET
     )
     ResponseEntity<Void> get(
-        @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
+        @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-,
+        @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
-        @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime
+        @NotNull @ApiParam(value = "A date header parameter", required = true, defaultValue = "1974-01-01") @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate,
-,
+        @ApiParam(value = "A date cookie parameter", defaultValue = "1975-01-01") @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate
-        @NotNull @ApiParam(value = "A date header parameter", required = true, defaultValue = "1974-01-01") @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate
-,
-        
-@ApiParam(value = "A date cookie parameter", defaultValue = "1975-01-01") @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate
     );
 
 
@@ -84,10 +80,8 @@ public interface DefaultApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
+        @NotNull @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-,
+        @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
-        @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false, defaultValue = "1971-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
-
     );
 
 }

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/PetApi.java

@@ -64,7 +64,6 @@ public interface PetApi {
     )
     ResponseEntity<Void> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -94,10 +93,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -133,7 +130,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByStatus(
         @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
-
     );
 
 
@@ -172,7 +168,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     );
 
 
@@ -210,7 +205,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull @Parameter(name = "petId", deprecated = true, description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") @Deprecated Long petId
-
     );
 
 
@@ -245,7 +239,6 @@ public interface PetApi {
     )
     ResponseEntity<Void> updatePet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -277,12 +270,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -317,12 +307,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 }

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/StoreApi.java

@@ -61,7 +61,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
         @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
-
     );
 
 
@@ -127,7 +126,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
-
     );
 
 
@@ -161,7 +159,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> placeOrder(
         @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     );
 
 }

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/api/UserApi.java

@@ -63,7 +63,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
         @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
-
     );
 
 
@@ -94,7 +93,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -125,7 +123,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -157,7 +154,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     );
 
 
@@ -192,7 +188,6 @@ public interface UserApi {
     )
     ResponseEntity<User> getUserByName(
         @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
-
     );
 
 
@@ -225,10 +220,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @NotNull @Parameter(name = "password", deprecated = true, description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) @Deprecated String password
-
     );
 
 
@@ -289,10 +282,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
-
     );
 
 }

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/PetApi.java

@@ -60,7 +60,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> addPet(
         @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -93,10 +92,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId
+        @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,
-,
         @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -133,7 +130,6 @@ public interface PetApi {
     )
     ResponseEntity<List<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) @Deprecated List<String> status
-
     );
 
 
@@ -172,7 +168,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     );
 
 
@@ -208,7 +203,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId
-
     );
 
 
@@ -252,7 +246,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> updatePet(
         @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -287,12 +280,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId
+        @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId,
-,
+        @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -329,12 +319,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+        @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,
-,
+        @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 }

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/StoreApi.java

@@ -50,7 +50,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
         @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId
-
     );
 
 
@@ -114,7 +113,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId
-
     );
 
 
@@ -146,7 +144,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> placeOrder(
         @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     );
 
 }

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/api/UserApi.java

@@ -52,7 +52,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
         @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user
-
     );
 
 
@@ -83,7 +82,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
         @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -114,7 +112,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
         @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -146,7 +143,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username
-
     );
 
 
@@ -179,7 +175,6 @@ public interface UserApi {
     )
     ResponseEntity<User> getUserByName(
         @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username
-
     );
 
 
@@ -210,10 +205,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @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
-
     );
 
 
@@ -274,10 +267,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> updateUser(
-        @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username
+        @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,
-,
         @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user
-
     );
 
 }

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java

@@ -57,7 +57,6 @@ public interface PetController {
     )
     ResponseEntity<Void> addPet(
         @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body
-
     );
 
 
@@ -89,10 +88,8 @@ public interface PetController {
         value = PetController.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId
+        @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,
-,
         @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -129,8 +126,7 @@ public interface PetController {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<List<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
+        @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,
-,
         @ApiIgnore final Pageable pageable
     );
 
@@ -170,8 +166,7 @@ public interface PetController {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<List<Pet>> findPetsByTags(
-        @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags
+        @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags,
-,
         @ApiIgnore final Pageable pageable
     );
 
@@ -208,7 +203,6 @@ public interface PetController {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId
-
     );
 
 
@@ -245,7 +239,6 @@ public interface PetController {
     )
     ResponseEntity<Void> updatePet(
         @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body
-
     );
 
 
@@ -279,12 +272,9 @@ public interface PetController {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId
+        @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId,
-,
+        @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -320,12 +310,9 @@ public interface PetController {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+        @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,
-,
+        @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 }

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/StoreController.java

@@ -50,7 +50,6 @@ public interface StoreController {
     )
     ResponseEntity<Void> deleteOrder(
         @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId
-
     );
 
 
@@ -114,7 +113,6 @@ public interface StoreController {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId
-
     );
 
 
@@ -144,7 +142,6 @@ public interface StoreController {
     )
     ResponseEntity<Order> placeOrder(
         @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body
-
     );
 
 }

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/UserController.java

@@ -48,7 +48,6 @@ public interface UserController {
     )
     ResponseEntity<Void> createUser(
         @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body
-
     );
 
 
@@ -74,7 +73,6 @@ public interface UserController {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
         @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body
-
     );
 
 
@@ -100,7 +98,6 @@ public interface UserController {
     )
     ResponseEntity<Void> createUsersWithListInput(
         @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body
-
     );
 
 
@@ -129,7 +126,6 @@ public interface UserController {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username
-
     );
 
 
@@ -161,7 +157,6 @@ public interface UserController {
     )
     ResponseEntity<User> getUserByName(
         @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username
-
     );
 
 
@@ -191,10 +186,8 @@ public interface UserController {
         produces = { "application/json", "application/xml" }
     )
     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 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
-
     );
 
 
@@ -271,10 +264,8 @@ public interface UserController {
         value = UserController.PATH_UPDATE_USER
     )
     ResponseEntity<Void> updateUser(
-        @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username
+        @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,
-,
         @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body
-
     );
 
 }

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

@@ -60,7 +60,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> addPet(
         @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -93,10 +92,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId
+        @NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,
-,
         @ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -133,7 +130,6 @@ public interface PetApi {
     )
     ResponseEntity<List<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) @Deprecated List<String> status
-
     );
 
 
@@ -172,7 +168,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     );
 
 
@@ -208,7 +203,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId
-
     );
 
 
@@ -252,7 +246,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> updatePet(
         @ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -287,12 +280,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId
+        @NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId,
-,
+        @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -329,12 +319,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+        @NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,
-,
+        @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 }

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

@@ -50,7 +50,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
         @NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId
-
     );
 
 
@@ -114,7 +113,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId
-
     );
 
 
@@ -146,7 +144,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> placeOrder(
         @ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     );
 
 }

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

@@ -52,7 +52,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
         @ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user
-
     );
 
 
@@ -83,7 +82,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
         @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -114,7 +112,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
         @ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -146,7 +143,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username
-
     );
 
 
@@ -179,7 +175,6 @@ public interface UserApi {
     )
     ResponseEntity<User> getUserByName(
         @NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username
-
     );
 
 
@@ -210,10 +205,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @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
-
     );
 
 
@@ -274,10 +267,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> updateUser(
-        @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username
+        @NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,
-,
         @ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user
-
     );
 
 }

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -36,7 +36,6 @@ public interface AnotherFakeApi {
     )
     ClientDto call123testSpecialTags(
          @RequestBody ClientDto clientDto
-
     );
 
 }

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java

@@ -47,7 +47,6 @@ public interface FakeApi {
     )
     void createXmlItem(
          @RequestBody XmlItemDto xmlItemDto
-
     );
 
 
@@ -67,7 +66,6 @@ public interface FakeApi {
     )
     Boolean fakeOuterBooleanSerialize(
          @RequestBody(required = false) @Nullable Boolean body
-
     );
 
 
@@ -87,7 +85,6 @@ public interface FakeApi {
     )
     OuterCompositeDto fakeOuterCompositeSerialize(
          @RequestBody(required = false) @Nullable OuterCompositeDto outerCompositeDto
-
     );
 
 
@@ -107,7 +104,6 @@ public interface FakeApi {
     )
     BigDecimal fakeOuterNumberSerialize(
          @RequestBody(required = false) @Nullable BigDecimal body
-
     );
 
 
@@ -127,7 +123,6 @@ public interface FakeApi {
     )
     String fakeOuterStringSerialize(
          @RequestBody(required = false) @Nullable String body
-
     );
 
 
@@ -147,7 +142,6 @@ public interface FakeApi {
     )
     void testBodyWithFileSchema(
          @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto
-
     );
 
 
@@ -166,10 +160,8 @@ public interface FakeApi {
         contentType = "application/json"
     )
     void testBodyWithQueryParams(
-         @RequestParam(value = "query", required = true) String query
+         @RequestParam(value = "query", required = true) String query,
-,
          @RequestBody UserDto userDto
-
     );
 
 
@@ -189,7 +181,6 @@ public interface FakeApi {
     )
     ClientDto testClientModel(
          @RequestBody ClientDto clientDto
-
     );
 
 
@@ -222,34 +213,20 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     void testEndpointParameters(
-         @RequestParam(value = "number", required = true) BigDecimal number
+         @RequestParam(value = "number", required = true) BigDecimal number,
-,
+         @RequestParam(value = "double", required = true) Double _double,
-         @RequestParam(value = "double", required = true) Double _double
+         @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
-,
+         @RequestParam(value = "byte", required = true) byte[] _byte,
-         @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter
+         @RequestParam(value = "integer", required = false) Integer integer,
-,
+         @RequestParam(value = "int32", required = false) Integer int32,
-         @RequestParam(value = "byte", required = true) byte[] _byte
+         @RequestParam(value = "int64", required = false) Long int64,
-,
+         @RequestParam(value = "float", required = false) Float _float,
-         @RequestParam(value = "integer", required = false) Integer integer
+         @RequestParam(value = "string", required = false) String string,
-,
+         @RequestPart(value = "binary", required = false) MultipartFile binary,
-         @RequestParam(value = "int32", required = false) Integer int32
+         @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-,
+         @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
-         @RequestParam(value = "int64", required = false) Long int64
+         @RequestParam(value = "password", required = false) String password,
-,
-         @RequestParam(value = "float", required = false) Float _float
-,
-         @RequestParam(value = "string", required = false) String string
-,
-         @RequestPart(value = "binary", required = false) MultipartFile binary
-,
-         @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
-,
-         @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime
-,
-         @RequestParam(value = "password", required = false) String password
-,
          @RequestParam(value = "callback", required = false) String paramCallback
-
     );
 
 
@@ -276,22 +253,14 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     void testEnumParameters(
-         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray
+         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray,
-,
+         @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString,
-         @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString
+         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray,
-,
+         @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString,
-         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray
+         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger,
-,
+         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble,
-         @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString
+         @RequestPart(value = "enum_form_string_array", required = false) List<String> enumFormStringArray,
-,
+         @RequestParam(value = "enum_form_string", required = false) String enumFormString
-         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger
-,
-         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble
-,
-         @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List<String> enumFormStringArray
-,
-         @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString
-
     );
 
 
@@ -314,18 +283,12 @@ public interface FakeApi {
         accept = { "application/json" }
     )
     void testGroupParameters(
-         @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup
+         @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,
-,
+         @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup,
-         @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup
+         @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,
-,
+         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup,
-         @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group
+         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup,
-,
-         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup
-,
-         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup
-,
          @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group
-
     );
 
 
@@ -345,7 +308,6 @@ public interface FakeApi {
     )
     void testInlineAdditionalProperties(
          @RequestBody Map<String, String> requestBody
-
     );
 
 
@@ -365,10 +327,8 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     void testJsonFormData(
-         @RequestParam(value = "param", required = true) String param
+         @RequestParam(value = "param", required = true) String param,
-,
          @RequestParam(value = "param2", required = true) String param2
-
     );
 
 
@@ -388,7 +348,6 @@ public interface FakeApi {
     )
     void testNullable(
          @RequestBody ChildWithNullableDto childWithNullableDto
-
     );
 
 
@@ -409,14 +368,10 @@ public interface FakeApi {
         accept = { "application/json" }
     )
     void testQueryParameterCollectionFormat(
-         @RequestParam(value = "pipe", required = true) List<String> pipe
+         @RequestParam(value = "pipe", required = true) List<String> pipe,
-,
+         @RequestParam(value = "http", required = true) List<String> http,
-         @RequestParam(value = "http", required = true) List<String> http
+         @RequestParam(value = "url", required = true) List<String> url,
-,
-         @RequestParam(value = "url", required = true) List<String> url
-,
          @RequestParam(value = "context", required = true) List<String> context
-
     );
 
 

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java

@@ -36,7 +36,6 @@ public interface FakeClassnameTags123Api {
     )
     ClientDto testClassname(
          @RequestBody ClientDto clientDto
-
     );
 
 }

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java

@@ -41,7 +41,6 @@ public interface PetApi {
     )
     void addPet(
          @RequestBody PetDto petDto
-
     );
 
 
@@ -61,10 +60,8 @@ public interface PetApi {
         accept = { "application/json" }
     )
     void deletePet(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
          @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -84,7 +81,6 @@ public interface PetApi {
     )
     List<PetDto> findPetsByStatus(
          @RequestParam(value = "status", required = true) List<String> status
-
     );
 
 
@@ -106,7 +102,6 @@ public interface PetApi {
     )
     Set<PetDto> findPetsByTags(
          @RequestParam(value = "tags", required = true) Set<String> tags
-
     );
 
 
@@ -127,7 +122,6 @@ public interface PetApi {
     )
     PetDto getPetById(
          @PathVariable("petId") Long petId
-
     );
 
 
@@ -145,7 +139,6 @@ public interface PetApi {
     )
     ResponseObjectWithDifferentFieldNamesDto responseObjectDifferentNames(
          @PathVariable("petId") Long petId
-
     );
 
 
@@ -168,7 +161,6 @@ public interface PetApi {
     )
     void updatePet(
          @RequestBody PetDto petDto
-
     );
 
 
@@ -189,12 +181,9 @@ public interface PetApi {
         contentType = "application/x-www-form-urlencoded"
     )
     void updatePetWithForm(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestParam(value = "name", required = false) String name,
-         @RequestParam(value = "name", required = false) String name
-,
          @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -215,12 +204,9 @@ public interface PetApi {
         contentType = "multipart/form-data"
     )
     ApiResponseDto uploadFile(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-         @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
          @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 
@@ -241,12 +227,9 @@ public interface PetApi {
         contentType = "multipart/form-data"
     )
     ApiResponseDto uploadFileWithRequiredFile(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile,
-         @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile
-,
          @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-
     );
 
 }

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java

@@ -37,7 +37,6 @@ public interface StoreApi {
     )
     void deleteOrder(
          @PathVariable("order_id") String orderId
-
     );
 
 
@@ -75,7 +74,6 @@ public interface StoreApi {
     )
     OrderDto getOrderById(
          @PathVariable("order_id") Long orderId
-
     );
 
 
@@ -96,7 +94,6 @@ public interface StoreApi {
     )
     OrderDto placeOrder(
          @RequestBody OrderDto orderDto
-
     );
 
 }

samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java

@@ -37,7 +37,6 @@ public interface UserApi {
     )
     void createUser(
          @RequestBody UserDto userDto
-
     );
 
 
@@ -57,7 +56,6 @@ public interface UserApi {
     )
     void createUsersWithArrayInput(
          @RequestBody List<UserDto> userDto
-
     );
 
 
@@ -77,7 +75,6 @@ public interface UserApi {
     )
     void createUsersWithListInput(
          @RequestBody List<UserDto> userDto
-
     );
 
 
@@ -97,7 +94,6 @@ public interface UserApi {
     )
     void deleteUser(
          @PathVariable("username") String username
-
     );
 
 
@@ -118,7 +114,6 @@ public interface UserApi {
     )
     UserDto getUserByName(
          @PathVariable("username") String username
-
     );
 
 
@@ -138,10 +133,8 @@ public interface UserApi {
         accept = { "application/json", "application/xml" }
     )
     String loginUser(
-         @RequestParam(value = "username", required = true) String username
+         @RequestParam(value = "username", required = true) String username,
-,
          @RequestParam(value = "password", required = true) String password
-
     );
 
 
@@ -179,10 +172,8 @@ public interface UserApi {
         contentType = "application/json"
     )
     void updateUser(
-         @PathVariable("username") String username
+         @PathVariable("username") String username,
-,
          @RequestBody UserDto userDto
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -40,7 +40,6 @@ public interface AnotherFakeApi {
     )
     Mono<Client> call123testSpecialTags(
          @RequestBody Mono<Client> client
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java

@@ -51,7 +51,6 @@ public interface FakeApi {
     )
     Mono<Void> createXmlItem(
          @RequestBody Mono<XmlItem> xmlItem
-
     );
 
 
@@ -71,7 +70,6 @@ public interface FakeApi {
     )
     Mono<Boolean> fakeOuterBooleanSerialize(
          @RequestBody(required = false) Mono<Boolean> body
-
     );
 
 
@@ -91,7 +89,6 @@ public interface FakeApi {
     )
     Mono<OuterComposite> fakeOuterCompositeSerialize(
          @RequestBody(required = false) Mono<OuterComposite> outerComposite
-
     );
 
 
@@ -111,7 +108,6 @@ public interface FakeApi {
     )
     Mono<BigDecimal> fakeOuterNumberSerialize(
          @RequestBody(required = false) Mono<BigDecimal> body
-
     );
 
 
@@ -131,7 +127,6 @@ public interface FakeApi {
     )
     Mono<String> fakeOuterStringSerialize(
          @RequestBody(required = false) Mono<String> body
-
     );
 
 
@@ -151,7 +146,6 @@ public interface FakeApi {
     )
     Mono<Void> testBodyWithFileSchema(
          @RequestBody Mono<FileSchemaTestClass> fileSchemaTestClass
-
     );
 
 
@@ -170,10 +164,8 @@ public interface FakeApi {
         contentType = "application/json"
     )
     Mono<Void> testBodyWithQueryParams(
-         @RequestParam(value = "query", required = true) String query
+         @RequestParam(value = "query", required = true) String query,
-,
          @RequestBody Mono<User> user
-
     );
 
 
@@ -193,7 +185,6 @@ public interface FakeApi {
     )
     Mono<Client> testClientModel(
          @RequestBody Mono<Client> client
-
     );
 
 
@@ -226,34 +217,20 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     Mono<Void> testEndpointParameters(
-         @RequestPart(value = "number", required = true) BigDecimal number
+         @RequestPart(value = "number", required = true) BigDecimal number,
-,
+         @RequestPart(value = "double", required = true) Double _double,
-         @RequestPart(value = "double", required = true) Double _double
+         @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
-,
+         @RequestPart(value = "byte", required = true) byte[] _byte,
-         @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter
+         @RequestPart(value = "integer", required = false) Integer integer,
-,
+         @RequestPart(value = "int32", required = false) Integer int32,
-         @RequestPart(value = "byte", required = true) byte[] _byte
+         @RequestPart(value = "int64", required = false) Long int64,
-,
+         @RequestPart(value = "float", required = false) Float _float,
-         @RequestPart(value = "integer", required = false) Integer integer
+         @RequestPart(value = "string", required = false) String string,
-,
+         @RequestPart(value = "binary", required = false) Part binary,
-         @RequestPart(value = "int32", required = false) Integer int32
+         @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-,
+         @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
-         @RequestPart(value = "int64", required = false) Long int64
+         @RequestPart(value = "password", required = false) String password,
-,
-         @RequestPart(value = "float", required = false) Float _float
-,
-         @RequestPart(value = "string", required = false) String string
-,
-         @RequestPart(value = "binary", required = false) Part binary
-,
-         @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
-,
-         @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime
-,
-         @RequestPart(value = "password", required = false) String password
-,
          @RequestPart(value = "callback", required = false) String paramCallback
-
     );
 
 
@@ -280,22 +257,14 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     Mono<Void> testEnumParameters(
-         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray
+         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray,
-,
+         @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString,
-         @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString
+         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray,
-,
+         @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString,
-         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray
+         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger,
-,
+         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble,
-         @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString
+         @RequestPart(value = "enum_form_string_array", required = false) List<String> enumFormStringArray,
-,
+         @RequestPart(value = "enum_form_string", required = false) String enumFormString
-         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger
-,
-         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble
-,
-         @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List<String> enumFormStringArray
-,
-         @RequestPart(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString
-
     );
 
 
@@ -318,18 +287,12 @@ public interface FakeApi {
         accept = { "application/json" }
     )
     Mono<Void> testGroupParameters(
-         @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup
+         @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,
-,
+         @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup,
-         @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup
+         @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,
-,
+         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup,
-         @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group
+         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup,
-,
-         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup
-,
-         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup
-,
          @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group
-
     );
 
 
@@ -349,7 +312,6 @@ public interface FakeApi {
     )
     Mono<Void> testInlineAdditionalProperties(
          @RequestBody Mono<Map<String, String>> requestBody
-
     );
 
 
@@ -369,10 +331,8 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     Mono<Void> testJsonFormData(
-         @RequestPart(value = "param", required = true) String param
+         @RequestPart(value = "param", required = true) String param,
-,
          @RequestPart(value = "param2", required = true) String param2
-
     );
 
 
@@ -392,7 +352,6 @@ public interface FakeApi {
     )
     Mono<Void> testNullable(
          @RequestBody Mono<ChildWithNullable> childWithNullable
-
     );
 
 
@@ -413,14 +372,10 @@ public interface FakeApi {
         accept = { "application/json" }
     )
     Mono<Void> testQueryParameterCollectionFormat(
-         @RequestParam(value = "pipe", required = true) List<String> pipe
+         @RequestParam(value = "pipe", required = true) List<String> pipe,
-,
+         @RequestParam(value = "http", required = true) List<String> http,
-         @RequestParam(value = "http", required = true) List<String> http
+         @RequestParam(value = "url", required = true) List<String> url,
-,
-         @RequestParam(value = "url", required = true) List<String> url
-,
          @RequestParam(value = "context", required = true) List<String> context
-
     );
 
 

samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java

@@ -40,7 +40,6 @@ public interface FakeClassnameTags123Api {
     )
     Mono<Client> testClassname(
          @RequestBody Mono<Client> client
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/PetApi.java

@@ -45,7 +45,6 @@ public interface PetApi {
     )
     Mono<Void> addPet(
          @RequestBody Mono<Pet> pet
-
     );
 
 
@@ -65,10 +64,8 @@ public interface PetApi {
         accept = { "application/json" }
     )
     Mono<Void> deletePet(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
          @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -88,7 +85,6 @@ public interface PetApi {
     )
     Flux<Pet> findPetsByStatus(
          @RequestParam(value = "status", required = true) List<String> status
-
     );
 
 
@@ -110,7 +106,6 @@ public interface PetApi {
     )
     Flux<Pet> findPetsByTags(
          @RequestParam(value = "tags", required = true) Set<String> tags
-
     );
 
 
@@ -131,7 +126,6 @@ public interface PetApi {
     )
     Mono<Pet> getPetById(
          @PathVariable("petId") Long petId
-
     );
 
 
@@ -149,7 +143,6 @@ public interface PetApi {
     )
     Mono<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
          @PathVariable("petId") Long petId
-
     );
 
 
@@ -172,7 +165,6 @@ public interface PetApi {
     )
     Mono<Void> updatePet(
          @RequestBody Mono<Pet> pet
-
     );
 
 
@@ -193,12 +185,9 @@ public interface PetApi {
         contentType = "application/x-www-form-urlencoded"
     )
     Mono<Void> updatePetWithForm(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestPart(value = "name", required = false) String name,
-         @RequestPart(value = "name", required = false) String name
-,
          @RequestPart(value = "status", required = false) String status
-
     );
 
 
@@ -219,12 +208,9 @@ public interface PetApi {
         contentType = "multipart/form-data"
     )
     Mono<ModelApiResponse> uploadFile(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata,
-         @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata
-,
          @RequestPart(value = "file", required = false) Part file
-
     );
 
 
@@ -245,12 +231,9 @@ public interface PetApi {
         contentType = "multipart/form-data"
     )
     Mono<ModelApiResponse> uploadFileWithRequiredFile(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestPart(value = "requiredFile", required = true) Part requiredFile,
-         @RequestPart(value = "requiredFile", required = true) Part requiredFile
-,
          @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/StoreApi.java

@@ -41,7 +41,6 @@ public interface StoreApi {
     )
     Mono<Void> deleteOrder(
          @PathVariable("order_id") String orderId
-
     );
 
 
@@ -79,7 +78,6 @@ public interface StoreApi {
     )
     Mono<Order> getOrderById(
          @PathVariable("order_id") Long orderId
-
     );
 
 
@@ -100,7 +98,6 @@ public interface StoreApi {
     )
     Mono<Order> placeOrder(
          @RequestBody Mono<Order> order
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/api/UserApi.java

@@ -41,7 +41,6 @@ public interface UserApi {
     )
     Mono<Void> createUser(
          @RequestBody Mono<User> user
-
     );
 
 
@@ -61,7 +60,6 @@ public interface UserApi {
     )
     Mono<Void> createUsersWithArrayInput(
          @RequestBody Flux<User> user
-
     );
 
 
@@ -81,7 +79,6 @@ public interface UserApi {
     )
     Mono<Void> createUsersWithListInput(
          @RequestBody Flux<User> user
-
     );
 
 
@@ -101,7 +98,6 @@ public interface UserApi {
     )
     Mono<Void> deleteUser(
          @PathVariable("username") String username
-
     );
 
 
@@ -122,7 +118,6 @@ public interface UserApi {
     )
     Mono<User> getUserByName(
          @PathVariable("username") String username
-
     );
 
 
@@ -142,10 +137,8 @@ public interface UserApi {
         accept = { "application/json", "application/xml" }
     )
     Mono<String> loginUser(
-         @RequestParam(value = "username", required = true) String username
+         @RequestParam(value = "username", required = true) String username,
-,
          @RequestParam(value = "password", required = true) String password
-
     );
 
 
@@ -183,10 +176,8 @@ public interface UserApi {
         contentType = "application/json"
     )
     Mono<Void> updateUser(
-         @PathVariable("username") String username
+         @PathVariable("username") String username,
-,
          @RequestBody Mono<User> user
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -39,7 +39,6 @@ public interface AnotherFakeApi {
     )
     Mono<ResponseEntity<Client>> call123testSpecialTags(
          @RequestBody Mono<Client> client
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java

@@ -50,7 +50,6 @@ public interface FakeApi {
     )
     Mono<ResponseEntity<Void>> createXmlItem(
          @RequestBody Mono<XmlItem> xmlItem
-
     );
 
 
@@ -69,7 +68,6 @@ public interface FakeApi {
     )
     Mono<ResponseEntity<Boolean>> fakeOuterBooleanSerialize(
          @RequestBody(required = false) Mono<Boolean> body
-
     );
 
 
@@ -88,7 +86,6 @@ public interface FakeApi {
     )
     Mono<ResponseEntity<OuterComposite>> fakeOuterCompositeSerialize(
          @RequestBody(required = false) Mono<OuterComposite> outerComposite
-
     );
 
 
@@ -107,7 +104,6 @@ public interface FakeApi {
     )
     Mono<ResponseEntity<BigDecimal>> fakeOuterNumberSerialize(
          @RequestBody(required = false) Mono<BigDecimal> body
-
     );
 
 
@@ -126,7 +122,6 @@ public interface FakeApi {
     )
     Mono<ResponseEntity<String>> fakeOuterStringSerialize(
          @RequestBody(required = false) Mono<String> body
-
     );
 
 
@@ -145,7 +140,6 @@ public interface FakeApi {
     )
     Mono<ResponseEntity<Void>> testBodyWithFileSchema(
          @RequestBody Mono<FileSchemaTestClass> fileSchemaTestClass
-
     );
 
 
@@ -163,10 +157,8 @@ public interface FakeApi {
         contentType = "application/json"
     )
     Mono<ResponseEntity<Void>> testBodyWithQueryParams(
-         @RequestParam(value = "query", required = true) String query
+         @RequestParam(value = "query", required = true) String query,
-,
          @RequestBody Mono<User> user
-
     );
 
 
@@ -185,7 +177,6 @@ public interface FakeApi {
     )
     Mono<ResponseEntity<Client>> testClientModel(
          @RequestBody Mono<Client> client
-
     );
 
 
@@ -217,34 +208,20 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     Mono<ResponseEntity<Void>> testEndpointParameters(
-         @RequestPart(value = "number", required = true) BigDecimal number
+         @RequestPart(value = "number", required = true) BigDecimal number,
-,
+         @RequestPart(value = "double", required = true) Double _double,
-         @RequestPart(value = "double", required = true) Double _double
+         @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
-,
+         @RequestPart(value = "byte", required = true) byte[] _byte,
-         @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter
+         @RequestPart(value = "integer", required = false) Integer integer,
-,
+         @RequestPart(value = "int32", required = false) Integer int32,
-         @RequestPart(value = "byte", required = true) byte[] _byte
+         @RequestPart(value = "int64", required = false) Long int64,
-,
+         @RequestPart(value = "float", required = false) Float _float,
-         @RequestPart(value = "integer", required = false) Integer integer
+         @RequestPart(value = "string", required = false) String string,
-,
+         @RequestPart(value = "binary", required = false) Part binary,
-         @RequestPart(value = "int32", required = false) Integer int32
+         @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-,
+         @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
-         @RequestPart(value = "int64", required = false) Long int64
+         @RequestPart(value = "password", required = false) String password,
-,
-         @RequestPart(value = "float", required = false) Float _float
-,
-         @RequestPart(value = "string", required = false) String string
-,
-         @RequestPart(value = "binary", required = false) Part binary
-,
-         @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
-,
-         @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime
-,
-         @RequestPart(value = "password", required = false) String password
-,
          @RequestPart(value = "callback", required = false) String paramCallback
-
     );
 
 
@@ -270,22 +247,14 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     Mono<ResponseEntity<Void>> testEnumParameters(
-         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray
+         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray,
-,
+         @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString,
-         @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString
+         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray,
-,
+         @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString,
-         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray
+         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger,
-,
+         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble,
-         @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString
+         @RequestPart(value = "enum_form_string_array", required = false) List<String> enumFormStringArray,
-,
+         @RequestPart(value = "enum_form_string", required = false) String enumFormString
-         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger
-,
-         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble
-,
-         @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List<String> enumFormStringArray
-,
-         @RequestPart(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString
-
     );
 
 
@@ -307,18 +276,12 @@ public interface FakeApi {
         accept = { "application/json" }
     )
     Mono<ResponseEntity<Void>> testGroupParameters(
-         @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup
+         @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,
-,
+         @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup,
-         @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup
+         @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,
-,
+         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup,
-         @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group
+         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup,
-,
-         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup
-,
-         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup
-,
          @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group
-
     );
 
 
@@ -337,7 +300,6 @@ public interface FakeApi {
     )
     Mono<ResponseEntity<Void>> testInlineAdditionalProperties(
          @RequestBody Mono<Map<String, String>> requestBody
-
     );
 
 
@@ -356,10 +318,8 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     Mono<ResponseEntity<Void>> testJsonFormData(
-         @RequestPart(value = "param", required = true) String param
+         @RequestPart(value = "param", required = true) String param,
-,
          @RequestPart(value = "param2", required = true) String param2
-
     );
 
 
@@ -378,7 +338,6 @@ public interface FakeApi {
     )
     Mono<ResponseEntity<Void>> testNullable(
          @RequestBody Mono<ChildWithNullable> childWithNullable
-
     );
 
 
@@ -398,14 +357,10 @@ public interface FakeApi {
         accept = { "application/json" }
     )
     Mono<ResponseEntity<Void>> testQueryParameterCollectionFormat(
-         @RequestParam(value = "pipe", required = true) List<String> pipe
+         @RequestParam(value = "pipe", required = true) List<String> pipe,
-,
+         @RequestParam(value = "http", required = true) List<String> http,
-         @RequestParam(value = "http", required = true) List<String> http
+         @RequestParam(value = "url", required = true) List<String> url,
-,
-         @RequestParam(value = "url", required = true) List<String> url
-,
          @RequestParam(value = "context", required = true) List<String> context
-
     );
 
 

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java

@@ -39,7 +39,6 @@ public interface FakeClassnameTags123Api {
     )
     Mono<ResponseEntity<Client>> testClassname(
          @RequestBody Mono<Client> client
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java

@@ -44,7 +44,6 @@ public interface PetApi {
     )
     Mono<ResponseEntity<Void>> addPet(
          @RequestBody Mono<Pet> pet
-
     );
 
 
@@ -63,10 +62,8 @@ public interface PetApi {
         accept = { "application/json" }
     )
     Mono<ResponseEntity<Void>> deletePet(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
          @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -85,7 +82,6 @@ public interface PetApi {
     )
     Mono<ResponseEntity<Flux<Pet>>> findPetsByStatus(
          @RequestParam(value = "status", required = true) List<String> status
-
     );
 
 
@@ -106,7 +102,6 @@ public interface PetApi {
     )
     Mono<ResponseEntity<Flux<Pet>>> findPetsByTags(
          @RequestParam(value = "tags", required = true) Set<String> tags
-
     );
 
 
@@ -126,7 +121,6 @@ public interface PetApi {
     )
     Mono<ResponseEntity<Pet>> getPetById(
          @PathVariable("petId") Long petId
-
     );
 
 
@@ -143,7 +137,6 @@ public interface PetApi {
     )
     Mono<ResponseEntity<ResponseObjectWithDifferentFieldNames>> responseObjectDifferentNames(
          @PathVariable("petId") Long petId
-
     );
 
 
@@ -165,7 +158,6 @@ public interface PetApi {
     )
     Mono<ResponseEntity<Void>> updatePet(
          @RequestBody Mono<Pet> pet
-
     );
 
 
@@ -185,12 +177,9 @@ public interface PetApi {
         contentType = "application/x-www-form-urlencoded"
     )
     Mono<ResponseEntity<Void>> updatePetWithForm(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestPart(value = "name", required = false) String name,
-         @RequestPart(value = "name", required = false) String name
-,
          @RequestPart(value = "status", required = false) String status
-
     );
 
 
@@ -210,12 +199,9 @@ public interface PetApi {
         contentType = "multipart/form-data"
     )
     Mono<ResponseEntity<ModelApiResponse>> uploadFile(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata,
-         @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata
-,
          @RequestPart(value = "file", required = false) Part file
-
     );
 
 
@@ -235,12 +221,9 @@ public interface PetApi {
         contentType = "multipart/form-data"
     )
     Mono<ResponseEntity<ModelApiResponse>> uploadFileWithRequiredFile(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestPart(value = "requiredFile", required = true) Part requiredFile,
-         @RequestPart(value = "requiredFile", required = true) Part requiredFile
-,
          @RequestPart(value = "additionalMetadata", required = false) String additionalMetadata
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/StoreApi.java

@@ -40,7 +40,6 @@ public interface StoreApi {
     )
     Mono<ResponseEntity<Void>> deleteOrder(
          @PathVariable("order_id") String orderId
-
     );
 
 
@@ -76,7 +75,6 @@ public interface StoreApi {
     )
     Mono<ResponseEntity<Order>> getOrderById(
          @PathVariable("order_id") Long orderId
-
     );
 
 
@@ -96,7 +94,6 @@ public interface StoreApi {
     )
     Mono<ResponseEntity<Order>> placeOrder(
          @RequestBody Mono<Order> order
-
     );
 
 }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/UserApi.java

@@ -40,7 +40,6 @@ public interface UserApi {
     )
     Mono<ResponseEntity<Void>> createUser(
          @RequestBody Mono<User> user
-
     );
 
 
@@ -59,7 +58,6 @@ public interface UserApi {
     )
     Mono<ResponseEntity<Void>> createUsersWithArrayInput(
          @RequestBody Flux<User> user
-
     );
 
 
@@ -78,7 +76,6 @@ public interface UserApi {
     )
     Mono<ResponseEntity<Void>> createUsersWithListInput(
          @RequestBody Flux<User> user
-
     );
 
 
@@ -97,7 +94,6 @@ public interface UserApi {
     )
     Mono<ResponseEntity<Void>> deleteUser(
          @PathVariable("username") String username
-
     );
 
 
@@ -117,7 +113,6 @@ public interface UserApi {
     )
     Mono<ResponseEntity<User>> getUserByName(
          @PathVariable("username") String username
-
     );
 
 
@@ -136,10 +131,8 @@ public interface UserApi {
         accept = { "application/json", "application/xml" }
     )
     Mono<ResponseEntity<String>> loginUser(
-         @RequestParam(value = "username", required = true) String username
+         @RequestParam(value = "username", required = true) String username,
-,
          @RequestParam(value = "password", required = true) String password
-
     );
 
 
@@ -175,10 +168,8 @@ public interface UserApi {
         contentType = "application/json"
     )
     Mono<ResponseEntity<Void>> updateUser(
-         @PathVariable("username") String username
+         @PathVariable("username") String username,
-,
          @RequestBody Mono<User> user
-
     );
 
 }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -35,7 +35,6 @@ public interface AnotherFakeApi {
     )
     ResponseEntity<ClientDto> call123testSpecialTags(
          @RequestBody ClientDto clientDto
-
     );
 
 }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java

@@ -46,7 +46,6 @@ public interface FakeApi {
     )
     ResponseEntity<Void> createXmlItem(
          @RequestBody XmlItemDto xmlItemDto
-
     );
 
 
@@ -65,7 +64,6 @@ public interface FakeApi {
     )
     ResponseEntity<Boolean> fakeOuterBooleanSerialize(
          @RequestBody(required = false) @Nullable Boolean body
-
     );
 
 
@@ -84,7 +82,6 @@ public interface FakeApi {
     )
     ResponseEntity<OuterCompositeDto> fakeOuterCompositeSerialize(
          @RequestBody(required = false) @Nullable OuterCompositeDto outerCompositeDto
-
     );
 
 
@@ -103,7 +100,6 @@ public interface FakeApi {
     )
     ResponseEntity<BigDecimal> fakeOuterNumberSerialize(
          @RequestBody(required = false) @Nullable BigDecimal body
-
     );
 
 
@@ -122,7 +118,6 @@ public interface FakeApi {
     )
     ResponseEntity<String> fakeOuterStringSerialize(
          @RequestBody(required = false) @Nullable String body
-
     );
 
 
@@ -141,7 +136,6 @@ public interface FakeApi {
     )
     ResponseEntity<Void> testBodyWithFileSchema(
          @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto
-
     );
 
 
@@ -159,10 +153,8 @@ public interface FakeApi {
         contentType = "application/json"
     )
     ResponseEntity<Void> testBodyWithQueryParams(
-         @RequestParam(value = "query", required = true) String query
+         @RequestParam(value = "query", required = true) String query,
-,
          @RequestBody UserDto userDto
-
     );
 
 
@@ -181,7 +173,6 @@ public interface FakeApi {
     )
     ResponseEntity<ClientDto> testClientModel(
          @RequestBody ClientDto clientDto
-
     );
 
 
@@ -213,34 +204,20 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> testEndpointParameters(
-         @RequestParam(value = "number", required = true) BigDecimal number
+         @RequestParam(value = "number", required = true) BigDecimal number,
-,
+         @RequestParam(value = "double", required = true) Double _double,
-         @RequestParam(value = "double", required = true) Double _double
+         @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
-,
+         @RequestParam(value = "byte", required = true) byte[] _byte,
-         @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter
+         @RequestParam(value = "integer", required = false) Integer integer,
-,
+         @RequestParam(value = "int32", required = false) Integer int32,
-         @RequestParam(value = "byte", required = true) byte[] _byte
+         @RequestParam(value = "int64", required = false) Long int64,
-,
+         @RequestParam(value = "float", required = false) Float _float,
-         @RequestParam(value = "integer", required = false) Integer integer
+         @RequestParam(value = "string", required = false) String string,
-,
+         @RequestPart(value = "binary", required = false) MultipartFile binary,
-         @RequestParam(value = "int32", required = false) Integer int32
+         @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-,
+         @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
-         @RequestParam(value = "int64", required = false) Long int64
+         @RequestParam(value = "password", required = false) String password,
-,
-         @RequestParam(value = "float", required = false) Float _float
-,
-         @RequestParam(value = "string", required = false) String string
-,
-         @RequestPart(value = "binary", required = false) MultipartFile binary
-,
-         @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
-,
-         @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime
-,
-         @RequestParam(value = "password", required = false) String password
-,
          @RequestParam(value = "callback", required = false) String paramCallback
-
     );
 
 
@@ -266,22 +243,14 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> testEnumParameters(
-         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray
+         @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray,
-,
+         @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString,
-         @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString
+         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray,
-,
+         @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString,
-         @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray
+         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger,
-,
+         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble,
-         @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString
+         @RequestPart(value = "enum_form_string_array", required = false) List<String> enumFormStringArray,
-,
+         @RequestParam(value = "enum_form_string", required = false) String enumFormString
-         @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger
-,
-         @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble
-,
-         @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List<String> enumFormStringArray
-,
-         @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString
-
     );
 
 
@@ -303,18 +272,12 @@ public interface FakeApi {
         accept = { "application/json" }
     )
     ResponseEntity<Void> testGroupParameters(
-         @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup
+         @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,
-,
+         @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup,
-         @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup
+         @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,
-,
+         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup,
-         @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group
+         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup,
-,
-         @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup
-,
-         @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup
-,
          @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group
-
     );
 
 
@@ -333,7 +296,6 @@ public interface FakeApi {
     )
     ResponseEntity<Void> testInlineAdditionalProperties(
          @RequestBody Map<String, String> requestBody
-
     );
 
 
@@ -352,10 +314,8 @@ public interface FakeApi {
         contentType = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> testJsonFormData(
-         @RequestParam(value = "param", required = true) String param
+         @RequestParam(value = "param", required = true) String param,
-,
          @RequestParam(value = "param2", required = true) String param2
-
     );
 
 
@@ -374,7 +334,6 @@ public interface FakeApi {
     )
     ResponseEntity<Void> testNullable(
          @RequestBody ChildWithNullableDto childWithNullableDto
-
     );
 
 
@@ -394,14 +353,10 @@ public interface FakeApi {
         accept = { "application/json" }
     )
     ResponseEntity<Void> testQueryParameterCollectionFormat(
-         @RequestParam(value = "pipe", required = true) List<String> pipe
+         @RequestParam(value = "pipe", required = true) List<String> pipe,
-,
+         @RequestParam(value = "http", required = true) List<String> http,
-         @RequestParam(value = "http", required = true) List<String> http
+         @RequestParam(value = "url", required = true) List<String> url,
-,
-         @RequestParam(value = "url", required = true) List<String> url
-,
          @RequestParam(value = "context", required = true) List<String> context
-
     );
 
 

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java

@@ -35,7 +35,6 @@ public interface FakeClassnameTags123Api {
     )
     ResponseEntity<ClientDto> testClassname(
          @RequestBody ClientDto clientDto
-
     );
 
 }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java

@@ -40,7 +40,6 @@ public interface PetApi {
     )
     ResponseEntity<Void> addPet(
          @RequestBody PetDto petDto
-
     );
 
 
@@ -59,10 +58,8 @@ public interface PetApi {
         accept = { "application/json" }
     )
     ResponseEntity<Void> deletePet(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
          @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -81,7 +78,6 @@ public interface PetApi {
     )
     ResponseEntity<List<PetDto>> findPetsByStatus(
          @RequestParam(value = "status", required = true) List<String> status
-
     );
 
 
@@ -102,7 +98,6 @@ public interface PetApi {
     )
     ResponseEntity<Set<PetDto>> findPetsByTags(
          @RequestParam(value = "tags", required = true) Set<String> tags
-
     );
 
 
@@ -122,7 +117,6 @@ public interface PetApi {
     )
     ResponseEntity<PetDto> getPetById(
          @PathVariable("petId") Long petId
-
     );
 
 
@@ -139,7 +133,6 @@ public interface PetApi {
     )
     ResponseEntity<ResponseObjectWithDifferentFieldNamesDto> responseObjectDifferentNames(
          @PathVariable("petId") Long petId
-
     );
 
 
@@ -161,7 +154,6 @@ public interface PetApi {
     )
     ResponseEntity<Void> updatePet(
          @RequestBody PetDto petDto
-
     );
 
 
@@ -181,12 +173,9 @@ public interface PetApi {
         contentType = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestParam(value = "name", required = false) String name,
-         @RequestParam(value = "name", required = false) String name
-,
          @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -206,12 +195,9 @@ public interface PetApi {
         contentType = "multipart/form-data"
     )
     ResponseEntity<ApiResponseDto> uploadFile(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-         @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
          @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 
@@ -231,12 +217,9 @@ public interface PetApi {
         contentType = "multipart/form-data"
     )
     ResponseEntity<ApiResponseDto> uploadFileWithRequiredFile(
-         @PathVariable("petId") Long petId
+         @PathVariable("petId") Long petId,
-,
+         @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile,
-         @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile
-,
          @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-
     );
 
 }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/StoreApi.java

@@ -36,7 +36,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
          @PathVariable("order_id") String orderId
-
     );
 
 
@@ -72,7 +71,6 @@ public interface StoreApi {
     )
     ResponseEntity<OrderDto> getOrderById(
          @PathVariable("order_id") Long orderId
-
     );
 
 
@@ -92,7 +90,6 @@ public interface StoreApi {
     )
     ResponseEntity<OrderDto> placeOrder(
          @RequestBody OrderDto orderDto
-
     );
 
 }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/UserApi.java

@@ -36,7 +36,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
          @RequestBody UserDto userDto
-
     );
 
 
@@ -55,7 +54,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
          @RequestBody List<UserDto> userDto
-
     );
 
 
@@ -74,7 +72,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
          @RequestBody List<UserDto> userDto
-
     );
 
 
@@ -93,7 +90,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
          @PathVariable("username") String username
-
     );
 
 
@@ -113,7 +109,6 @@ public interface UserApi {
     )
     ResponseEntity<UserDto> getUserByName(
          @PathVariable("username") String username
-
     );
 
 
@@ -132,10 +127,8 @@ public interface UserApi {
         accept = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-         @RequestParam(value = "username", required = true) String username
+         @RequestParam(value = "username", required = true) String username,
-,
          @RequestParam(value = "password", required = true) String password
-
     );
 
 
@@ -171,10 +164,8 @@ public interface UserApi {
         contentType = "application/json"
     )
     ResponseEntity<Void> updateUser(
-         @PathVariable("username") String username
+         @PathVariable("username") String username,
-,
          @RequestBody UserDto userDto
-
     );
 
 }

samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts

@@ -1214,7 +1214,9 @@ export class FakeApi extends runtime.BaseAPI {
         }
 
         if (requestParameters['language'] != null) {
-            queryParameters['language'] = requestParameters['language'];
+            for (let key of Object.keys(requestParameters['language'])) {
+                queryParameters[key] = requestParameters['language'][key];
+            }
         }
 
         if (requestParameters['allowEmpty'] != null) {

samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/FakeApi.ts

@@ -1072,7 +1072,9 @@ export class FakeApi extends runtime.BaseAPI {
         }
 
         if (requestParameters['language'] != null) {
-            queryParameters['language'] = requestParameters['language'];
+            for (let key of Object.keys(requestParameters['language'])) {
+                queryParameters[key] = requestParameters['language'][key];
+            }
         }
 
         if (requestParameters['allowEmpty'] != null) {

samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/PetApi.java

@@ -41,7 +41,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> addPet(
          @Valid @RequestBody Pet pet
-
     );
 
 
@@ -59,10 +58,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull  @PathVariable("petId") Long petId
+        @NotNull  @PathVariable("petId") Long petId,
-,
          @RequestHeader(value = "api_key", required = false) Optional<String> apiKey
-
     );
 
 
@@ -82,7 +79,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByStatus(
         @NotNull  @Valid @RequestParam(value = "status", required = true) @Deprecated List<String> status
-
     );
 
 
@@ -104,7 +100,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull  @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     );
 
 
@@ -125,7 +120,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull  @PathVariable("petId") Long petId
-
     );
 
 
@@ -150,7 +144,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> updatePet(
          @Valid @RequestBody Pet pet
-
     );
 
 
@@ -170,12 +163,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull  @PathVariable("petId") Long petId
+        @NotNull  @PathVariable("petId") Long petId,
-,
+         @Valid @RequestParam(value = "name", required = false) Optional<String> name,
-         @Valid @RequestParam(value = "name", required = false) Optional<String> name
-,
          @Valid @RequestParam(value = "status", required = false) Optional<String> status
-
     );
 
 
@@ -196,12 +186,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull  @PathVariable("petId") Long petId
+        @NotNull  @PathVariable("petId") Long petId,
-,
+         @Valid @RequestParam(value = "additionalMetadata", required = false) Optional<String> additionalMetadata,
-         @Valid @RequestParam(value = "additionalMetadata", required = false) Optional<String> additionalMetadata
-,
          @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/StoreApi.java

@@ -38,7 +38,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
         @NotNull  @PathVariable("orderId") String orderId
-
     );
 
 
@@ -76,7 +75,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L)  @PathVariable("orderId") Long orderId
-
     );
 
 
@@ -97,7 +95,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> placeOrder(
          @Valid @RequestBody Order order
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/api/UserApi.java

@@ -38,7 +38,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
          @Valid @RequestBody User user
-
     );
 
 
@@ -57,7 +56,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
          @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -76,7 +74,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
          @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -95,7 +92,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull  @PathVariable("username") String username
-
     );
 
 
@@ -116,7 +112,6 @@ public interface UserApi {
     )
     ResponseEntity<User> getUserByName(
         @NotNull  @PathVariable("username") String username
-
     );
 
 
@@ -136,10 +131,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")  @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")  @Valid @RequestParam(value = "username", required = true) String username,
-,
         @NotNull  @Valid @RequestParam(value = "password", required = true) String password
-
     );
 
 
@@ -175,10 +168,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> updateUser(
-        @NotNull  @PathVariable("username") String username
+        @NotNull  @PathVariable("username") String username,
-,
          @Valid @RequestBody User user
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/PetApi.java

@@ -70,7 +70,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -100,10 +99,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -139,7 +136,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByStatus(
         @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List<String> status
-
     );
 
 
@@ -178,7 +174,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     );
 
 
@@ -216,7 +211,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     );
 
 
@@ -260,7 +254,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> updatePet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -292,12 +285,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -332,12 +322,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/StoreApi.java

@@ -61,7 +61,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
         @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
-
     );
 
 
@@ -127,7 +126,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
-
     );
 
 
@@ -161,7 +159,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> placeOrder(
         @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/api/UserApi.java

@@ -63,7 +63,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
         @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
-
     );
 
 
@@ -94,7 +93,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -125,7 +123,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -157,7 +154,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     );
 
 
@@ -192,7 +188,6 @@ public interface UserApi {
     )
     ResponseEntity<User> getUserByName(
         @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
-
     );
 
 
@@ -225,10 +220,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @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
-
     );
 
 
@@ -289,10 +282,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java

@@ -71,7 +71,6 @@ public interface PetApi {
     )
     CompletableFuture<ResponseEntity<Pet>> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -101,10 +100,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     CompletableFuture<ResponseEntity<Void>> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -140,7 +137,6 @@ public interface PetApi {
     )
     CompletableFuture<ResponseEntity<List<Pet>>> findPetsByStatus(
         @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List<String> status
-
     );
 
 
@@ -179,7 +175,6 @@ public interface PetApi {
     )
     CompletableFuture<ResponseEntity<List<Pet>>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     );
 
 
@@ -217,7 +212,6 @@ public interface PetApi {
     )
     CompletableFuture<ResponseEntity<Pet>> getPetById(
         @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     );
 
 
@@ -261,7 +255,6 @@ public interface PetApi {
     )
     CompletableFuture<ResponseEntity<Pet>> updatePet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -293,12 +286,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     CompletableFuture<ResponseEntity<Void>> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -333,12 +323,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     CompletableFuture<ResponseEntity<ModelApiResponse>> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java

@@ -62,7 +62,6 @@ public interface StoreApi {
     )
     CompletableFuture<ResponseEntity<Void>> deleteOrder(
         @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
-
     );
 
 
@@ -128,7 +127,6 @@ public interface StoreApi {
     )
     CompletableFuture<ResponseEntity<Order>> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
-
     );
 
 
@@ -162,7 +160,6 @@ public interface StoreApi {
     )
     CompletableFuture<ResponseEntity<Order>> placeOrder(
         @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java

@@ -64,7 +64,6 @@ public interface UserApi {
     )
     CompletableFuture<ResponseEntity<Void>> createUser(
         @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
-
     );
 
 
@@ -95,7 +94,6 @@ public interface UserApi {
     )
     CompletableFuture<ResponseEntity<Void>> createUsersWithArrayInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -126,7 +124,6 @@ public interface UserApi {
     )
     CompletableFuture<ResponseEntity<Void>> createUsersWithListInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -158,7 +155,6 @@ public interface UserApi {
     )
     CompletableFuture<ResponseEntity<Void>> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     );
 
 
@@ -193,7 +189,6 @@ public interface UserApi {
     )
     CompletableFuture<ResponseEntity<User>> getUserByName(
         @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
-
     );
 
 
@@ -226,10 +221,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     CompletableFuture<ResponseEntity<String>> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @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
-
     );
 
 
@@ -290,10 +283,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     CompletableFuture<ResponseEntity<Void>> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java

@@ -59,14 +59,10 @@ public interface DefaultApi {
         value = DefaultApi.PATH_GET
     )
     ResponseEntity<Void> get(
-        @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
+        @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-,
+        @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
-        @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime
+        @NotNull @Parameter(name = "X-Order-Date", description = "A date header parameter", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate,
-,
+        @Parameter(name = "loginDate", description = "A date cookie parameter", in = ParameterIn.COOKIE) @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate
-        @NotNull @Parameter(name = "X-Order-Date", description = "A date header parameter", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate
-,
-        
-@Parameter(name = "loginDate", description = "A date cookie parameter", in = ParameterIn.COOKIE) @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate
     );
 
 
@@ -92,10 +88,8 @@ public interface DefaultApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
+        @NotNull @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-,
+        @Parameter(name = "visitDate", description = "Updated last visit timestamp") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
-        @Parameter(name = "visitDate", description = "Updated last visit timestamp") @Valid @RequestParam(value = "visitDate", required = false, defaultValue = "1971-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/api/PetApi.java

@@ -68,7 +68,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -62,7 +62,6 @@ public interface AnotherFakeApi {
     )
     ResponseEntity<Client> call123testSpecialTags(
         @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java

@@ -70,7 +70,6 @@ public interface FakeApi {
     )
     ResponseEntity<Void> createXmlItem(
         @Parameter(name = "XmlItem", description = "XmlItem Body", required = true) @Valid @RequestBody XmlItem xmlItem
-
     );
 
 
@@ -100,7 +99,6 @@ public interface FakeApi {
     )
     ResponseEntity<Boolean> fakeOuterBooleanSerialize(
         @Parameter(name = "body", description = "Input boolean as post body") @Valid @RequestBody(required = false) @Nullable Boolean body
-
     );
 
 
@@ -130,7 +128,6 @@ public interface FakeApi {
     )
     ResponseEntity<OuterComposite> fakeOuterCompositeSerialize(
         @Parameter(name = "OuterComposite", description = "Input composite as post body") @Valid @RequestBody(required = false) @Nullable OuterComposite outerComposite
-
     );
 
 
@@ -160,7 +157,6 @@ public interface FakeApi {
     )
     ResponseEntity<BigDecimal> fakeOuterNumberSerialize(
         @Parameter(name = "body", description = "Input number as post body") @Valid @RequestBody(required = false) @Nullable BigDecimal body
-
     );
 
 
@@ -190,7 +186,6 @@ public interface FakeApi {
     )
     ResponseEntity<String> fakeOuterStringSerialize(
         @Parameter(name = "body", description = "Input string as post body") @Valid @RequestBody(required = false) @Nullable String body
-
     );
 
 
@@ -217,7 +212,6 @@ public interface FakeApi {
     )
     ResponseEntity<Void> testBodyWithFileSchema(
         @Parameter(name = "FileSchemaTestClass", description = "", required = true) @Valid @RequestBody FileSchemaTestClass fileSchemaTestClass
-
     );
 
 
@@ -242,10 +236,8 @@ public interface FakeApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> testBodyWithQueryParams(
-        @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query
+        @NotNull @Parameter(name = "query", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "query", required = true) String query,
-,
         @Parameter(name = "User", description = "", required = true) @Valid @RequestBody User user
-
     );
 
 
@@ -276,7 +268,6 @@ public interface FakeApi {
     )
     ResponseEntity<Client> testClientModel(
         @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client
-
     );
 
 
@@ -321,34 +312,20 @@ public interface FakeApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> testEndpointParameters(
-        @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number
+        @Parameter(name = "number", description = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number,
-,
+        @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double,
-        @Parameter(name = "double", description = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double
+        @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
-,
+        @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter
+        @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer,
-,
+        @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32,
-        @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte
+        @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
-,
+        @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @Parameter(name = "integer", description = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer
+        @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string,
-,
+        @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @Parameter(name = "int32", description = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32
+        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-,
+        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
-        @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64
+        @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password,
-,
-        @Parameter(name = "float", description = "None") @DecimalMax(value = "987.6") @Valid @RequestParam(value = "float", required = false) Float _float
-,
-        @Parameter(name = "string", description = "None") @Pattern(regexp = "/[a-z]/i") @Valid @RequestParam(value = "string", required = false) String string
-,
-        @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary
-,
-        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date
-,
-        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime
-,
-        @Parameter(name = "password", description = "None") @Size(min = 10, max = 64) @Valid @RequestParam(value = "password", required = false) String password
-,
         @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
-
     );
 
 
@@ -384,22 +361,14 @@ public interface FakeApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> testEnumParameters(
-        @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray
+        @Parameter(name = "enum_header_string_array", description = "Header parameter enum test (string array)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string_array", required = false) @Nullable List<String> enumHeaderStringArray,
-,
+        @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString,
-        @Parameter(name = "enum_header_string", description = "Header parameter enum test (string)", in = ParameterIn.HEADER) @RequestHeader(value = "enum_header_string", required = false, defaultValue = "-efg") String enumHeaderString
+        @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray,
-,
+        @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString,
-        @Parameter(name = "enum_query_string_array", description = "Query parameter enum test (string array)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string_array", required = false) @Nullable List<String> enumQueryStringArray
+        @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger,
-,
+        @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble,
-        @Parameter(name = "enum_query_string", description = "Query parameter enum test (string)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_string", required = false, defaultValue = "-efg") String enumQueryString
+        @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,
-,
+        @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false) String enumFormString
-        @Parameter(name = "enum_query_integer", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_integer", required = false) @Nullable Integer enumQueryInteger
-,
-        @Parameter(name = "enum_query_double", description = "Query parameter enum test (double)", in = ParameterIn.QUERY) @Valid @RequestParam(value = "enum_query_double", required = false) @Nullable Double enumQueryDouble
-,
-        @Parameter(name = "enum_form_string_array", description = "Form parameter enum test (string array)") @Valid @RequestPart(value = "enum_form_string_array", required = false, defaultValue = "$") List<String> enumFormStringArray
-,
-        @Parameter(name = "enum_form_string", description = "Form parameter enum test (string)") @Valid @RequestParam(value = "enum_form_string", required = false, defaultValue = "-efg") String enumFormString
-
     );
 
 
@@ -430,18 +399,12 @@ public interface FakeApi {
         value = FakeApi.PATH_TEST_GROUP_PARAMETERS
     )
     ResponseEntity<Void> testGroupParameters(
-        @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup
+        @NotNull @Parameter(name = "required_string_group", description = "Required String in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,
-,
+        @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup,
-        @NotNull @Parameter(name = "required_boolean_group", description = "Required Boolean in group parameters", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "required_boolean_group", required = true) Boolean requiredBooleanGroup
+        @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,
-,
+        @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup,
-        @NotNull @Parameter(name = "required_int64_group", description = "Required Integer in group parameters", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group
+        @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup,
-,
-        @Parameter(name = "string_group", description = "String in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "string_group", required = false) @Nullable Integer stringGroup
-,
-        @Parameter(name = "boolean_group", description = "Boolean in group parameters", in = ParameterIn.HEADER) @RequestHeader(value = "boolean_group", required = false) @Nullable Boolean booleanGroup
-,
         @Parameter(name = "int64_group", description = "Integer in group parameters", in = ParameterIn.QUERY) @Valid @RequestParam(value = "int64_group", required = false) @Nullable Long int64Group
-
     );
 
 
@@ -469,7 +432,6 @@ public interface FakeApi {
     )
     ResponseEntity<Void> testInlineAdditionalProperties(
         @Parameter(name = "request_body", description = "request body", required = true) @Valid @RequestBody Map<String, String> requestBody
-
     );
 
 
@@ -497,10 +459,8 @@ public interface FakeApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> testJsonFormData(
-        @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param
+        @Parameter(name = "param", description = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param,
-,
         @Parameter(name = "param2", description = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2
-
     );
 
 
@@ -528,7 +488,6 @@ public interface FakeApi {
     )
     ResponseEntity<Void> testNullable(
         @Parameter(name = "ChildWithNullable", description = "request body", required = true) @Valid @RequestBody ChildWithNullable childWithNullable
-
     );
 
 
@@ -556,14 +515,10 @@ public interface FakeApi {
         value = FakeApi.PATH_TEST_QUERY_PARAMETER_COLLECTION_FORMAT
     )
     ResponseEntity<Void> testQueryParameterCollectionFormat(
-        @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe
+        @NotNull @Parameter(name = "pipe", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "pipe", required = true) List<String> pipe,
-,
+        @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List<String> http,
-        @NotNull @Parameter(name = "http", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "http", required = true) List<String> http
+        @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List<String> url,
-,
-        @NotNull @Parameter(name = "url", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "url", required = true) List<String> url
-,
         @NotNull @Parameter(name = "context", description = "", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "context", required = true) List<String> context
-
     );
 
 

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java

@@ -65,7 +65,6 @@ public interface FakeClassnameTags123Api {
     )
     ResponseEntity<Client> testClassname(
         @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java

@@ -68,7 +68,6 @@ public interface PetApi {
     )
     ResponseEntity<Void> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -100,10 +99,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -139,7 +136,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByStatus(
         @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
-
     );
 
 
@@ -178,7 +174,6 @@ public interface PetApi {
     )
     ResponseEntity<Set<Pet>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) Set<String> tags
-
     );
 
 
@@ -216,7 +211,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     );
 
 
@@ -243,7 +237,6 @@ public interface PetApi {
     )
     ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
         @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     );
 
 
@@ -280,7 +273,6 @@ public interface PetApi {
     )
     ResponseEntity<Void> updatePet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -312,12 +304,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -352,12 +341,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 
@@ -392,12 +378,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFileWithRequiredFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile,
-        @Parameter(name = "requiredFile", description = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile
-,
         @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/StoreApi.java

@@ -61,7 +61,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
         @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
-
     );
 
 
@@ -127,7 +126,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "order_id", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("order_id") Long orderId
-
     );
 
 
@@ -161,7 +159,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> placeOrder(
         @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/UserApi.java

@@ -60,7 +60,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
         @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
-
     );
 
 
@@ -88,7 +87,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -116,7 +114,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -145,7 +142,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     );
 
 
@@ -180,7 +176,6 @@ public interface UserApi {
     )
     ResponseEntity<User> getUserByName(
         @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
-
     );
 
 
@@ -213,10 +208,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-        @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @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
-
     );
 
 
@@ -271,10 +264,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java

@@ -64,7 +64,6 @@ public interface PetApi {
     )
     ResponseEntity<Void> addPet(
         @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body
-
     );
 
 
@@ -92,10 +91,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -130,8 +127,7 @@ public interface PetApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<List<Pet>> findPetsByStatus(
-        @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
+        @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,
-,
         @ParameterObject final Pageable pageable
     );
 
@@ -171,10 +167,8 @@ public interface PetApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<List<Pet>> findPetsByTags(
-        @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
+        @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags,
-,
+        @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) @Nullable String size,
-        @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) @Nullable String size
-,
         @ParameterObject final Pageable pageable
     );
 
@@ -213,7 +207,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     );
 
 
@@ -246,7 +239,6 @@ public interface PetApi {
     )
     ResponseEntity<Void> updatePet(
         @Parameter(name = "body", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body
-
     );
 
 
@@ -276,12 +268,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -314,12 +303,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java

@@ -61,7 +61,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
         @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
-
     );
 
 
@@ -127,7 +126,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
-
     );
 
 
@@ -158,7 +156,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> placeOrder(
         @Parameter(name = "body", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java

@@ -59,7 +59,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
         @Parameter(name = "body", description = "Created user object", required = true) @Valid @RequestBody User body
-
     );
 
 
@@ -84,7 +83,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
         @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body
-
     );
 
 
@@ -109,7 +107,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
         @Parameter(name = "body", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> body
-
     );
 
 
@@ -138,7 +135,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     );
 
 
@@ -171,7 +167,6 @@ public interface UserApi {
     )
     ResponseEntity<User> getUserByName(
         @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
-
     );
 
 
@@ -202,10 +197,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-        @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @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
-
     );
 
 
@@ -280,10 +273,8 @@ public interface UserApi {
         value = UserApi.PATH_UPDATE_USER
     )
     ResponseEntity<Void> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "body", description = "Updated user object", required = true) @Valid @RequestBody User body
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java

@@ -70,7 +70,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -100,10 +99,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     );
 
 
@@ -139,7 +136,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByStatus(
         @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List<String> status
-
     );
 
 
@@ -178,7 +174,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     );
 
 
@@ -216,7 +211,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     );
 
 
@@ -260,7 +254,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> updatePet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     );
 
 
@@ -292,12 +285,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     );
 
 
@@ -332,12 +322,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java

@@ -61,7 +61,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
         @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
-
     );
 
 
@@ -127,7 +126,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
-
     );
 
 
@@ -161,7 +159,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> placeOrder(
         @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     );
 
 }

samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java

@@ -63,7 +63,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
         @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
-
     );
 
 
@@ -94,7 +93,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -125,7 +123,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     );
 
 
@@ -157,7 +154,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     );
 
 
@@ -192,7 +188,6 @@ public interface UserApi {
     )
     ResponseEntity<User> getUserByName(
         @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
-
     );
 
 
@@ -225,10 +220,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @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
-
     );
 
 
@@ -289,10 +282,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
-
     );
 
 }

samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/PetApi.java

@@ -70,7 +70,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     ) throws Exception;
 
 
@@ -100,10 +99,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     ResponseEntity<Void> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     ) throws Exception;
 
 
@@ -139,7 +136,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByStatus(
         @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List<String> status
-
     ) throws Exception;
 
 
@@ -178,7 +174,6 @@ public interface PetApi {
     )
     ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     ) throws Exception;
 
 
@@ -216,7 +211,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> getPetById(
         @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     ) throws Exception;
 
 
@@ -260,7 +254,6 @@ public interface PetApi {
     )
     ResponseEntity<Pet> updatePet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     ) throws Exception;
 
 
@@ -292,12 +285,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     ) throws Exception;
 
 
@@ -332,12 +322,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     ) throws Exception;
 
 }

samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/StoreApi.java

@@ -61,7 +61,6 @@ public interface StoreApi {
     )
     ResponseEntity<Void> deleteOrder(
         @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
-
     ) throws Exception;
 
 
@@ -127,7 +126,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
-
     ) throws Exception;
 
 
@@ -161,7 +159,6 @@ public interface StoreApi {
     )
     ResponseEntity<Order> placeOrder(
         @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     ) throws Exception;
 
 }

samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/UserApi.java

@@ -63,7 +63,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUser(
         @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
-
     ) throws Exception;
 
 
@@ -94,7 +93,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithArrayInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     ) throws Exception;
 
 
@@ -125,7 +123,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> createUsersWithListInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     ) throws Exception;
 
 
@@ -157,7 +154,6 @@ public interface UserApi {
     )
     ResponseEntity<Void> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     ) throws Exception;
 
 
@@ -192,7 +188,6 @@ public interface UserApi {
     )
     ResponseEntity<User> getUserByName(
         @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
-
     ) throws Exception;
 
 
@@ -225,10 +220,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @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
-
     ) throws Exception;
 
 
@@ -289,10 +282,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     ResponseEntity<Void> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
-
     ) throws Exception;
 
 }

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

@@ -77,7 +77,6 @@ public interface PetApi {
     )
     default ResponseEntity<Pet> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -124,10 +123,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     default ResponseEntity<Void> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -166,7 +163,6 @@ public interface PetApi {
     )
     default ResponseEntity<List<Pet>> findPetsByStatus(
         @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List<String> status
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -222,7 +218,6 @@ public interface PetApi {
     )
     default ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -277,7 +272,6 @@ public interface PetApi {
     )
     default ResponseEntity<Pet> getPetById(
         @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -338,7 +332,6 @@ public interface PetApi {
     )
     default ResponseEntity<Pet> updatePet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -387,12 +380,9 @@ public interface PetApi {
         consumes = "application/x-www-form-urlencoded"
     )
     default ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -430,12 +420,9 @@ public interface PetApi {
         consumes = "multipart/form-data"
     )
     default ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

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

@@ -68,7 +68,6 @@ public interface StoreApi {
     )
     default ResponseEntity<Void> deleteOrder(
         @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -140,7 +139,6 @@ public interface StoreApi {
     )
     default ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -191,7 +189,6 @@ public interface StoreApi {
     )
     default ResponseEntity<Order> placeOrder(
         @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

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

@@ -70,7 +70,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> createUser(
         @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -104,7 +103,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> createUsersWithArrayInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -138,7 +136,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> createUsersWithListInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -173,7 +170,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -211,7 +207,6 @@ public interface UserApi {
     )
     default ResponseEntity<User> getUserByName(
         @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
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -261,10 +256,8 @@ public interface UserApi {
         produces = { "application/json", "application/xml" }
     )
     default ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @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
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -331,10 +324,8 @@ public interface UserApi {
         consumes = "application/json"
     )
     default ResponseEntity<Void> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 

samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java

@@ -68,7 +68,6 @@ public interface BarApi {
     )
     default ResponseEntity<Bar> createBar(
         @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java

@@ -69,7 +69,6 @@ public interface FooApi {
     )
     default ResponseEntity<FooRefOrValue> createFoo(
         @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) @Nullable Foo foo
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java

@@ -68,7 +68,6 @@ public interface BarApi {
     )
     default ResponseEntity<Bar> createBar(
         @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java

@@ -69,7 +69,6 @@ public interface FooApi {
     )
     default ResponseEntity<FooRefOrValue> createFoo(
         @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) @Nullable Foo foo
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java

@@ -68,7 +68,6 @@ public interface BarApi {
     )
     default ResponseEntity<Bar> createBar(
         @Parameter(name = "BarCreate", description = "", required = true) @Valid @RequestBody BarCreate barCreate
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java

@@ -69,7 +69,6 @@ public interface FooApi {
     )
     default ResponseEntity<FooRefOrValue> createFoo(
         @Parameter(name = "Foo", description = "The Foo to be created") @Valid @RequestBody(required = false) @Nullable Foo foo
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java

@@ -77,7 +77,6 @@ public interface PetApi {
     )
     default ResponseEntity<Pet> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -124,10 +123,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     default ResponseEntity<Void> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -166,7 +163,6 @@ public interface PetApi {
     )
     default ResponseEntity<List<Pet>> findPetsByStatus(
         @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List<String> status
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -222,7 +218,6 @@ public interface PetApi {
     )
     default ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -277,7 +272,6 @@ public interface PetApi {
     )
     default ResponseEntity<Pet> getPetById(
         @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -338,7 +332,6 @@ public interface PetApi {
     )
     default ResponseEntity<Pet> updatePet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -387,12 +380,9 @@ public interface PetApi {
         consumes = { "application/x-www-form-urlencoded" }
     )
     default ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -430,12 +420,9 @@ public interface PetApi {
         consumes = { "multipart/form-data" }
     )
     default ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java

@@ -68,7 +68,6 @@ public interface StoreApi {
     )
     default ResponseEntity<Void> deleteOrder(
         @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -140,7 +139,6 @@ public interface StoreApi {
     )
     default ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -191,7 +189,6 @@ public interface StoreApi {
     )
     default ResponseEntity<Order> placeOrder(
         @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java

@@ -70,7 +70,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> createUser(
         @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -104,7 +103,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> createUsersWithArrayInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -138,7 +136,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> createUsersWithListInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -173,7 +170,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -211,7 +207,6 @@ public interface UserApi {
     )
     default ResponseEntity<User> getUserByName(
         @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
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -261,10 +256,8 @@ public interface UserApi {
         produces = { "application/xml", "application/json" }
     )
     default ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @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
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -331,10 +324,8 @@ public interface UserApi {
         consumes = { "application/json" }
     )
     default ResponseEntity<Void> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 

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

@@ -77,7 +77,6 @@ public interface PetApi {
     )
     default ResponseEntity<Pet> addPet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -124,10 +123,8 @@ public interface PetApi {
         value = PetApi.PATH_DELETE_PET
     )
     default ResponseEntity<Void> deletePet(
-        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -166,7 +163,6 @@ public interface PetApi {
     )
     default ResponseEntity<List<Pet>> findPetsByStatus(
         @NotNull @Parameter(name = "status", deprecated = true, description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) @Deprecated List<String> status
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -222,7 +218,6 @@ public interface PetApi {
     )
     default ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -277,7 +272,6 @@ public interface PetApi {
     )
     default ResponseEntity<Pet> getPetById(
         @NotNull @Parameter(name = "petId", description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -338,7 +332,6 @@ public interface PetApi {
     )
     default ResponseEntity<Pet> updatePet(
         @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -387,12 +380,9 @@ public interface PetApi {
         consumes = { "application/x-www-form-urlencoded" }
     )
     default ResponseEntity<Void> updatePetWithForm(
-        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name
-,
         @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -430,12 +420,9 @@ public interface PetApi {
         consumes = { "multipart/form-data" }
     )
     default ResponseEntity<ModelApiResponse> uploadFile(
-        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+        @NotNull @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
-,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

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

@@ -68,7 +68,6 @@ public interface StoreApi {
     )
     default ResponseEntity<Void> deleteOrder(
         @NotNull @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -140,7 +139,6 @@ public interface StoreApi {
     )
     default ResponseEntity<Order> getOrderById(
         @NotNull @Min(value = 1L) @Max(value = 5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -191,7 +189,6 @@ public interface StoreApi {
     )
     default ResponseEntity<Order> placeOrder(
         @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

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

@@ -70,7 +70,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> createUser(
         @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -104,7 +103,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> createUsersWithArrayInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -138,7 +136,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> createUsersWithListInput(
         @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -173,7 +170,6 @@ public interface UserApi {
     )
     default ResponseEntity<Void> deleteUser(
         @NotNull @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -211,7 +207,6 @@ public interface UserApi {
     )
     default ResponseEntity<User> getUserByName(
         @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
-
     ) {
         getRequest().ifPresent(request -> {
             for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -261,10 +256,8 @@ public interface UserApi {
         produces = { "application/xml", "application/json" }
     )
     default ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username
+        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-,
         @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
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 
@@ -331,10 +324,8 @@ public interface UserApi {
         consumes = { "application/json" }
     )
     default ResponseEntity<Void> updateUser(
-        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @NotNull @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-,
         @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
-
     ) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 

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

@@ -65,7 +65,6 @@ public interface AnotherFakeApi {
     )
     default ResponseEntity<Client> call123testSpecialTags(
         @Parameter(name = "Client", description = "client model", required = true) @Valid @RequestBody Client client
-
     ) {
         return getDelegate().call123testSpecialTags(client);
     }