Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-867 - Removed handling of null Pageables.

Browse Source 
Pageable now exposes a dedicated null-object representing the absence of pagination so that all places that previously handled null values can now rather be more relaxed and assume that a non-null value is given.
This commit is contained in:
Oliver Gierke
2017-03-15 16:57:33 +01:00
parent 917c3e2889
commit dec820d6c2
5 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java
View File

@@ -69,8 +69,8 @@ public abstract class PageableDefaultUnitTests {
@Test
public void returnsDefaultIfNoRequestParametersAndNoDefault() throws Exception {
assertSupportedAndResult(getParameterOfMethod("supportedMethod"), ReflectionTestUtils
.invokeMethod(ReflectionTestUtils.getField(getResolver(), "fallbackPageable"), "get"));
assertSupportedAndResult(getParameterOfMethod("supportedMethod"),
(Pageable) ReflectionTestUtils.getField(getResolver(), "fallbackPageable"));
}
@Test

18
src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java
View File

@@ -18,8 +18,6 @@ package org.springframework.data.web;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.web.PageableHandlerMethodArgumentResolver.*;
import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -140,20 +138,20 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa
}
@Test // DATACMNS-477
public void returnsNullIfFallbackIsNullAndNoParametersGiven() throws Exception {
public void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() throws Exception {
PageableHandlerMethodArgumentResolver resolver = getResolver();
resolver.setFallbackPageable(Optional.empty());
resolver.setFallbackPageable(Pageable.unpaged());
assertSupportedAndResult(supportedMethodParameter, null, new ServletWebRequest(new MockHttpServletRequest()),
resolver);
}
@Test // DATACMNS-477
public void returnsNullIfFallbackIsNullAndOnlyPageIsGiven() throws Exception {
public void returnsNullIfFallbackIsUnpagedAndOnlyPageIsGiven() throws Exception {
PageableHandlerMethodArgumentResolver resolver = getResolver();
resolver.setFallbackPageable(Optional.empty());
resolver.setFallbackPageable(Pageable.unpaged());
MockHttpServletRequest request = new MockHttpServletRequest();
request.addParameter("page", "20");
@@ -162,10 +160,10 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa
}
@Test // DATACMNS-477
public void returnsNullIfFallbackIsNullAndOnlySizeIsGiven() throws Exception {
public void returnsNullIfFallbackIsUnpagedAndOnlySizeIsGiven() throws Exception {
PageableHandlerMethodArgumentResolver resolver = getResolver();
resolver.setFallbackPageable(Optional.empty());
resolver.setFallbackPageable(Pageable.unpaged());
MockHttpServletRequest request = new MockHttpServletRequest();
request.addParameter("size", "10");
@@ -191,7 +189,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa
public void usesNullSortIfNoDefaultIsConfiguredAndPageAndSizeAreGiven() {
PageableHandlerMethodArgumentResolver resolver = getResolver();
resolver.setFallbackPageable(Optional.empty());
resolver.setFallbackPageable(Pageable.unpaged());
MockHttpServletRequest request = new MockHttpServletRequest();
request.addParameter("page", "0");
@@ -236,7 +234,7 @@ public class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefa
public void detectsFallbackPageableIfNullOneIsConfigured() {
PageableHandlerMethodArgumentResolver resolver = getResolver();
resolver.setFallbackPageable(Optional.empty());
resolver.setFallbackPageable(Pageable.unpaged());
assertThat(resolver.isFallbackPageable(null)).isFalse();
assertThat(resolver.isFallbackPageable(PageRequest.of(0, 10))).isFalse();