[Java][jersey2] Use builder pattern for requests (#4666)

* Use builder pattern for requests * petstore * Add @throws annotation * regenerate jersey2 test files * Also group bodyParam in builder class * petstore java6 * regenerate java8 * ensure up to date
2020-01-18 09:12:20 +01:00
parent 420039c9eb
commit ee984c38a5
139 changed files with 2378 additions and 1330 deletions
--- a/samples/client/petstore/java/jersey2-java6/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/AnotherFakeApi.md
@@ -12,6 +12,7 @@ Method | HTTP request | Description

 > Client call123testSpecialTags(body)

+
 To test special tags

 To test special tags and operation ID starting with number
@@ -33,8 +34,9 @@ public class Example {

        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
        Client body = new Client(); // Client | client model
-        try {
+        try { 
            Client result = apiInstance.call123testSpecialTags(body);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
--- a/samples/client/petstore/java/jersey2-java6/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/FakeApi.md
@@ -25,6 +25,7 @@ Method | HTTP request | Description

 > createXmlItem(xmlItem)

+
 creates an XmlItem

 this route creates an XmlItem
@@ -46,8 +47,10 @@ public class Example {

        FakeApi apiInstance = new FakeApi(defaultClient);
        XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body
-        try {
+        try { 
            apiInstance.createXmlItem(xmlItem);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#createXmlItem");
            System.err.println("Status code: " + e.getCode());
@@ -91,6 +94,7 @@ No authorization required



+
 Test serialization of outer boolean types

 ### Example
@@ -110,8 +114,9 @@ public class Example {

        FakeApi apiInstance = new FakeApi(defaultClient);
        Boolean body = true; // Boolean | Input boolean as post body
-        try {
+        try { 
            Boolean result = apiInstance.fakeOuterBooleanSerialize(body);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize");
@@ -156,6 +161,7 @@ No authorization required



+
 Test serialization of object with outer number type

 ### Example
@@ -175,8 +181,9 @@ public class Example {

        FakeApi apiInstance = new FakeApi(defaultClient);
        OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body
-        try {
+        try { 
            OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize");
@@ -221,6 +228,7 @@ No authorization required



+
 Test serialization of outer number types

 ### Example
@@ -240,8 +248,9 @@ public class Example {

        FakeApi apiInstance = new FakeApi(defaultClient);
        BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body
-        try {
+        try { 
            BigDecimal result = apiInstance.fakeOuterNumberSerialize(body);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize");
@@ -286,6 +295,7 @@ No authorization required



+
 Test serialization of outer string types

 ### Example
@@ -305,8 +315,9 @@ public class Example {

        FakeApi apiInstance = new FakeApi(defaultClient);
        String body = "body_example"; // String | Input string as post body
-        try {
+        try { 
            String result = apiInstance.fakeOuterStringSerialize(body);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize");
@@ -351,7 +362,8 @@ No authorization required



-For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+
+For this test, the body for this request much reference a schema named `File`.

 ### Example

@@ -370,8 +382,10 @@ public class Example {

        FakeApi apiInstance = new FakeApi(defaultClient);
        FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | 
-        try {
+        try { 
            apiInstance.testBodyWithFileSchema(body);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#testBodyWithFileSchema");
            System.err.println("Status code: " + e.getCode());
@@ -415,6 +429,7 @@ No authorization required



+
 ### Example

 ```java
@@ -433,8 +448,10 @@ public class Example {
        FakeApi apiInstance = new FakeApi(defaultClient);
        String query = "query_example"; // String | 
        User body = new User(); // User | 
-        try {
+        try { 
            apiInstance.testBodyWithQueryParams(query, body);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#testBodyWithQueryParams");
            System.err.println("Status code: " + e.getCode());
@@ -477,10 +494,11 @@ No authorization required

 > Client testClientModel(body)

-To test \&quot;client\&quot; model

 To test \&quot;client\&quot; model

+To test "client" model
+
 ### Example

 ```java
@@ -498,8 +516,9 @@ public class Example {

        FakeApi apiInstance = new FakeApi(defaultClient);
        Client body = new Client(); // Client | client model
-        try {
+        try { 
            Client result = apiInstance.testClientModel(body);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#testClientModel");
@@ -542,10 +561,14 @@ No authorization required

 > testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)

-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트

 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트

+Fake endpoint for testing various parameters
+ 假端點
+ 偽のエンドポイント
+ 가짜 엔드 포인트
+
 ### Example

 ```java
@@ -582,8 +605,10 @@ public class Example {
        OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
        String password = "password_example"; // String | None
        String paramCallback = "paramCallback_example"; // String | None
-        try {
+        try { 
            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#testEndpointParameters");
            System.err.println("Status code: " + e.getCode());
@@ -639,6 +664,7 @@ null (empty response body)

 > testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)

+
 To test enum parameters

 To test enum parameters
@@ -667,8 +693,10 @@ public class Example {
        Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
        List<String> enumFormStringArray = "$"; // List<String> | Form parameter enum test (string array)
        String enumFormString = "-efg"; // String | Form parameter enum test (string)
-        try {
+        try { 
            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#testEnumParameters");
            System.err.println("Status code: " + e.getCode());
@@ -716,7 +744,8 @@ No authorization required

 ## testGroupParameters

-> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
+
+> testGroupParameters().requiredStringGroup(requiredStringGroup).requiredBooleanGroup(requiredBooleanGroup).requiredInt64Group(requiredInt64Group).stringGroup(stringGroup).booleanGroup(booleanGroup).int64Group(int64Group).execute();

 Fake endpoint to test group parameters (optional)

@@ -744,8 +773,16 @@ public class Example {
        Integer stringGroup = 56; // Integer | String in group parameters
        Boolean booleanGroup = true; // Boolean | Boolean in group parameters
        Long int64Group = 56L; // Long | Integer in group parameters
-        try {
-            apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+        try { 
+            api.testGroupParameters()
+                .requiredStringGroup(requiredStringGroup)
+                .requiredBooleanGroup(requiredBooleanGroup)
+                .requiredInt64Group(requiredInt64Group)
+                .stringGroup(stringGroup)
+                .booleanGroup(booleanGroup)
+                .int64Group(int64Group)
+                .execute();
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#testGroupParameters");
            System.err.println("Status code: " + e.getCode());
@@ -792,6 +829,7 @@ No authorization required

 > testInlineAdditionalProperties(param)

+
 test inline additionalProperties

 ### Example
@@ -811,8 +849,10 @@ public class Example {

        FakeApi apiInstance = new FakeApi(defaultClient);
        Map<String, String> param = new HashMap(); // Map<String, String> | request body
-        try {
+        try { 
            apiInstance.testInlineAdditionalProperties(param);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties");
            System.err.println("Status code: " + e.getCode());
@@ -854,6 +894,7 @@ No authorization required

 > testJsonFormData(param, param2)

+
 test json serialization of form data

 ### Example
@@ -874,8 +915,10 @@ public class Example {
        FakeApi apiInstance = new FakeApi(defaultClient);
        String param = "param_example"; // String | field1
        String param2 = "param2_example"; // String | field2
-        try {
+        try { 
            apiInstance.testJsonFormData(param, param2);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#testJsonFormData");
            System.err.println("Status code: " + e.getCode());
@@ -920,6 +963,7 @@ No authorization required



+
 To test the collection format in query parameters

 ### Example
@@ -943,8 +987,10 @@ public class Example {
        List<String> http = Arrays.asList(); // List<String> | 
        List<String> url = Arrays.asList(); // List<String> | 
        List<String> context = Arrays.asList(); // List<String> | 
-        try {
+        try { 
            apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeApi#testQueryParameterCollectionFormat");
            System.err.println("Status code: " + e.getCode());
--- a/samples/client/petstore/java/jersey2-java6/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/FakeClassnameTags123Api.md
@@ -12,6 +12,7 @@ Method | HTTP request | Description

 > Client testClassname(body)

+
 To test class name in snake case

 To test class name in snake case
@@ -40,8 +41,9 @@ public class Example {

        FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(defaultClient);
        Client body = new Client(); // Client | client model
-        try {
+        try { 
            Client result = apiInstance.testClassname(body);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling FakeClassnameTags123Api#testClassname");
--- a/samples/client/petstore/java/jersey2-java6/docs/PetApi.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/PetApi.md
@@ -20,6 +20,7 @@ Method | HTTP request | Description

 > addPet(body)

+
 Add a new pet to the store

 ### Example
@@ -44,8 +45,10 @@ public class Example {

        PetApi apiInstance = new PetApi(defaultClient);
        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
-        try {
+        try { 
            apiInstance.addPet(body);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling PetApi#addPet");
            System.err.println("Status code: " + e.getCode());
@@ -88,6 +91,7 @@ null (empty response body)

 > deletePet(petId, apiKey)

+
 Deletes a pet

 ### Example
@@ -113,8 +117,10 @@ public class Example {
        PetApi apiInstance = new PetApi(defaultClient);
        Long petId = 56L; // Long | Pet id to delete
        String apiKey = "apiKey_example"; // String | 
-        try {
+        try { 
            apiInstance.deletePet(petId, apiKey);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling PetApi#deletePet");
            System.err.println("Status code: " + e.getCode());
@@ -158,6 +164,7 @@ null (empty response body)

 > List&lt;Pet&gt; findPetsByStatus(status)

+
 Finds Pets by status

 Multiple status values can be provided with comma separated strings
@@ -184,8 +191,9 @@ public class Example {

        PetApi apiInstance = new PetApi(defaultClient);
        List<String> status = Arrays.asList("available"); // List<String> | Status values that need to be considered for filter
-        try {
+        try { 
            List<Pet> result = apiInstance.findPetsByStatus(status);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling PetApi#findPetsByStatus");
@@ -229,6 +237,7 @@ Name | Type | Description  | Notes

 > List&lt;Pet&gt; findPetsByTags(tags)

+
 Finds Pets by tags

 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -255,8 +264,9 @@ public class Example {

        PetApi apiInstance = new PetApi(defaultClient);
        List<String> tags = Arrays.asList(); // List<String> | Tags to filter by
-        try {
+        try { 
            List<Pet> result = apiInstance.findPetsByTags(tags);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling PetApi#findPetsByTags");
@@ -300,6 +310,7 @@ Name | Type | Description  | Notes

 > Pet getPetById(petId)

+
 Find pet by ID

 Returns a single pet
@@ -328,8 +339,9 @@ public class Example {

        PetApi apiInstance = new PetApi(defaultClient);
        Long petId = 56L; // Long | ID of pet to return
-        try {
+        try { 
            Pet result = apiInstance.getPetById(petId);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling PetApi#getPetById");
@@ -374,6 +386,7 @@ Name | Type | Description  | Notes

 > updatePet(body)

+
 Update an existing pet

 ### Example
@@ -398,8 +411,10 @@ public class Example {

        PetApi apiInstance = new PetApi(defaultClient);
        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
-        try {
+        try { 
            apiInstance.updatePet(body);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling PetApi#updatePet");
            System.err.println("Status code: " + e.getCode());
@@ -444,6 +459,7 @@ null (empty response body)

 > updatePetWithForm(petId, name, status)

+
 Updates a pet in the store with form data

 ### Example
@@ -470,8 +486,10 @@ public class Example {
        Long petId = 56L; // Long | ID of pet that needs to be updated
        String name = "name_example"; // String | Updated name of the pet
        String status = "status_example"; // String | Updated status of the pet
-        try {
+        try { 
            apiInstance.updatePetWithForm(petId, name, status);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling PetApi#updatePetWithForm");
            System.err.println("Status code: " + e.getCode());
@@ -515,6 +533,7 @@ null (empty response body)

 > ModelApiResponse uploadFile(petId, additionalMetadata, file)

+
 uploads an image

 ### Example
@@ -541,8 +560,9 @@ public class Example {
        Long petId = 56L; // Long | ID of pet to update
        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
        File file = new File("/path/to/file"); // File | file to upload
-        try {
+        try { 
            ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling PetApi#uploadFile");
@@ -587,6 +607,7 @@ Name | Type | Description  | Notes

 > ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)

+
 uploads an image (required)

 ### Example
@@ -613,8 +634,9 @@ public class Example {
        Long petId = 56L; // Long | ID of pet to update
        File requiredFile = new File("/path/to/file"); // File | file to upload
        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
-        try {
+        try { 
            ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile");
--- a/samples/client/petstore/java/jersey2-java6/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/StoreApi.md
@@ -15,9 +15,10 @@ Method | HTTP request | Description

 > deleteOrder(orderId)

+
 Delete purchase order by ID

-For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors

 ### Example

@@ -36,8 +37,10 @@ public class Example {

        StoreApi apiInstance = new StoreApi(defaultClient);
        String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
-        try {
+        try { 
            apiInstance.deleteOrder(orderId);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling StoreApi#deleteOrder");
            System.err.println("Status code: " + e.getCode());
@@ -80,6 +83,7 @@ No authorization required

 > Map&lt;String, Integer&gt; getInventory()

+
 Returns pet inventories by status

 Returns a map of status codes to quantities
@@ -107,8 +111,9 @@ public class Example {
        //api_key.setApiKeyPrefix("Token");

        StoreApi apiInstance = new StoreApi(defaultClient);
-        try {
+        try { 
            Map<String, Integer> result = apiInstance.getInventory();
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling StoreApi#getInventory");
@@ -148,9 +153,10 @@ This endpoint does not need any parameter.

 > Order getOrderById(orderId)

+
 Find purchase order by ID

-For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions

 ### Example

@@ -169,8 +175,9 @@ public class Example {

        StoreApi apiInstance = new StoreApi(defaultClient);
        Long orderId = 56L; // Long | ID of pet that needs to be fetched
-        try {
+        try { 
            Order result = apiInstance.getOrderById(orderId);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling StoreApi#getOrderById");
@@ -215,6 +222,7 @@ No authorization required

 > Order placeOrder(body)

+
 Place an order for a pet

 ### Example
@@ -234,8 +242,9 @@ public class Example {

        StoreApi apiInstance = new StoreApi(defaultClient);
        Order body = new Order(); // Order | order placed for purchasing the pet
-        try {
+        try { 
            Order result = apiInstance.placeOrder(body);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling StoreApi#placeOrder");
--- a/samples/client/petstore/java/jersey2-java6/docs/UserApi.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/UserApi.md
@@ -19,6 +19,7 @@ Method | HTTP request | Description

 > createUser(body)

+
 Create user

 This can only be done by the logged in user.
@@ -40,8 +41,10 @@ public class Example {

        UserApi apiInstance = new UserApi(defaultClient);
        User body = new User(); // User | Created user object
-        try {
+        try { 
            apiInstance.createUser(body);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling UserApi#createUser");
            System.err.println("Status code: " + e.getCode());
@@ -83,6 +86,7 @@ No authorization required

 > createUsersWithArrayInput(body)

+
 Creates list of users with given input array

 ### Example
@@ -102,8 +106,10 @@ public class Example {

        UserApi apiInstance = new UserApi(defaultClient);
        List<User> body = Arrays.asList(); // List<User> | List of user object
-        try {
+        try { 
            apiInstance.createUsersWithArrayInput(body);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
            System.err.println("Status code: " + e.getCode());
@@ -145,6 +151,7 @@ No authorization required

 > createUsersWithListInput(body)

+
 Creates list of users with given input array

 ### Example
@@ -164,8 +171,10 @@ public class Example {

        UserApi apiInstance = new UserApi(defaultClient);
        List<User> body = Arrays.asList(); // List<User> | List of user object
-        try {
+        try { 
            apiInstance.createUsersWithListInput(body);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling UserApi#createUsersWithListInput");
            System.err.println("Status code: " + e.getCode());
@@ -207,6 +216,7 @@ No authorization required

 > deleteUser(username)

+
 Delete user

 This can only be done by the logged in user.
@@ -228,8 +238,10 @@ public class Example {

        UserApi apiInstance = new UserApi(defaultClient);
        String username = "username_example"; // String | The name that needs to be deleted
-        try {
+        try { 
            apiInstance.deleteUser(username);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling UserApi#deleteUser");
            System.err.println("Status code: " + e.getCode());
@@ -272,6 +284,7 @@ No authorization required

 > User getUserByName(username)

+
 Get user by user name

 ### Example
@@ -291,8 +304,9 @@ public class Example {

        UserApi apiInstance = new UserApi(defaultClient);
        String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing.
-        try {
+        try { 
            User result = apiInstance.getUserByName(username);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling UserApi#getUserByName");
@@ -337,6 +351,7 @@ No authorization required

 > String loginUser(username, password)

+
 Logs user into the system

 ### Example
@@ -357,8 +372,9 @@ public class Example {
        UserApi apiInstance = new UserApi(defaultClient);
        String username = "username_example"; // String | The user name for login
        String password = "password_example"; // String | The password for login in clear text
-        try {
+        try { 
            String result = apiInstance.loginUser(username, password);
+            
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling UserApi#loginUser");
@@ -403,6 +419,7 @@ No authorization required

 > logoutUser()

+
 Logs out current logged in user session

 ### Example
@@ -421,8 +438,10 @@ public class Example {
        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");

        UserApi apiInstance = new UserApi(defaultClient);
-        try {
+        try { 
            apiInstance.logoutUser();
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling UserApi#logoutUser");
            System.err.println("Status code: " + e.getCode());
@@ -461,6 +480,7 @@ No authorization required

 > updateUser(username, body)

+
 Updated user

 This can only be done by the logged in user.
@@ -483,8 +503,10 @@ public class Example {
        UserApi apiInstance = new UserApi(defaultClient);
        String username = "username_example"; // String | name that need to be deleted
        User body = new User(); // User | Updated user object
-        try {
+        try { 
            apiInstance.updateUser(username, body);
+            
+            
        } catch (ApiException e) {
            System.err.println("Exception when calling UserApi#updateUser");
            System.err.println("Status code: " + e.getCode());
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -34,7 +34,6 @@ public class AnotherFakeApi {
  public void setApiClient(ApiClient apiClient) {
    this.apiClient = apiClient;
  }
-
  /**
   * To test special tags
   * To test special tags and operation ID starting with number
@@ -43,13 +42,13 @@ public class AnotherFakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public Client call123testSpecialTags(Client body) throws ApiException {
    return call123testSpecialTagsWithHttpInfo(body).getData();
-      }
+  }

  /**
   * To test special tags
@@ -59,8 +58,8 @@ public class AnotherFakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throws ApiException {
@@ -98,5 +97,5 @@ public class AnotherFakeApi {

    GenericType<Client> localVarReturnType = new GenericType<Client>() {};
    return apiClient.invokeAPI(localVarPath, "PATCH", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
 }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -42,7 +42,6 @@ public class FakeApi {
  public void setApiClient(ApiClient apiClient) {
    this.apiClient = apiClient;
  }
-
  /**
   * creates an XmlItem
   * this route creates an XmlItem
@@ -50,12 +49,11 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public void createXmlItem(XmlItem xmlItem) throws ApiException {
-
    createXmlItemWithHttpInfo(xmlItem);
  }

@@ -67,8 +65,8 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> createXmlItemWithHttpInfo(XmlItem xmlItem) throws ApiException {
@@ -104,7 +102,7 @@ public class FakeApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -115,13 +113,13 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Output boolean </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Output boolean </td><td>  -  </td></tr>
     </table>
   */
  public Boolean fakeOuterBooleanSerialize(Boolean body) throws ApiException {
    return fakeOuterBooleanSerializeWithHttpInfo(body).getData();
-      }
+  }

  /**
   * 
@@ -131,8 +129,8 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Output boolean </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Output boolean </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException {
@@ -165,7 +163,7 @@ public class FakeApi {

    GenericType<Boolean> localVarReturnType = new GenericType<Boolean>() {};
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * 
   * Test serialization of object with outer number type
@@ -174,13 +172,13 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Output composite </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Output composite </td><td>  -  </td></tr>
     </table>
   */
  public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws ApiException {
    return fakeOuterCompositeSerializeWithHttpInfo(body).getData();
-      }
+  }

  /**
   * 
@@ -190,8 +188,8 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Output composite </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Output composite </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException {
@@ -224,7 +222,7 @@ public class FakeApi {

    GenericType<OuterComposite> localVarReturnType = new GenericType<OuterComposite>() {};
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * 
   * Test serialization of outer number types
@@ -233,13 +231,13 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Output number </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Output number </td><td>  -  </td></tr>
     </table>
   */
  public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws ApiException {
    return fakeOuterNumberSerializeWithHttpInfo(body).getData();
-      }
+  }

  /**
   * 
@@ -249,8 +247,8 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Output number </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Output number </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException {
@@ -283,7 +281,7 @@ public class FakeApi {

    GenericType<BigDecimal> localVarReturnType = new GenericType<BigDecimal>() {};
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * 
   * Test serialization of outer string types
@@ -292,13 +290,13 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Output string </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Output string </td><td>  -  </td></tr>
     </table>
   */
  public String fakeOuterStringSerialize(String body) throws ApiException {
    return fakeOuterStringSerializeWithHttpInfo(body).getData();
-      }
+  }

  /**
   * 
@@ -308,8 +306,8 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Output string </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Output string </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException {
@@ -342,7 +340,7 @@ public class FakeApi {

    GenericType<String> localVarReturnType = new GenericType<String>() {};
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * 
   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
@@ -350,12 +348,11 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
     </table>
   */
  public void testBodyWithFileSchema(FileSchemaTestClass body) throws ApiException {
-
    testBodyWithFileSchemaWithHttpInfo(body);
  }

@@ -367,8 +364,8 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass body) throws ApiException {
@@ -404,7 +401,7 @@ public class FakeApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -415,12 +412,11 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
     </table>
   */
  public void testBodyWithQueryParams(String query, User body) throws ApiException {
-
    testBodyWithQueryParamsWithHttpInfo(query, body);
  }

@@ -433,8 +429,8 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(String query, User body) throws ApiException {
@@ -476,7 +472,7 @@ public class FakeApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -487,13 +483,13 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public Client testClientModel(Client body) throws ApiException {
    return testClientModelWithHttpInfo(body).getData();
-      }
+  }

  /**
   * To test \&quot;client\&quot; model
@@ -503,8 +499,8 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiException {
@@ -542,7 +538,7 @@ public class FakeApi {

    GenericType<Client> localVarReturnType = new GenericType<Client>() {};
    return apiClient.invokeAPI(localVarPath, "PATCH", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
   * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -563,13 +559,12 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
     </table>
   */
  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-
    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
  }

@@ -594,9 +589,9 @@ public class FakeApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
@@ -675,7 +670,7 @@ if (paramCallback != null)

    String[] localVarAuthNames = new String[] { "http_basic_test" };

-
+    
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -692,13 +687,12 @@ if (paramCallback != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid request </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid request </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
     </table>
   */
  public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
-
    testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
  }

@@ -717,9 +711,9 @@ if (paramCallback != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid request </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid request </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
@@ -762,48 +756,11 @@ if (enumFormString != null)

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
-  /**
-   * Fake endpoint to test group parameters (optional)
-   * Fake endpoint to test group parameters (optional)
-   * @param requiredStringGroup Required String in group parameters (required)
-   * @param requiredBooleanGroup Required Boolean in group parameters (required)
-   * @param requiredInt64Group Required Integer in group parameters (required)
-   * @param stringGroup String in group parameters (optional)
-   * @param booleanGroup Boolean in group parameters (optional)
-   * @param int64Group Integer in group parameters (optional)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Someting wrong </td><td>  -  </td></tr>
-     </table>
-   */
-  public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {

-    testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-  }
-
-  /**
-   * Fake endpoint to test group parameters (optional)
-   * Fake endpoint to test group parameters (optional)
-   * @param requiredStringGroup Required String in group parameters (required)
-   * @param requiredBooleanGroup Required Boolean in group parameters (required)
-   * @param requiredInt64Group Required Integer in group parameters (required)
-   * @param stringGroup String in group parameters (optional)
-   * @param booleanGroup Boolean in group parameters (optional)
-   * @param int64Group Integer in group parameters (optional)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Someting wrong </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
+private ApiResponse<Void> testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
    Object localVarPostBody = null;
    
    // verify the required parameter 'requiredStringGroup' is set
@@ -854,9 +811,133 @@ if (booleanGroup != null)

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
+
+  public class APItestGroupParametersRequest {
+    private Integer requiredStringGroup;
+    private Boolean requiredBooleanGroup;
+    private Long requiredInt64Group;
+    private Integer stringGroup;
+    private Boolean booleanGroup;
+    private Long int64Group;
+
+    private APItestGroupParametersRequest() {
+    }
+    
+
+    /**
+     * Set requiredStringGroup
+     * @param requiredStringGroup Required String in group parameters (required)
+     * @return APItestGroupParametersRequest
+     */
+    public APItestGroupParametersRequest requiredStringGroup(Integer requiredStringGroup) {
+      this.requiredStringGroup = requiredStringGroup;
+      return this;
+    }
+    
+
+    /**
+     * Set requiredBooleanGroup
+     * @param requiredBooleanGroup Required Boolean in group parameters (required)
+     * @return APItestGroupParametersRequest
+     */
+    public APItestGroupParametersRequest requiredBooleanGroup(Boolean requiredBooleanGroup) {
+      this.requiredBooleanGroup = requiredBooleanGroup;
+      return this;
+    }
+    
+
+    /**
+     * Set requiredInt64Group
+     * @param requiredInt64Group Required Integer in group parameters (required)
+     * @return APItestGroupParametersRequest
+     */
+    public APItestGroupParametersRequest requiredInt64Group(Long requiredInt64Group) {
+      this.requiredInt64Group = requiredInt64Group;
+      return this;
+    }
+    
+
+    /**
+     * Set stringGroup
+     * @param stringGroup String in group parameters (optional)
+     * @return APItestGroupParametersRequest
+     */
+    public APItestGroupParametersRequest stringGroup(Integer stringGroup) {
+      this.stringGroup = stringGroup;
+      return this;
+    }
+    
+
+    /**
+     * Set booleanGroup
+     * @param booleanGroup Boolean in group parameters (optional)
+     * @return APItestGroupParametersRequest
+     */
+    public APItestGroupParametersRequest booleanGroup(Boolean booleanGroup) {
+      this.booleanGroup = booleanGroup;
+      return this;
+    }
+    
+
+    /**
+     * Set int64Group
+     * @param int64Group Integer in group parameters (optional)
+     * @return APItestGroupParametersRequest
+     */
+    public APItestGroupParametersRequest int64Group(Long int64Group) {
+      this.int64Group = int64Group;
+      return this;
+    }
+    
+
+    /**
+     * Execute testGroupParameters request
+     
+     * @throws ApiException if fails to make API call
+     * @http.response.details
+       <table summary="Response Details" border="1">
+         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+         <tr><td> 400 </td><td> Someting wrong </td><td>  -  </td></tr>
+       </table>
+     
+     */
+    
+    public void execute() throws ApiException {
+      this.executeWithHttpInfo().getData();
+    }
+
+    /**
+     * Execute testGroupParameters request with HTTP info returned
+     * @return ApiResponse&lt;Void&gt;
+     * @throws ApiException if fails to make API call
+     * @http.response.details
+       <table summary="Response Details" border="1">
+         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+         <tr><td> 400 </td><td> Someting wrong </td><td>  -  </td></tr>
+       </table>
+     
+     */
+    
+    public ApiResponse<Void> executeWithHttpInfo() throws ApiException {
+      return testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+    }
+  }
+
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * @return testGroupParametersRequest
+   * @throws ApiException if fails to make API call
+   
+   
+   */
+  
+  public APItestGroupParametersRequest testGroupParameters() throws ApiException {
+    return new APItestGroupParametersRequest();
+  }
  /**
   * test inline additionalProperties
   * 
@@ -864,12 +945,11 @@ if (booleanGroup != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public void testInlineAdditionalProperties(Map<String, String> param) throws ApiException {
-
    testInlineAdditionalPropertiesWithHttpInfo(param);
  }

@@ -881,8 +961,8 @@ if (booleanGroup != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> testInlineAdditionalPropertiesWithHttpInfo(Map<String, String> param) throws ApiException {
@@ -918,7 +998,7 @@ if (booleanGroup != null)

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -929,12 +1009,11 @@ if (booleanGroup != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public void testJsonFormData(String param, String param2) throws ApiException {
-
    testJsonFormDataWithHttpInfo(param, param2);
  }

@@ -947,8 +1026,8 @@ if (booleanGroup != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> testJsonFormDataWithHttpInfo(String param, String param2) throws ApiException {
@@ -993,7 +1072,7 @@ if (param2 != null)

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -1007,12 +1086,11 @@ if (param2 != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
     </table>
   */
  public void testQueryParameterCollectionFormat(List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
-
    testQueryParameterCollectionFormatWithHttpInfo(pipe, ioutil, http, url, context);
  }

@@ -1028,8 +1106,8 @@ if (param2 != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
@@ -1090,7 +1168,7 @@ if (param2 != null)

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
 }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -34,7 +34,6 @@ public class FakeClassnameTags123Api {
  public void setApiClient(ApiClient apiClient) {
    this.apiClient = apiClient;
  }
-
  /**
   * To test class name in snake case
   * To test class name in snake case
@@ -43,13 +42,13 @@ public class FakeClassnameTags123Api {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public Client testClassname(Client body) throws ApiException {
    return testClassnameWithHttpInfo(body).getData();
-      }
+  }

  /**
   * To test class name in snake case
@@ -59,8 +58,8 @@ public class FakeClassnameTags123Api {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Client> testClassnameWithHttpInfo(Client body) throws ApiException {
@@ -98,5 +97,5 @@ public class FakeClassnameTags123Api {

    GenericType<Client> localVarReturnType = new GenericType<Client>() {};
    return apiClient.invokeAPI(localVarPath, "PATCH", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
 }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/PetApi.java
@@ -36,7 +36,6 @@ public class PetApi {
  public void setApiClient(ApiClient apiClient) {
    this.apiClient = apiClient;
  }
-
  /**
   * Add a new pet to the store
   * 
@@ -44,13 +43,12 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
     </table>
   */
  public void addPet(Pet body) throws ApiException {
-
    addPetWithHttpInfo(body);
  }

@@ -62,9 +60,9 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> addPetWithHttpInfo(Pet body) throws ApiException {
@@ -100,7 +98,7 @@ public class PetApi {

    String[] localVarAuthNames = new String[] { "petstore_auth" };

-
+    
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -111,13 +109,12 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid pet value </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid pet value </td><td>  -  </td></tr>
     </table>
   */
  public void deletePet(Long petId, String apiKey) throws ApiException {
-
    deletePetWithHttpInfo(petId, apiKey);
  }

@@ -130,9 +127,9 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid pet value </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid pet value </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException {
@@ -171,7 +168,7 @@ public class PetApi {

    String[] localVarAuthNames = new String[] { "petstore_auth" };

-
+    
    return apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -182,14 +179,14 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid status value </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid status value </td><td>  -  </td></tr>
     </table>
   */
  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
    return findPetsByStatusWithHttpInfo(status).getData();
-      }
+  }

  /**
   * Finds Pets by status
@@ -199,9 +196,9 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid status value </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid status value </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
@@ -240,7 +237,7 @@ public class PetApi {

    GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * Finds Pets by tags
   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -249,16 +246,16 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid tag value </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid tag value </td><td>  -  </td></tr>
     </table>
   * @deprecated
   */
  @Deprecated
  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
    return findPetsByTagsWithHttpInfo(tags).getData();
-      }
+  }

  /**
   * Finds Pets by tags
@@ -268,9 +265,9 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid tag value </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid tag value </td><td>  -  </td></tr>
     </table>
   * @deprecated
   */
@@ -311,7 +308,7 @@ public class PetApi {

    GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * Find pet by ID
   * Returns a single pet
@@ -320,15 +317,15 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
     </table>
   */
  public Pet getPetById(Long petId) throws ApiException {
    return getPetByIdWithHttpInfo(petId).getData();
-      }
+  }

  /**
   * Find pet by ID
@@ -338,10 +335,10 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
@@ -380,7 +377,7 @@ public class PetApi {

    GenericType<Pet> localVarReturnType = new GenericType<Pet>() {};
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * Update an existing pet
   * 
@@ -388,15 +385,14 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
-        <tr><td> 405 </td><td> Validation exception </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
+       <tr><td> 405 </td><td> Validation exception </td><td>  -  </td></tr>
     </table>
   */
  public void updatePet(Pet body) throws ApiException {
-
    updatePetWithHttpInfo(body);
  }

@@ -408,11 +404,11 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
-        <tr><td> 405 </td><td> Validation exception </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
+       <tr><td> 405 </td><td> Validation exception </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> updatePetWithHttpInfo(Pet body) throws ApiException {
@@ -448,7 +444,7 @@ public class PetApi {

    String[] localVarAuthNames = new String[] { "petstore_auth" };

-
+    
    return apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -460,12 +456,11 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
     </table>
   */
  public void updatePetWithForm(Long petId, String name, String status) throws ApiException {
-
    updatePetWithFormWithHttpInfo(petId, name, status);
  }

@@ -479,8 +474,8 @@ public class PetApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException {
@@ -521,7 +516,7 @@ if (status != null)

    String[] localVarAuthNames = new String[] { "petstore_auth" };

-
+    
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -534,13 +529,13 @@ if (status != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
    return uploadFileWithHttpInfo(petId, additionalMetadata, file).getData();
-      }
+  }

  /**
   * uploads an image
@@ -552,8 +547,8 @@ if (status != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File file) throws ApiException {
@@ -596,7 +591,7 @@ if (file != null)

    GenericType<ModelApiResponse> localVarReturnType = new GenericType<ModelApiResponse>() {};
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * uploads an image (required)
   * 
@@ -607,13 +602,13 @@ if (file != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
    return uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata).getData();
-      }
+  }

  /**
   * uploads an image (required)
@@ -625,8 +620,8 @@ if (file != null)
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
@@ -674,5 +669,5 @@ if (requiredFile != null)

    GenericType<ModelApiResponse> localVarReturnType = new GenericType<ModelApiResponse>() {};
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
 }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -34,7 +34,6 @@ public class StoreApi {
  public void setApiClient(ApiClient apiClient) {
    this.apiClient = apiClient;
  }
-
  /**
   * Delete purchase order by ID
   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
@@ -42,13 +41,12 @@ public class StoreApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
     </table>
   */
  public void deleteOrder(String orderId) throws ApiException {
-
    deleteOrderWithHttpInfo(orderId);
  }

@@ -60,9 +58,9 @@ public class StoreApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiException {
@@ -99,7 +97,7 @@ public class StoreApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -109,13 +107,13 @@ public class StoreApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public Map<String, Integer> getInventory() throws ApiException {
    return getInventoryWithHttpInfo().getData();
-      }
+  }

  /**
   * Returns pet inventories by status
@@ -124,8 +122,8 @@ public class StoreApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
@@ -158,7 +156,7 @@ public class StoreApi {

    GenericType<Map<String, Integer>> localVarReturnType = new GenericType<Map<String, Integer>>() {};
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * Find purchase order by ID
   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
@@ -167,15 +165,15 @@ public class StoreApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
     </table>
   */
  public Order getOrderById(Long orderId) throws ApiException {
    return getOrderByIdWithHttpInfo(orderId).getData();
-      }
+  }

  /**
   * Find purchase order by ID
@@ -185,10 +183,10 @@ public class StoreApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
@@ -227,7 +225,7 @@ public class StoreApi {

    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * Place an order for a pet
   * 
@@ -236,14 +234,14 @@ public class StoreApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid Order </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid Order </td><td>  -  </td></tr>
     </table>
   */
  public Order placeOrder(Order body) throws ApiException {
    return placeOrderWithHttpInfo(body).getData();
-      }
+  }

  /**
   * Place an order for a pet
@@ -253,9 +251,9 @@ public class StoreApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid Order </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid Order </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException {
@@ -293,5 +291,5 @@ public class StoreApi {

    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
 }
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/UserApi.java
@@ -34,7 +34,6 @@ public class UserApi {
  public void setApiClient(ApiClient apiClient) {
    this.apiClient = apiClient;
  }
-
  /**
   * Create user
   * This can only be done by the logged in user.
@@ -42,12 +41,11 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public void createUser(User body) throws ApiException {
-
    createUserWithHttpInfo(body);
  }

@@ -59,8 +57,8 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> createUserWithHttpInfo(User body) throws ApiException {
@@ -96,7 +94,7 @@ public class UserApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -106,12 +104,11 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public void createUsersWithArrayInput(List<User> body) throws ApiException {
-
    createUsersWithArrayInputWithHttpInfo(body);
  }

@@ -123,8 +120,8 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(List<User> body) throws ApiException {
@@ -160,7 +157,7 @@ public class UserApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -170,12 +167,11 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public void createUsersWithListInput(List<User> body) throws ApiException {
-
    createUsersWithListInputWithHttpInfo(body);
  }

@@ -187,8 +183,8 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> createUsersWithListInputWithHttpInfo(List<User> body) throws ApiException {
@@ -224,7 +220,7 @@ public class UserApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -234,13 +230,12 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
     </table>
   */
  public void deleteUser(String username) throws ApiException {
-
    deleteUserWithHttpInfo(username);
  }

@@ -252,9 +247,9 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiException {
@@ -291,7 +286,7 @@ public class UserApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -302,15 +297,15 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
     </table>
   */
  public User getUserByName(String username) throws ApiException {
    return getUserByNameWithHttpInfo(username).getData();
-      }
+  }

  /**
   * Get user by user name
@@ -320,10 +315,10 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-        <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
@@ -362,7 +357,7 @@ public class UserApi {

    GenericType<User> localVarReturnType = new GenericType<User>() {};
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * Logs user into the system
   * 
@@ -372,14 +367,14 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  </td></tr>
-        <tr><td> 400 </td><td> Invalid username/password supplied </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  </td></tr>
+       <tr><td> 400 </td><td> Invalid username/password supplied </td><td>  -  </td></tr>
     </table>
   */
  public String loginUser(String username, String password) throws ApiException {
    return loginUserWithHttpInfo(username, password).getData();
-      }
+  }

  /**
   * Logs user into the system
@@ -390,9 +385,9 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 200 </td><td> successful operation </td><td>  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  </td></tr>
-        <tr><td> 400 </td><td> Invalid username/password supplied </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 200 </td><td> successful operation </td><td>  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  </td></tr>
+       <tr><td> 400 </td><td> Invalid username/password supplied </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
@@ -437,19 +432,18 @@ public class UserApi {

    GenericType<String> localVarReturnType = new GenericType<String>() {};
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
  /**
   * Logs out current logged in user session
   * 
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public void logoutUser() throws ApiException {
-
    logoutUserWithHttpInfo();
  }

@@ -460,8 +454,8 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> logoutUserWithHttpInfo() throws ApiException {
@@ -492,7 +486,7 @@ public class UserApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
  /**
@@ -503,13 +497,12 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid user supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid user supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
     </table>
   */
  public void updateUser(String username, User body) throws ApiException {
-
    updateUserWithHttpInfo(username, body);
  }

@@ -522,9 +515,9 @@ public class UserApi {
   * @throws ApiException if fails to make API call
   * @http.response.details
     <table summary="Response Details" border="1">
-        <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-        <tr><td> 400 </td><td> Invalid user supplied </td><td>  -  </td></tr>
-        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
+       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+       <tr><td> 400 </td><td> Invalid user supplied </td><td>  -  </td></tr>
+       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
     </table>
   */
  public ApiResponse<Void> updateUserWithHttpInfo(String username, User body) throws ApiException {
@@ -566,7 +559,7 @@ public class UserApi {

    String[] localVarAuthNames = new String[] {  };

-
+    
    return apiClient.invokeAPI(localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
  }
 }