fix hashcode/equals in PageableList

standevgd · standevgd · commit 00217d2f8274 · 2017-07-19T17:17:40.000+02:00
diff --git a/src/main/java/com/gooddata/collections/PageableList.java b/src/main/java/com/gooddata/collections/PageableList.java
@@ -236,15 +236,15 @@ public boolean equals(final Object o) {
         final PageableList<?> that = (PageableList<?>) o;
 
         if (!items.equals(that.items)) return false;
-        if (!getPaging().equals(that.getPaging())) return false;
-        return getLinks().equals(that.getLinks());
+        if (getPaging() != null ? !getPaging().equals(that.getPaging()) : that.getPaging() != null) return false;
+        return getLinks() != null ? getLinks().equals(that.getLinks()) : that.getLinks() == null;
     }
 
     @Override
     public int hashCode() {
         int result = items.hashCode();
-        result = 31 * result + getPaging().hashCode();
-        result = 31 * result + getLinks().hashCode();
+        result = 31 * result + (getPaging() != null ? getPaging().hashCode() : 0);
+        result = 31 * result + (getLinks() != null ? getLinks().hashCode() : 0);
         return result;
     }
 }
diff --git a/src/test/java/com/gooddata/collections/PageableListTest.java b/src/test/java/com/gooddata/collections/PageableListTest.java
@@ -7,13 +7,16 @@
 
 import org.testng.annotations.Test;
 
+import java.util.Collections;
+
 import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
 
 public class PageableListTest {
 
@@ -41,4 +44,18 @@ public void testCollectionWithPaging() {
         assertThat(collection.getNextPage(), notNullValue());
         assertThat(collection.getNextPage().getPageUri(null).toString(), is("next"));
     }
+
+    @Test
+    public void testEquals() {
+        assertThat(new PageableList<>(), is(new PageableList<>()));
+        assertThat(new PageableList<>(Collections.singletonList(1), null), is(not(new PageableList<>())));
+    }
+
+
+    @Test
+    public void testHashCode() {
+        assertThat(new PageableList<>().hashCode(), is(new PageableList<>().hashCode()));
+        assertThat(new PageableList<>(Collections.singletonList(1), null).hashCode(), is(not(new PageableList<>().hashCode())));
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -236,15 +236,15 @@ public boolean equals(final Object o) {`
`236`	`236`	`final PageableList<?> that = (PageableList<?>) o;`
`237`	`237`
`238`	`238`	`if (!items.equals(that.items)) return false;`
`239`		`- if (!getPaging().equals(that.getPaging())) return false;`
`240`		`- return getLinks().equals(that.getLinks());`
	`239`	`+ if (getPaging() != null ? !getPaging().equals(that.getPaging()) : that.getPaging() != null) return false;`
	`240`	`+ return getLinks() != null ? getLinks().equals(that.getLinks()) : that.getLinks() == null;`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`@Override`
`244`	`244`	`public int hashCode() {`
`245`	`245`	`int result = items.hashCode();`
`246`		`- result = 31 * result + getPaging().hashCode();`
`247`		`- result = 31 * result + getLinks().hashCode();`
	`246`	`+ result = 31 * result + (getPaging() != null ? getPaging().hashCode() : 0);`
	`247`	`+ result = 31 * result + (getLinks() != null ? getLinks().hashCode() : 0);`
`248`	`248`	`return result;`
`249`	`249`	`}`
`250`	`250`	`}`