[csharp] Options: useCollection, returnICollection

Added generator options for csharp to:

* useCollection: Deserialize responses into and return Collection<T>
* returnICollection: For List<T> or Collection<T>, return ICollection<T>
  instead of the concrete type

Author: jimschubert

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

@@ -62,4 +62,9 @@ public class CodegenConstants {
     public static final String OPTIONAL_ASSEMBLY_INFO = "optionalAssemblyInfo";
     public static final String OPTIONAL_ASSEMBLY_INFO_DESC = "Generate AssemblyInfo.cs (Default: true).";
 
+    public static final String USE_COLLECTION = "useCollection";
+    public static final String USE_COLLECTION_DESC = "Deserialize array types to Collection<T> instead of List<T>.";
+
+    public static final String RETURN_ICOLLECTION = "returnICollection";
+    public static final String RETURN_ICOLLECTION_DESC = "Return ICollection<T> instead of the concrete type.";
 }

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

@@ -28,6 +28,8 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
     protected boolean optionalAssemblyInfoFlag = true;
     protected boolean optionalMethodArgumentFlag = true;
     protected boolean useDateTimeOffsetFlag = false;
+    protected boolean useCollection = false;
+    protected boolean returnICollection = false;
     protected String packageTitle = "Swagger Library";
     protected String packageProductName = "SwaggerLibrary";
     protected String packageDescription = "A library generated from a Swagger doc";
@@ -78,6 +80,7 @@ public CSharpClientCodegen() {
                         "byte[]",
                         "ICollection",
                         "Collection",
+                        "List",
                         "Dictionary",
                         "DateTime?",
                         "DateTimeOffset?",
@@ -91,7 +94,8 @@ public CSharpClientCodegen() {
                         "Object")
         );
 
-        instantiationTypes.put("array", "Collection");
+        instantiationTypes.put("array", "List");
+        instantiationTypes.put("list", "List");
         instantiationTypes.put("map", "Dictionary");
 
         typeMapping = new HashMap<String, String>();
@@ -106,8 +110,8 @@ public CSharpClientCodegen() {
         typeMapping.put("datetime", "DateTime?");
         typeMapping.put("date", "DateTime?");
         typeMapping.put("file", "Stream");
-        typeMapping.put("array", "ICollection");
-        typeMapping.put("list", "ICollection");
+        typeMapping.put("array", "List");
+        typeMapping.put("list", "List");
         typeMapping.put("map", "Dictionary");
         typeMapping.put("object", "Object");
 
@@ -123,6 +127,11 @@ public CSharpClientCodegen() {
                 CodegenConstants.OPTIONAL_ASSEMBLY_INFO_DESC).defaultValue(Boolean.TRUE.toString()));
         cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC).defaultValue(sourceFolder));
         cliOptions.add(CliOption.newBoolean(CodegenConstants.USE_DATETIME_OFFSET, CodegenConstants.USE_DATETIME_OFFSET_DESC));
+
+        cliOptions.add( CliOption.newBoolean(CodegenConstants.USE_COLLECTION, CodegenConstants.USE_COLLECTION_DESC)
+                 .defaultValue(Boolean.FALSE.toString()) );
+        cliOptions.add( CliOption.newBoolean(CodegenConstants.RETURN_ICOLLECTION, CodegenConstants.RETURN_ICOLLECTION_DESC)
+                .defaultValue(Boolean.FALSE.toString()) );
     }
 
     @Override
@@ -179,6 +188,14 @@ public void processOpts() {
                     .get(CodegenConstants.OPTIONAL_ASSEMBLY_INFO).toString()));
         }
 
+        if (additionalProperties.containsKey(CodegenConstants.USE_COLLECTION)){
+            setUseCollection(Boolean.valueOf(additionalProperties.get(CodegenConstants.USE_COLLECTION).toString()));
+        }
+
+        if (additionalProperties.containsKey(CodegenConstants.RETURN_ICOLLECTION)){
+            setReturnICollection(Boolean.valueOf(additionalProperties.get(CodegenConstants.RETURN_ICOLLECTION).toString()));
+        }
+
         supportingFiles.add(new SupportingFile("Configuration.mustache",
                 sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "Configuration.cs"));
         supportingFiles.add(new SupportingFile("ApiClient.mustache",
@@ -301,13 +318,15 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
                 List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
                 for (CodegenOperation operation : ops) {
                     if (operation.returnType != null) {
-                        // TODO: also change map from Dictionary to IDictionary
-                        if (operation.returnType.startsWith("ICollection") ||
-                                operation.returnType.startsWith("IDictionary")) {
-                            // Whenever returnType is an interface, deserialize to the concrete type
-                            operation.returnContainer = operation.returnType.substring(1);
-                        } else {
-                            operation.returnContainer = operation.returnType;
+                        operation.returnContainer = operation.returnType;
+                        if( this.returnICollection && (
+                                operation.returnType.startsWith("List")||
+                                operation.returnType.startsWith("Collection")) ) {
+                            // NOTE: ICollection works for both List<T> and Collection<T>
+                            int genericStart = operation.returnType.indexOf("<");
+                            if(genericStart > 0) {
+                                operation.returnType = "ICollection" + operation.returnType.substring(genericStart);
+                            }
                         }
                     }
                 }
@@ -370,6 +389,21 @@ public void setOptionalMethodArgumentFlag(boolean flag) {
         this.optionalMethodArgumentFlag = flag;
     }
 
+    public void setReturnICollection(boolean returnICollection) {
+        this.returnICollection = returnICollection;
+    }
+
+    public void setUseCollection(boolean useCollection) {
+        this.useCollection = useCollection;
+        if(useCollection){
+            typeMapping.put("array", "Collection");
+            typeMapping.put("list", "Collection");
+
+            instantiationTypes.put("array", "Collection");
+            instantiationTypes.put("list", "Collection");
+        }
+    }
+
     public void useDateTimeOffset(boolean flag) {
         this.useDateTimeOffsetFlag = flag;
         if (flag)

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java

@@ -26,6 +26,8 @@ public Map<String, String> createOptions() {
                 .put(CodegenConstants.OPTIONAL_ASSEMBLY_INFO, "true")
                 .put(CodegenConstants.USE_DATETIME_OFFSET, "true")
                 .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
+                .put(CodegenConstants.USE_COLLECTION, "false")
+                .put(CodegenConstants.RETURN_ICOLLECTION, "false")
                 .build();
     }