Java gson: add @SerializedName value as constant (#22)

* Java gson: add @SerializedName value as constant Fix #21 * Run bin/java-petstore-all.sh
OpenAPITools · May 13, 2018 · bf7e4e7 · bf7e4e7
1 parent 41b0ff3
commit bf7e4e7
Show file tree

Hide file tree

Showing 205 changed files with 1,236 additions and 611 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -57,7 +57,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{/isXmlAttribute}}
   {{/withXml}}
   {{#gson}}
-  @SerializedName("{{baseName}}")
+  public static final String SERIALIZED_NAME_{{nameInCamelCase}} = "{{baseName}}";
+  @SerializedName(SERIALIZED_NAME_{{nameInCamelCase}})
   {{/gson}}
   {{#isContainer}}
   private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};

diff --git a/samples/client/petstore/java/jersey1/build.gradle b/samples/client/petstore/java/jersey1/build.gradle
@@ -18,7 +18,6 @@ repositories {
     jcenter()
 }
 
-
 if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'com.android.library'
@@ -91,6 +90,21 @@ if(hasProperty('target') && target == 'android') {
        main = System.getProperty('mainClass')
        classpath = sourceSets.main.runtimeClasspath
     }
+
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        classifier = 'javadoc'
+        from javadoc.destinationDir
+    }
+
+    artifacts {
+        archives sourcesJar
+        archives javadocJar
+    }
 }
 
 ext {
@@ -113,3 +127,4 @@ dependencies {
     compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"
 }
+
diff --git a/...arcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/...arcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -34,10 +34,12 @@
  */
 
 public class AdditionalPropertiesClass implements Parcelable {
-  @SerializedName("map_property")
+  public static final String SERIALIZED_NAME_MapProperty = "map_property";
+  @SerializedName(SERIALIZED_NAME_MapProperty)
   private Map<String, String> mapProperty = null;
 
-  @SerializedName("map_of_map_property")
+  public static final String SERIALIZED_NAME_MapOfMapProperty = "map_of_map_property";
+  @SerializedName(SERIALIZED_NAME_MapOfMapProperty)
   private Map<String, Map<String, String>> mapOfMapProperty = null;
 
   public AdditionalPropertiesClass() {

diff --git a/.../java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java b/.../java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
@@ -32,10 +32,12 @@
 
 
 public class Animal implements Parcelable {
-  @SerializedName("className")
+  public static final String SERIALIZED_NAME_ClassName = "className";
+  @SerializedName(SERIALIZED_NAME_ClassName)
   private String className = null;
 
-  @SerializedName("color")
+  public static final String SERIALIZED_NAME_Color = "color";
+  @SerializedName(SERIALIZED_NAME_Color)
   private String color = "red";
 
   public Animal() {

diff --git a/...parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/...parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -34,7 +34,8 @@
  */
 
 public class ArrayOfArrayOfNumberOnly implements Parcelable {
-  @SerializedName("ArrayArrayNumber")
+  public static final String SERIALIZED_NAME_ArrayArrayNumber = "ArrayArrayNumber";
+  @SerializedName(SERIALIZED_NAME_ArrayArrayNumber)
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
   public ArrayOfArrayOfNumberOnly() {

diff --git a/...p-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/...p-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -34,7 +34,8 @@
  */
 
 public class ArrayOfNumberOnly implements Parcelable {
-  @SerializedName("ArrayNumber")
+  public static final String SERIALIZED_NAME_ArrayNumber = "ArrayNumber";
+  @SerializedName(SERIALIZED_NAME_ArrayNumber)
   private List<BigDecimal> arrayNumber = null;
 
   public ArrayOfNumberOnly() {

diff --git a/...va/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java b/...va/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,13 +34,16 @@
  */
 
 public class ArrayTest implements Parcelable {
-  @SerializedName("array_of_string")
+  public static final String SERIALIZED_NAME_ArrayOfString = "array_of_string";
+  @SerializedName(SERIALIZED_NAME_ArrayOfString)
   private List<String> arrayOfString = null;
 
-  @SerializedName("array_array_of_integer")
+  public static final String SERIALIZED_NAME_ArrayArrayOfInteger = "array_array_of_integer";
+  @SerializedName(SERIALIZED_NAME_ArrayArrayOfInteger)
   private List<List<Long>> arrayArrayOfInteger = null;
 
-  @SerializedName("array_array_of_model")
+  public static final String SERIALIZED_NAME_ArrayArrayOfModel = "array_array_of_model";
+  @SerializedName(SERIALIZED_NAME_ArrayArrayOfModel)
   private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
 
   public ArrayTest() {

diff --git a/...http-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java b/...http-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -31,22 +31,28 @@
  */
 
 public class Capitalization implements Parcelable {
-  @SerializedName("smallCamel")
+  public static final String SERIALIZED_NAME_SmallCamel = "smallCamel";
+  @SerializedName(SERIALIZED_NAME_SmallCamel)
   private String smallCamel = null;
 
-  @SerializedName("CapitalCamel")
+  public static final String SERIALIZED_NAME_CapitalCamel = "CapitalCamel";
+  @SerializedName(SERIALIZED_NAME_CapitalCamel)
   private String capitalCamel = null;
 
-  @SerializedName("small_Snake")
+  public static final String SERIALIZED_NAME_SmallSnake = "small_Snake";
+  @SerializedName(SERIALIZED_NAME_SmallSnake)
   private String smallSnake = null;
 
-  @SerializedName("Capital_Snake")
+  public static final String SERIALIZED_NAME_CapitalSnake = "Capital_Snake";
+  @SerializedName(SERIALIZED_NAME_CapitalSnake)
   private String capitalSnake = null;
 
-  @SerializedName("SCA_ETH_Flow_Points")
+  public static final String SERIALIZED_NAME_ScAETHFlowPoints = "SCA_ETH_Flow_Points";
+  @SerializedName(SERIALIZED_NAME_ScAETHFlowPoints)
   private String scAETHFlowPoints = null;
 
-  @SerializedName("ATT_NAME")
+  public static final String SERIALIZED_NAME_ATTNAME = "ATT_NAME";
+  @SerializedName(SERIALIZED_NAME_ATTNAME)
   private String ATT_NAME = null;
 
   public Capitalization() {

diff --git a/...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java b/...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
@@ -32,7 +32,8 @@
  */
 
 public class Cat extends Animal implements Parcelable {
-  @SerializedName("declawed")
+  public static final String SERIALIZED_NAME_Declawed = "declawed";
+  @SerializedName(SERIALIZED_NAME_Declawed)
   private Boolean declawed = null;
 
   public Cat() {

diff --git a/...ava/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java b/...ava/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
@@ -31,10 +31,12 @@
  */
 
 public class Category implements Parcelable {
-  @SerializedName("id")
+  public static final String SERIALIZED_NAME_Id = "id";
+  @SerializedName(SERIALIZED_NAME_Id)
   private Long id = null;
 
-  @SerializedName("name")
+  public static final String SERIALIZED_NAME_Name = "name";
+  @SerializedName(SERIALIZED_NAME_Name)
   private String name = null;
 
   public Category() {

diff --git a/...a/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java b/...a/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -32,7 +32,8 @@
 @ApiModel(description = "Model for testing model with \"_class\" property")
 
 public class ClassModel implements Parcelable {
-  @SerializedName("_class")
+  public static final String SERIALIZED_NAME_PropertyClass = "_class";
+  @SerializedName(SERIALIZED_NAME_PropertyClass)
   private String propertyClass = null;
 
   public ClassModel() {

diff --git a/.../java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java b/.../java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
@@ -31,7 +31,8 @@
  */
 
 public class Client implements Parcelable {
-  @SerializedName("client")
+  public static final String SERIALIZED_NAME_Client = "client";
+  @SerializedName(SERIALIZED_NAME_Client)
   private String client = null;
 
   public Client() {

diff --git a/...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java b/...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
@@ -32,7 +32,8 @@
  */
 
 public class Dog extends Animal implements Parcelable {
-  @SerializedName("breed")
+  public static final String SERIALIZED_NAME_Breed = "breed";
+  @SerializedName(SERIALIZED_NAME_Breed)
   private String breed = null;
 
   public Dog() {

diff --git a/...a/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java b/...a/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -80,7 +80,8 @@ public JustSymbolEnum read(final JsonReader jsonReader) throws IOException {
     }
   }
 
-  @SerializedName("just_symbol")
+  public static final String SERIALIZED_NAME_JustSymbol = "just_symbol";
+  @SerializedName(SERIALIZED_NAME_JustSymbol)
   private JustSymbolEnum justSymbol = null;
 
   /**
@@ -130,7 +131,8 @@ public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException {
     }
   }
 
-  @SerializedName("array_enum")
+  public static final String SERIALIZED_NAME_ArrayEnum = "array_enum";
+  @SerializedName(SERIALIZED_NAME_ArrayEnum)
   private List<ArrayEnumEnum> arrayEnum = null;
 
   public EnumArrays() {

diff --git a/...ava/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/...ava/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -81,7 +81,8 @@ public EnumStringEnum read(final JsonReader jsonReader) throws IOException {
     }
   }
 
-  @SerializedName("enum_string")
+  public static final String SERIALIZED_NAME_EnumString = "enum_string";
+  @SerializedName(SERIALIZED_NAME_EnumString)
   private EnumStringEnum enumString = null;
 
   /**
@@ -133,7 +134,8 @@ public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOExcepti
     }
   }
 
-  @SerializedName("enum_string_required")
+  public static final String SERIALIZED_NAME_EnumStringRequired = "enum_string_required";
+  @SerializedName(SERIALIZED_NAME_EnumStringRequired)
   private EnumStringRequiredEnum enumStringRequired = null;
 
   /**
@@ -183,7 +185,8 @@ public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
     }
   }
 
-  @SerializedName("enum_integer")
+  public static final String SERIALIZED_NAME_EnumInteger = "enum_integer";
+  @SerializedName(SERIALIZED_NAME_EnumInteger)
   private EnumIntegerEnum enumInteger = null;
 
   /**
@@ -233,10 +236,12 @@ public EnumNumberEnum read(final JsonReader jsonReader) throws IOException {
     }
   }
 
-  @SerializedName("enum_number")
+  public static final String SERIALIZED_NAME_EnumNumber = "enum_number";
+  @SerializedName(SERIALIZED_NAME_EnumNumber)
   private EnumNumberEnum enumNumber = null;
 
-  @SerializedName("outerEnum")
+  public static final String SERIALIZED_NAME_OuterEnum = "outerEnum";
+  @SerializedName(SERIALIZED_NAME_OuterEnum)
   private OuterEnum outerEnum = null;
 
   public EnumTest() {

diff --git a/...a/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java b/...a/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -36,43 +36,56 @@
  */
 
 public class FormatTest implements Parcelable {
-  @SerializedName("integer")
+  public static final String SERIALIZED_NAME_Integer = "integer";
+  @SerializedName(SERIALIZED_NAME_Integer)
   private Integer integer = null;
 
-  @SerializedName("int32")
+  public static final String SERIALIZED_NAME_Int32 = "int32";
+  @SerializedName(SERIALIZED_NAME_Int32)
   private Integer int32 = null;
 
-  @SerializedName("int64")
+  public static final String SERIALIZED_NAME_Int64 = "int64";
+  @SerializedName(SERIALIZED_NAME_Int64)
   private Long int64 = null;
 
-  @SerializedName("number")
+  public static final String SERIALIZED_NAME_Number = "number";
+  @SerializedName(SERIALIZED_NAME_Number)
   private BigDecimal number = null;
 
-  @SerializedName("float")
+  public static final String SERIALIZED_NAME_Float = "float";
+  @SerializedName(SERIALIZED_NAME_Float)
   private Float _float = null;
 
-  @SerializedName("double")
+  public static final String SERIALIZED_NAME_Double = "double";
+  @SerializedName(SERIALIZED_NAME_Double)
   private Double _double = null;
 
-  @SerializedName("string")
+  public static final String SERIALIZED_NAME_String = "string";
+  @SerializedName(SERIALIZED_NAME_String)
   private String string = null;
 
-  @SerializedName("byte")
+  public static final String SERIALIZED_NAME_Byte = "byte";
+  @SerializedName(SERIALIZED_NAME_Byte)
   private byte[] _byte = null;
 
-  @SerializedName("binary")
+  public static final String SERIALIZED_NAME_Binary = "binary";
+  @SerializedName(SERIALIZED_NAME_Binary)
   private File binary = null;
 
-  @SerializedName("date")
+  public static final String SERIALIZED_NAME_Date = "date";
+  @SerializedName(SERIALIZED_NAME_Date)
   private LocalDate date = null;
 
-  @SerializedName("dateTime")
+  public static final String SERIALIZED_NAME_DateTime = "dateTime";
+  @SerializedName(SERIALIZED_NAME_DateTime)
   private OffsetDateTime dateTime = null;
 
-  @SerializedName("uuid")
+  public static final String SERIALIZED_NAME_Uuid = "uuid";
+  @SerializedName(SERIALIZED_NAME_Uuid)
   private UUID uuid = null;
 
-  @SerializedName("password")
+  public static final String SERIALIZED_NAME_Password = "password";
+  @SerializedName(SERIALIZED_NAME_Password)
   private String password = null;
 
   public FormatTest() {

diff --git a/...ttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/...ttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -31,10 +31,12 @@
  */
 
 public class HasOnlyReadOnly implements Parcelable {
-  @SerializedName("bar")
+  public static final String SERIALIZED_NAME_Bar = "bar";
+  @SerializedName(SERIALIZED_NAME_Bar)
   private String bar = null;
 
-  @SerializedName("foo")
+  public static final String SERIALIZED_NAME_Foo = "foo";
+  @SerializedName(SERIALIZED_NAME_Foo)
   private String foo = null;
 
   public HasOnlyReadOnly() {

diff --git a/...java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java b/...java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
@@ -34,7 +34,8 @@
  */
 
 public class MapTest implements Parcelable {
-  @SerializedName("map_map_of_string")
+  public static final String SERIALIZED_NAME_MapMapOfString = "map_map_of_string";
+  @SerializedName(SERIALIZED_NAME_MapMapOfString)
   private Map<String, Map<String, String>> mapMapOfString = null;
 
   /**
@@ -84,7 +85,8 @@ public InnerEnum read(final JsonReader jsonReader) throws IOException {
     }
   }
 
-  @SerializedName("map_of_enum_string")
+  public static final String SERIALIZED_NAME_MapOfEnumString = "map_of_enum_string";
+  @SerializedName(SERIALIZED_NAME_MapOfEnumString)
   private Map<String, InnerEnum> mapOfEnumString = null;
 
   public MapTest() {

diff --git a/.../main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/.../main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,13 +37,16 @@
  */
 
 public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
-  @SerializedName("uuid")
+  public static final String SERIALIZED_NAME_Uuid = "uuid";
+  @SerializedName(SERIALIZED_NAME_Uuid)
   private UUID uuid = null;
 
-  @SerializedName("dateTime")
+  public static final String SERIALIZED_NAME_DateTime = "dateTime";
+  @SerializedName(SERIALIZED_NAME_DateTime)
   private OffsetDateTime dateTime = null;
 
-  @SerializedName("map")
+  public static final String SERIALIZED_NAME_Map = "map";
+  @SerializedName(SERIALIZED_NAME_Map)
   private Map<String, Animal> map = null;
 
   public MixedPropertiesAndAdditionalPropertiesClass() {