Merge branch 'devhl/21686-fix-response-datatype' of https://github.com/devhl-labs/openapi-generator into devhl-labs-devhl/21686-fix-response-datatype

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java

@@ -753,9 +753,13 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
         return value;
     }
 
-    /** 
-     * Fixes nested maps so the generic type is defined
-     * Convertes List<List>> to List<List<T>>
+    /**
+     * Ensures property name is unique and not a reserved word.
+     * @param model
+     * @param property
+     * @param value
+     * @param composedPropertyNames
+     * @return
      */
     private String patchPropertyName(CodegenModel model, CodegenProperty property, String value, Set<String> composedPropertyNames) {
         value = setUniquePropertyName(model, property, value);
@@ -794,6 +798,10 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
     protected void patchPropertyIsInherited(CodegenModel model, CodegenProperty property) {
     }
 
+    /** 
+     * Fixes nested maps so the generic type is defined
+     * Convertes List<List>> to List<List<T>>
+     */
     private void patchNestedMaps(CodegenProperty property) {
         // Process nested types before making any replacements to ensure we have the correct inner type
         if (property.items != null) {
@@ -825,6 +833,41 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
         }
     }
 
+    /** 
+     * Fixes nested maps so the generic type is defined
+     * Convertes List<List>> to List<List<T>>
+     */
+    private void patchNestedMaps(CodegenResponse response) {
+        // Process nested types before making any replacements to ensure we have the correct inner type
+        if (response.items != null) {
+            patchNestedMaps(response.items);
+        }
+
+        String[] nestedTypes = {"List", "Collection", "ICollection", "Dictionary"};
+        
+        if (response.dataType != null) {
+            String originalType = response.dataType;
+            
+            for (String nestedType : nestedTypes) {
+                // fix incorrect data types for maps of maps
+                if (response.items != null) {
+                    if (response.dataType.contains(", " + nestedType + ">")) {
+                        response.dataType = response.dataType.replace(", " + nestedType + ">", ", " + response.items.datatypeWithEnum + ">");
+                    }
+
+                    if (response.dataType.contains("<" + nestedType + ">")) {
+                        response.dataType = response.dataType.replace("<" + nestedType + ">", "<" + response.items.datatypeWithEnum + ">");
+                    }
+                }
+            }
+
+            // Only update dataType if we actually made changes
+            if (!originalType.equals(response.dataType)) {
+                response.dataType = response.dataType;
+            }
+        }
+    }
+
     protected void patchProperty(Map<String, CodegenModel> enumRefs, CodegenModel model, CodegenProperty property) {
         if (enumRefs.containsKey(property.dataType)) {
             // Handle any enum properties referred to by $ref.
@@ -962,6 +1005,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
                 }
                 if (operation.responses != null) {
                     for (CodegenResponse response : operation.responses) {
+                        patchNestedMaps(response);
 
                         if (response.returnProperty != null) {
                             Boolean isValueType = isValueType(response.returnProperty);