better enum support for csharp

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

@@ -262,6 +262,7 @@ public class DefaultCodegen {
      */
     public String toEnumVarName(String value) {
         String var = value.replaceAll("\\W+", "_").toUpperCase();
+        LOGGER.info("toEnumVarName: " + value + " => " + var);
         if (var.matches("\\d.*")) {
             return "_" + var;
         } else {

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

@@ -203,11 +203,6 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         }
     }
 
-    @Override
-    public String toEnumName(CodegenProperty property) {
-        return StringUtils.capitalize(property.name) + "Enum?";
-    }
-
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         List<Object> models = (List<Object>) objs.get("models");
@@ -223,7 +218,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                 }
             }
         }
-        return objs;
+        // process enum in models
+        return postProcessModelsEnum(objs);
     }
 
     @Override
@@ -544,4 +540,54 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
     public void setSourceFolder(String sourceFolder) {
         this.sourceFolder = sourceFolder;
     }
+
+    
+    @Override
+    public String toEnumVarName(String name) {
+        String enumName = sanitizeName(name);
+
+        enumName = enumName.replaceFirst("^_", "");
+        enumName = enumName.replaceFirst("_$", "");
+
+        enumName = camelize(enumName) + "Enum";
+
+        LOGGER.info("toEnumVarName = " + enumName);
+
+        if (enumName.matches("\\d.*")) { // starts with number
+            return "_" + enumName;
+        } else {
+            return enumName;
+        }
+    }
+
+    @Override
+    public String toEnumName(CodegenProperty property) {
+        return sanitizeName(camelize(property.name)) + "Enum";
+    }
+
+    /*
+    @Override
+    public String toEnumName(CodegenProperty property) {
+        String enumName = sanitizeName(property.name);
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            enumName = modelNamePrefix + "_" + enumName;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            enumName = enumName + "_" + modelNameSuffix;
+        }
+
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(enumName)) {
+            LOGGER.warn(enumName + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + enumName));
+            enumName = "model_" + enumName; // e.g. return => ModelReturn (after camelize)
+        }
+
+        if (enumName.matches("\\d.*")) { // starts with number
+            return "_" + enumName;
+        } else {
+            return enumName;
+        }
+    }
+    */
 }

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

@@ -306,11 +306,14 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         this.packageGuid = packageGuid;
     }
 
+    /*
+     *
+     */
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objMap) {
-        Map<String, Object> objs = super.postProcessModels(objMap);
-
-        List<Object> models = (List<Object>) objs.get("models");
+    	objMap = super.postProcessModels(objMap);
+    	
+        List<Object> models = (List<Object>) objMap.get("models");
         for (Object _mo : models) {
             Map<String, Object> mo = (Map<String, Object>) _mo;
             CodegenModel cm = (CodegenModel) mo.get("model");
@@ -325,11 +328,13 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                 if (allowableValues == null) {
                     continue;
                 }
+
                 List<String> values = (List<String>) allowableValues.get("values");
+
                 if (values == null) {
                     continue;
                 }
-
+                
                 // put "enumVars" map into `allowableValues", including `name` and `value`
                 List<Map<String, String>> enumVars = new ArrayList<Map<String, String>>();
                 String commonPrefix = findCommonPrefixOfVars(values);
@@ -351,6 +356,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                     enumVars.add(enumVar);
                 }
                 allowableValues.put("enumVars", enumVars);
+                
                 // handle default value for enum, e.g. available => StatusEnum.AVAILABLE
 
                 // HACK: strip ? from enum
@@ -362,21 +368,21 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                     String enumName = null;
 
                     for (Map<String, String> enumVar : enumVars) {
-
                         if (var.defaultValue.replace("\"", "").equals(enumVar.get("value"))) {
                             enumName = enumVar.get("name");
                             break;
                         }
                     }
+
                     if (enumName != null && var.vendorExtensions.containsKey(DATA_TYPE_WITH_ENUM_EXTENSION)) {
                         var.defaultValue = var.vendorExtensions.get(DATA_TYPE_WITH_ENUM_EXTENSION) + "." + enumName;
                     }
                 }
-
             }
         }
 
-        return objs;
+    	return super.postProcessModels(objMap);
+        //return objs;
     }
 
     public void setTargetFramework(String dotnetFramework) {