Merge branch 'master' into fix-property-sanitization

Author: michaeldavis-wf

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.16-SNAPSHOT</version>
+    <version>1.0.17-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -246,7 +246,7 @@
         </dependency>
     </dependencies>
     <properties>
-        <swagger-codegen-version>3.0.16-SNAPSHOT</swagger-codegen-version>
+        <swagger-codegen-version>3.0.17-SNAPSHOT</swagger-codegen-version>
         <swagger-parser-version>2.0.17</swagger-parser-version>
         <swagger-core-version>2.1.1</swagger-core-version>
         <jackson-version>2.10.1</jackson-version>

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

@@ -1364,9 +1364,6 @@ else if (schema instanceof ComposedSchema) {
 
             // interfaces (intermediate models)
             if (allOf != null && !allOf.isEmpty()) {
-                if (codegenModel.interfaces == null) {
-                    codegenModel.interfaces = new ArrayList<String>();
-                }
                 for (int i = 0; i < allOf.size(); i++) {
                     if (i == 0 && !copyFistAllOfProperties) {
                         continue;
@@ -1381,7 +1378,6 @@ else if (schema instanceof ComposedSchema) {
                         refSchema = allDefinitions.get(ref);
                     }
                     final String modelName = toModelName(ref);
-                    codegenModel.interfaces.add(modelName);
                     addImport(codegenModel, modelName);
                     if (allDefinitions != null && refSchema != null) {
                         if (!supportsMixins) {