You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2013/07/13 21:18:39 UTC
svn commit: r1502836 - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration/web/
test/java/org/apache/commons/configuration/web/
Author: oheger
Date: Sat Jul 13 19:18:39 2013
New Revision: 1502836
URL: http://svn.apache.org/r1502836
Log:
Integrated ListDelimiterHandler with web configurations.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/web/BaseWebConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/web/BaseWebConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/web/BaseWebConfiguration.java?rev=1502836&r1=1502835&r2=1502836&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/web/BaseWebConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/web/BaseWebConfiguration.java Sat Jul 13 19:18:39 2013
@@ -16,10 +16,9 @@
*/
package org.apache.commons.configuration.web;
-import java.util.List;
+import java.util.Collection;
import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.PropertyConverter;
/**
* <p>
@@ -103,11 +102,11 @@ abstract class BaseWebConfiguration exte
*/
protected Object handleDelimiters(Object value)
{
- if (!isDelimiterParsingDisabled() && value instanceof String)
+ if (value instanceof String)
{
- List<String> list = PropertyConverter.split((String) value,
- getListDelimiter());
- value = list.size() > 1 ? list : list.get(0);
+ Collection<String> values =
+ getListDelimiterHandler().split((String) value, true);
+ value = values.size() > 1 ? values : values.iterator().next();
}
return value;
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java?rev=1502836&r1=1502835&r2=1502836&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestAppletConfiguration.java Sat Jul 13 19:18:39 2013
@@ -24,6 +24,7 @@ import java.util.Properties;
import org.apache.commons.configuration.AbstractConfiguration;
import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.MapConfiguration;
import org.apache.commons.configuration.TestAbstractConfiguration;
import org.junit.Before;
@@ -65,6 +66,7 @@ public class TestAppletConfiguration ext
@Override
protected AbstractConfiguration getConfiguration()
{
+ AbstractConfiguration config;
final Properties parameters = new Properties();
parameters.setProperty("key1", "value1");
parameters.setProperty("key2", "value2");
@@ -98,12 +100,15 @@ public class TestAppletConfiguration ext
}
};
- return new AppletConfiguration(applet);
+ config = new AppletConfiguration(applet);
}
else
{
- return new MapConfiguration(parameters);
+ config = new MapConfiguration(parameters);
}
+
+ config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
+ return config;
}
@Override
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java?rev=1502836&r1=1502835&r2=1502836&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletConfiguration.java Sat Jul 13 19:18:39 2013
@@ -22,6 +22,7 @@ import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServlet;
import org.apache.commons.configuration.AbstractConfiguration;
+import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.TestAbstractConfiguration;
import org.junit.Test;
@@ -57,7 +58,9 @@ public class TestServletConfiguration ex
}
};
- return new ServletConfiguration(servlet);
+ ServletConfiguration servletConfiguration = new ServletConfiguration(servlet);
+ servletConfiguration.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
+ return servletConfiguration;
}
@Override
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java?rev=1502836&r1=1502835&r2=1502836&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletContextConfiguration.java Sat Jul 13 19:18:39 2013
@@ -26,6 +26,7 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServlet;
import org.apache.commons.configuration.AbstractConfiguration;
+import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.TestAbstractConfiguration;
import org.junit.Test;
@@ -84,7 +85,9 @@ public class TestServletContextConfigura
}
};
- return new ServletContextConfiguration(servlet);
+ ServletContextConfiguration resultConfig = new ServletContextConfiguration(servlet);
+ resultConfig.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
+ return resultConfig;
}
@Override
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java?rev=1502836&r1=1502835&r2=1502836&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java Sat Jul 13 19:18:39 2013
@@ -24,6 +24,7 @@ import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import org.apache.commons.configuration.AbstractConfiguration;
+import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.TestAbstractConfiguration;
import org.junit.Test;
@@ -44,7 +45,9 @@ public class TestServletFilterConfigurat
config.setInitParameter("list", "value1, value2");
config.setInitParameter("listesc", "value1\\,value2");
- return new ServletFilterConfiguration(config);
+ ServletFilterConfiguration resultConfig = new ServletFilterConfiguration(config);
+ resultConfig.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
+ return resultConfig;
}
@Override
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java?rev=1502836&r1=1502835&r2=1502836&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/web/TestServletRequestConfiguration.java Sat Jul 13 19:18:39 2013
@@ -29,6 +29,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationMap;
+import org.apache.commons.configuration.DefaultListDelimiterHandler;
import org.apache.commons.configuration.TestAbstractConfiguration;
import org.junit.Test;
@@ -101,7 +102,9 @@ public class TestServletRequestConfigura
}
};
- return new ServletRequestConfiguration(request);
+ ServletRequestConfiguration config = new ServletRequestConfiguration(request);
+ config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
+ return config;
}
@Override