refs #2621 - fixes ComposedProperty equals

frantuma · frantuma · commit c738a7c1ad34 · 2018-08-01T15:42:17.000+02:00
diff --git a/modules/swagger-models/src/main/java/io/swagger/models/properties/ComposedProperty.java b/modules/swagger-models/src/main/java/io/swagger/models/properties/ComposedProperty.java
@@ -65,6 +65,11 @@ public void setAllOf(List<Property> allOf) {
         this.allOf = allOf;
     }
 
+    public ComposedProperty allOf(List<Property> allOf) {
+        this.allOf = allOf;
+        return this;
+    }
+
     @Override
     public ComposedProperty readOnly() {
         this.setReadOnly(Boolean.TRUE);
@@ -86,6 +91,9 @@ public boolean equals(Object o) {
         if (!(o instanceof ComposedProperty)) {
             return false;
         }
+        if (!super.equals(o)) {
+            return false;
+        }
 
         return Objects.equals(allOf, ((ComposedProperty) o).allOf);
     }

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,11 @@ public void setAllOf(List<Property> allOf) {`
`65`	`65`	`this.allOf = allOf;`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ public ComposedProperty allOf(List<Property> allOf) {`
	`69`	`+ this.allOf = allOf;`
	`70`	`+ return this;`
	`71`	`+ }`
	`72`	`+`
`68`	`73`	`@Override`
`69`	`74`	`public ComposedProperty readOnly() {`
`70`	`75`	`this.setReadOnly(Boolean.TRUE);`
`@@ -86,6 +91,9 @@ public boolean equals(Object o) {`
`86`	`91`	`if (!(o instanceof ComposedProperty)) {`
`87`	`92`	`return false;`
`88`	`93`	`}`
	`94`	`+ if (!super.equals(o)) {`
	`95`	`+ return false;`
	`96`	`+ }`
`89`	`97`
`90`	`98`	`return Objects.equals(allOf, ((ComposedProperty) o).allOf);`
`91`	`99`	`}`