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

MapMethodProcessor supportsParameter is more specific

Browse Source 
Closes gh-33160
This commit is contained in:
rstoyanchev
2024-12-09 15:21:55 +00:00
parent 68997d8416
commit 66f33a8265
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import java.util.Map;
import org.springframework.core.MethodParameter;
import org.springframework.lang.Nullable;
import org.springframework.ui.ModelMap;
import org.springframework.util.Assert;
import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest;
@@ -42,7 +43,9 @@ public class MapMethodProcessor implements HandlerMethodArgumentResolver, Handle
@Override
public boolean supportsParameter(MethodParameter parameter) {
return (Map.class.isAssignableFrom(parameter.getParameterType()) &&
// We don't support any type of Map
Class<?> type = parameter.getParameterType();
return ((type.isAssignableFrom(Map.class) || ModelMap.class.isAssignableFrom(type)) &&
parameter.getParameterAnnotations().length == 0);
}