Merge pull request #9207 from flamangoes/flamangoes

[JAVA] Generate and use variable name for setting discriminator and fix #9205

Author: HugoMario

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java

@@ -21,7 +21,7 @@ public class CodegenModel {
     public String name, classname, title, description, classVarName, modelJson, dataType, xmlPrefix, xmlNamespace, xmlName;
     public String classFilename; // store the class file name, mainly used for import
     public String unescapedDescription;
-    public String discriminator;
+    public String discriminator, discriminatorClassVarName;
     public String defaultValue;
     public String arrayModelType;
     public boolean isAlias; // Is this effectively an alias of another simple type

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -1334,7 +1334,9 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
         if (model instanceof ModelImpl) {
             ModelImpl modelImpl = (ModelImpl) model;
             m.discriminator = modelImpl.getDiscriminator();
-
+            if (m.discriminator != null) {
+                m.discriminatorClassVarName = toParamName(m.discriminator);
+            }
             if (modelImpl.getXml() != null) {
                 m.xmlPrefix = modelImpl.getXml().getPrefix();
                 m.xmlNamespace = modelImpl.getXml().getNamespace();
@@ -1366,6 +1368,9 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
                         ModelImpl modelImpl = (ModelImpl) innerModel;
                         if (m.discriminator == null) {
                             m.discriminator = modelImpl.getDiscriminator();
+                            if (m.discriminator != null) {
+                                m.discriminatorClassVarName = toParamName(m.discriminator);
+                            }
                         }
                         if (modelImpl.getXml() != null) {
                             m.xmlPrefix = modelImpl.getXml().getPrefix();

modules/swagger-codegen/src/main/resources/Java/pojo.mustache

@@ -74,7 +74,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{/parent}}
   {{#gson}}
   {{#discriminator}}
-    this.{{discriminator}} = this.getClass().getSimpleName();
+    this.{{discriminatorClassVarName}} = this.getClass().getSimpleName();
   {{/discriminator}}
   {{/gson}}
   }
@@ -83,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{#gson}}
   {{#discriminator}}
   public {{classname}}() {
-    this.{{discriminator}} = this.getClass().getSimpleName();
+    this.{{discriminatorClassVarName}} = this.getClass().getSimpleName();
   }
   {{/discriminator}}
   {{/gson}}