Merge branch 'master' into issue-444

Author: HugoMario

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.19-SNAPSHOT</version>
+    <version>1.0.23-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -252,10 +252,10 @@
         </dependency>
     </dependencies>
     <properties>
-        <swagger-codegen-version>3.0.19-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.0.18</swagger-parser-version>
-        <swagger-core-version>2.1.1</swagger-core-version>
-        <jackson-version>2.10.1</jackson-version>
+        <swagger-codegen-version>3.0.23-SNAPSHOT</swagger-codegen-version>
+        <swagger-parser-version>2.0.22</swagger-parser-version>
+        <swagger-core-version>2.1.4</swagger-core-version>
+        <jackson-version>2.10.3</jackson-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
         <commons-io-version>2.4</commons-io-version>

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

@@ -17,6 +17,7 @@
 
 public class SchemaHandler implements ISchemaHandler {
 
+    public static final String ALL_OF_PREFFIX = "AllOf";
     public static final String ONE_OF_PREFFIX = "OneOf";
     public static final String ANY_OF_PREFFIX = "AnyOf";
     public static final String ARRAY_ITEMS_SUFFIX = "Items";
@@ -32,7 +33,6 @@ public SchemaHandler(DefaultCodegenConfig codegenConfig) {
     public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map<String, CodegenModel> allModels) {
         if (schema instanceof ComposedSchema) {
             this.addComposedModel(this.processComposedSchema(codegenModel, (ComposedSchema) schema, allModels));
-            return;
         }
         if (schema instanceof ArraySchema) {
             this.addComposedModel(this.processArrayItemSchema(codegenModel, (ArraySchema) schema, allModels));
@@ -99,7 +99,13 @@ protected CodegenModel processComposedSchema(String name, ComposedSchema compose
     }
 
     protected CodegenModel processComposedSchema(String codegenModelName, CodegenProperty codegenProperty, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
-        List<Schema> schemas = composedSchema.getOneOf();
+        List<Schema> schemas = composedSchema.getAllOf();
+        if (schemas != null && !schemas.isEmpty()) {
+            final CodegenModel composedModel = codegenConfig.fromModel(ALL_OF_PREFFIX + codegenModelName, composedSchema);
+            this.updatePropertyDataType(codegenProperty, composedModel);
+            return composedModel;
+        }
+        schemas = composedSchema.getOneOf();
         CodegenModel composedModel = this.createComposedModel(ONE_OF_PREFFIX + codegenModelName, schemas);
         if (composedModel == null) {
             schemas = composedSchema.getAnyOf();
@@ -109,17 +115,17 @@ protected CodegenModel processComposedSchema(String codegenModelName, CodegenPro
             }
         }
         this.addInterfaces(schemas, composedModel, allModels);
-        codegenProperty.datatype = composedModel.getClassname();
-        codegenProperty.datatypeWithEnum = composedModel.getClassname();
-        codegenProperty.baseType = composedModel.getClassname();
-        codegenProperty.complexType = composedModel.getClassname();
+        this.updatePropertyDataType(codegenProperty, composedModel);
         return composedModel;
     }
 
     protected CodegenModel processArrayItemSchema(CodegenModel codegenModel, ArraySchema arraySchema, Map<String, CodegenModel> allModels) {
         final Schema itemsSchema = arraySchema.getItems();
         if (itemsSchema instanceof ComposedSchema) {
             final CodegenModel composedModel = this.processComposedSchema(codegenModel.name + ARRAY_ITEMS_SUFFIX, (ComposedSchema) itemsSchema, allModels);
+            if (composedModel == null) {
+                return null;
+            }
             this.updateArrayModel(codegenModel, composedModel.name, arraySchema);
             return composedModel;
         }
@@ -221,4 +227,11 @@ protected void updateArrayModel(CodegenModel codegenModel, String schemaName, Ar
 
         arraySchema.setItems(items);
     }
+
+    private void updatePropertyDataType(CodegenProperty codegenProperty, CodegenModel composedModel) {
+        codegenProperty.datatype = composedModel.getClassname();
+        codegenProperty.datatypeWithEnum = composedModel.getClassname();
+        codegenProperty.baseType = composedModel.getClassname();
+        codegenProperty.complexType = composedModel.getClassname();
+    }
 }