AbstractKotlinCodegen: only prefer parent property if property is enum

* This is done because enums can't have inheritance. In all other cases, the child property should be preferred
Thecrazyskull · Sep 2, 2020 · d797b6e · d797b6e
1 parent 5b5d8d5
commit d797b6e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -778,7 +778,8 @@ private CodegenModel reconcileProperties(CodegenModel codegenModel,
             Iterator<CodegenProperty> iterator = codegenProperties.iterator();
             while (iterator.hasNext()) {
                 CodegenProperty codegenProperty = iterator.next();
-                if (codegenProperty.baseName.equals(parentModelCodegenProperty.baseName)) {
+                if (codegenProperty.baseName.equals(parentModelCodegenProperty.baseName)
+                        && parentModelCodegenProperty.isEnum) {
                     // We found a property in the child class that is
                     // a duplicate of the one in the parent,
                     // so mark it as inherited & copy the data type.