Author: oheger
Date: Sat May 29 14:22:08 2010
New Revision: 949393
URL: http://svn.apache.org/viewvc?rev=949393&view=rev
Log:
CONFIGURATION-415: Files with a plus character in their names are now handled
correctly. Copied code from the FileUtils class of Commons IO to
ConfigurationUtils.fileFromURL() to achieve this. Ported this fix to
configuration2 branch.
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml?rev=949393&r1=949392&r2=949393&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/changes/changes.xml
Sat May 29 14:22:08 2010
@@ -79,6 +79,9 @@
</release>
<release version="1.7" date="in SVN" description="">
+ <action dev="oheger" type="fix" issue="CONFIGURATION-415">
+ Files with a plus character in their names are now handled correctly.
+ </action>
<action dev="oheger" type="fix" issue="CONFIGURATION-413"
due-to="Alexander Prishchepov">
SubsetConfiguration now produces correct events.
</action>
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java?rev=949393&r1=949392&r2=949393&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
Sat May 29 14:22:08 2010
@@ -21,12 +21,10 @@ import java.io.File;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLDecoder;
import java.util.Iterator;
import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
@@ -47,7 +45,7 @@ import org.apache.commons.logging.LogFac
* @author <a href="mailto:herve.qui...@esil.univ-mrs.fr";>Herve Quiroz</a>
* @author <a href="mailto:oliver.he...@t-online.de";>Oliver Heger</a>
* @author Emmanuel Bourg
- * @version $Revision$, $Date$
+ * @version $Id$
*/
public final class ConfigurationUtils
{
@@ -60,9 +58,6 @@ public final class ConfigurationUtils
/** Constant for the name of the clone() method.*/
private static final String METHOD_CLONE = "clone";
- /** Constant for the encoding for URLs. */
- private static final String ENCODING = "UTF-8";
-
/** The logger.*/
private static Log log =
LogFactory.getLog(ConfigurationUtils.class.getName());
@@ -543,28 +538,33 @@ public final class ConfigurationUtils
/**
* Tries to convert the specified URL to a file object. If this fails,
- * <b>null</b> is returned.
+ * <b>null</b> is returned. Note: This code has been copied from the
+ * <code>FileUtils</code> class from <em>Commons IO</em>.
*
* @param url the URL
* @return the resulting file object
*/
public static File fileFromURL(URL url)
{
- if (PROTOCOL_FILE.equals(url.getProtocol()))
+ if (url == null || !url.getProtocol().equals(PROTOCOL_FILE))
{
- try
- {
- return new File(URLDecoder.decode(url.getPath(), ENCODING));
- }
- catch (UnsupportedEncodingException uex)
- {
- // should not happen because UTF-8 should be supported
- throw new AssertionError("Encoding not supported: " + uex);
- }
+ return null;
}
else
{
- return null;
+ String filename = url.getFile().replace('/', File.separatorChar);
+ int pos = 0;
+ while ((pos = filename.indexOf('%', pos)) >= 0)
+ {
+ if (pos + 2 < filename.length())
+ {
+ String hexStr = filename.substring(pos + 1, pos + 3);
+ char ch = (char) Integer.parseInt(hexStr, 16);
+ filename = filename.substring(0, pos) + ch
+ + filename.substring(pos + 3);
+ }
+ }
+ return new File(filename);
}
}
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java?rev=949393&r1=949392&r2=949393&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
Sat May 29 14:22:08 2010
@@ -18,6 +18,7 @@
package org.apache.commons.configuration2;
import java.io.File;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +35,7 @@ import com.mockobjects.dynamic.Mock;
/**
* Tests the ConfigurationUtils class
*
- * @version $Revision$, $Date$
+ * @version $Id$
*/
public class TestConfigurationUtils extends TestCase
{
@@ -165,6 +166,28 @@ public class TestConfigurationUtils exte
reference.getAbsolutePath()));
}
+ /**
+ * Tests whether a "+" character in the file name is handled correctly by
+ * fileFromURL(). This test is related to CONFIGURATION-415.
+ */
+ public void testFileFromURLWithPlus() throws MalformedURLException
+ {
+ File file = ConfigurationAssert.getOutFile("foo+bar.txt")
+ .getAbsoluteFile();
+ URL fileURL = file.toURI().toURL();
+ File file2 = ConfigurationUtils.fileFromURL(fileURL);
+ assertEquals("Wrong file", file, file2);
+ }
+
+ /**
+ * Tests whether fileFromURL() handles null URLs correctly.
+ */
+ public void testFileFromURLNull() throws MalformedURLException
+ {
+ assertNull("Wrong file for null URL", ConfigurationUtils
+ .fileFromURL(null));
+ }
+
public void testLocateWithNullTCCL() throws Exception
{
ClassLoader cl = Thread.currentThread().getContextClassLoader();
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java?rev=949393&r1=949392&r2=949393&view=diff
==============================================================================
---
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestFileConfiguration.java
Sat May 29 14:22:08 2010
@@ -376,6 +376,29 @@ public class TestFileConfiguration exten
}
/**
+ * Tests whether file names containing a "+" character are handled
+ * correctly. This test is related to CONFIGURATION-415.
+ */
+ public void testPathWithPlus() throws ConfigurationException, IOException
+ {
+ File saveFile =
ConfigurationAssert.getOutFile("test+config.properties")
+ .getAbsoluteFile();
+ saveFile.createNewFile();
+ try
+ {
+ FileConfiguration config = new PropertiesConfiguration(saveFile);
+ config.addProperty("test", Boolean.TRUE);
+ config.save();
+ File configFile = config.getFile();
+ assertEquals("Wrong configuration file", saveFile, configFile);
+ }
+ finally
+ {
+ assertTrue("Could not remove test file", saveFile.delete());
+ }
+ }
+
+ /**
* Tests the getFile() method.
*/
public void testGetFile() throws ConfigurationException
