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

fixed Portlet request mapping priorities in cross-controller case

Browse Source 
Issue: SPR-9303
Issue: SPR-9605
This commit is contained in:
Juergen Hoeller
2012-08-29 22:02:32 +02:00
parent f78bef906d
commit f9cf5d1aa6
3 changed files with 91 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2012 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.
@@ -76,16 +76,19 @@ public abstract class AbstractMapBasedHandlerMapping<K> extends AbstractHandlerM
if (handler instanceof Map) {
Map<PortletRequestMappingPredicate, Object> predicateMap =
(Map<PortletRequestMappingPredicate, Object>) handler;
List<PortletRequestMappingPredicate> predicates =
new LinkedList<PortletRequestMappingPredicate>(predicateMap.keySet());
Collections.sort(predicates);
for (PortletRequestMappingPredicate predicate : predicates) {
List<PortletRequestMappingPredicate> filtered = new LinkedList<PortletRequestMappingPredicate>();
for (PortletRequestMappingPredicate predicate : predicateMap.keySet()) {
if (predicate.match(request)) {
predicate.validate(request);
return predicateMap.get(predicate);
filtered.add(predicate);
}
}
return null;
if (filtered.isEmpty()) {
return null;
}
Collections.sort(filtered);
PortletRequestMappingPredicate predicate = filtered.get(0);
predicate.validate(request);
return predicateMap.get(predicate);
}
return handler;
}

42
org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
View File

@@ -272,7 +272,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
private static abstract class AbstractParameterMappingPredicate implements PortletRequestMappingPredicate {
protected final String[] params;
private final String[] params;
public AbstractParameterMappingPredicate(String[] params) {
this.params = params;
@@ -281,6 +281,17 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
public boolean match(PortletRequest request) {
return PortletAnnotationMappingUtils.checkParameters(this.params, request);
}
protected int compareParams(AbstractParameterMappingPredicate other) {
return new Integer(other.params.length).compareTo(this.params.length);
}
protected int compareParams(Object other) {
if (other instanceof AbstractParameterMappingPredicate) {
return compareParams((AbstractParameterMappingPredicate) other);
}
return 0;
}
}
@@ -318,10 +329,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
}
public int compareTo(Object other) {
if (other instanceof AbstractParameterMappingPredicate) {
return new Integer(((AbstractParameterMappingPredicate) other).params.length).compareTo(this.params.length);
}
return (other instanceof SpecialRequestTypePredicate ? -1 : 0);
return (other instanceof SpecialRequestTypePredicate ? -1 : compareParams(other));
}
}
@@ -336,13 +344,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
}
public int compareTo(Object other) {
if (other instanceof SpecialRequestTypePredicate) {
return 1;
}
else if (other instanceof AbstractParameterMappingPredicate) {
return new Integer(((AbstractParameterMappingPredicate) other).params.length).compareTo(this.params.length);
}
return 0;
return (other instanceof SpecialRequestTypePredicate ? 1 : compareParams(other));
}
}
@@ -378,10 +380,10 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
return (hasActionName ? -1 : 1);
}
else {
return new Integer(otherAction.params.length).compareTo(this.params.length);
return compareParams(otherAction);
}
}
return (other instanceof SpecialRequestTypePredicate ? 0 : -1);
return (other instanceof SpecialRequestTypePredicate ? compareParams(other) : -1);
}
}
@@ -417,10 +419,10 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
return (hasWindowState ? -1 : 1);
}
else {
return new Integer(otherRender.params.length).compareTo(this.params.length);
return compareParams(otherRender);
}
}
return (other instanceof SpecialRequestTypePredicate ? 0 : -1);
return (other instanceof SpecialRequestTypePredicate ? compareParams(other) : -1);
}
}
@@ -443,8 +445,8 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
public int compareTo(Object other) {
if (other instanceof ResourceMappingPredicate) {
boolean hasResourceId = "".equals(this.resourceId);
boolean otherHasResourceId = "".equals(((ResourceMappingPredicate) other).resourceId);
boolean hasResourceId = !"".equals(this.resourceId);
boolean otherHasResourceId = !"".equals(((ResourceMappingPredicate) other).resourceId);
if (hasResourceId != otherHasResourceId) {
return (hasResourceId ? -1 : 1);
}
@@ -478,8 +480,8 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
public int compareTo(Object other) {
if (other instanceof EventMappingPredicate) {
boolean hasEventName = "".equals(this.eventName);
boolean otherHasEventName = "".equals(((EventMappingPredicate) other).eventName);
boolean hasEventName = !"".equals(this.eventName);
boolean otherHasEventName = !"".equals(((EventMappingPredicate) other).eventName);
if (hasEventName != otherHasEventName) {
return (hasEventName ? -1 : 1);
}