Add support for multiple inheritance (#1664)

* add all parent names

* clean up supportsInheritance

* fix npe

* fix allVars, fix test cases

* add more tests, remove comments

* update docker m2 cache dir, add more tests, fix mandatory

* update samples

* regenerate js spec files

* add logic to detect self reference

* add isSelfReference flag to codegen property

* add ruby tests for cat model

* remove debugging info

* fix JS allvars not have x-js-doctype

* update samples

* update js samples

Author: wing328

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

@@ -171,6 +171,8 @@ public interface CodegenConfig {
 
     void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations);
 
+    Map<String, Object> updateAllModels(Map<String, Object> objs);
+
     Map<String, Object> postProcessAllModels(Map<String, Object> objs);
 
     Map<String, Object> postProcessModels(Map<String, Object> objs);

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java

@@ -22,11 +22,13 @@
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonIgnoreProperties({"parentModel", "interfaceModels"})
 public class CodegenModel {
     public String parent, parentSchema;
     public List<String> interfaces;
+    public List<String> allParents;
 
     // References to parent and interface CodegenModels. Only set when code generator supports inheritance.
     public CodegenModel parentModel;
@@ -46,18 +48,18 @@ public class CodegenModel {
     public String arrayModelType;
     public boolean isAlias; // Is this effectively an alias of another simple type
     public boolean isString, isInteger;
-    public List<CodegenProperty> vars = new ArrayList<CodegenProperty>();
+    public List<CodegenProperty> vars = new ArrayList<CodegenProperty>(); // all properties (without parent's properties)
+    public List<CodegenProperty> allVars = new ArrayList<CodegenProperty>(); // all properties (with parent's properties)
     public List<CodegenProperty> requiredVars = new ArrayList<CodegenProperty>(); // a list of required properties
     public List<CodegenProperty> optionalVars = new ArrayList<CodegenProperty>(); // a list of optional properties
     public List<CodegenProperty> readOnlyVars = new ArrayList<CodegenProperty>(); // a list of read-only properties
     public List<CodegenProperty> readWriteVars = new ArrayList<CodegenProperty>(); // a list of properties for read, write
-    public List<CodegenProperty> allVars = new ArrayList<CodegenProperty>();
     public List<CodegenProperty> parentVars = new ArrayList<CodegenProperty>();
     public Map<String, Object> allowableValues;
 
     // Sorted sets of required parameters.
-    public Set<String> mandatory = new TreeSet<String>();
-    public Set<String> allMandatory;
+    public Set<String> mandatory = new TreeSet<String>(); // without parent's required properties
+    public Set<String> allMandatory = new TreeSet<String>(); // with parent's required properties
 
     public Set<String> imports = new TreeSet<String>();
     public boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasRequired, hasOptional, isArrayModel, hasChildren, isMapModel;
@@ -69,16 +71,59 @@ public class CodegenModel {
     //The type of the value from additional properties. Used in map like objects.
     public String additionalPropertiesType;
 
-    {
-        // By default these are the same collections. Where the code generator supports inheritance, composed models
-        // store the complete closure of owned and inherited properties in allVars and allMandatory.
-        allVars = vars;
-        allMandatory = mandatory;
-    }
-
     @Override
     public String toString() {
-        return String.format(Locale.ROOT, "%s(%s)", name, classname);
+        return new ToStringBuilder(this)
+                .append("parent", parent)
+                .append("parentSchema", parentSchema)
+                .append("interfaces", interfaces)
+                .append("parentModel", parentModel)
+                .append("interfaceModels", interfaceModels)
+                .append("children", children)
+                .append("name", name)
+                .append("classname", classname)
+                .append("title", title)
+                .append("description", description)
+                .append("classVarName", classVarName)
+                .append("modelJson", modelJson)
+                .append("dataType", dataType)
+                .append("xmlPrefix", xmlPrefix)
+                .append("xmlNamespace", xmlNamespace)
+                .append("xmlName", xmlName)
+                .append("classFilename", classFilename)
+                .append("unescapedDescription", unescapedDescription)
+                .append("discriminator", discriminator)
+                .append("defaultValue", defaultValue)
+                .append("arrayModelType", arrayModelType)
+                .append("isAlias", isAlias)
+                .append("isString", isString)
+                .append("isInteger", isInteger)
+                .append("vars", vars)
+                .append("requiredVars", requiredVars)
+                .append("optionalVars", optionalVars)
+                .append("readOnlyVars", readOnlyVars)
+                .append("readWriteVars", readWriteVars)
+                .append("allVars", allVars)
+                .append("parentVars", parentVars)
+                .append("allowableValues", allowableValues)
+                .append("mandatory", mandatory)
+                .append("allMandatory", allMandatory)
+                .append("imports", imports)
+                .append("hasVars", hasVars)
+                .append("emptyVars", emptyVars)
+                .append("hasMoreModels", hasMoreModels)
+                .append("hasEnums", hasEnums)
+                .append("isEnum", isEnum)
+                .append("hasRequired", hasRequired)
+                .append("hasOptional", hasOptional)
+                .append("isArrayModel", isArrayModel)
+                .append("hasChildren", hasChildren)
+                .append("isMapModel", isMapModel)
+                .append("hasOnlyReadOnly", hasOnlyReadOnly)
+                .append("externalDocumentation", externalDocumentation)
+                .append("vendorExtensions", vendorExtensions)
+                .append("additionalPropertiesType", additionalPropertiesType)
+                .toString();
     }
 
     @Override
@@ -94,6 +139,8 @@ public boolean equals(Object o) {
             return false;
         if (interfaces != null ? !interfaces.equals(that.interfaces) : that.interfaces != null)
             return false;
+        if (allParents != null ? !allParents.equals(that.allParents) : that.allParents != null)
+            return false;
         if (parentModel != null ? !parentModel.equals(that.parentModel) : that.parentModel != null)
             return false;
         if (interfaceModels != null ? !interfaceModels.equals(that.interfaceModels) : that.interfaceModels != null)
@@ -169,6 +216,7 @@ public int hashCode() {
         int result = parent != null ? parent.hashCode() : 0;
         result = 31 * result + (parentSchema != null ? parentSchema.hashCode() : 0);
         result = 31 * result + (interfaces != null ? interfaces.hashCode() : 0);
+        result = 31 * result + (allParents != null ? allParents.hashCode() : 0);
         result = 31 * result + (parentModel != null ? parentModel.hashCode() : 0);
         result = 31 * result + (interfaceModels != null ? interfaceModels.hashCode() : 0);
         result = 31 * result + (name != null ? name.hashCode() : 0);
@@ -226,10 +274,18 @@ public List<String> getInterfaces() {
         return interfaces;
     }
 
+    public List<String> getAllParents() {
+        return allParents;
+    }
+
     public void setInterfaces(List<String> interfaces) {
         this.interfaces = interfaces;
     }
 
+    public void setAllParents(List<String> allParents) {
+        this.allParents = allParents;
+    }
+
     public CodegenModel getParentModel() {
         return parentModel;
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java

@@ -61,6 +61,7 @@ public class CodegenProperty implements Cloneable {
     public boolean isReadOnly;
     public boolean isWriteOnly;
     public boolean isNullable;
+    public boolean isSelfReference;
     public List<String> _enum;
     public Map<String, Object> allowableValues;
     public CodegenProperty items;
@@ -439,6 +440,7 @@ public int hashCode() {
         result = prime * result + ((isReadOnly ? 13 : 31));
         result = prime * result + ((isWriteOnly ? 13 : 31));
         result = prime * result + ((isNullable ? 13 : 31));
+        result = prime * result + ((isSelfReference ? 13 : 31));
         result = prime * result + ((items == null) ? 0 : items.hashCode());
         result = prime * result + ((mostInnerItems == null) ? 0 : mostInnerItems.hashCode());
         result = prime * result + ((jsonSchema == null) ? 0 : jsonSchema.hashCode());
@@ -597,6 +599,9 @@ public boolean equals(Object obj) {
         if (this.isNullable != other.isNullable) {
             return false;
         }
+        if (this.isSelfReference != other.isSelfReference ) {
+            return false;
+        }
         if (this._enum != other._enum && (this._enum == null || !this._enum.equals(other._enum))) {
             return false;
         }
@@ -790,6 +795,7 @@ public java.lang.String toString() {
                 ", isReadOnly=" + isReadOnly +
                 ", isWriteOnly=" + isWriteOnly +
                 ", isNullable=" + isNullable +
+                ", isSelfReference=" + isSelfReference +
                 ", _enum=" + _enum +
                 ", allowableValues=" + allowableValues +
                 ", items=" + items +