diff --git a/modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache b/modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache
index dcb5f4ef32..ea41c7c314 100644
--- a/modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache
@@ -25,6 +25,10 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
     this.value = value;
   }
 
+  public {{{dataType}}} getValue() {
+    return value;
+  }
+
   @Override
 {{#jackson}}
   @JsonValue
diff --git a/modules/swagger-codegen/src/main/resources/Java/modelInnerEnum.mustache b/modules/swagger-codegen/src/main/resources/Java/modelInnerEnum.mustache
index 07c97d6e3d..40cf35c19c 100644
--- a/modules/swagger-codegen/src/main/resources/Java/modelInnerEnum.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/modelInnerEnum.mustache
@@ -26,6 +26,10 @@
       this.value = value;
     }
 
+    public {{{datatype}}} getValue() {
+      return value;
+    }
+
     @Override
 {{#jackson}}
     @JsonValue
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java
index 737e133e40..438891640c 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumClass.java
index 5766e2d3e9..e0971c22a1 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumClass.java
@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
index d8b6c89e18..598df273fc 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
index 9a3ad6264a..b0e7368810 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
index 584904beb7..5ca9dcda14 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterEnum.java
index c10da3dc43..c4b5a78369 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index 27861fcd13..d4d4f28bb5 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java
index 737e133e40..438891640c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumClass.java
index 5766e2d3e9..e0971c22a1 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumClass.java
@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java
index d8b6c89e18..598df273fc 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java
@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java
index 9a3ad6264a..b0e7368810 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java
index 584904beb7..5ca9dcda14 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java
@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/OuterEnum.java
index c10da3dc43..c4b5a78369 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java
index 27861fcd13..d4d4f28bb5 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java
@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumArrays.java
index 70e3eef3be..7dedfdf46f 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumClass.java
index f6752b251f..b45ec8a44a 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumClass.java
@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumTest.java
index 657f533b58..d056e23115 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/EnumTest.java
@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/MapTest.java
index 338033b5bc..adb3157034 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Order.java
index 6cb192a6be..7953b9749f 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Order.java
@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterEnum.java
index 4e92b03856..316fe05b70 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Pet.java
index b1193cad6e..86c2c47ff0 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/Pet.java
@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java
index 737e133e40..438891640c 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumClass.java
index 5766e2d3e9..e0971c22a1 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumClass.java
@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
index d8b6c89e18..598df273fc 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java
index 9a3ad6264a..b0e7368810 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java
index 0746717bdf..6496675cd0 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java
@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/OuterEnum.java
index c10da3dc43..c4b5a78369 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java
index 27861fcd13..d4d4f28bb5 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java
@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
index 737e133e40..438891640c 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
index 5766e2d3e9..e0971c22a1 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
index d8b6c89e18..598df273fc 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumTest.java
@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java
index 9a3ad6264a..b0e7368810 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
index 584904beb7..5ca9dcda14 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/OuterEnum.java
index c10da3dc43..c4b5a78369 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
index 27861fcd13..d4d4f28bb5 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumArrays.java
index 593272046e..e6ae2abc47 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -43,6 +43,10 @@ public class EnumArrays implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -68,6 +72,10 @@ public class EnumArrays implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumClass.java
index 956e8d1f61..b468b30509 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumClass.java
@@ -39,6 +39,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumTest.java
index cb7fc84f13..1fa54d1ba5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/EnumTest.java
@@ -45,6 +45,10 @@ public class EnumTest implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -70,6 +74,10 @@ public class EnumTest implements Parcelable {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -95,6 +103,10 @@ public class EnumTest implements Parcelable {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MapTest.java
index f224e8523d..0e771e40f4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MapTest.java
@@ -47,6 +47,10 @@ public class MapTest implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java
index cb3ee25309..05083906e4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java
@@ -57,6 +57,10 @@ public class Order implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterEnum.java
index b4ec56eec8..0017ac5ee3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -39,6 +39,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Pet.java
index a22f2fd0b7..87b0bd3ab5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Pet.java
@@ -63,6 +63,10 @@ public class Pet implements Parcelable {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumArrays.java
index eab37afb32..a011e90e15 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -66,6 +70,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
index 5235a97ad1..f3f984f537 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumClass.java
@@ -37,6 +37,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
index 81d729c3e3..61b2cdd924 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/EnumTest.java
@@ -43,6 +43,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -68,6 +72,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -93,6 +101,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java
index 15e118df88..69d72ded52 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
index 52c5364950..ef60c7dd07 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Order.java
@@ -55,6 +55,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/OuterEnum.java
index d7f8ec3390..01cfbb6061 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -37,6 +37,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
index 64b70ed7c5..e8c57d7762 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Pet.java
@@ -61,6 +61,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumArrays.java
index 737e133e40..438891640c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumClass.java
index 5766e2d3e9..e0971c22a1 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumClass.java
@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumTest.java
index d8b6c89e18..598df273fc 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/EnumTest.java
@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MapTest.java
index 9a3ad6264a..b0e7368810 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Order.java
index 584904beb7..5ca9dcda14 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Order.java
@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/OuterEnum.java
index c10da3dc43..c4b5a78369 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Pet.java
index 27861fcd13..d4d4f28bb5 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/io/swagger/client/model/Pet.java
@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java
index 737e133e40..438891640c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -75,6 +79,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumClass.java
index 5766e2d3e9..e0971c22a1 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumClass.java
@@ -35,6 +35,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java
index d8b6c89e18..598df273fc 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/EnumTest.java
@@ -42,6 +42,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -76,6 +80,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -110,6 +118,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java
index 9a3ad6264a..b0e7368810 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java
index 584904beb7..5ca9dcda14 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Order.java
@@ -54,6 +54,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterEnum.java
index c10da3dc43..c4b5a78369 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -35,6 +35,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java
index 27861fcd13..d4d4f28bb5 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/model/Pet.java
@@ -60,6 +60,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java
index eab37afb32..a011e90e15 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -66,6 +70,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java
index 5235a97ad1..f3f984f537 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java
@@ -37,6 +37,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java
index 81d729c3e3..61b2cdd924 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java
@@ -43,6 +43,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -68,6 +72,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -93,6 +101,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java
index 15e118df88..69d72ded52 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
index 52c5364950..ef60c7dd07 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java
@@ -55,6 +55,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/OuterEnum.java
index d7f8ec3390..01cfbb6061 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -37,6 +37,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
index 64b70ed7c5..e8c57d7762 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java
@@ -61,6 +61,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumArrays.java
index 72cd250d34..7fe1d4b573 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -43,6 +43,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -77,6 +81,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumClass.java
index 7f37782ca2..b2bc54d995 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumClass.java
@@ -37,6 +37,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumTest.java
index 3861da7eca..46fa4cbd74 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/EnumTest.java
@@ -44,6 +44,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -78,6 +82,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
@@ -112,6 +120,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MapTest.java
index a521e3d57b..623093649a 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/MapTest.java
@@ -47,6 +47,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Order.java
index ed8cb215f5..b39d06b765 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Order.java
@@ -56,6 +56,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/OuterEnum.java
index 12249b4b51..08eea17626 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -37,6 +37,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   @JsonValue
   public String toString() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Pet.java
index 57ece97222..636b8a3924 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/Pet.java
@@ -62,6 +62,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     @JsonValue
     public String toString() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java
index eab37afb32..a011e90e15 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -66,6 +70,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumClass.java
index 5235a97ad1..f3f984f537 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumClass.java
@@ -37,6 +37,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java
index 81d729c3e3..61b2cdd924 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java
@@ -43,6 +43,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -68,6 +72,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -93,6 +101,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java
index 15e118df88..69d72ded52 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
index 52c5364950..ef60c7dd07 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java
@@ -55,6 +55,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/OuterEnum.java
index d7f8ec3390..01cfbb6061 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -37,6 +37,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
index 64b70ed7c5..e8c57d7762 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java
@@ -61,6 +61,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java
index eab37afb32..a011e90e15 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -66,6 +70,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumClass.java
index 5235a97ad1..f3f984f537 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumClass.java
@@ -37,6 +37,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java
index 81d729c3e3..61b2cdd924 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java
@@ -43,6 +43,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -68,6 +72,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -93,6 +101,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java
index 15e118df88..69d72ded52 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
index 52c5364950..ef60c7dd07 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java
@@ -55,6 +55,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/OuterEnum.java
index d7f8ec3390..01cfbb6061 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -37,6 +37,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
index 64b70ed7c5..e8c57d7762 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java
@@ -61,6 +61,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumArrays.java
index eab37afb32..a011e90e15 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -41,6 +41,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -66,6 +70,10 @@ public class EnumArrays {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumClass.java
index 5235a97ad1..f3f984f537 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumClass.java
@@ -37,6 +37,10 @@ public enum EnumClass {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumTest.java
index 81d729c3e3..61b2cdd924 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/EnumTest.java
@@ -43,6 +43,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -68,6 +72,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Integer getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
@@ -93,6 +101,10 @@ public class EnumTest {
       this.value = value;
     }
 
+    public Double getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MapTest.java
index 15e118df88..69d72ded52 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/MapTest.java
@@ -45,6 +45,10 @@ public class MapTest {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Order.java
index 52c5364950..ef60c7dd07 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Order.java
@@ -55,6 +55,10 @@ public class Order {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/OuterEnum.java
index d7f8ec3390..01cfbb6061 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/OuterEnum.java
@@ -37,6 +37,10 @@ public enum OuterEnum {
     this.value = value;
   }
 
+  public String getValue() {
+    return value;
+  }
+
   @Override
   public String toString() {
     return String.valueOf(value);
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Pet.java
index 64b70ed7c5..e8c57d7762 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/model/Pet.java
@@ -61,6 +61,10 @@ public class Pet {
       this.value = value;
     }
 
+    public String getValue() {
+      return value;
+    }
+
     @Override
     public String toString() {
       return String.valueOf(value);