diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
index 678a5cc4a..5b1c8c66e 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
@@ -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;
     }
     
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
index f8d200267..63d825591 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
@@ -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;
 	}
-    
-    
-
 }
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
index a86d221b4..927d0874d 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
@@ -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;
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
index e30375ea6..e2ad74fda 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
@@ -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();
         }
     }
 
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
index cf52eed08..dc203cb61 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
@@ -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;
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java
index d882c2724..85480d379 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java
@@ -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();