Merge branch 'master' into aspnetcore3

Author: knom

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.13</version>
+    <version>1.0.14-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -246,7 +246,7 @@
         </dependency>
     </dependencies>
     <properties>
-        <swagger-codegen-version>3.0.13</swagger-codegen-version>
+        <swagger-codegen-version>3.0.14-SNAPSHOT</swagger-codegen-version>
         <swagger-parser-version>2.0.15</swagger-parser-version>
         <swagger-core-version>2.0.10</swagger-core-version>
         <jackson-version>2.9.10</jackson-version>

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

@@ -169,6 +169,7 @@ public abstract class DefaultCodegenConfig implements CodegenConfig {
 
     protected String ignoreFilePathOverride;
     protected boolean useOas2 = false;
+    protected boolean copyFistAllOfProperties = false;
 
     public List<CliOption> cliOptions() {
         return cliOptions;
@@ -1353,7 +1354,10 @@ else if (schema instanceof ComposedSchema) {
                 if (codegenModel.interfaces == null) {
                     codegenModel.interfaces = new ArrayList<String>();
                 }
-                for (int i = 1; i < allOf.size(); i++) {
+                for (int i = 0; i < allOf.size(); i++) {
+                    if (i == 0 && !copyFistAllOfProperties) {
+                        continue;
+                    }
                     Schema interfaceSchema = allOf.get(i);
                     if (StringUtils.isBlank(interfaceSchema.get$ref())) {
                         continue;

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

@@ -35,6 +35,7 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 import static io.swagger.codegen.v3.CodegenConstants.HAS_ENUMS_EXT_NAME;
@@ -1182,7 +1183,12 @@ private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, Code
                 while (iterator.hasNext()) {
                     CodegenProperty codegenProperty = iterator.next();
                     isEnum = getBooleanValue(codegenProperty, IS_ENUM_EXT_NAME);
-                    if (isEnum && codegenProperty.equals(parentModelCodegenPropery)) {
+                    // we don't check for the full set of properties as they could be overridden
+                    // e.g. in the child; if we used codegenProperty.equals, the result in this
+                    // case would be `false` resulting on 2 different enums created on parent and
+                    // child classes, used in same method. This means that the child class will use
+                    // the enum defined in the parent, loosing any overridden property
+                    if (isEnum && isSameEnum(codegenProperty, parentModelCodegenPropery)) {
                         // We found an enum in the child class that is
                         // a duplicate of the one in the parent, so remove it.
                         iterator.remove();
@@ -1199,11 +1205,48 @@ private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, Code
                 count += 1;
                 codegenProperty.getVendorExtensions().put(CodegenConstants.HAS_MORE_EXT_NAME, (count < numVars) ? true : false);
             }
+
+            if (!codegenProperties.isEmpty()) {
+                codegenModel.getVendorExtensions().put(CodegenConstants.HAS_VARS_EXT_NAME, true);
+                codegenModel.getVendorExtensions().put(CodegenConstants.HAS_ENUMS_EXT_NAME, false);
+            } else {
+                codegenModel.emptyVars = true;
+                codegenModel.getVendorExtensions().put(CodegenConstants.HAS_VARS_EXT_NAME, false);
+                codegenModel.getVendorExtensions().put(CodegenConstants.HAS_ENUMS_EXT_NAME, false);
+            }
+
+
             codegenModel.vars = codegenProperties;
         }
         return codegenModel;
+
+
     }
 
+    protected static boolean isSameEnum(CodegenProperty actual, CodegenProperty other) {
+        if (actual == null && other == null) {
+            return true;
+        }
+        if ((actual.name == null) ? (other.name != null) : !actual.name.equals(other.name)) {
+            return false;
+        }
+        if ((actual.baseName == null) ? (other.baseName != null) : !actual.baseName.equals(other.baseName)) {
+            return false;
+        }
+        if ((actual.datatype == null) ? (other.datatype != null) : !actual.datatype.equals(other.datatype)) {
+            return false;
+        }
+        if ((actual.datatypeWithEnum == null) ? (other.datatypeWithEnum != null) : !actual.datatypeWithEnum.equals(other.datatypeWithEnum)) {
+            return false;
+        }
+        if ((actual.baseType == null) ? (other.baseType != null) : !actual.baseType.equals(other.baseType)) {
+            return false;
+        }
+        if (!Objects.equals(actual.enumName, other.enumName)) {
+            return false;
+        }
+        return true;
+    }
     private static String sanitizePackageName(String packageName) {
         packageName = packageName.trim(); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
         packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_");

src/main/java/io/swagger/codegen/v3/generators/python/PythonClientCodegen.java

@@ -236,6 +236,8 @@ public void processOpts() {
         modelPackage = packageName + "." + modelPackage;
         apiPackage = packageName + "." + apiPackage;
 
+        copyFistAllOfProperties = true;
+
     }
 
     private static String dropDots(String str) {