Merge pull request #806 from swagger-api/codegen-enum-values-issue

HugoMario · web-flow · commit f2adecbc26cb · 2020-11-17T08:21:55.000-05:00
fixed java, javascript and kotlin enumeration issue
diff --git a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
@@ -362,6 +362,12 @@ public void processModelEnums(Map<String, Object> objs) {
         }
     }
 
+    public boolean isPrimivite(String datatype) {
+        return "number".equalsIgnoreCase(datatype)
+            || "integer".equalsIgnoreCase(datatype)
+            || "boolean".equalsIgnoreCase(datatype);
+    }
+
     /**
      * update codegen property enum with proper naming convention
      * and handling of numbers, special characters
@@ -1465,6 +1471,9 @@ else if (schema instanceof ComposedSchema) {
                 // comment out below as allowableValues is not set in post processing model enum
                 codegenModel.allowableValues = new HashMap<String, Object>();
                 codegenModel.allowableValues.put("values", schema.getEnum());
+                if (codegenModel.dataType.equals("BigDecimal")) {
+                    addImport(codegenModel, "BigDecimal");
+                }
             }
             addVars(codegenModel, schema.getProperties(), schema.getRequired());
         }
@@ -1474,6 +1483,15 @@ else if (schema instanceof ComposedSchema) {
                 postProcessModelProperty(codegenModel, prop);
             }
         }
+
+        System.out.println(codegenModel.name);
+        System.out.println(codegenModel.dataType);
+        System.out.println(codegenModel.getIsInteger());
+        System.out.println(codegenModel.getIsNumber());
+        System.out.println(codegenModel.getIsBoolean());
+        System.out.println("--------");
+
+
         return codegenModel;
     }
 
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java
@@ -1258,8 +1258,7 @@ public String toEnumVarName(String value, String datatype) {
         }
 
         // number
-        if ("Integer".equals(datatype) || "Long".equals(datatype) ||
-                "Float".equals(datatype) || "Double".equals(datatype)) {
+        if ("Integer".equals(datatype) || "Long".equals(datatype) || "Float".equals(datatype) || "Double".equals(datatype) || "BigDecimal".equals(datatype)) {
             String varName = "NUMBER_" + value;
             varName = varName.replaceAll("-", "MINUS_");
             varName = varName.replaceAll("\\+", "PLUS_");
@@ -1281,14 +1280,17 @@ public String toEnumValue(String value, String datatype) {
         if (value == null) {
             return null;
         }
-        if ("Integer".equals(datatype) || "Double".equals(datatype)) {
+        System.out.println("|||||||||||||||||||||||||||| datatype: " + datatype);
+        if ("Integer".equals(datatype) || "Double".equals(datatype) || "Boolean".equals(datatype)) {
             return value;
         } else if ("Long".equals(datatype)) {
             // add l to number, e.g. 2048 => 2048l
             return value + "l";
         } else if ("Float".equals(datatype)) {
             // add f to number, e.g. 3.14 => 3.14f
             return value + "f";
+        } else if ("BigDecimal".equals(datatype)) {
+            return "new BigDecimal(" + escapeText(value) + ")";
         } else {
             return "\"" + escapeText(value) + "\"";
         }
diff --git a/src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java
@@ -1064,7 +1064,7 @@ public String toEnumVarName(String value, String datatype) {
 
     @Override
     public String toEnumValue(String value, String datatype) {
-        if ("Integer".equals(datatype) || "Number".equals(datatype)) {
+        if ("Integer".equals(datatype) || "Number".equals(datatype) || "Boolean".equals(datatype)) {
             return value;
         } else {
             return "\"" + escapeText(value) + "\"";
diff --git a/src/main/java/io/swagger/codegen/v3/generators/kotlin/AbstractKotlinCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/kotlin/AbstractKotlinCodegen.java
@@ -467,6 +467,25 @@ public String toEnumVarName(String value, String datatype) {
         return modified;
     }
 
+    @Override
+    public String toEnumValue(String value, String datatype) {
+        if (isPrimivite(datatype)) {
+            return value;
+        }
+        return super.toEnumValue(value, datatype);
+    }
+
+    @Override
+    public boolean isPrimivite(String datatype) {
+        return "kotlin.Byte".equalsIgnoreCase(datatype)
+            || "kotlin.Short".equalsIgnoreCase(datatype)
+            || "kotlin.Int".equalsIgnoreCase(datatype)
+            || "kotlin.Long".equalsIgnoreCase(datatype)
+            || "kotlin.Float".equalsIgnoreCase(datatype)
+            || "kotlin.Double".equalsIgnoreCase(datatype)
+            || "kotlin.Boolean".equalsIgnoreCase(datatype);
+    }
+
     @Override
     public String toInstantiationType(Schema p) {
         if (p instanceof ArraySchema) {
diff --git a/src/main/resources/handlebars/Java/modelEnum.mustache b/src/main/resources/handlebars/Java/modelEnum.mustache
@@ -62,7 +62,7 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
 
     @Override
     public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {
-      {{{dataType}}} value = jsonReader.{{#is this 'integer'}}nextInt(){{/is}}{{#isNot this 'integer'}}next{{{dataType}}}(){{/isNot}};
+      {{{dataType}}} value = {{#isNumber}}new BigDecimal(jsonReader.nextDouble()){{/isNumber}}{{^isNumber}}jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}next{{{dataType}}}(){{/isInteger}}{{/isNumber}};
       return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue(String.valueOf(value));
     }
   }
diff --git a/src/main/resources/handlebars/Java/modelInnerEnum.mustache b/src/main/resources/handlebars/Java/modelInnerEnum.mustache
@@ -45,7 +45,7 @@
 
       @Override
       public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {
-        {{{datatype}}} value = jsonReader.{{#is ../this 'integer'}}nextInt(){{/is}}{{#isNot ../this 'integer'}}next{{{datatype}}}(){{/isNot}};
+        {{{dataType}}} value = {{#isNumber}}new BigDecimal(jsonReader.nextDouble()){{/isNumber}}{{^isNumber}}jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}next{{{dataType}}}(){{/isInteger}}{{/isNumber}};
         return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.fromValue(String.valueOf(value));
       }
     }{{/gson}}

Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,12 @@ public void processModelEnums(Map<String, Object> objs) {`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`
	`365`	`+ public boolean isPrimivite(String datatype) {`
	`366`	`+ return "number".equalsIgnoreCase(datatype)`
	`367`	`+ \|\| "integer".equalsIgnoreCase(datatype)`
	`368`	`+ \|\| "boolean".equalsIgnoreCase(datatype);`
	`369`	`+ }`
	`370`	`+`
`365`	`371`	`/**`
`366`	`372`	`* update codegen property enum with proper naming convention`
`367`	`373`	`* and handling of numbers, special characters`
`@@ -1465,6 +1471,9 @@ else if (schema instanceof ComposedSchema) {`
`1465`	`1471`	`// comment out below as allowableValues is not set in post processing model enum`
`1466`	`1472`	`codegenModel.allowableValues = new HashMap<String, Object>();`
`1467`	`1473`	`codegenModel.allowableValues.put("values", schema.getEnum());`
	`1474`	`+ if (codegenModel.dataType.equals("BigDecimal")) {`
	`1475`	`+ addImport(codegenModel, "BigDecimal");`
	`1476`	`+ }`
`1468`	`1477`	`}`
`1469`	`1478`	`addVars(codegenModel, schema.getProperties(), schema.getRequired());`
`1470`	`1479`	`}`
`@@ -1474,6 +1483,15 @@ else if (schema instanceof ComposedSchema) {`
`1474`	`1483`	`postProcessModelProperty(codegenModel, prop);`
`1475`	`1484`	`}`
`1476`	`1485`	`}`
	`1486`	`+`
	`1487`	`+ System.out.println(codegenModel.name);`
	`1488`	`+ System.out.println(codegenModel.dataType);`
	`1489`	`+ System.out.println(codegenModel.getIsInteger());`
	`1490`	`+ System.out.println(codegenModel.getIsNumber());`
	`1491`	`+ System.out.println(codegenModel.getIsBoolean());`
	`1492`	`+ System.out.println("--------");`
	`1493`	`+`
	`1494`	`+`
`1477`	`1495`	`return codegenModel;`
`1478`	`1496`	`}`
`1479`	`1497`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum`
`62`	`62`
`63`	`63`	`@Override`
`64`	`64`	`public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {`
`65`		`- {{{dataType}}} value = jsonReader.{{#is this 'integer'}}nextInt(){{/is}}{{#isNot this 'integer'}}next{{{dataType}}}(){{/isNot}};`
	`65`	`+ {{{dataType}}} value = {{#isNumber}}new BigDecimal(jsonReader.nextDouble()){{/isNumber}}{{^isNumber}}jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}next{{{dataType}}}(){{/isInteger}}{{/isNumber}};`
`66`	`66`	`return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue(String.valueOf(value));`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`
`46`	`46`	`@Override`
`47`	`47`	`public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {`
`48`		`- {{{datatype}}} value = jsonReader.{{#is ../this 'integer'}}nextInt(){{/is}}{{#isNot ../this 'integer'}}next{{{datatype}}}(){{/isNot}};`
	`48`	`+ {{{dataType}}} value = {{#isNumber}}new BigDecimal(jsonReader.nextDouble()){{/isNumber}}{{^isNumber}}jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}next{{{dataType}}}(){{/isInteger}}{{/isNumber}};`
`49`	`49`	`return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.fromValue(String.valueOf(value));`
`50`	`50`	`}`
`51`	`51`	`}{{/gson}}`