Author: oheger
Date: Sat Feb 6 15:57:48 2010
New Revision: 907240
URL: http://svn.apache.org/viewvc?rev=907240&view=rev
Log:
Removed convertToHierarchical() method and fixed some Eclipse warnings.
Modified:
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
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=907240&r1=907239&r2=907240&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 Feb 6 15:57:48 2010
@@ -174,41 +174,6 @@
}
/**
- * Converts the passed in configuration to a hierarchical one. If the
- * configuration is already hierarchical, it is directly returned.
Otherwise
- * all properties are copied into a new hierarchical configuration.
- *
- * @param conf the configuration to convert
- * @return the new hierarchical configuration (the result is <b>null</b> if
- * and only if the passed in configuration is <b>null</b>)
- * @since 1.3
- */
- public static HierarchicalConfiguration
convertToHierarchical(Configuration conf)
- {
- // todo to be changed into convertToHierarchical(conf, null) when
HierarchicalConfiguration is removed
-
- if (conf == null)
- {
- return null;
- }
-
- if (conf instanceof HierarchicalConfiguration)
- {
- return (HierarchicalConfiguration) conf;
- }
- else
- {
- HierarchicalConfiguration hc = new HierarchicalConfiguration();
- // Workaround for problem with copy()
- boolean delimiterParsingStatus = hc.isDelimiterParsingDisabled();
- hc.setDelimiterParsingDisabled(true);
- ConfigurationUtils.copy(conf, hc);
- hc.setDelimiterParsingDisabled(delimiterParsingStatus);
- return hc;
- }
- }
-
- /**
* Converts the passed in <code>Configuration</code> object to a
* hierarchical one using the specified <code>ExpressionEngine</code>. This
* conversion works by adding the keys found in the configuration to a
newly
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=907240&r1=907239&r2=907240&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 Feb 6 15:57:48 2010
@@ -20,7 +20,6 @@
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import junit.framework.TestCase;
@@ -94,15 +93,15 @@
.toString());
File absFile = new File("config.xml").getAbsoluteFile();
assertEquals(
- absFile.toURL(),
+ absFile.toURI().toURL(),
ConfigurationUtils.getURL(
"http://localhost:8080/webapp/config/baseConfig.xml";,
absFile.getAbsolutePath()));
assertEquals(
- absFile.toURL(),
+ absFile.toURI().toURL(),
ConfigurationUtils.getURL(null, absFile.getAbsolutePath()));
- assertEquals(absFile.toURL(),
+ assertEquals(absFile.toURI().toURL(),
ConfigurationUtils.getURL(absFile.getParent(), "config.xml"));
}
@@ -140,12 +139,12 @@
// append the source configuration to the target configuration
ConfigurationUtils.append(conf1, conf2);
- List expected = new ArrayList();
+ List<Object> expected = new ArrayList<Object>();
expected.add("value3");
expected.add("value1");
ListAssert.assertEquals("'key1' property", expected,
conf2.getList("key1"));
- expected = new ArrayList();
+ expected = new ArrayList<Object>();
expected.add("value4");
expected.add("value2");
ListAssert.assertEquals("'key2' property", expected,
conf2.getList("key2"));
@@ -159,8 +158,8 @@
assertEquals(reference, ConfigurationUtils.getFile(null,
reference.getAbsolutePath()));
assertEquals(reference,
ConfigurationUtils.getFile(directory.getAbsolutePath(),
reference.getAbsolutePath()));
assertEquals(reference,
ConfigurationUtils.getFile(directory.getAbsolutePath(), reference.getName()));
- assertEquals(reference,
ConfigurationUtils.getFile(directory.toURL().toString(), reference.getName()));
- assertEquals(reference, ConfigurationUtils.getFile("invalid",
reference.toURL().toString()));
+ assertEquals(reference,
ConfigurationUtils.getFile(directory.toURI().toURL().toString(),
reference.getName()));
+ assertEquals(reference, ConfigurationUtils.getFile("invalid",
reference.toURI().toURL().toString()));
assertEquals(reference, ConfigurationUtils.getFile(
"jar:file:/C:/myjar.jar!/my-config.xml/someprops.properties",
reference.getAbsolutePath()));
@@ -183,66 +182,6 @@
}
/**
- * Tests converting a configuration into a hierarchical one.
- */
- public void testConvertToHierarchical()
- {
- Configuration conf = new BaseConfiguration();
- for (int i = 0; i < 10; i++)
- {
- conf.addProperty("test" + i, "value" + i);
- conf.addProperty("test.list", "item" + i);
- }
-
- HierarchicalConfiguration hc = ConfigurationUtils
- .convertToHierarchical(conf);
- for (Iterator it = conf.getKeys(); it.hasNext();)
- {
- String key = (String) it.next();
- assertEquals("Wrong value for key " + key, conf.getProperty(key),
- hc.getProperty(key));
- }
- }
-
- /**
- * Tests converting a configuration into a hierarchical one that is already
- * hierarchical.
- */
- public void testConvertHierarchicalToHierarchical()
- {
- Configuration conf = new HierarchicalConfiguration();
- conf.addProperty("test", "yes");
- assertSame("Wrong configuration returned", conf, ConfigurationUtils
- .convertToHierarchical(conf));
- }
-
- /**
- * Tests converting a null configuration to a hierarchical one. The result
- * should be null, too.
- */
- public void testConvertNullToHierarchical()
- {
- assertNull("Wrong conversion result for null config",
- ConfigurationUtils.convertToHierarchical(null));
- }
-
- /**
- * Tests converting a configuration into a hierarchical one if some of its
- * properties contain escaped list delimiter characters.
- */
- public void testConvertToHierarchicalDelimiters()
- {
- Configuration conf = new BaseConfiguration();
- conf.addProperty("test.key", "1\\,2\\,3");
- assertEquals("Wrong property value", "1,2,3", conf
- .getString("test.key"));
- HierarchicalConfiguration hc = ConfigurationUtils
- .convertToHierarchical(conf);
- assertEquals("Escaped list delimiters not correctly handled", "1,2,3",
- hc.getString("test.key"));
- }
-
- /**
* Tests converting a configuration to a hierarchical one using a specific
* expression engine.
*/
@@ -254,7 +193,7 @@
DefaultExpressionEngine engine = new DefaultExpressionEngine();
engine.setIndexStart("[");
engine.setIndexEnd("]");
- AbstractHierarchicalConfiguration hc =
ConfigurationUtils.convertToHierarchical(conf, engine);
+ AbstractHierarchicalConfiguration<?> hc =
ConfigurationUtils.convertToHierarchical(conf, engine);
assertTrue("Wrong value for test(a)", hc.getBoolean("test(a)"));
assertFalse("Wrong value for test(b)", hc.getBoolean("test(b)"));
}
