diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java index e23cc139b6..18e380178d 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java @@ -55,7 +55,6 @@ import org.springframework.web.reactive.result.method.HandlerMethodArgumentResol import org.springframework.web.reactive.result.method.InvocableHandlerMethod; import org.springframework.web.reactive.result.method.SyncHandlerMethodArgumentResolver; import org.springframework.web.reactive.result.method.SyncInvocableHandlerMethod; -import org.springframework.web.service.invoker.RequestParamArgumentResolver; /** * Package-private class to assist {@link RequestMappingHandlerAdapter} with @@ -142,7 +141,7 @@ class ControllerMethodResolver { if (BEAN_VALIDATION_PRESENT) { this.methodValidator = HandlerMethodValidator.from(webBindingInitializer, null, methodParamPredicate(this.requestMappingResolvers, ModelAttributeMethodArgumentResolver.class), - methodParamPredicate(this.requestMappingResolvers, RequestParamArgumentResolver.class)); + methodParamPredicate(this.requestMappingResolvers, RequestParamMethodArgumentResolver.class)); } else { this.methodValidator = null; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index 50004f9879..0d1e3fa451 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -94,7 +94,6 @@ import org.springframework.web.method.support.HandlerMethodReturnValueHandler; import org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite; import org.springframework.web.method.support.InvocableHandlerMethod; import org.springframework.web.method.support.ModelAndViewContainer; -import org.springframework.web.service.invoker.RequestParamArgumentResolver; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.View; import org.springframework.web.servlet.mvc.annotation.ModelAndViewResolver; @@ -577,7 +576,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter this.methodValidator = HandlerMethodValidator.from( this.webBindingInitializer, this.parameterNameDiscoverer, methodParamPredicate(resolvers, ModelAttributeMethodProcessor.class), - methodParamPredicate(resolvers, RequestParamArgumentResolver.class)); + methodParamPredicate(resolvers, RequestParamMethodArgumentResolver.class)); } }