You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2013/03/19 23:11:59 UTC
svn commit: r1458543 - in /struts/struts2/trunk/core/src:
main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java
Author: lukaszlenart
Date: Tue Mar 19 22:11:59 2013
New Revision: 1458543
URL: http://svn.apache.org/r1458543
Log:
WW-3994 Uses constructor injections instead property injections to avoid NPE
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java?rev=1458543&r1=1458542&r2=1458543&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java Tue Mar 19 22:11:59 2013
@@ -21,18 +21,16 @@
package org.apache.struts2.dispatcher.mapper;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts2.StrutsConstants;
-
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.StrutsConstants;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* <!-- START SNIPPET: description -->
@@ -88,12 +86,11 @@ public class CompositeActionMapper imple
protected Container container;
protected List<ActionMapper> actionMappers = new ArrayList<ActionMapper>();
-
- @Inject
- public void setContainer(Container container) {
+
+ public CompositeActionMapper(@Inject Container container) {
this.container = container;
}
-
+
@Inject(StrutsConstants.STRUTS_MAPPER_COMPOSITE)
public void setActionMappers(String list) {
if (list != null) {
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java?rev=1458543&r1=1458542&r2=1458543&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java Tue Mar 19 22:11:59 2013
@@ -21,23 +21,14 @@
package org.apache.struts2.dispatcher.mapper;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts2.StrutsConstants;
-import org.springframework.mock.web.MockHttpServletRequest;
-
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Scope.Strategy;
-
import junit.framework.TestCase;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
/**
*
@@ -49,9 +40,8 @@ public class CompositeActionMapperTest e
Mock mockContainer;
public void setUp() throws Exception {
- compositeActionMapper = new CompositeActionMapper();
mockContainer = new Mock(Container.class);
- compositeActionMapper.setContainer((Container)mockContainer.proxy());
+ compositeActionMapper = new CompositeActionMapper((Container)mockContainer.proxy());
}