root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-8789 Support request with multiple param values in FlahMap matching logic

This commit is contained in:
Rossen Stoyanchev 2011-11-01 16:26:25 +00:00
parent e6920a59fa
commit 8337f4bf20
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build-spring-framework/resources/changelog.txt
View File

@ -15,7 +15,8 @@ Changes in version 3.1 RC2 (2011-11-15)
* fixed MethodInvokingJobDetailFactoryBean's Quartz 2.0 support * fixed MethodInvokingJobDetailFactoryBean's Quartz 2.0 support
* RmiClientInterceptor detects nested SocketException as connect failure as well * RmiClientInterceptor detects nested SocketException as connect failure as well
* fixed StandardServlet/PortletEnvironment to check for JNDI (for Google App Engine compatibility) * fixed StandardServlet/PortletEnvironment to check for JNDI (for Google App Engine compatibility)
* Use original request URI in FlashMap matching logic to account for URL rewriting
* Support target request with multiple parameter values in FlahMap matching logic
Changes in version 3.1 RC1 (2011-10-11) Changes in version 3.1 RC1 (2011-10-11)
--------------------------------------- ---------------------------------------

9
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/DefaultFlashMapManager.java
View File

@ -28,6 +28,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.servlet.FlashMap; import org.springframework.web.servlet.FlashMap;
import org.springframework.web.servlet.FlashMapManager; import org.springframework.web.servlet.FlashMapManager;
@ -123,10 +124,10 @@ public class DefaultFlashMapManager implements FlashMapManager {
return false; return false;
} }
} }
MultiValueMap<String, String> params = flashMap.getTargetRequestParams(); MultiValueMap<String, String> targetParams = flashMap.getTargetRequestParams();
for (String key : params.keySet()) { for (String paramName : targetParams.keySet()) {
for (String value : params.get(key)) { for (String targetValue : targetParams.get(paramName)) {
if (!value.equals(request.getParameter(key))) { if (!ObjectUtils.containsElement(request.getParameterValues(paramName), targetValue)) {
return false; return false;
} }
} }

36
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/support/DefaultFlashMapManagerTests.java
View File

@ -133,16 +133,16 @@ public class DefaultFlashMapManagerTests {
this.flashMapManager.requestStarted(this.request); this.flashMapManager.requestStarted(this.request);
assertNull(RequestContextUtils.getInputFlashMap(this.request)); assertNull(RequestContextUtils.getInputFlashMap(this.request));
assertEquals("FlashMap should have been removed", 1, getFlashMaps().size()); assertEquals("FlashMap should not have been removed", 1, getFlashMaps().size());
clearRequestAttributes(); clearFlashMapRequestAttributes();
this.request.setParameter("number", "two"); this.request.setParameter("number", "two");
this.flashMapManager.requestStarted(this.request); this.flashMapManager.requestStarted(this.request);
assertNull(RequestContextUtils.getInputFlashMap(this.request)); assertNull(RequestContextUtils.getInputFlashMap(this.request));
assertEquals("FlashMap should have been removed", 1, getFlashMaps().size()); assertEquals("FlashMap should not have been removed", 1, getFlashMaps().size());
clearRequestAttributes(); clearFlashMapRequestAttributes();
this.request.setParameter("number", "one"); this.request.setParameter("number", "one");
this.flashMapManager.requestStarted(this.request); this.flashMapManager.requestStarted(this.request);
@ -150,6 +150,32 @@ public class DefaultFlashMapManagerTests {
assertEquals("Input FlashMap should have been removed", 0, getFlashMaps().size()); assertEquals("Input FlashMap should have been removed", 0, getFlashMaps().size());
} }
// SPR-8798
@Test
public void lookupFlashMapWithMultiValueParam() {
FlashMap flashMap = new FlashMap();
flashMap.put("name", "value");
flashMap.addTargetRequestParam("id", "1");
flashMap.addTargetRequestParam("id", "2");
List<FlashMap> allMaps = createFlashMaps();
allMaps.add(flashMap);
this.request.setParameter("id", "1");
this.flashMapManager.requestStarted(this.request);
assertNull(RequestContextUtils.getInputFlashMap(this.request));
assertEquals("FlashMap should not have been removed", 1, getFlashMaps().size());
clearFlashMapRequestAttributes();
this.request.addParameter("id", "2");
this.flashMapManager.requestStarted(this.request);
assertEquals(flashMap, RequestContextUtils.getInputFlashMap(this.request));
assertEquals("Input FlashMap should have been removed", 0, getFlashMaps().size());
}
@Test @Test
public void lookupFlashMapSortOrder() { public void lookupFlashMapSortOrder() {
FlashMap emptyFlashMap = new FlashMap(); FlashMap emptyFlashMap = new FlashMap();
@ -284,7 +310,7 @@ public class DefaultFlashMapManagerTests {
return allMaps; return allMaps;
} }
private void clearRequestAttributes() { private void clearFlashMapRequestAttributes() {
request.removeAttribute(INPUT_FLASH_MAP_ATTRIBUTE); request.removeAttribute(INPUT_FLASH_MAP_ATTRIBUTE);
request.removeAttribute(OUTPUT_FLASH_MAP_ATTRIBUTE); request.removeAttribute(OUTPUT_FLASH_MAP_ATTRIBUTE);
} }