Issue swagger-api#15: fix NullPointerException with ComposedSchema

abacusresearch · Feb 21, 2018 · 3ab39a7 · 3ab39a7
1 parent 82632bb
commit 3ab39a7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/src/main/java/io/swagger/codegen/languages/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/languages/DefaultCodegenConfig.java
@@ -1207,18 +1207,26 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
                 allRequired = new ArrayList<String>();
                 codegenModel.allVars = new ArrayList<CodegenProperty>();
                 int modelImplCnt = 0; // only one inline object allowed in a ComposedModel
-                for (Schema innerModel: composed.getAllOf()) {
-                    if (codegenModel.discriminator == null) {
-                        codegenModel.discriminator = schema.getDiscriminator();
-                    }
-                    if (innerModel.getXml() != null) {
-                        codegenModel.xmlPrefix = innerModel.getXml().getPrefix();
-                        codegenModel.xmlNamespace = innerModel.getXml().getNamespace();
-                        codegenModel.xmlName = innerModel.getXml().getName();
-                    }
-                    if (modelImplCnt++ > 1) {
-                        LOGGER.warn("More than one inline schema specified in allOf:. Only the first one is recognized. All others are ignored.");
-                        break; // only one ModelImpl with discriminator allowed in allOf
+                if(composed.getAllOf() != null) {
+                    for (Schema innerModel : composed.getAllOf()) {
+                        if (codegenModel.discriminator == null) {
+                            codegenModel.discriminator = schema
+                                    .getDiscriminator();
+                        }
+                        if (innerModel.getXml() != null) {
+                            codegenModel.xmlPrefix = innerModel.getXml()
+                                    .getPrefix();
+                            codegenModel.xmlNamespace = innerModel.getXml()
+                                    .getNamespace();
+                            codegenModel.xmlName = innerModel.getXml()
+                                    .getName();
+                        }
+                        if (modelImplCnt++ > 1) {
+                            LOGGER.warn(
+                                    "More than one inline schema specified in allOf:. Only the first one is recognized. All others are ignored.");
+                            break; // only one ModelImpl with discriminator
+                                   // allowed in allOf
+                        }
                     }
                 }
             } else {

diff --git a/src/test/java/io/swagger/codegen/languages/java/JavaClientCodegenTest.java b/src/test/java/io/swagger/codegen/languages/java/JavaClientCodegenTest.java
@@ -5,6 +5,7 @@
 import io.swagger.codegen.CodegenModelType;
 import io.swagger.codegen.CodegenParameter;
 import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.ComposedSchema;
 import io.swagger.v3.oas.models.media.Content;
 import io.swagger.v3.oas.models.media.IntegerSchema;
 import io.swagger.v3.oas.models.media.MediaType;
@@ -161,4 +162,12 @@ public void arraysInRequestBody() throws Exception {
         Assert.assertEquals(codegenParameter3.dataType, "List<Point>");
         Assert.assertEquals(codegenParameter3.baseType, "Point");
     }
+
+    @Test
+    public void nullValuesInComposedSchema() throws Exception {
+        final JavaClientCodegen codegen = new JavaClientCodegen();
+        CodegenModel result = codegen.fromModel("CompSche",
+                new ComposedSchema());
+        Assert.assertEquals(result.name, "CompSche");
+    }
 }