diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
index 4ea86f5cd6fb..668b34a90ae6 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -635,6 +635,8 @@ public class ApiClient {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
       response = invocationBuilder.delete();
+    } else if ("PATCH".equals(method)) {
+      response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity);
     } else {
       throw new ApiException(500, "unknown method type " + method);
     }
diff --git a/samples/client/petstore/java/jersey2/docs/FakeApi.md b/samples/client/petstore/java/jersey2/docs/FakeApi.md
index 9012aff618e2..29813bd93492 100644
--- a/samples/client/petstore/java/jersey2/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2/docs/FakeApi.md
@@ -54,7 +54,7 @@ No authorization required
 
 <a name="testEndpointParameters"></a>
 # **testEndpointParameters**
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -90,8 +90,9 @@ byte[] binary = B; // byte[] | None
 LocalDate date = new LocalDate(); // LocalDate | None
 DateTime dateTime = new DateTime(); // DateTime | None
 String password = "password_example"; // String | None
+String paramCallback = "paramCallback_example"; // String | None
 try {
-    apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password);
+    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");
     e.printStackTrace();
@@ -115,6 +116,7 @@ Name | Type | Description  | Notes
  **date** | **LocalDate**| None | [optional]
  **dateTime** | **DateTime**| None | [optional]
  **password** | **String**| None | [optional]
+ **paramCallback** | **String**| None | [optional]
 
 ### Return type
 
diff --git a/samples/client/petstore/java/jersey2/gradlew.bat b/samples/client/petstore/java/jersey2/gradlew.bat
index 72d362dafd89..5f192121eb4f 100644
--- a/samples/client/petstore/java/jersey2/gradlew.bat
+++ b/samples/client/petstore/java/jersey2/gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
index ec4fea20fada..5eb7e89e13e4 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java
@@ -22,6 +22,7 @@ import org.glassfish.jersey.media.multipart.MultiPartFeature;
 
 import java.io.IOException;
 import java.io.InputStream;
+
 import java.nio.file.Files;
 import java.util.Collection;
 import java.util.Collections;
@@ -623,6 +624,8 @@ public class ApiClient {
       response = invocationBuilder.put(entity);
     } else if ("DELETE".equals(method)) {
       response = invocationBuilder.delete();
+    } else if ("PATCH".equals(method)) {
+      response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity);
     } else {
       throw new ApiException(500, "unknown method type " + method);
     }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/RFC3339DateFormat.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/RFC3339DateFormat.java
index 3d287008be5c..d662f9457d7a 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/RFC3339DateFormat.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/RFC3339DateFormat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Swagger Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
index 70d8b276c1cd..9c08693ef371 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
@@ -94,9 +94,10 @@ public class FakeApi {
    * @param date None (optional)
    * @param dateTime None (optional)
    * @param password None (optional)
+   * @param paramCallback None (optional)
    * @throws ApiException if fails to make API call
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, DateTime dateTime, String password) throws ApiException {
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, DateTime dateTime, String password, String paramCallback) throws ApiException {
     Object localVarPostBody = null;
     
     // verify the required parameter 'number' is set
@@ -155,6 +156,8 @@ if (dateTime != null)
       localVarFormParams.put("dateTime", dateTime);
 if (password != null)
       localVarFormParams.put("password", password);
+if (paramCallback != null)
+      localVarFormParams.put("callback", paramCallback);
 
     final String[] localVarAccepts = {
       "application/xml; charset=utf-8", "application/json; charset=utf-8"
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 2da13804a0d6..21e4efaeaa26 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -34,12 +34,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * AdditionalPropertiesClass
  */
 
-public class AdditionalPropertiesClass   {
+public class AdditionalPropertiesClass {
   @JsonProperty("map_property")
   private Map<String, String> mapProperty = new HashMap<String, String>();
 
@@ -111,6 +110,7 @@ public class AdditionalPropertiesClass   {
     return Objects.hash(mapProperty, mapOfMapProperty);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -132,5 +132,6 @@ public class AdditionalPropertiesClass   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
index 346da224ad12..993f9bbe6f4c 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Animal
  */
 
-public class Animal   {
+public class Animal {
   @JsonProperty("className")
   private String className = null;
 
@@ -98,6 +97,7 @@ public class Animal   {
     return Objects.hash(className, color);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -119,5 +119,6 @@ public class Animal   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
index 563476ccb3db..181812be4f42 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -30,12 +30,11 @@ import io.swagger.client.model.Animal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * AnimalFarm
  */
 
-public class AnimalFarm extends ArrayList<Animal>  {
+public class AnimalFarm extends ArrayList<Animal> {
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -53,6 +52,7 @@ public class AnimalFarm extends ArrayList<Animal>  {
     return Objects.hash(super.hashCode());
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -72,5 +72,6 @@ public class AnimalFarm extends ArrayList<Animal>  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index a99f20093850..c02b8e1a37fb 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -34,12 +34,11 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayOfArrayOfNumberOnly
  */
 
-public class ArrayOfArrayOfNumberOnly   {
+public class ArrayOfArrayOfNumberOnly {
   @JsonProperty("ArrayArrayNumber")
   private List<List<BigDecimal>> arrayArrayNumber = new ArrayList<List<BigDecimal>>();
 
@@ -84,6 +83,7 @@ public class ArrayOfArrayOfNumberOnly   {
     return Objects.hash(arrayArrayNumber);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -104,5 +104,6 @@ public class ArrayOfArrayOfNumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 1aaf27b9921d..fe97b65e1902 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -34,12 +34,11 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayOfNumberOnly
  */
 
-public class ArrayOfNumberOnly   {
+public class ArrayOfNumberOnly {
   @JsonProperty("ArrayNumber")
   private List<BigDecimal> arrayNumber = new ArrayList<BigDecimal>();
 
@@ -84,6 +83,7 @@ public class ArrayOfNumberOnly   {
     return Objects.hash(arrayNumber);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -104,5 +104,6 @@ public class ArrayOfNumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
index 124d8bfa3a1f..a035e8fe2f01 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -34,12 +34,11 @@ import io.swagger.client.model.ReadOnlyFirst;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * ArrayTest
  */
 
-public class ArrayTest   {
+public class ArrayTest {
   @JsonProperty("array_of_string")
   private List<String> arrayOfString = new ArrayList<String>();
 
@@ -138,6 +137,7 @@ public class ArrayTest   {
     return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -160,5 +160,6 @@ public class ArrayTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java
index 41dc312a10f4..b2532f78f852 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java
@@ -32,12 +32,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
 
-
 /**
  * Cat
  */
 
-public class Cat extends Animal  {
+public class Cat extends Animal {
   @JsonProperty("declawed")
   private Boolean declawed = null;
 
@@ -78,6 +77,7 @@ public class Cat extends Animal  {
     return Objects.hash(declawed, super.hashCode());
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -98,5 +98,6 @@ public class Cat extends Animal  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
index ba4ce89c2975..84def6a8dacd 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Category
  */
 
-public class Category   {
+public class Category {
   @JsonProperty("id")
   private Long id = null;
 
@@ -98,6 +97,7 @@ public class Category   {
     return Objects.hash(id, name);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -119,5 +119,6 @@ public class Category   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Client.java
index 43ade4b6fcb7..1540bc4d7de5 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Client.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Client
  */
 
-public class Client   {
+public class Client {
   @JsonProperty("client")
   private String client = null;
 
@@ -76,6 +75,7 @@ public class Client   {
     return Objects.hash(client);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -96,5 +96,6 @@ public class Client   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java
index 788aee5c2262..d5e9063c9880 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java
@@ -32,12 +32,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.client.model.Animal;
 
-
 /**
  * Dog
  */
 
-public class Dog extends Animal  {
+public class Dog extends Animal {
   @JsonProperty("breed")
   private String breed = null;
 
@@ -78,6 +77,7 @@ public class Dog extends Animal  {
     return Objects.hash(breed, super.hashCode());
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -98,5 +98,6 @@ public class Dog extends Animal  {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
index 45295c524f60..d8be37b302cf 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -33,12 +33,11 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * EnumArrays
  */
 
-public class EnumArrays   {
+public class EnumArrays {
   /**
    * Gets or Sets justSymbol
    */
@@ -165,6 +164,7 @@ public class EnumArrays   {
     return Objects.hash(justSymbol, arrayEnum);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -186,5 +186,6 @@ public class EnumArrays   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
index f9887c69340e..c2f4ae537357 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
@@ -27,7 +27,6 @@ package io.swagger.client.model;
 
 import java.util.Objects;
 
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 
 /**
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
index a7268316c401..cf3cab664582 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * EnumTest
  */
 
-public class EnumTest   {
+public class EnumTest {
   /**
    * Gets or Sets enumString
    */
@@ -210,6 +209,7 @@ public class EnumTest   {
     return Objects.hash(enumString, enumInteger, enumNumber);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -232,5 +232,6 @@ public class EnumTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java
index 2b5b42042812..df839b0898cd 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/FormatTest.java
@@ -34,12 +34,11 @@ import java.math.BigDecimal;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 
-
 /**
  * FormatTest
  */
 
-public class FormatTest   {
+public class FormatTest {
   @JsonProperty("integer")
   private Integer integer = null;
 
@@ -353,6 +352,7 @@ public class FormatTest   {
     return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -385,5 +385,6 @@ public class FormatTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index d874a5452448..9f59c6a47bd4 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * HasOnlyReadOnly
  */
 
-public class HasOnlyReadOnly   {
+public class HasOnlyReadOnly {
   @JsonProperty("bar")
   private String bar = null;
 
@@ -80,6 +79,7 @@ public class HasOnlyReadOnly   {
     return Objects.hash(bar, foo);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -101,5 +101,6 @@ public class HasOnlyReadOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java
index f8cf1ad5d1a5..335dcb31cbfd 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java
@@ -34,12 +34,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * MapTest
  */
 
-public class MapTest   {
+public class MapTest {
   @JsonProperty("map_map_of_string")
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
 
@@ -141,6 +140,7 @@ public class MapTest   {
     return Objects.hash(mapMapOfString, mapOfEnumString);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -162,5 +162,6 @@ public class MapTest   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 20958fd50d8a..af5292584ab6 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -36,12 +36,11 @@ import java.util.List;
 import java.util.Map;
 import org.joda.time.DateTime;
 
-
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
 
-public class MixedPropertiesAndAdditionalPropertiesClass   {
+public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("uuid")
   private String uuid = null;
 
@@ -130,6 +129,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
     return Objects.hash(uuid, dateTime, map);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -152,5 +152,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
index 8f48dd8020e0..e905b7f9183e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
@@ -31,13 +31,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
 
-public class Model200Response   {
+public class Model200Response {
   @JsonProperty("name")
   private Integer name = null;
 
@@ -99,6 +98,7 @@ public class Model200Response   {
     return Objects.hash(name, propertyClass);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -120,5 +120,6 @@ public class Model200Response   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 70ee2a834c01..f554939b8986 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * ModelApiResponse
  */
 
-public class ModelApiResponse   {
+public class ModelApiResponse {
   @JsonProperty("code")
   private Integer code = null;
 
@@ -120,6 +119,7 @@ public class ModelApiResponse   {
     return Objects.hash(code, type, message);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -142,5 +142,6 @@ public class ModelApiResponse   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
index 28294a150909..5332ff4fe2bf 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -31,13 +31,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
 
-public class ModelReturn   {
+public class ModelReturn {
   @JsonProperty("return")
   private Integer _return = null;
 
@@ -77,6 +76,7 @@ public class ModelReturn   {
     return Objects.hash(_return);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -97,5 +97,6 @@ public class ModelReturn   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
index 4b70e8df1a61..d26b62921fa9 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
@@ -31,13 +31,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
 
-public class Name   {
+public class Name {
   @JsonProperty("name")
   private Integer name = null;
 
@@ -125,6 +124,7 @@ public class Name   {
     return Objects.hash(name, snakeCase, property, _123Number);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -148,5 +148,6 @@ public class Name   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/NumberOnly.java
index ad74058d2e51..3dc6009047f6 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -32,12 +32,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 
-
 /**
  * NumberOnly
  */
 
-public class NumberOnly   {
+public class NumberOnly {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber = null;
 
@@ -77,6 +76,7 @@ public class NumberOnly   {
     return Objects.hash(justNumber);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -97,5 +97,6 @@ public class NumberOnly   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
index 1616b030b9dc..4eea9879c860 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
@@ -32,12 +32,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.DateTime;
 
-
 /**
  * Order
  */
 
-public class Order   {
+public class Order {
   @JsonProperty("id")
   private Long id = null;
 
@@ -219,6 +218,7 @@ public class Order   {
     return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -244,5 +244,6 @@ public class Order   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
index a89e0ea3e050..3ef257006ec6 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
@@ -35,12 +35,11 @@ import io.swagger.client.model.Tag;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * Pet
  */
 
-public class Pet   {
+public class Pet {
   @JsonProperty("id")
   private Long id = null;
 
@@ -232,6 +231,7 @@ public class Pet   {
     return Objects.hash(id, category, name, photoUrls, tags, status);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -257,5 +257,6 @@ public class Pet   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 63e11bf14fde..0cbe504a297e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * ReadOnlyFirst
  */
 
-public class ReadOnlyFirst   {
+public class ReadOnlyFirst {
   @JsonProperty("bar")
   private String bar = null;
 
@@ -89,6 +88,7 @@ public class ReadOnlyFirst   {
     return Objects.hash(bar, baz);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -110,5 +110,6 @@ public class ReadOnlyFirst   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
index f8c5c06ca40a..96bbd285945b 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * SpecialModelName
  */
 
-public class SpecialModelName   {
+public class SpecialModelName {
   @JsonProperty("$special[property.name]")
   private Long specialPropertyName = null;
 
@@ -76,6 +75,7 @@ public class SpecialModelName   {
     return Objects.hash(specialPropertyName);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -96,5 +96,6 @@ public class SpecialModelName   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
index 27be94678da8..330d2c8faa1e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * Tag
  */
 
-public class Tag   {
+public class Tag {
   @JsonProperty("id")
   private Long id = null;
 
@@ -98,6 +97,7 @@ public class Tag   {
     return Objects.hash(id, name);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -119,5 +119,6 @@ public class Tag   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }
 
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
index 84e3b147049e..97fc77b476db 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
@@ -31,12 +31,11 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-
 /**
  * User
  */
 
-public class User   {
+public class User {
   @JsonProperty("id")
   private Long id = null;
 
@@ -230,6 +229,7 @@ public class User   {
     return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
   }
 
+
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -257,5 +257,6 @@ public class User   {
     }
     return o.toString().replace("\n", "\n    ");
   }
+  
 }