fixed java enumeration issue

Author: HugoMario

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

@@ -56,6 +56,14 @@ public class CodegenModel {
         allMandatory = mandatory;
     }
 
+    public boolean getIsInteger() {
+        return "Integer".equalsIgnoreCase(this.dataType);
+    }
+
+    public boolean getIsNumber() {
+        return "BigDecimal".equalsIgnoreCase(this.dataType);
+    }
+
     @Override
     public String toString() {
         return String.format("%s(%s)", name, classname);

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

@@ -11,6 +11,7 @@
 import java.util.regex.Pattern;
 
 import io.swagger.models.properties.UntypedProperty;
+import io.swagger.util.Yaml;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -1529,6 +1530,9 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
                 // comment out below as allowableValues is not set in post processing model enum
                 m.allowableValues = new HashMap<String, Object>();
                 m.allowableValues.put("values", impl.getEnum());
+                if (m.dataType.equals("BigDecimal")) {
+                    addImport(m, "BigDecimal");
+                }
             }
             if (impl.getAdditionalProperties() != null) {
                 addAdditionPropertiesToCodeGenModel(m, impl);

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

@@ -1212,8 +1212,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_");
@@ -1232,14 +1231,16 @@ public String toEnumVarName(String value, String datatype) {
 
     @Override
     public String toEnumValue(String value, String datatype) {
-        if ("Integer".equals(datatype) || "Double".equals(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) + "\"";
         }

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

@@ -60,7 +60,7 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
 
     @Override
     public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {
-      {{{dataType}}} value = jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}next{{{dataType}}}(){{/isInteger}};
+      {{{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));
     }
   }

modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java

@@ -1,5 +1,6 @@
 package io.swagger.codegen.java;
 
+import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.DefaultCodegen;
@@ -8,8 +9,10 @@
 import io.swagger.models.Model;
 import io.swagger.models.ModelImpl;
 import io.swagger.models.RefModel;
+import io.swagger.models.Swagger;
 import io.swagger.models.properties.Property;
 import io.swagger.models.properties.StringProperty;
+import io.swagger.parser.SwaggerParser;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -92,4 +95,18 @@ public void overrideEnumTest() {
         Assert.assertEquals(enumVar.datatypeWithEnum, "UnsharedThingEnum");
         Assert.assertTrue(enumVar.isEnum);
     }
+
+    @Test(description = "not override identical parent enums")
+    public void testEnumTypes() {
+        //final Swagger swagger = parser.read("src/test/resources/issue-913/BS/ApiSpecification.yaml");
+        final CodegenConfig codegenConfig = new JavaClientCodegen();
+
+        final Swagger swagger = new SwaggerParser().read("2_0/issue-10546.yaml", null, true);
+        final Model booleanModel = swagger.getDefinitions().get("Boolean");
+
+        CodegenModel codegenModel = codegenConfig.fromModel("Boolean", booleanModel);
+
+        Assert.assertTrue(codegenModel.isEnum);
+        Assert.assertEquals(codegenModel.dataType, "Boolean");
+    }
 }

modules/swagger-codegen/src/test/resources/2_0/issue-10546.yaml

@@ -0,0 +1,46 @@
+swagger: '2.0'
+info:
+  description: Demo
+  version: 1.0.0
+  title: Demo for Boolean-element Bug
+schemes:
+  - https
+consumes:
+  - application/json
+produces:
+  - application/json
+paths:
+  /types:
+    get:
+      produces:
+        - application/json
+      responses:
+        200:
+          description: OK
+definitions:
+  Boolean:
+    type: boolean
+    description: True or False indicator
+    enum:
+      - true
+      - false
+  Interos:
+    type: integer
+    format: int32
+    description: True or False indicator
+    enum:
+      - 0
+      - 1
+      - 2
+      - 3
+      - 4
+      - 5
+      - 6
+  Numeros:
+    type: number
+    description: some number
+    enum:
+      - 7
+      - 8
+      - 9
+      - 10