From bd9010df139d686b97a193edf01b49f124281062 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Fri, 16 Jun 2023 16:32:56 +0800 Subject: [PATCH] Fix outdated Javadoc --- .../springframework/data/web/PageableArgumentResolver.java | 3 +-- .../org/springframework/data/web/SortArgumentResolver.java | 5 ++--- .../web/PageableHandlerMethodArgumentResolverUnitTests.java | 2 +- ...activePageableHandlerMethodArgumentResolverUnitTests.java | 2 +- .../ReactiveSortHandlerMethodArgumentResolverUnitTests.java | 2 +- .../org/springframework/data/web/SortDefaultUnitTests.java | 2 +- .../data/web/SortHandlerMethodArgumentResolverUnitTests.java | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/springframework/data/web/PageableArgumentResolver.java b/src/main/java/org/springframework/data/web/PageableArgumentResolver.java index 14b78cd2fc..0904812d4f 100644 --- a/src/main/java/org/springframework/data/web/PageableArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/PageableArgumentResolver.java @@ -28,8 +28,7 @@ /** * 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 diff --git a/src/main/java/org/springframework/data/web/SortArgumentResolver.java b/src/main/java/org/springframework/data/web/SortArgumentResolver.java index acb506f065..75289e496b 100644 --- a/src/main/java/org/springframework/data/web/SortArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/SortArgumentResolver.java @@ -28,8 +28,7 @@ /** * 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 diff --git a/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java index c3bebc46b7..d87644fb79 100755 --- a/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java @@ -149,7 +149,7 @@ void sizeParamIsNotNumeric() throws Exception { } @Test // DATACMNS-477 - void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() throws Exception { + void returnsUnpagedIfFallbackIsUnpagedAndNoParametersGiven() throws Exception { var resolver = getResolver(); resolver.setFallbackPageable(Pageable.unpaged()); diff --git a/src/test/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolverUnitTests.java index 38dcf537cf..508046c03f 100755 --- a/src/test/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolverUnitTests.java @@ -131,7 +131,7 @@ void sizeParamIsNotNumeric() { } @Test // DATACMNS-1211 - void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() { + void returnsUnpagedIfFallbackIsUnpagedAndNoParametersGiven() { var resolver = getReactiveResolver(); resolver.setFallbackPageable(Pageable.unpaged()); diff --git a/src/test/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolverUnitTests.java index aa53992ef1..008697d576 100755 --- a/src/test/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolverUnitTests.java @@ -54,7 +54,7 @@ void supportsSortParameter() { } @Test // DATACMNS-1211 - void returnsNullForNoDefault() { + void returnsUnsortedForNoDefault() { assertSupportedAndResolvedTo(getParameterOfMethod("supportedMethod"), Sort.unsorted()); } diff --git a/src/test/java/org/springframework/data/web/SortDefaultUnitTests.java b/src/test/java/org/springframework/data/web/SortDefaultUnitTests.java index ebfea027a8..066e4ba658 100755 --- a/src/test/java/org/springframework/data/web/SortDefaultUnitTests.java +++ b/src/test/java/org/springframework/data/web/SortDefaultUnitTests.java @@ -68,7 +68,7 @@ void supportsSortParameter() { } @Test - void returnsNullForNoDefault() throws Exception { + void returnsUnsortedForNoDefault() throws Exception { assertSupportedAndResolvedTo(getParameterOfMethod("supportedMethod"), Sort.unsorted()); } diff --git a/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java index b3f27c9901..3b7ef07662 100755 --- a/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java @@ -106,7 +106,7 @@ void discoversQualifiedSortFromRequest() { } @Test - void returnsNullForSortParameterSetToNothing() { + void returnsUnsortedForSortParameterSetToNothing() { var parameter = getParameterOfMethod("supportedMethod");