Merge pull request #9146 from swagger-api/issue-6519-regresion

HugoMario · web-flow · commit 41d2a9dc4f55 · 2019-02-05T22:42:46.000-05:00
fixed NPE on composed models datatype.
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -2683,6 +2683,10 @@ public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
                         name = getTypeDeclaration(name);
                     }
                     p.dataType = name;
+                } else {
+                    if (sub instanceof ComposedModel) {
+                        p.dataType = "object";
+                    }
                 }
             }
             p.paramName = toParamName(bp.getName());

Original file line number	Diff line number	Diff line change
`@@ -2683,6 +2683,10 @@ public CodegenParameter fromParameter(Parameter param, Set<String> imports) {`
`2683`	`2683`	`name = getTypeDeclaration(name);`
`2684`	`2684`	`}`
`2685`	`2685`	`p.dataType = name;`
	`2686`	`+ } else {`
	`2687`	`+ if (sub instanceof ComposedModel) {`
	`2688`	`+ p.dataType = "object";`
	`2689`	`+ }`
`2686`	`2690`	`}`
`2687`	`2691`	`}`
`2688`	`2692`	`p.paramName = toParamName(bp.getName());`