Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use correct RequestParam resolver

Browse Source 
Closes gh-31329
This commit is contained in:
rstoyanchev
2023-10-20 12:39:50 +01:00
parent c1437f9817
commit a2f2f7c348
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java
View File

@@ -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;

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

@@ -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));
}
}