You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by oh...@apache.org on 2005/08/20 20:18:39 UTC
svn commit: r234100 - in /jakarta/commons/proper/configuration/trunk:
src/java/org/apache/commons/configuration/
src/test/org/apache/commons/configuration/ xdocs/
Author: oheger
Date: Sat Aug 20 11:18:16 2005
New Revision: 234100
URL: http://svn.apache.org/viewcvs?rev=234100&view=rev
Log:
Fix for issue 35963: Updated XMLConfiguration to consistently deal with empty elements
Modified:
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/XMLConfiguration.java
jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestHierarchicalConfiguration.java
jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestXMLConfiguration.java
jakarta/commons/proper/configuration/trunk/xdocs/changes.xml
Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java?rev=234100&r1=234099&r2=234100&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java (original)
+++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java Sat Aug 20 11:18:16 2005
@@ -892,6 +892,28 @@
return list;
}
+
+ /**
+ * Returns a flag whether this node has child elements.
+ *
+ * @return <b>true</b> if there a child node, <b>false</b> otherwise
+ */
+ public boolean hasChildren()
+ {
+ if (children != null)
+ {
+ for (Iterator it = children.values().iterator(); it.hasNext();)
+ {
+ Collection nodes = (Collection) it.next();
+ if (!nodes.isEmpty())
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
/**
* Removes the specified child from this node.
Modified: jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/XMLConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/XMLConfiguration.java?rev=234100&r1=234099&r2=234100&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/XMLConfiguration.java (original)
+++ jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/XMLConfiguration.java Sat Aug 20 11:18:16 2005
@@ -339,7 +339,7 @@
}
}
String text = buffer.toString().trim();
- if (text.length() > 0)
+ if (text.length() > 0 || !node.hasChildren())
{
node.setValue(text);
}
Modified: jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestHierarchicalConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestHierarchicalConfiguration.java?rev=234100&r1=234099&r2=234100&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestHierarchicalConfiguration.java (original)
+++ jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestHierarchicalConfiguration.java Sat Aug 20 11:18:16 2005
@@ -406,13 +406,20 @@
{
HierarchicalConfiguration.Node node = new HierarchicalConfiguration.Node(
"parent", "test");
+ assertFalse(node.hasChildren());
node.removeChildren(); // should have no effect
assertFalse(node.remove("child"));
+
+ node.addChild(createNode("test", "test"));
+ assertTrue(node.hasChildren());
+ assertTrue(node.remove("test"));
+ assertFalse(node.hasChildren());
for (int i = 0; i < 10; i++)
{
node.addChild(createNode("child" + i, "test" + i));
}
+ assertTrue(node.hasChildren());
assertFalse(node.remove("child"));
assertTrue(node.remove("child2"));
assertTrue(node.getChildren("child2").isEmpty());
Modified: jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestXMLConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestXMLConfiguration.java?rev=234100&r1=234099&r2=234100&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestXMLConfiguration.java (original)
+++ jakarta/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestXMLConfiguration.java Sat Aug 20 11:18:16 2005
@@ -68,7 +68,7 @@
public void testGetCommentedProperty()
{
- assertEquals(null, conf.getProperty("test.comment"));
+ assertEquals("", conf.getProperty("test.comment"));
}
public void testGetPropertyWithXMLEntity()
@@ -160,7 +160,7 @@
// test non-text/cdata element
property = conf.getProperty("test.comment");
- assertNull(property);
+ assertEquals("", property);
// test cdata element
property = conf.getProperty("test.cdata");
@@ -723,6 +723,22 @@
{
//ok
}
+ }
+
+ /**
+ * Tests handling of empty elements.
+ */
+ public void testEmptyElements() throws ConfigurationException
+ {
+ assertTrue(conf.containsKey("empty"));
+ assertEquals("", conf.getString("empty"));
+ conf.addProperty("empty2", "");
+ conf.setProperty("empty", "no more empty");
+ conf.save(testSaveConf);
+
+ conf = new XMLConfiguration(testSaveConf);
+ assertEquals("no more empty", conf.getString("empty"));
+ assertEquals("", conf.getProperty("empty2"));
}
/**
Modified: jakarta/commons/proper/configuration/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/xdocs/changes.xml?rev=234100&r1=234099&r2=234100&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/xdocs/changes.xml (original)
+++ jakarta/commons/proper/configuration/trunk/xdocs/changes.xml Sat Aug 20 11:18:16 2005
@@ -23,6 +23,11 @@
<body>
<release version="1.2-dev" date="in SVN">
+ <action dev="oheger" type="update" issue="35963">
+ Empty elements or elements whose content consists only of comments or
+ whitespace are now taken into account by XMLConfiguration. They are
+ added to the configuration; their value is an empty string.
+ </action>
<action dev="oheger" type="add">
XMLConfiguration now sets a valid system id in the InputSource used for
loading files. This enables XML parsers to correctly resolve relative
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org