Commit f8f9610

committed

Add equals/hashCode support for Unpaged.

Closes #3061

1 parent ee75b8c commit f8f9610Copy full SHA for f8f9610

File tree

+22

-0

lines changed

src
- main/java/org/springframework/data/domain
  - Unpaged.java
- test/java/org/springframework/data/domain
  - PageRequestUnitTests.java

+22

-0

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,4 +89,21 @@ public Pageable withPage(int pageNumber) {`
`89`	`89`
`90`	`90`	`throw new UnsupportedOperationException();`
`91`	`91`	`}`
	`92`	`+`
	`93`	`+ @Override`
	`94`	`+ public boolean equals(Object o) {`
	`95`	`+ if (this == o) {`
	`96`	`+ return true;`
	`97`	`+ }`
	`98`	`+ if (!(o instanceof Unpaged unpaged)) {`
	`99`	`+ return false;`
	`100`	`+ }`
	`101`	`+`
	`102`	`+ return sort.equals(unpaged.sort);`
	`103`	`+ }`
	`104`	`+`
	`105`	`+ @Override`
	`106`	`+ public int hashCode() {`
	`107`	`+ return sort.hashCode();`
	`108`	`+ }`
`92`	`109`	`}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,11 @@ void equalsRegardsSortCorrectly() {`
`58`	`58`
`59`	`59`	`// Is not equal to instance with another sort`
`60`	`60`	`assertNotEqualsAndHashcode(request, PageRequest.of(1, 10, Direction.ASC, "foo"));`
	`61`	`+`
	`62`	`+ // Equaliity for unpaged`
	`63`	`+ assertEqualsAndHashcode(Pageable.unpaged(), Pageable.unpaged(Sort.unsorted()));`
	`64`	`+`
	`65`	`+ assertNotEqualsAndHashcode(Pageable.unpaged(), Pageable.unpaged(Sort.by("foo")));`
`61`	`66`	`}`
`62`	`67`
`63`	`68`	`@Test // DATACMNS-1581`

Comments

(0)