committed by
Mark Paluch
parent
9af41c9729
commit
8b86fb8879
@@ -28,8 +28,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
|
||||
/**
|
||||
* Argument resolver to extract a {@link Pageable} object from a {@link NativeWebRequest} for a particular
|
||||
* {@link MethodParameter}. A {@link PageableArgumentResolver} can either resolve {@link Pageable} itself or wrap
|
||||
* another {@link PageableArgumentResolver} to post-process {@link Pageable}. {@link Pageable} resolution yields either
|
||||
* in a {@link Pageable} object or {@literal null} if {@link Pageable} cannot be resolved.
|
||||
* another {@link PageableArgumentResolver} to post-process {@link Pageable}.
|
||||
*
|
||||
* @author Mark Paluch
|
||||
* @since 1.13
|
||||
|
||||
@@ -28,8 +28,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
|
||||
/**
|
||||
* Argument resolver to extract a {@link Sort} object from a {@link NativeWebRequest} for a particular
|
||||
* {@link MethodParameter}. A {@link SortArgumentResolver} can either resolve {@link Sort} itself or wrap another
|
||||
* {@link SortArgumentResolver} to post-process {@link Sort}. {@link Sort} resolution yields either in a {@link Sort}
|
||||
* object or {@literal null} if {@link Sort} cannot be resolved.
|
||||
* {@link SortArgumentResolver} to post-process {@link Sort}.
|
||||
*
|
||||
* @author Mark Paluch
|
||||
* @since 1.13
|
||||
@@ -45,7 +44,7 @@ public interface SortArgumentResolver extends HandlerMethodArgumentResolver {
|
||||
* @param mavContainer the ModelAndViewContainer for the current request
|
||||
* @param webRequest the current request
|
||||
* @param binderFactory a factory for creating {@link WebDataBinder} instances
|
||||
* @return the resolved argument value, or {@code null}
|
||||
* @return the resolved argument value
|
||||
*/
|
||||
@NonNull
|
||||
@Override
|
||||
|
||||
@@ -149,7 +149,7 @@ class PageableHandlerMethodArgumentResolverUnitTests extends PageableDefaultUnit
|
||||
}
|
||||
|
||||
@Test // DATACMNS-477
|
||||
void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() throws Exception {
|
||||
void returnsUnpagedIfFallbackIsUnpagedAndNoParametersGiven() throws Exception {
|
||||
|
||||
var resolver = getResolver();
|
||||
resolver.setFallbackPageable(Pageable.unpaged());
|
||||
|
||||
@@ -132,7 +132,7 @@ class ReactivePageableHandlerMethodArgumentResolverUnitTests {
|
||||
}
|
||||
|
||||
@Test // DATACMNS-1211
|
||||
void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() {
|
||||
void returnsUnpagedIfFallbackIsUnpagedAndNoParametersGiven() {
|
||||
|
||||
var resolver = getReactiveResolver();
|
||||
resolver.setFallbackPageable(Pageable.unpaged());
|
||||
|
||||
@@ -55,7 +55,7 @@ class ReactiveSortHandlerMethodArgumentResolverUnitTests {
|
||||
}
|
||||
|
||||
@Test // DATACMNS-1211
|
||||
void returnsNullForNoDefault() {
|
||||
void returnsUnsortedForNoDefault() {
|
||||
assertSupportedAndResolvedTo(getParameterOfMethod("supportedMethod"), Sort.unsorted());
|
||||
}
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ abstract class SortDefaultUnitTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
void returnsNullForNoDefault() throws Exception {
|
||||
void returnsUnsortedForNoDefault() throws Exception {
|
||||
assertSupportedAndResolvedTo(getParameterOfMethod("supportedMethod"), Sort.unsorted());
|
||||
}
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ class SortHandlerMethodArgumentResolverUnitTests extends SortDefaultUnitTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
void returnsNullForSortParameterSetToNothing() {
|
||||
void returnsUnsortedForSortParameterSetToNothing() {
|
||||
|
||||
var parameter = getParameterOfMethod("supportedMethod");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user