Browse Source

Merge 3af13c43ec into f4201529bc

pull/2320/merge
Manousos Mathioudakis 1 week ago committed by GitHub
parent
commit
8794cdf684
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      src/main/java/org/springframework/data/domain/PageImpl.java
  2. 12
      src/test/java/org/springframework/data/domain/PageImplUnitTests.java

4
src/main/java/org/springframework/data/domain/PageImpl.java

@ -29,6 +29,7 @@ import org.springframework.util.CollectionUtils; @@ -29,6 +29,7 @@ import org.springframework.util.CollectionUtils;
* @param <T> the type of which the page consists.
* @author Oliver Gierke
* @author Mark Paluch
* @author Manousos Mathioudakis
*/
public class PageImpl<T> extends Chunk<T> implements Page<T> {
@ -118,6 +119,7 @@ public class PageImpl<T> extends Chunk<T> implements Page<T> { @@ -118,6 +119,7 @@ public class PageImpl<T> extends Chunk<T> implements Page<T> {
contentType = content.get(0).getClass().getName();
}
return String.format("Page %s of %d containing %s instances", getNumber() + 1, getTotalPages(), contentType);
return String.format("Page %s of %d containing %s instances @%s",
getNumber() + 1, getTotalPages(), contentType, Integer.toHexString(hashCode()));
}
}

12
src/test/java/org/springframework/data/domain/PageImplUnitTests.java

@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test; @@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test;
*
* @author Oliver Gierke
* @author Mark Paluch
* @author Manousos Mathioudakis
*/
class PageImplUnitTests {
@ -191,7 +192,16 @@ class PageImplUnitTests { @@ -191,7 +192,16 @@ class PageImplUnitTests {
Page<Integer> page = new PageImpl<>(Collections.singletonList(null));
assertThat(page).hasToString("Page 1 of 1 containing UNKNOWN instances");
assertThat(page).hasToString(String.format("Page 1 of 1 containing UNKNOWN instances @%s", Integer.toHexString(page.hashCode())));
}
@Test //issue 2066
void toStringShouldNotBeEqualsForDifferentPages() {
Page<String> page1 = new PageImpl<>(Arrays.asList("item1", "item2"), PageRequest.of(0, 5), 10);
Page<String> page2 = new PageImpl<>(Arrays.asList("item1", "item3"), PageRequest.of(0, 5), 10);
assertThat(page1.toString()).isNotEqualTo(page2.toString());
}
}

Loading…
Cancel
Save