diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
index 4b51baeac63..40af7e2111b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
@@ -1269,13 +1269,13 @@ public void writePropertyBack(String propertyKey, boolean value) {
     }
 
     /**
-     * Output the Getter name for boolean property, e.g. isActive
+     * Output the partial Getter name for boolean property, e.g. Active
      *
      * @param name the name of the property
-     * @return getter name based on naming convention
+     * @return partial getter name based on naming convention
      */
     public String toBooleanGetter(String name) {
-        return "is" + getterAndSetterCapitalize(name);
+        return getterAndSetterCapitalize(name);
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
index fa0a84b2c65..e3af6e2e8c4 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
@@ -118,7 +118,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
 {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
 {{/vendorExtensions.extraAnnotation}}
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   {{^isReadOnly}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache
index 74859ab39b4..8b50a3ded9e 100644
--- a/modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pojo.mustache
@@ -42,7 +42,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
index 05543a0dd0e..2b6b95a5dbc 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
@@ -33,7 +33,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
index f1bcb38e57d..b3817e2c81f 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
@@ -64,16 +64,16 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
 {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
 {{/vendorExtensions.extraAnnotation}}
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatype}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatype}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     if ({{name}} == null) {
       return null;
     }
     return {{name}}.value();
-  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
-  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
-  }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }{{/isEnum}}
 
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pojo.mustache
index 69a60003102..378ec210f2b 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pojo.mustache
@@ -85,7 +85,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   @JsonProperty("{{baseName}}")
   {{/jackson}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   {{^isReadOnly}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache
index a2c7e8c000c..8afc16cf9d8 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache
@@ -28,7 +28,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
index 8abd4bcd94b..99e0576bdbe 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
@@ -28,7 +28,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache
index 73d96a3b16b..52c1df7c815 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache
@@ -31,7 +31,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/pojo.mustache
index c7ce1c4dadb..3d1a7ca885a 100644
--- a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/pojo.mustache
@@ -83,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
  {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
   {{/vendorExtensions.extraAnnotation}}
-  {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+  {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache
index 96aea0b41c7..3a49211f64e 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache
@@ -87,7 +87,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{{vendorExtensions.extraAnnotation}}}
   {{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/JavaVertXServer/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaVertXServer/pojo.mustache
index c3f95a095c2..e2be0d8ba78 100644
--- a/modules/swagger-codegen/src/main/resources/JavaVertXServer/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaVertXServer/pojo.mustache
@@ -20,7 +20,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vars}}
     {{#vendorExtensions.extraAnnotation}}{{vendorExtensions.extraAnnotation}}{{/vendorExtensions.extraAnnotation}}
   @JsonProperty("{{baseName}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pojo.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pojo.mustache
index 3f1179dee46..b9fef349d81 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/pojo.mustache
@@ -78,11 +78,11 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{/maximum}}
    * @return {{name}}
   **/
- {{#vendorExtensions.extraAnnotation}}
+  {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
   {{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   {{^isReadOnly}}
diff --git a/modules/swagger-codegen/src/main/resources/java-pkmst/pojo.mustache b/modules/swagger-codegen/src/main/resources/java-pkmst/pojo.mustache
index 5830c643aeb..a57abed0ef1 100644
--- a/modules/swagger-codegen/src/main/resources/java-pkmst/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/java-pkmst/pojo.mustache
@@ -87,7 +87,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{{vendorExtensions.extraAnnotation}}}
   {{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/undertow/pojo.mustache b/modules/swagger-codegen/src/main/resources/undertow/pojo.mustache
index fd6a4b34fa1..cb83418b77d 100644
--- a/modules/swagger-codegen/src/main/resources/undertow/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/undertow/pojo.mustache
@@ -22,7 +22,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}}
   @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
-  public {{{datatypeWithEnum}}} {{getter}}() {
+  public {{{datatypeWithEnum}}} {{#isBoolean}}is{{/isBoolean}}{{getter}}() {
     return {{name}};
   }
   public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java
index e064a189ec4..5a610b1fbea 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelTest.java
@@ -715,7 +715,7 @@ public void booleanParameterTest() {
         Assert.assertEquals(cp.baseType, "Boolean");
         Assert.assertTrue(cp.isNotContainer);
         Assert.assertTrue(cp.isBoolean);
-        Assert.assertEquals(cp.getter, "isProperty");
+        Assert.assertEquals(cp.getter, "Property");
     }
 
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/feign/.swagger-codegen/VERSION b/samples/client/petstore/java/feign/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/feign/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/feign/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/google-api-client/.swagger-codegen/VERSION b/samples/client/petstore/java/google-api-client/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/google-api-client/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/google-api-client/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey1/.swagger-codegen/VERSION b/samples/client/petstore/java/jersey1/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/jersey1/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/jersey1/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION b/samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2-java8/.swagger-codegen/VERSION b/samples/client/petstore/java/jersey2-java8/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/jersey2-java8/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/jersey2-java8/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/jersey2/.swagger-codegen/VERSION b/samples/client/petstore/java/jersey2/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/jersey2/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/jersey2/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION b/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resteasy/.swagger-codegen/VERSION b/samples/client/petstore/java/resteasy/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/resteasy/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/resteasy/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate-withXml/.swagger-codegen/VERSION b/samples/client/petstore/java/resttemplate-withXml/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/resttemplate-withXml/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION b/samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit/.swagger-codegen/VERSION b/samples/client/petstore/java/retrofit/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/retrofit/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/retrofit/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION b/samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION b/samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/.swagger-codegen/VERSION b/samples/client/petstore/java/retrofit2rx/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/retrofit2rx/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/retrofit2rx/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx2/.swagger-codegen/VERSION b/samples/client/petstore/java/retrofit2rx2/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/java/retrofit2rx2/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/retrofit2rx2/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION b/samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION
+++ b/samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java
index 9a1956aae8c..0e190cbe457 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java
@@ -21,9 +21,9 @@ public class Category  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String name = null;
-
  /**
    * Get id
    * @return id
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java
index 51ffbeff6da..c6aab8b6a07 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java
@@ -21,11 +21,12 @@ public class ModelApiResponse  {
   
   @ApiModelProperty(value = "")
   private Integer code = null;
+
   @ApiModelProperty(value = "")
   private String type = null;
+
   @ApiModelProperty(value = "")
   private String message = null;
-
  /**
    * Get code
    * @return code
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java
index dac33686761..973b0260b36 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java
@@ -22,13 +22,17 @@ public class Order  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private Long petId = null;
+
   @ApiModelProperty(value = "")
   private Integer quantity = null;
+
   @ApiModelProperty(value = "")
   private Date shipDate = null;
 
+
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
 public enum StatusEnum {
@@ -66,9 +70,9 @@ public static StatusEnum fromValue(String v) {
    * Order Status  
   **/
   private StatusEnum status = null;
+
   @ApiModelProperty(value = "")
   private Boolean complete = false;
-
  /**
    * Get id
    * @return id
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java
index 3c8ab5da478..6e3fcf954ec 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java
@@ -25,14 +25,19 @@ public class Pet  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private Category category = null;
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   private String name = null;
+
   @ApiModelProperty(required = true, value = "")
   private List<String> photoUrls = new ArrayList<String>();
+
   @ApiModelProperty(value = "")
-  private List<Tag> tags = new ArrayList<Tag>();
+  private List<Tag> tags = null;
+
 
 @XmlType(name="StatusEnum")
 @XmlEnum(String.class)
@@ -71,7 +76,6 @@ public static StatusEnum fromValue(String v) {
    * pet status in the store  
   **/
   private StatusEnum status = null;
-
  /**
    * Get id
    * @return id
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java
index 24fd1d55d2a..71801d143d3 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java
@@ -21,9 +21,9 @@ public class Tag  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String name = null;
-
  /**
    * Get id
    * @return id
diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java
index 858e8e14268..e7d2773ea70 100644
--- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java
+++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java
@@ -21,24 +21,30 @@ public class User  {
   
   @ApiModelProperty(value = "")
   private Long id = null;
+
   @ApiModelProperty(value = "")
   private String username = null;
+
   @ApiModelProperty(value = "")
   private String firstName = null;
+
   @ApiModelProperty(value = "")
   private String lastName = null;
+
   @ApiModelProperty(value = "")
   private String email = null;
+
   @ApiModelProperty(value = "")
   private String password = null;
+
   @ApiModelProperty(value = "")
   private String phone = null;
+
   @ApiModelProperty(value = "User Status")
  /**
    * User Status  
   **/
   private Integer userStatus = null;
-
  /**
    * Get id
    * @return id
diff --git a/samples/client/petstore/spring-cloud/.swagger-codegen/VERSION b/samples/client/petstore/spring-cloud/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/spring-cloud/.swagger-codegen/VERSION
+++ b/samples/client/petstore/spring-cloud/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/PetApi.java
index 155bdaef8ec..b165892d785 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/StoreApi.java
index bd341f73670..dd1e44d96a0 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/UserApi.java
index 1c451b04cb4..18cb1a04bc4 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/.swagger-codegen/VERSION b/samples/client/petstore/spring-stubs/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/client/petstore/spring-stubs/.swagger-codegen/VERSION
+++ b/samples/client/petstore/spring-stubs/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
index 507c7441aa4..464827b61e7 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
index 59c31604ecb..aea78a46e7a 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
index 2dd573f1c06..e4ce3bbecf0 100644
--- a/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/client/petstore/spring-stubs/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/java-inflector/.swagger-codegen/VERSION b/samples/server/petstore/java-inflector/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-inflector/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-inflector/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml
index ef4896bab5e..211a01bfeac 100644
--- a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml
+++ b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml
@@ -128,7 +128,6 @@ paths:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
-      x-contentType: "application/json"
       x-accepts: "application/json"
   /pet/findByTags:
     get:
@@ -164,7 +163,6 @@ paths:
         - "write:pets"
         - "read:pets"
       deprecated: true
-      x-contentType: "application/json"
       x-accepts: "application/json"
   /pet/{petId}:
     get:
@@ -194,7 +192,6 @@ paths:
           description: "Pet not found"
       security:
       - api_key: []
-      x-contentType: "application/json"
       x-accepts: "application/json"
     post:
       tags:
@@ -260,7 +257,6 @@ paths:
       - petstore_auth:
         - "write:pets"
         - "read:pets"
-      x-contentType: "application/json"
       x-accepts: "application/json"
   /pet/{petId}/uploadImage:
     post:
@@ -321,7 +317,6 @@ paths:
               format: "int32"
       security:
       - api_key: []
-      x-contentType: "application/json"
       x-accepts: "application/json"
   /store/order:
     post:
@@ -378,7 +373,6 @@ paths:
           description: "Invalid ID supplied"
         404:
           description: "Order not found"
-      x-contentType: "application/json"
       x-accepts: "application/json"
     delete:
       tags:
@@ -401,7 +395,6 @@ paths:
           description: "Invalid ID supplied"
         404:
           description: "Order not found"
-      x-contentType: "application/json"
       x-accepts: "application/json"
   /user:
     post:
@@ -510,7 +503,6 @@ paths:
               description: "date in UTC when toekn expires"
         400:
           description: "Invalid username/password supplied"
-      x-contentType: "application/json"
       x-accepts: "application/json"
   /user/logout:
     get:
@@ -526,7 +518,6 @@ paths:
       responses:
         default:
           description: "successful operation"
-      x-contentType: "application/json"
       x-accepts: "application/json"
   /user/{username}:
     get:
@@ -553,7 +544,6 @@ paths:
           description: "Invalid username supplied"
         404:
           description: "User not found"
-      x-contentType: "application/json"
       x-accepts: "application/json"
     put:
       tags:
@@ -603,7 +593,6 @@ paths:
           description: "Invalid username supplied"
         404:
           description: "User not found"
-      x-contentType: "application/json"
       x-accepts: "application/json"
   /fake_classname_test:
     patch:
diff --git a/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION b/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-pkmst/.swagger-codegen/VERSION b/samples/server/petstore/java-pkmst/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-pkmst/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-pkmst/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java
index b1105fa803b..147f4fcf2de 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
index 3f877e9157a..5163fbbb35b 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java
index 56a58162c19..656933d0486 100644
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/controller/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/java-play-framework-controller-only/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework-controller-only/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-play-framework-controller-only/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-play-framework-controller-only/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework-fake-endpoints/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework-no-bean-validation/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-play-framework-no-bean-validation/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework-no-exception-handling/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-play-framework-no-exception-handling/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-play-framework-no-exception-handling/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-interface/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework-no-interface/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-play-framework-no-interface/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-play-framework-no-interface/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework-no-swagger-ui/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-play-framework-no-swagger-ui/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-play-framework-no-swagger-ui/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework-no-wrap-calls/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-play-framework-no-wrap-calls/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-play-framework-no-wrap-calls/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/async/.swagger-codegen/VERSION b/samples/server/petstore/java-vertx/async/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-vertx/async/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-vertx/async/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/java-vertx/rx/.swagger-codegen/VERSION b/samples/server/petstore/java-vertx/rx/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/java-vertx/rx/.swagger-codegen/VERSION
+++ b/samples/server/petstore/java-vertx/rx/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-cdi/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-java8/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/eap/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec-interface/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-spec-interface/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs-spec-interface/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-spec-interface/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/api/FakeApi.java
index e9c28d5da5f..1c9903022bd 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/api/FakeApi.java
@@ -76,6 +76,14 @@ public interface FakeApi {
         @ApiResponse(code = 404, message = "Not found", response = Void.class) })
     void testEnumParameters(@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString,@HeaderParam("enum_header_string_array")   @ApiParam("Header parameter enum test (string array)") List<String> enumHeaderStringArray,@HeaderParam("enum_header_string")  @DefaultValue("-efg")  @ApiParam("Header parameter enum test (string)") String enumHeaderString,@QueryParam("enum_query_string_array")   @ApiParam("Query parameter enum test (string array)")  List<String> enumQueryStringArray,@QueryParam("enum_query_string")  @DefaultValue("-efg")  @ApiParam("Query parameter enum test (string)")  String enumQueryString,@QueryParam("enum_query_integer")   @ApiParam("Query parameter enum test (double)")  Integer enumQueryInteger,@FormParam(value = "enum_query_double")  Double enumQueryDouble) throws Exception;
 
+    @POST
+    @Path("/inline-additionalProperties")
+    @Consumes({ "application/json" })
+    @ApiOperation(value = "test inline additionalProperties", notes = "", tags={ "fake",  })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+    void testInlineAdditionalProperties(@Valid Object param) throws Exception;
+
     @GET
     @Path("/jsonFormData")
     @Consumes({ "application/json" })
diff --git a/samples/server/petstore/jaxrs-spec-interface/swagger.json b/samples/server/petstore/jaxrs-spec-interface/swagger.json
index 5b53d7108d0..318ac581fce 100644
--- a/samples/server/petstore/jaxrs-spec-interface/swagger.json
+++ b/samples/server/petstore/jaxrs-spec-interface/swagger.json
@@ -108,8 +108,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ "available", "pending", "sold" ],
-            "default" : "available"
+            "default" : "available",
+            "enum" : [ "available", "pending", "sold" ]
           },
           "collectionFormat" : "csv"
         } ],
@@ -680,8 +680,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ ">", "$" ],
-            "default" : "$"
+            "default" : "$",
+            "enum" : [ ">", "$" ]
           }
         }, {
           "name" : "enum_form_string",
@@ -699,8 +699,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ ">", "$" ],
-            "default" : "$"
+            "default" : "$",
+            "enum" : [ ">", "$" ]
           }
         }, {
           "name" : "enum_header_string",
@@ -718,8 +718,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ ">", "$" ],
-            "default" : "$"
+            "default" : "$",
+            "enum" : [ ">", "$" ]
           }
         }, {
           "name" : "enum_query_string",
@@ -1030,6 +1030,32 @@
         }
       }
     },
+    "/fake/inline-additionalProperties" : {
+      "post" : {
+        "tags" : [ "fake" ],
+        "summary" : "test inline additionalProperties",
+        "description" : "",
+        "operationId" : "testInlineAdditionalProperties",
+        "consumes" : [ "application/json" ],
+        "parameters" : [ {
+          "in" : "body",
+          "name" : "param",
+          "description" : "request body",
+          "required" : true,
+          "schema" : {
+            "type" : "object",
+            "additionalProperties" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation"
+          }
+        }
+      }
+    },
     "/another-fake/dummy" : {
       "patch" : {
         "tags" : [ "$another-fake?" ],
diff --git a/samples/server/petstore/jaxrs-spec/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-spec/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs-spec/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs-spec/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/FakeApi.java
index 39f7c494893..8c345d48cb6 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/FakeApi.java
@@ -90,6 +90,16 @@ public Response testEnumParameters(@FormParam(value = "enum_form_string_array")
         return Response.ok().entity("magic!").build();
     }
 
+    @POST
+    @Path("/inline-additionalProperties")
+    @Consumes({ "application/json" })
+    @ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake",  })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+    public Response testInlineAdditionalProperties(@Valid Object param) {
+        return Response.ok().entity("magic!").build();
+    }
+
     @GET
     @Path("/jsonFormData")
     @Consumes({ "application/json" })
diff --git a/samples/server/petstore/jaxrs-spec/swagger.json b/samples/server/petstore/jaxrs-spec/swagger.json
index 5b53d7108d0..318ac581fce 100644
--- a/samples/server/petstore/jaxrs-spec/swagger.json
+++ b/samples/server/petstore/jaxrs-spec/swagger.json
@@ -108,8 +108,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ "available", "pending", "sold" ],
-            "default" : "available"
+            "default" : "available",
+            "enum" : [ "available", "pending", "sold" ]
           },
           "collectionFormat" : "csv"
         } ],
@@ -680,8 +680,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ ">", "$" ],
-            "default" : "$"
+            "default" : "$",
+            "enum" : [ ">", "$" ]
           }
         }, {
           "name" : "enum_form_string",
@@ -699,8 +699,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ ">", "$" ],
-            "default" : "$"
+            "default" : "$",
+            "enum" : [ ">", "$" ]
           }
         }, {
           "name" : "enum_header_string",
@@ -718,8 +718,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ ">", "$" ],
-            "default" : "$"
+            "default" : "$",
+            "enum" : [ ">", "$" ]
           }
         }, {
           "name" : "enum_query_string",
@@ -1030,6 +1030,32 @@
         }
       }
     },
+    "/fake/inline-additionalProperties" : {
+      "post" : {
+        "tags" : [ "fake" ],
+        "summary" : "test inline additionalProperties",
+        "description" : "",
+        "operationId" : "testInlineAdditionalProperties",
+        "consumes" : [ "application/json" ],
+        "parameters" : [ {
+          "in" : "body",
+          "name" : "param",
+          "description" : "request body",
+          "required" : true,
+          "schema" : {
+            "type" : "object",
+            "additionalProperties" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation"
+          }
+        }
+      }
+    },
     "/another-fake/dummy" : {
       "patch" : {
         "tags" : [ "$another-fake?" ],
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/io/swagger/api/FakeApi.java
index a04f054727e..3cf2646a388 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/io/swagger/api/FakeApi.java
@@ -152,6 +152,19 @@ public Response testEnumParameters(
     throws NotFoundException {
         return delegate.testEnumParameters(enumFormStringArray,enumFormString,enumHeaderStringArray,enumHeaderString,enumQueryStringArray,enumQueryString,enumQueryInteger,enumQueryDouble,securityContext);
     }
+    @POST
+    
+    @Consumes({ "application/json" })
+    
+    @io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake",  })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+    public Response testInlineAdditionalProperties(
+        @ApiParam(value = "request body" ,required=true) Object param,
+        @Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.testInlineAdditionalProperties(param,securityContext);
+    }
     @GET
     
     @Consumes({ "application/json" })
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/io/swagger/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/io/swagger/api/FakeApiService.java
index e5c185eef8e..3c7b947ca72 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/io/swagger/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/io/swagger/api/FakeApiService.java
@@ -37,6 +37,8 @@ public abstract Response testEndpointParameters(BigDecimal number,Double _double
       throws NotFoundException;
       public abstract Response testEnumParameters(List<String> enumFormStringArray,String enumFormString,List<String> enumHeaderStringArray,String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger,Double enumQueryDouble,SecurityContext securityContext)
       throws NotFoundException;
+      public abstract Response testInlineAdditionalProperties(Object param,SecurityContext securityContext)
+      throws NotFoundException;
       public abstract Response testJsonFormData(String param,String param2,SecurityContext securityContext)
       throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
index 54aa3577d52..4cae4c62be5 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
@@ -66,6 +66,12 @@ public Response testEnumParameters(List<String> enumFormStringArray, String enum
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
+    public Response testInlineAdditionalProperties(Object param, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
     public Response testJsonFormData(String param, String param2, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
diff --git a/samples/server/petstore/jaxrs/jersey1/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs/jersey1/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs/jersey1/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs/jersey1/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java
index 2bbe7e14467..f93b18347c2 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java
@@ -152,6 +152,19 @@ public Response testEnumParameters(
     throws NotFoundException {
         return delegate.testEnumParameters(enumFormStringArray,enumFormString,enumHeaderStringArray,enumHeaderString,enumQueryStringArray,enumQueryString,enumQueryInteger,enumQueryDouble,securityContext);
     }
+    @POST
+    @Path("/inline-additionalProperties")
+    @Consumes({ "application/json" })
+    
+    @io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake",  })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+    public Response testInlineAdditionalProperties(
+        @ApiParam(value = "request body" ,required=true) Object param,
+        @Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.testInlineAdditionalProperties(param,securityContext);
+    }
     @GET
     @Path("/jsonFormData")
     @Consumes({ "application/json" })
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java
index e5c185eef8e..3c7b947ca72 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java
@@ -37,6 +37,8 @@ public abstract Response testEndpointParameters(BigDecimal number,Double _double
       throws NotFoundException;
       public abstract Response testEnumParameters(List<String> enumFormStringArray,String enumFormString,List<String> enumHeaderStringArray,String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger,Double enumQueryDouble,SecurityContext securityContext)
       throws NotFoundException;
+      public abstract Response testInlineAdditionalProperties(Object param,SecurityContext securityContext)
+      throws NotFoundException;
       public abstract Response testJsonFormData(String param,String param2,SecurityContext securityContext)
       throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
index 54aa3577d52..4cae4c62be5 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
@@ -66,6 +66,12 @@ public Response testEnumParameters(List<String> enumFormStringArray, String enum
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
+    public Response testInlineAdditionalProperties(Object param, SecurityContext securityContext)
+    throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
     public Response testJsonFormData(String param, String param2, SecurityContext securityContext)
     throws NotFoundException {
         // do some magic!
diff --git a/samples/server/petstore/jaxrs/jersey2/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs/jersey2/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/jaxrs/jersey2/.swagger-codegen/VERSION
+++ b/samples/server/petstore/jaxrs/jersey2/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApi.java
index 7e933d3d0c0..d16817cce9b 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApi.java
@@ -167,6 +167,18 @@ public Response testEnumParameters(@ApiParam(value = "Form parameter enum test (
     throws NotFoundException {
         return delegate.testEnumParameters(enumFormStringArray,enumFormString,enumHeaderStringArray,enumHeaderString,enumQueryStringArray,enumQueryString,enumQueryInteger,enumQueryDouble,securityContext);
     }
+    @POST
+    @Path("/inline-additionalProperties")
+    @Consumes({ "application/json" })
+    
+    @io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", })
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
+    public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) Object param
+,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.testInlineAdditionalProperties(param,securityContext);
+    }
     @GET
     @Path("/jsonFormData")
     @Consumes({ "application/json" })
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApiService.java
index 71148802573..16ef0a8dbfb 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/api/FakeApiService.java
@@ -27,5 +27,6 @@ public abstract class FakeApiService {
     public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,byte[] binary,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testEnumParameters(List<String> enumFormStringArray,String enumFormString,List<String> enumHeaderStringArray,String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger,Double enumQueryDouble,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response testInlineAdditionalProperties(Object param,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testJsonFormData(String param,String param2,SecurityContext securityContext) throws NotFoundException;
 }
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
index 529420f7f70..bd8eb54209c 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
@@ -56,6 +56,11 @@ public Response testEnumParameters(List<String> enumFormStringArray, String enum
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
+    public Response testInlineAdditionalProperties(Object param, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
     public Response testJsonFormData(String param, String param2, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
diff --git a/samples/server/petstore/spring-mvc-j8-async/.swagger-codegen/VERSION b/samples/server/petstore/spring-mvc-j8-async/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/spring-mvc-j8-async/.swagger-codegen/VERSION
+++ b/samples/server/petstore/spring-mvc-j8-async/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/AnotherFakeApi.java
index c2e845dce90..c8feff90183 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java
index fa83c88995e..38a7b4fe2cc 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeClassnameTestApi.java
index 1382f6a44f9..f18ad98e5fc 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java
index 744d64d1e14..562cc907e63 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java
index e77f2de7f70..b994f0fb2c3 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java
index 4e755a2a73d..cfbdeb6e72f 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/.swagger-codegen/VERSION b/samples/server/petstore/spring-mvc/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/spring-mvc/.swagger-codegen/VERSION
+++ b/samples/server/petstore/spring-mvc/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApi.java
index 6f6dd920913..24c71116691 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
index 5eafb606519..bc212797fda 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApi.java
index 8316190673c..0885527e63f 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
index 5b1cf918729..2d0f8af5367 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
index f23d712511f..147b5232ad4 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
index 3dbcf7293cd..fa7ab76ced3 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/.swagger-codegen/VERSION b/samples/server/petstore/springboot-beanvalidation/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/springboot-beanvalidation/.swagger-codegen/VERSION
+++ b/samples/server/petstore/springboot-beanvalidation/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/AnotherFakeApi.java
index 6f6dd920913..24c71116691 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApi.java
index 5eafb606519..bc212797fda 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeClassnameTestApi.java
index 8316190673c..0885527e63f 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/PetApi.java
index 5b1cf918729..2d0f8af5367 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/StoreApi.java
index f23d712511f..147b5232ad4 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/UserApi.java
index 3dbcf7293cd..fa7ab76ced3 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/.swagger-codegen/VERSION b/samples/server/petstore/springboot-delegate-j8/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/springboot-delegate-j8/.swagger-codegen/VERSION
+++ b/samples/server/petstore/springboot-delegate-j8/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/AnotherFakeApi.java
index 3c73a0fc9e8..5c83b17fc52 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApi.java
index 0d017dcf03a..0c7242f70f5 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeClassnameTestApi.java
index ef017ee1dc8..c227de57d36 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/PetApi.java
index a93561a2ee8..c4dcb643254 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApi.java
index 40a3b4f23f3..407f8a9cc9c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/UserApi.java
index db6ab0443be..ccfac7d3364 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/.swagger-codegen/VERSION b/samples/server/petstore/springboot-delegate/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/springboot-delegate/.swagger-codegen/VERSION
+++ b/samples/server/petstore/springboot-delegate/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/AnotherFakeApi.java
index 6f6dd920913..24c71116691 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeApi.java
index 5eafb606519..bc212797fda 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeClassnameTestApi.java
index 8316190673c..0885527e63f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/PetApi.java
index 5b1cf918729..2d0f8af5367 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/StoreApi.java
index f23d712511f..147b5232ad4 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/UserApi.java
index 3dbcf7293cd..fa7ab76ced3 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/.swagger-codegen/VERSION b/samples/server/petstore/springboot-implicitHeaders/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/springboot-implicitHeaders/.swagger-codegen/VERSION
+++ b/samples/server/petstore/springboot-implicitHeaders/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/AnotherFakeApi.java
index b64d01acfd1..bc2a48dd7e3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApi.java
index 5efacf31e1c..2502e3a4565 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeClassnameTestApi.java
index 6fd233b0e39..05b5aa91b31 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/PetApi.java
index 24e97f3e45e..03769462d97 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/StoreApi.java
index f6d21087d1b..aad5ce4d968 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/UserApi.java
index 04bd05d9973..1256e5bc299 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/.swagger-codegen/VERSION b/samples/server/petstore/springboot-useoptional/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/springboot-useoptional/.swagger-codegen/VERSION
+++ b/samples/server/petstore/springboot-useoptional/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/AnotherFakeApi.java
index 8364594a3ee..f1b5a0a2f27 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApi.java
index dbc6657504d..9d44f00d239 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeClassnameTestApi.java
index a2041e4522a..2cc715a0b74 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/PetApi.java
index 58d2732d665..ac2c92dd042 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/StoreApi.java
index 021b7830489..77dbeb7ad4d 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/UserApi.java
index bf116aa378c..40dba34ed98 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/.swagger-codegen/VERSION b/samples/server/petstore/springboot/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/springboot/.swagger-codegen/VERSION
+++ b/samples/server/petstore/springboot/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/AnotherFakeApi.java
index 6f6dd920913..24c71116691 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/AnotherFakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/AnotherFakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java
index 5eafb606519..bc212797fda 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeClassnameTestApi.java
index 8316190673c..0885527e63f 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeClassnameTestApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
index 5b1cf918729..2d0f8af5367 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
index f23d712511f..147b5232ad4 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
index 3dbcf7293cd..fa7ab76ced3 100644
--- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.3.0-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.3.1-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/undertow/.swagger-codegen/VERSION b/samples/server/petstore/undertow/.swagger-codegen/VERSION
index f9f7450d135..50794f17f1a 100644
--- a/samples/server/petstore/undertow/.swagger-codegen/VERSION
+++ b/samples/server/petstore/undertow/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
\ No newline at end of file
+2.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/undertow/src/main/resources/config/swagger.json b/samples/server/petstore/undertow/src/main/resources/config/swagger.json
index 7c571eca3fe..0f5defa6026 100644
--- a/samples/server/petstore/undertow/src/main/resources/config/swagger.json
+++ b/samples/server/petstore/undertow/src/main/resources/config/swagger.json
@@ -112,8 +112,8 @@
           "type" : "array",
           "items" : {
             "type" : "string",
-            "enum" : [ "available", "pending", "sold" ],
-            "default" : "available"
+            "default" : "available",
+            "enum" : [ "available", "pending", "sold" ]
           },
           "collectionFormat" : "csv"
         } ],
@@ -134,7 +134,6 @@
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       }
     },
@@ -174,7 +173,6 @@
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
         "deprecated" : true,
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       }
     },
@@ -210,7 +208,6 @@
         "security" : [ {
           "api_key" : [ ]
         } ],
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       },
       "post" : {
@@ -278,7 +275,6 @@
         "security" : [ {
           "petstore_auth" : [ "write:pets", "read:pets" ]
         } ],
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       }
     },
@@ -348,7 +344,6 @@
         "security" : [ {
           "api_key" : [ ]
         } ],
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       }
     },
@@ -414,7 +409,6 @@
             "description" : "Order not found"
           }
         },
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       },
       "delete" : {
@@ -438,7 +432,6 @@
             "description" : "Order not found"
           }
         },
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       }
     },
@@ -566,7 +559,6 @@
             "description" : "Invalid username/password supplied"
           }
         },
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       }
     },
@@ -583,7 +575,6 @@
             "description" : "successful operation"
           }
         },
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       }
     },
@@ -615,7 +606,6 @@
             "description" : "User not found"
           }
         },
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       },
       "put" : {
@@ -671,7 +661,6 @@
             "description" : "User not found"
           }
         },
-        "x-contentType" : "application/json",
         "x-accepts" : "application/json"
       }
     }