add enum support to java

Author: xhh

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

@@ -213,7 +213,7 @@ public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
                 if (var.defaultValue != null) {
                     String enumName = null;
                     for (Map<String, String> enumVar : enumVars) {
-                        if (var.defaultValue.equals(enumVar.get("value"))) {
+                        if (toEnumValue(var.defaultValue, var.datatype).equals(enumVar.get("value"))) {
                             enumName = enumVar.get("name");
                             break;
                         }

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

@@ -11,6 +11,7 @@
 import io.swagger.models.properties.*;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.WordUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -651,6 +652,28 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
         return codegenModel;
     }
 
+    @Override
+    public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
+        objs = super.postProcessModelsEnum(objs);
+        String lib = getLibrary();
+        if (StringUtils.isEmpty(lib) || "feign".equals(lib) || "jersey2".equals(lib)) {
+            List<Map<String, String>> imports = (List<Map<String, String>>)objs.get("imports");
+            List<Object> models = (List<Object>) objs.get("models");
+            for (Object _mo : models) {
+                Map<String, Object> mo = (Map<String, Object>) _mo;
+                CodegenModel cm = (CodegenModel) mo.get("model");
+                // for enum model
+                if (Boolean.TRUE.equals(cm.isEnum) && cm.allowableValues != null) {
+                    cm.imports.add(importMapping.get("JsonValue"));
+                    Map<String, String> item = new HashMap<String, String>();
+                    item.put("import", importMapping.get("JsonValue"));
+                    imports.add(item);
+                }
+            }
+        }
+        return objs;
+    }
+
     @Override
     public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
         if(serializeBigDecimalAsString) {
@@ -801,16 +824,43 @@ public String findCommonPrefixOfVars(List<String> vars) {
         return prefix.replaceAll("[a-zA-Z0-9]+\\z", "");
     }
 */
+
+    @Override
+    public String toEnumName(CodegenProperty property) {
+        return sanitizeName(camelize(property.name)) + "Enum";
+    }
+
     @Override
     public String toEnumVarName(String value, String datatype) {
-        String var = value.replaceAll("\\W+", "_").toUpperCase();
+        // number
+        if ("Integer".equals(datatype) || "Long".equals(datatype) ||
+            "Float".equals(datatype) || "Double".equals(datatype)) {
+            String varName = "NUMBER_" + value;
+            varName = varName.replaceAll("-", "MINUS_");
+            varName = varName.replaceAll("\\+", "PLUS_");
+            varName = varName.replaceAll("\\.", "_DOT_");
+            return varName;
+        }
+
+        // string
+        String var = value.replaceAll("\\W+", "_").replaceAll("_+", "_").toUpperCase();
         if (var.matches("\\d.*")) {
             return "_" + var;
         } else {
             return var;
         }
     }
 
+    @Override
+    public String toEnumValue(String value, String datatype) {
+        if ("Integer".equals(datatype) || "Long".equals(datatype) ||
+            "Float".equals(datatype) || "Double".equals(datatype)) {
+            return value;
+        } else {
+            return "\"" + escapeText(value) + "\"";
+        }
+    }
+
     private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
         // This generator uses inline classes to define enums, which breaks when
         // dealing with models that have subTypes. To clean this up, we will analyze

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

@@ -6,11 +6,7 @@ import java.util.Objects;
 
 {{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
 {{#models}}
-{{#model}}{{#description}}
-/**
- * {{description}}
- **/{{/description}}
-{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
-{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{#model}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{>pojo}}{{/isEnum}}
 {{/model}}
 {{/models}}

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

@@ -0,0 +1,19 @@
+/**
+ * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+ */
+public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
+  {{#allowableValues}}{{#enumVars}}{{{name}}}({{{value}}}){{^-last}},
+  {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+
+  private {{dataType}} value;
+
+  {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{dataType}} value) {
+    this.value = value;
+  }
+
+  @Override
+  @JsonValue
+  public String toString() {
+    return String.valueOf(value);
+  }
+}

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

@@ -0,0 +1,19 @@
+  /**
+   * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+   */
+  public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
+    {{#allowableValues}}{{#enumVars}}{{{name}}}({{{value}}}){{^-last}},
+    {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+
+    private {{datatype}} value;
+
+    {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{datatype}} value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }

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

@@ -1,11 +1,14 @@
-{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
+/**
+ * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
+ */{{#description}}
+@ApiModel(description = "{{{description}}}"){{/description}}
 {{>generatedAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}
 
-{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
+{{>modelInnerEnum}}{{/isEnum}}{{#items.isEnum}}{{#items}}
 
-{{>enumClass}}{{/items}}{{/items.isEnum}}
+{{>modelInnerEnum}}{{/items}}{{/items.isEnum}}
   private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
 
   {{#vars}}{{^isReadOnly}}

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

@@ -6,10 +6,10 @@
 import io.swagger.annotations.ApiModelProperty;
 
 
-
-
-
-
+/**
+ * Animal
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-12T22:48:50.833+08:00")
 public class Animal   {
 
   private String className = null;
@@ -31,6 +31,7 @@ public void setClassName(String className) {
     this.className = className;
   }
 
+  
 
   @Override
   public boolean equals(java.lang.Object o) {

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

@@ -7,10 +7,10 @@
 import io.swagger.client.model.Animal;
 
 
-
-
-
-
+/**
+ * Cat
+ */
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-12T22:48:50.833+08:00")
 public class Cat extends Animal  {
 
   private String className = null;
@@ -33,7 +33,7 @@ public void setClassName(String className) {
     this.className = className;
   }
 
-
+  
   /**
    **/
   public Cat declawed(Boolean declawed) {
@@ -50,6 +50,7 @@ public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }
 
+  
 
   @Override
   public boolean equals(java.lang.Object o) {