From bd016f36172436bfa786ec0c6f9028c589da0aa3 Mon Sep 17 00:00:00 2001
From: Stian Liknes <stianlik@gmail.com>
Date: Wed, 13 Jun 2018 07:45:32 +0200
Subject: [PATCH 1/3] Fix getter methods for Java model with
 additionalProperties

When a model class is configured with additionalProperties, getters for
non-dynamic properties always return null because values have been set as properties
of the map instead of the class. As a workaround, this commit ensures that we these
values are available in getters as well.

This fixes #4970, fixes #5259, and fixes #5187
---
 .../openapi-generator/src/main/resources/Java/pojo.mustache  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
index 21c21b1ddd3c..d9d8e78b6042 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -139,7 +139,12 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{{vendorExtensions.extraAnnotation}}}
 {{/vendorExtensions.extraAnnotation}}
   public {{{datatypeWithEnum}}} {{getter}}() {
+    {{#parent}}
+    return {{name}} == null ? ({{{datatypeWithEnum}}}) this.get("{{name}}") : {{name}};
+    {{/parent}}
+    {{^parent}}
     return {{name}};
+    {{/parent}}
   }
   {{^isReadOnly}}
 

From dc854f0eca63493cd4e9e43c00b7eca52fb81703 Mon Sep 17 00:00:00 2001
From: Stian Liknes <stianlik@gmail.com>
Date: Wed, 13 Jun 2018 08:06:23 +0200
Subject: [PATCH 2/3] Update Petstore sample

---
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/JSON.java            | 3 ++-
 .../src/main/java/org/openapitools/client/JSON.java            | 3 ++-
 .../src/main/java/org/openapitools/client/JSON.java            | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
index 2121c5c2793f..e10693b90af8 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
@@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
index b7beed2df53c..bbcf13698707 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
@@ -41,7 +41,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
index d9bc6e301ef8..f9f55a2d3821 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
@@ -64,7 +64,8 @@ public Class getClassForElement(JsonElement readElement) {
             }
           })
         ;
-        return fireBuilder.createGsonBuilder();
+        GsonBuilder builder = fireBuilder.createGsonBuilder();
+        return builder;
     }
 
     private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
index d9bc6e301ef8..f9f55a2d3821 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
@@ -64,7 +64,8 @@ public Class getClassForElement(JsonElement readElement) {
             }
           })
         ;
-        return fireBuilder.createGsonBuilder();
+        GsonBuilder builder = fireBuilder.createGsonBuilder();
+        return builder;
     }
 
     private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java
index d9bc6e301ef8..f9f55a2d3821 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java
@@ -64,7 +64,8 @@ public Class getClassForElement(JsonElement readElement) {
             }
           })
         ;
-        return fireBuilder.createGsonBuilder();
+        GsonBuilder builder = fireBuilder.createGsonBuilder();
+        return builder;
     }
 
     private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {

From 207b663c788e6624cf04e9d80ea09d45d785c0ca Mon Sep 17 00:00:00 2001
From: Stian Liknes <stianlik@gmail.com>
Date: Wed, 13 Jun 2018 16:31:17 +0200
Subject: [PATCH 3/3] Update samples using `bin/ensure-up-to-date`

---
 .../feign/src/main/java/org/openapitools/client/model/Cat.java | 2 +-
 .../feign/src/main/java/org/openapitools/client/model/Dog.java | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/JSON.java            | 3 +--
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/JSON.java            | 3 +--
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/JSON.java            | 3 +--
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Cat.java       | 2 +-
 .../src/main/java/org/openapitools/client/model/Dog.java       | 2 +-
 .../vertx/src/main/java/org/openapitools/client/model/Cat.java | 2 +-
 .../vertx/src/main/java/org/openapitools/client/model/Dog.java | 2 +-
 39 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
index 2121c5c2793f..e10693b90af8 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
@@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
index b7beed2df53c..bbcf13698707 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
@@ -41,7 +41,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
index 2121c5c2793f..e10693b90af8 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
@@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
index b7beed2df53c..bbcf13698707 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
@@ -41,7 +41,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
index 32d52beedcbb..14380a432430 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
index 0241c4faf61d..25eb1c6a3e8a 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
index 2121c5c2793f..e10693b90af8 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
@@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
index b7beed2df53c..bbcf13698707 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
@@ -41,7 +41,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
index 2121c5c2793f..e10693b90af8 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
@@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
index b7beed2df53c..bbcf13698707 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
@@ -41,7 +41,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
index f9f55a2d3821..d9bc6e301ef8 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/JSON.java
@@ -64,8 +64,7 @@ public Class getClassForElement(JsonElement readElement) {
             }
           })
         ;
-        GsonBuilder builder = fireBuilder.createGsonBuilder();
-        return builder;
+        return fireBuilder.createGsonBuilder();
     }
 
     private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
index 3a78e65332cb..eab96b67c6d3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
@@ -50,7 +50,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
index 417e979efc08..2fd8445333ad 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
@@ -50,7 +50,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
index f9f55a2d3821..d9bc6e301ef8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java
@@ -64,8 +64,7 @@ public Class getClassForElement(JsonElement readElement) {
             }
           })
         ;
-        GsonBuilder builder = fireBuilder.createGsonBuilder();
-        return builder;
+        return fireBuilder.createGsonBuilder();
     }
 
     private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
index 834be67f34f7..5427e1fb7c20 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
@@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
index 3c86defe3c87..8277c8ad1d96 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
@@ -45,7 +45,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java
index f9f55a2d3821..d9bc6e301ef8 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/JSON.java
@@ -64,8 +64,7 @@ public Class getClassForElement(JsonElement readElement) {
             }
           })
         ;
-        GsonBuilder builder = fireBuilder.createGsonBuilder();
-        return builder;
+        return fireBuilder.createGsonBuilder();
     }
 
     private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
index 834be67f34f7..5427e1fb7c20 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
@@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
index 3c86defe3c87..8277c8ad1d96 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
@@ -45,7 +45,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
index 2121c5c2793f..e10693b90af8 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
@@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
index b7beed2df53c..bbcf13698707 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
@@ -41,7 +41,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
index 8ecd9f0fdcb1..96e689838c04 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
@@ -48,7 +48,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
index c1ed2c3d9e76..e9a83a0dae18 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
index 2121c5c2793f..e10693b90af8 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
@@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
index b7beed2df53c..bbcf13698707 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
@@ -41,7 +41,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
index 834be67f34f7..5427e1fb7c20 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
@@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
index 3c86defe3c87..8277c8ad1d96 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
@@ -45,7 +45,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
index a23ce44c0466..d06daee16690 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
@@ -43,7 +43,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
index 29210dd068ef..115bae685d12 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
@@ -43,7 +43,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
index a23ce44c0466..d06daee16690 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
@@ -43,7 +43,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
index 29210dd068ef..115bae685d12 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
@@ -43,7 +43,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
index 834be67f34f7..5427e1fb7c20 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
@@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
index 3c86defe3c87..8277c8ad1d96 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
@@ -45,7 +45,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
index 834be67f34f7..5427e1fb7c20 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
@@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
index 3c86defe3c87..8277c8ad1d96 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
@@ -45,7 +45,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
index 834be67f34f7..5427e1fb7c20 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
@@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
index 3c86defe3c87..8277c8ad1d96 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
@@ -45,7 +45,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
index 2121c5c2793f..e10693b90af8 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
@@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
   **/
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
-    return declawed;
+    return declawed == null ? (Boolean) this.get("declawed") : declawed;
   }
 
   public void setDeclawed(Boolean declawed) {
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
index b7beed2df53c..bbcf13698707 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
@@ -41,7 +41,7 @@ public Dog breed(String breed) {
   **/
   @ApiModelProperty(value = "")
   public String getBreed() {
-    return breed;
+    return breed == null ? (String) this.get("breed") : breed;
   }
 
   public void setBreed(String breed) {