Fix for Issue #4840 [BUG][JAVA][spring-mvc] Generated Code for Map of Maps Return Type does not compile (#5240)

emileonhardt · web-flow · commit 55f928a82ef6 · 2020-04-07T22:32:09.000+08:00
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@@ -652,7 +652,7 @@ private void doDataTypeAssignment(String returnType, DataTypeAssigner dataTypeAs
         } else if (rt.startsWith("Map")) {
             int end = rt.lastIndexOf(">");
             if (end > 0) {
-                dataTypeAssigner.setReturnType(rt.substring("Map<".length(), end).split(",")[1].trim());
+                dataTypeAssigner.setReturnType(rt.substring("Map<".length(), end).split(",", 2)[1].trim());
                 dataTypeAssigner.setReturnContainer("Map");
             }
         } else if (rt.startsWith("Set")) {

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ private void doDataTypeAssignment(String returnType, DataTypeAssigner dataTypeAs`
`652`	`652`	`} else if (rt.startsWith("Map")) {`
`653`	`653`	`int end = rt.lastIndexOf(">");`
`654`	`654`	`if (end > 0) {`
`655`		`- dataTypeAssigner.setReturnType(rt.substring("Map<".length(), end).split(",")[1].trim());`
	`655`	`+ dataTypeAssigner.setReturnType(rt.substring("Map<".length(), end).split(",", 2)[1].trim());`
`656`	`656`	`dataTypeAssigner.setReturnContainer("Map");`
`657`	`657`	`}`
`658`	`658`	`} else if (rt.startsWith("Set")) {`