better default value for enum variable declaration

Author: wing328

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

@@ -1595,14 +1595,10 @@ protected void updatePropertyForArray(CodegenProperty property, CodegenProperty
             // inner item is Enum
             if (isPropertyInnerMostEnum(property)) {
                 property.isEnum = true;
-                // update datatypeWithEnum for array
+                // update datatypeWithEnum and default value for array
                 // e.g. List<string> => List<StatusEnum>
                 updateDataTypeWithEnumForArray(property);
 
-                // TOOD need to revise the default value for enum
-                if (property.defaultValue != null) {
-                    property.defaultValue = property.defaultValue.replace(property.items.baseType, property.items.datatypeWithEnum);
-                }
             }
         }
     }
@@ -1626,15 +1622,9 @@ protected void updatePropertyForMap(CodegenProperty property, CodegenProperty in
             // inner item is Enum
             if (isPropertyInnerMostEnum(property)) {
                 property.isEnum = true;
-                // update datatypeWithEnum for map
+                // update datatypeWithEnum and default value for map
                 // e.g. Dictionary<string, string> => Dictionary<string, StatusEnum>
                 updateDataTypeWithEnumForMap(property);
-
-                // TOOD need to revise the default value for enum
-                // set default value
-                if (property.defaultValue != null) {
-                    property.defaultValue = property.defaultValue.replace(property.items.baseType, property.items.datatypeWithEnum);
-                }
             }
         }
 
@@ -1667,7 +1657,11 @@ protected void updateDataTypeWithEnumForArray(CodegenProperty property) {
         }
         // set both datatype and datetypeWithEnum as only the inner type is enum
         property.datatypeWithEnum = property.datatypeWithEnum.replace(baseItem.baseType, toEnumName(baseItem));
-        //property.datatype = property.datatypeWithEnum;
+
+        // set default value for variable with inner enum
+        if (property.defaultValue != null) {
+            property.defaultValue = property.defaultValue.replace(property.items.baseType, toEnumName(property.items));
+        }
     }
 
     /**
@@ -1682,7 +1676,11 @@ protected void updateDataTypeWithEnumForMap(CodegenProperty property) {
         }
         // set both datatype and datetypeWithEnum as only the inner type is enum
         property.datatypeWithEnum = property.datatypeWithEnum.replace(", " + baseItem.baseType, ", " + toEnumName(baseItem));
-        //property.datatype = property.datatypeWithEnum;
+
+        // set default value for variable with inner enum
+        if (property.defaultValue != null) {
+            property.defaultValue = property.defaultValue.replace(", " + property.items.baseType, ", " + toEnumName(property.items));
+        }
     }
 
     protected void setNonArrayMapProperty(CodegenProperty property, String type) {

samples/client/petstore/java/okhttp-gson/hello.txt

@@ -43,7 +43,7 @@ public class MapTest   {
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
 
   @SerializedName("map_map_of_enum")
-  private Map<String, Map<String, InnerEnum>> mapMapOfEnum = new HashMap<String, Map<String, InnerEnum>>();
+  private Map<String, Map<String, InnerEnum>> mapMapOfEnum = new HashMap<String, InnerEnum<String, String>>();
 
   /**
    * Gets or Sets inner