Merge pull request #3085 from mduesterhoeft/equals-object

Consider properties for equality of ObjectProperty

Author: frantuma

modules/swagger-models/src/main/java/io/swagger/models/properties/ObjectProperty.java

@@ -139,4 +139,29 @@ public ObjectProperty example(Object example) {
         this.setExample(example);
         return this;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        if (!(o instanceof ObjectProperty)) {
+            return false;
+        }
+
+        ObjectProperty that = (ObjectProperty) o;
+
+        if (properties != null ? !properties.equals(that.properties) : that.properties != null) {
+            return false;
+        }
+        return super.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        int result =  super.hashCode();
+        result = 31 * result + (properties != null ? properties.hashCode() : 0);
+        return result;
+    }
 }

modules/swagger-models/src/test/java/io/swagger/models/properties/ObjectPropertyTest.java

@@ -4,7 +4,9 @@
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertFalse;
 
 public class ObjectPropertyTest {
 
@@ -50,4 +52,38 @@ public void testRequired() {
         // then
         assertTrue(objectProperty.getRequired(), "The get required must be the same as the set one");
     }
+
+    @Test
+    public void testNotEqualOnDifferentProperties() {
+        //given
+        ObjectProperty objectProperty = new ObjectProperty();
+        objectProperty.property("some", new StringProperty());
+
+        ObjectProperty otherObjectProperty = new ObjectProperty();
+        otherObjectProperty.property("someOther", new StringProperty());
+
+        //when
+        boolean equals = objectProperty.equals(otherObjectProperty);
+
+        //then
+        assertFalse(equals);
+        assertNotEquals(objectProperty.hashCode(), otherObjectProperty.hashCode());
+    }
+
+    @Test
+    public void testEqualOnEqualProperties() {
+        //given
+        ObjectProperty objectProperty = new ObjectProperty();
+        objectProperty.property("some", new StringProperty());
+
+        ObjectProperty otherObjectProperty = new ObjectProperty();
+        otherObjectProperty.property("some", new StringProperty());
+
+        //when
+        boolean equals = objectProperty.equals(otherObjectProperty);
+
+        //then
+        assertTrue(equals);
+        assertEquals(objectProperty.hashCode(), otherObjectProperty.hashCode());
+    }
 }