Skip to content

Commit 8b86fb8

Browse files
quaffmp911de
authored andcommitted
Fix outdated Javadoc.
Closes #2860
1 parent 9af41c9 commit 8b86fb8

7 files changed

+8
-10
lines changed

src/main/java/org/springframework/data/web/PageableArgumentResolver.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
/**
2929
* Argument resolver to extract a {@link Pageable} object from a {@link NativeWebRequest} for a particular
3030
* {@link MethodParameter}. A {@link PageableArgumentResolver} can either resolve {@link Pageable} itself or wrap
31-
* another {@link PageableArgumentResolver} to post-process {@link Pageable}. {@link Pageable} resolution yields either
32-
* in a {@link Pageable} object or {@literal null} if {@link Pageable} cannot be resolved.
31+
* another {@link PageableArgumentResolver} to post-process {@link Pageable}.
3332
*
3433
* @author Mark Paluch
3534
* @since 1.13

src/main/java/org/springframework/data/web/SortArgumentResolver.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
/**
2929
* Argument resolver to extract a {@link Sort} object from a {@link NativeWebRequest} for a particular
3030
* {@link MethodParameter}. A {@link SortArgumentResolver} can either resolve {@link Sort} itself or wrap another
31-
* {@link SortArgumentResolver} to post-process {@link Sort}. {@link Sort} resolution yields either in a {@link Sort}
32-
* object or {@literal null} if {@link Sort} cannot be resolved.
31+
* {@link SortArgumentResolver} to post-process {@link Sort}.
3332
*
3433
* @author Mark Paluch
3534
* @since 1.13
@@ -45,7 +44,7 @@ public interface SortArgumentResolver extends HandlerMethodArgumentResolver {
4544
* @param mavContainer the ModelAndViewContainer for the current request
4645
* @param webRequest the current request
4746
* @param binderFactory a factory for creating {@link WebDataBinder} instances
48-
* @return the resolved argument value, or {@code null}
47+
* @return the resolved argument value
4948
*/
5049
@NonNull
5150
@Override

src/test/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void sizeParamIsNotNumeric() throws Exception {
149149
}
150150

151151
@Test // DATACMNS-477
152-
void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() throws Exception {
152+
void returnsUnpagedIfFallbackIsUnpagedAndNoParametersGiven() throws Exception {
153153

154154
var resolver = getResolver();
155155
resolver.setFallbackPageable(Pageable.unpaged());

src/test/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolverUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void sizeParamIsNotNumeric() {
132132
}
133133

134134
@Test // DATACMNS-1211
135-
void returnsNullIfFallbackIsUnpagedAndNoParametersGiven() {
135+
void returnsUnpagedIfFallbackIsUnpagedAndNoParametersGiven() {
136136

137137
var resolver = getReactiveResolver();
138138
resolver.setFallbackPageable(Pageable.unpaged());

src/test/java/org/springframework/data/web/ReactiveSortHandlerMethodArgumentResolverUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void supportsSortParameter() {
5555
}
5656

5757
@Test // DATACMNS-1211
58-
void returnsNullForNoDefault() {
58+
void returnsUnsortedForNoDefault() {
5959
assertSupportedAndResolvedTo(getParameterOfMethod("supportedMethod"), Sort.unsorted());
6060
}
6161

src/test/java/org/springframework/data/web/SortDefaultUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void supportsSortParameter() {
6969
}
7070

7171
@Test
72-
void returnsNullForNoDefault() throws Exception {
72+
void returnsUnsortedForNoDefault() throws Exception {
7373
assertSupportedAndResolvedTo(getParameterOfMethod("supportedMethod"), Sort.unsorted());
7474
}
7575

src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void discoversQualifiedSortFromRequest() {
107107
}
108108

109109
@Test
110-
void returnsNullForSortParameterSetToNothing() {
110+
void returnsUnsortedForSortParameterSetToNothing() {
111111

112112
var parameter = getParameterOfMethod("supportedMethod");
113113

0 commit comments

Comments
 (0)