Author: lukaszlenart
Date: Wed Dec 5 10:35:55 2012
New Revision: 1417344
URL: http://svn.apache.org/viewvc?rev=1417344&view=rev
Log:
WW-3910 returns empty string list instead null and uses List instead of
String[] array
Added:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java?rev=1417344&r1=1417343&r2=1417344&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
Wed Dec 5 10:35:55 2012
@@ -37,6 +37,7 @@ import java.net.URL;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
@@ -69,7 +70,7 @@ public class DefaultStaticContentLoader
/**
* Store set of path prefixes to use with static resources.
*/
- protected String[] pathPrefixes;
+ protected List<String> pathPrefixes;
/**
* Store state of StrutsConstants.STRUTS_SERVE_STATIC_CONTENT setting.
@@ -150,9 +151,9 @@ public class DefaultStaticContentLoader
* A comma-delimited String listing packages
* @return A string array of packages
*/
- protected String[] parse(String packages) {
+ protected List<String> parse(String packages) {
if (packages == null) {
- return null;
+ return Collections.emptyList();
}
List<String> pathPrefixes = new ArrayList<String>();
@@ -165,7 +166,7 @@ public class DefaultStaticContentLoader
pathPrefixes.add(pathPrefix);
}
- return pathPrefixes.toArray(new String[pathPrefixes.size()]);
+ return pathPrefixes;
}
/*
@@ -253,7 +254,6 @@ public class DefaultStaticContentLoader
} finally {
is.close();
}
- return;
}
}
@@ -276,7 +276,7 @@ public class DefaultStaticContentLoader
}
}
- log = LoggerFactory.getLogger(FilterDispatcher.class);
+ log = LoggerFactory.getLogger(DefaultStaticContentLoader.class);
}
@@ -296,7 +296,6 @@ public class DefaultStaticContentLoader
* @param packagePrefix The package prefix to use to locate the resource
* @return full path
* @throws UnsupportedEncodingException
- * @throws IOException
*/
protected String buildPath(String name, String packagePrefix) throws
UnsupportedEncodingException {
String resourcePath;
Added:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderTest.java?rev=1417344&view=auto
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderTest.java
(added)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderTest.java
Wed Dec 5 10:35:55 2012
@@ -0,0 +1,35 @@
+package org.apache.struts2.dispatcher;
+
+import org.apache.struts2.StrutsTestCase;
+
+import java.util.List;
+
+public class DefaultStaticContentLoaderTest extends StrutsTestCase {
+
+ public void testParsePackages() throws Exception {
+
+ DefaultStaticContentLoader filterDispatcher = new
DefaultStaticContentLoader();
+ List<String> result1 = filterDispatcher.parse("foo.bar.package1
foo.bar.package2 foo.bar.package3");
+ List<String> result2 =
filterDispatcher.parse("foo.bar.package1\tfoo.bar.package2\tfoo.bar.package3");
+ List<String> result3 =
filterDispatcher.parse("foo.bar.package1,foo.bar.package2,foo.bar.package3");
+ List<String> result4 = filterDispatcher.parse("foo.bar.package1
foo.bar.package2 \t foo.bar.package3 , foo.bar.package4");
+
+ assertEquals(result1.get(0), "foo/bar/package1/");
+ assertEquals(result1.get(1), "foo/bar/package2/");
+ assertEquals(result1.get(2), "foo/bar/package3/");
+
+ assertEquals(result2.get(0), "foo/bar/package1/");
+ assertEquals(result2.get(1), "foo/bar/package2/");
+ assertEquals(result2.get(2), "foo/bar/package3/");
+
+ assertEquals(result3.get(0), "foo/bar/package1/");
+ assertEquals(result3.get(1), "foo/bar/package2/");
+ assertEquals(result3.get(2), "foo/bar/package3/");
+
+ assertEquals(result4.get(0), "foo/bar/package1/");
+ assertEquals(result4.get(1), "foo/bar/package2/");
+ assertEquals(result4.get(2), "foo/bar/package3/");
+ assertEquals(result4.get(3), "foo/bar/package4/");
+ }
+
+}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java?rev=1417344&r1=1417343&r2=1417344&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
Wed Dec 5 10:35:55 2012
@@ -49,35 +49,6 @@ import java.util.HashMap;
*/
public class FilterDispatcherTest extends StrutsTestCase {
-
- public void testParsePackages() throws Exception {
-
- DefaultStaticContentLoader filterDispatcher = new
DefaultStaticContentLoader();
- String[] result1 = filterDispatcher.parse("foo.bar.package1
foo.bar.package2 foo.bar.package3");
- String[] result2 =
filterDispatcher.parse("foo.bar.package1\tfoo.bar.package2\tfoo.bar.package3");
- String[] result3 =
filterDispatcher.parse("foo.bar.package1,foo.bar.package2,foo.bar.package3");
- String[] result4 = filterDispatcher.parse("foo.bar.package1
foo.bar.package2 \t foo.bar.package3 , foo.bar.package4");
-
- assertEquals(result1[0], "foo/bar/package1/");
- assertEquals(result1[1], "foo/bar/package2/");
- assertEquals(result1[2], "foo/bar/package3/");
-
- assertEquals(result2[0], "foo/bar/package1/");
- assertEquals(result2[1], "foo/bar/package2/");
- assertEquals(result2[2], "foo/bar/package3/");
-
- assertEquals(result3[0], "foo/bar/package1/");
- assertEquals(result3[1], "foo/bar/package2/");
- assertEquals(result3[2], "foo/bar/package3/");
-
- assertEquals(result4[0], "foo/bar/package1/");
- assertEquals(result4[1], "foo/bar/package2/");
- assertEquals(result4[2], "foo/bar/package3/");
- assertEquals(result4[3], "foo/bar/package4/");
- }
-
-
-
public void testIfActionMapperIsNullDontServiceAction() throws Exception {
MockServletContext servletContext = new MockServletContext();
MockFilterConfig filterConfig = new MockFilterConfig(servletContext);
