Skip to content

Commit 62e2336

Browse files
committed
Fix getters to match setters in RMHA
Issue: SPR-10519
1 parent c6ecaac commit 62e2336

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@
6363
import org.springframework.web.context.request.NativeWebRequest;
6464
import org.springframework.web.context.request.ServletWebRequest;
6565
import org.springframework.web.context.request.WebRequest;
66-
import org.springframework.web.context.request.async.WebAsyncTask;
6766
import org.springframework.web.context.request.async.AsyncWebRequest;
6867
import org.springframework.web.context.request.async.CallableProcessingInterceptor;
6968
import org.springframework.web.context.request.async.DeferredResultProcessingInterceptor;
7069
import org.springframework.web.context.request.async.WebAsyncManager;
70+
import org.springframework.web.context.request.async.WebAsyncTask;
7171
import org.springframework.web.context.request.async.WebAsyncUtils;
7272
import org.springframework.web.method.ControllerAdviceBean;
7373
import org.springframework.web.method.HandlerMethod;
@@ -218,8 +218,8 @@ public void setArgumentResolvers(List<HandlerMethodArgumentResolver> argumentRes
218218
* Return the configured argument resolvers, or possibly {@code null} if
219219
* not initialized yet via {@link #afterPropertiesSet()}.
220220
*/
221-
public HandlerMethodArgumentResolverComposite getArgumentResolvers() {
222-
return this.argumentResolvers;
221+
public List<HandlerMethodArgumentResolver> getArgumentResolvers() {
222+
return this.argumentResolvers.getResolvers();
223223
}
224224

225225
/**
@@ -239,8 +239,8 @@ public void setInitBinderArgumentResolvers(List<HandlerMethodArgumentResolver> a
239239
* Return the argument resolvers for {@code @InitBinder} methods, or possibly
240240
* {@code null} if not initialized yet via {@link #afterPropertiesSet()}.
241241
*/
242-
public HandlerMethodArgumentResolverComposite getInitBinderArgumentResolvers() {
243-
return this.initBinderArgumentResolvers;
242+
public List<HandlerMethodArgumentResolver> getInitBinderArgumentResolvers() {
243+
return this.initBinderArgumentResolvers.getResolvers();
244244
}
245245

246246
/**
@@ -277,8 +277,8 @@ public void setReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnV
277277
* Return the configured handlers, or possibly {@code null} if not
278278
* initialized yet via {@link #afterPropertiesSet()}.
279279
*/
280-
public HandlerMethodReturnValueHandlerComposite getReturnValueHandlers() {
281-
return this.returnValueHandlers;
280+
public List<HandlerMethodReturnValueHandler> getReturnValueHandlers() {
281+
return this.returnValueHandlers.getHandlers();
282282
}
283283

284284
/**

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
package org.springframework.web.servlet.mvc.method.annotation;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertTrue;
21-
2219
import java.lang.reflect.Method;
2320
import java.util.Arrays;
2421

@@ -41,6 +38,8 @@
4138
import org.springframework.web.servlet.FlashMap;
4239
import org.springframework.web.servlet.ModelAndView;
4340

41+
import static org.junit.Assert.*;
42+
4443
/**
4544
* Unit tests for {@link RequestMappingHandlerAdapter}.
4645
*
@@ -72,9 +71,9 @@ public static void setupOnce() {
7271
adapter.setApplicationContext(new StaticWebApplicationContext());
7372
adapter.afterPropertiesSet();
7473

75-
RESOLVER_COUNT = adapter.getArgumentResolvers().getResolvers().size();
76-
INIT_BINDER_RESOLVER_COUNT = adapter.getInitBinderArgumentResolvers().getResolvers().size();
77-
HANDLER_COUNT = adapter.getReturnValueHandlers().getHandlers().size();
74+
RESOLVER_COUNT = adapter.getArgumentResolvers().size();
75+
INIT_BINDER_RESOLVER_COUNT = adapter.getInitBinderArgumentResolvers().size();
76+
HANDLER_COUNT = adapter.getReturnValueHandlers().size();
7877
}
7978

8079
@Before
@@ -131,7 +130,7 @@ public void setCustomArgumentResolvers() throws Exception {
131130
this.handlerAdapter.setCustomArgumentResolvers(Arrays.asList(resolver));
132131
this.handlerAdapter.afterPropertiesSet();
133132

134-
assertTrue(this.handlerAdapter.getArgumentResolvers().getResolvers().contains(resolver));
133+
assertTrue(this.handlerAdapter.getArgumentResolvers().contains(resolver));
135134
assertMethodProcessorCount(RESOLVER_COUNT + 1, INIT_BINDER_RESOLVER_COUNT + 1, HANDLER_COUNT);
136135
}
137136

@@ -159,7 +158,7 @@ public void setCustomReturnValueHandlers() {
159158
this.handlerAdapter.setCustomReturnValueHandlers(Arrays.asList(handler));
160159
this.handlerAdapter.afterPropertiesSet();
161160

162-
assertTrue(this.handlerAdapter.getReturnValueHandlers().getHandlers().contains(handler));
161+
assertTrue(this.handlerAdapter.getReturnValueHandlers().contains(handler));
163162
assertMethodProcessorCount(RESOLVER_COUNT, INIT_BINDER_RESOLVER_COUNT, HANDLER_COUNT + 1);
164163
}
165164

@@ -192,9 +191,9 @@ private HandlerMethod handlerMethod(Object handler, String methodName, Class<?>.
192191
}
193192

194193
private void assertMethodProcessorCount(int resolverCount, int initBinderResolverCount, int handlerCount) {
195-
assertEquals(resolverCount, this.handlerAdapter.getArgumentResolvers().getResolvers().size());
196-
assertEquals(initBinderResolverCount, this.handlerAdapter.getInitBinderArgumentResolvers().getResolvers().size());
197-
assertEquals(handlerCount, this.handlerAdapter.getReturnValueHandlers().getHandlers().size());
194+
assertEquals(resolverCount, this.handlerAdapter.getArgumentResolvers().size());
195+
assertEquals(initBinderResolverCount, this.handlerAdapter.getInitBinderArgumentResolvers().size());
196+
assertEquals(handlerCount, this.handlerAdapter.getReturnValueHandlers().size());
198197
}
199198

200199

0 commit comments

Comments
 (0)