Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-2881 - Generic ActionMapping.param

Browse Source 
- applied patch by Mathias Bogaert

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@747124 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
René Gielen
2009-02-23 20:15:45 +00:00
parent 50fd30b972
commit 703faa0af8
6 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
+4 -4
View File
@@ -38,7 +38,7 @@ public class ActionMapping {
private String namespace;
private String method;
private String extension;
private Map params;
private Map<String, Object> params;
private Result result;
/**
@@ -63,7 +63,7 @@ public class ActionMapping {
* @param method The method
* @param params The extra parameters
*/
public ActionMapping(String name, String namespace, String method, Map params) {
public ActionMapping(String name, String namespace, String method, Map<String, Object> params) {
this.name = name;
this.namespace = namespace;
this.method = method;
@@ -87,7 +87,7 @@ public class ActionMapping {
/**
* @return The extra parameters
*/
public Map getParams() {
public Map<String, Object> getParams() {
return params;
}
@@ -147,7 +147,7 @@ public class ActionMapping {
/**
* @param params The extra parameters for this mapping
*/
public void setParams(Map params) {
public void setParams(Map<String, Object> params) {
this.params = params;
}
core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
+2 -6
View File
@@ -110,7 +110,6 @@ public class Restful2ActionMapper extends DefaultActionMapper {
* @see org.apache.struts2.dispatcher.mapper.ActionMapper#getMapping(javax.servlet.http.HttpServletRequest)
*/
public ActionMapping getMapping(HttpServletRequest request, ConfigurationManager configManager) {
if (!isSlashesInActionNames()) {
throw new IllegalStateException("This action mapper requires the setting 'slashesInActionNames' to be set to 'true'");
}
@@ -174,7 +173,7 @@ public class Restful2ActionMapper extends DefaultActionMapper {
if (idParameterName != null && id != null) {
if (mapping.getParams() == null) {
mapping.setParams(new HashMap());
mapping.setParams(new HashMap<String, Object>());
}
mapping.getParams().put(idParameterName, id);
}
@@ -206,7 +205,7 @@ public class Restful2ActionMapper extends DefaultActionMapper {
}
if (parameters.size() > 0) {
if (mapping.getParams() == null) {
mapping.setParams(new HashMap());
mapping.setParams(new HashMap<String, Object>());
}
mapping.getParams().putAll(parameters);
}
@@ -252,7 +251,4 @@ public class Restful2ActionMapper extends DefaultActionMapper {
public void setIdParameterName(String idParameterName) {
this.idParameterName = idParameterName;
}
}
core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
+3 -4
View File
@@ -78,7 +78,7 @@ public class RestfulActionMapper implements ActionMapper {
}
String actionName = uri.substring(1, nextSlash);
HashMap<String,String> parameters = new HashMap<String,String>();
Map<String, Object> parameters = new HashMap<String, Object>();
try {
StringTokenizer st = new StringTokenizer(uri.substring(nextSlash), "/");
boolean isNameTok = true;
@@ -121,9 +121,8 @@ public class RestfulActionMapper implements ActionMapper {
*/
public String getUriFromActionMapping(ActionMapping mapping) {
String base = mapping.getNamespace() + mapping.getName();
for (Iterator iterator = mapping.getParams().entrySet().iterator(); iterator.hasNext();) {
Map.Entry entry = (Map.Entry) iterator.next();
String name = (String) entry.getKey();
for (Map.Entry<String, Object> entry : mapping.getParams().entrySet()) {
String name = entry.getKey();
if (name.equals(mapping.getName() + "Id")) {
base = base + "/" + entry.getValue();
break;
core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
+2 -2
View File
@@ -79,12 +79,12 @@ public class ActionMappingParametersInteceptor extends ParametersInterceptor {
* an empty map.
*/
@Override
protected Map retrieveParameters(ActionContext ac) {
protected Map<String, Object> retrieveParameters(ActionContext ac) {
ActionMapping mapping = (ActionMapping) ac.get(ServletActionContext.ACTION_MAPPING);
if (mapping != null) {
return mapping.getParams();
} else {
return Collections.EMPTY_MAP;
return Collections.emptyMap();
}
}
core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
-1
View File
@@ -22,7 +22,6 @@
package org.apache.struts2.dispatcher.mapper;
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.StrutsConstants;
import com.mockobjects.servlet.MockHttpServletRequest;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.Configuration;
core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java
+3 -3
View File
@@ -41,13 +41,13 @@ public class RestfulActionMapperTest extends TestCase {
ActionMapping am = new ActionMapping();
am.setName("view");
am.setNamespace("secure");
am.setParams(Collections.EMPTY_MAP);
am.setParams(Collections.<String, Object>emptyMap());
assertEquals("secureview", mapper.getUriFromActionMapping(am));
}
public void testGetUriParam() {
Map param = new HashMap();
Map<String, Object> param = new HashMap<String, Object>();
param.put("article", "123");
ActionMapping am = new ActionMapping();
am.setName("view");
@@ -58,7 +58,7 @@ public class RestfulActionMapperTest extends TestCase {
}
public void testGetUriParamId() {
Map param = new HashMap();
Map<String, Object> param = new HashMap<String, Object>();
param.put("article", "123");
param.put("viewId", "456");
ActionMapping am = new ActionMapping();