This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new 9857c5a Raise embedded if into parent if.
9857c5a is described below
commit 9857c5ac150daa95f7a904cd194ce0fd0d75354e
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 28 12:28:39 2021 -0500
Raise embedded if into parent if.
---
.../commons/configuration2/AbstractConfiguration.java | 7 ++-----
.../apache/commons/configuration2/INIConfiguration.java | 7 ++-----
.../apache/commons/configuration2/XMLConfiguration.java | 7 ++-----
.../commons/configuration2/io/DefaultFileSystem.java | 16 +++++-----------
.../plist/XMLPropertyListConfiguration.java | 10 +++-------
.../configuration2/tree/DefaultExpressionEngine.java | 7 ++-----
.../commons/configuration2/tree/NodeStructureHelper.java | 7 ++-----
7 files changed, 18 insertions(+), 43 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index c3be4b6..67f0f48 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -484,12 +484,9 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
{
for (final Lookup l : ci.getDefaultLookups())
{
- if (l instanceof ConfigurationLookup)
+ if (l instanceof ConfigurationLookup && targetConf ==
((ConfigurationLookup) l).getConfiguration())
{
- if (targetConf == ((ConfigurationLookup) l).getConfiguration())
- {
- return l;
- }
+ return l;
}
}
return null;
diff --git
a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
index 2b47f17..76099e5 100644
--- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
@@ -803,12 +803,9 @@ public class INIConfiguration extends
BaseHierarchicalConfiguration implements
{
final char sep = separators.charAt(i);
final int pos = line.indexOf(sep);
- if (pos >= 0)
+ if ((pos >= 0) && (index < 0 || pos < index))
{
- if (index < 0 || pos < index)
- {
- index = pos;
- }
+ index = pos;
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index f0f3d19..f1271d0 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -788,12 +788,9 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements
for (int i = 0; i < childNodes.getLength(); i++)
{
final Node item = childNodes.item(i);
- if (item instanceof Element)
+ if (item instanceof Element && name.equals(((Element)
item).getTagName()))
{
- if (name.equals(((Element) item).getTagName()))
- {
- count++;
- }
+ count++;
}
}
return count;
diff --git
a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
index 7e19c27..c91201c 100644
--- a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
+++ b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
@@ -254,19 +254,13 @@ public class DefaultFileSystem extends FileSystem
*/
private void createPath(final File file) throws ConfigurationException
{
- if (file != null)
+ // create the path to the file if the file doesn't exist
+ if (file != null && !file.exists())
{
- // create the path to the file if the file doesn't exist
- if (!file.exists())
+ final File parent = file.getParentFile();
+ if ((parent != null && !parent.exists()) && !parent.mkdirs())
{
- final File parent = file.getParentFile();
- if (parent != null && !parent.exists())
- {
- if (!parent.mkdirs())
- {
- throw new ConfigurationException("Cannot create path:
" + parent);
- }
- }
+ throw new ConfigurationException("Cannot create path: " +
parent);
}
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
index 7afd61b..9c2d5b9 100644
---
a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
@@ -549,14 +549,10 @@ public class XMLPropertyListConfiguration extends
BaseHierarchicalConfiguration
if ("array".equals(qName))
{
push(new ArrayNodeBuilder());
- }
- else if ("dict".equals(qName))
+ } else if ("dict".equals(qName) && peek() instanceof
ArrayNodeBuilder)
{
- if (peek() instanceof ArrayNodeBuilder)
- {
- // push the new root builder on the stack
- push(new PListNodeBuilder());
- }
+ // push the new root builder on the stack
+ push(new PListNodeBuilder());
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
index 22d0d1e..e22f29b 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
@@ -382,12 +382,9 @@ public class DefaultExpressionEngine implements
ExpressionEngine
processSubNodes(keyPart, findChildNodesByName(handler, node,
key),
results, handler);
}
- if (keyPart.isAttribute() && !keyPart.hasNext())
+ if (keyPart.isAttribute() && !keyPart.hasNext() &&
handler.getAttributeValue(node, key) != null)
{
- if (handler.getAttributeValue(node, key) != null)
- {
- results.add(QueryResult.createAttributeResult(node, key));
- }
+ results.add(QueryResult.createAttributeResult(node, key));
}
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
b/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
index f0b912e..f155a92 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
@@ -592,12 +592,9 @@ public class NodeStructureHelper
int foundIdx = 0;
for (final ImmutableNode node : parent)
{
- if (childName.equals(node.getNodeName()))
+ if (childName.equals(node.getNodeName()) && (foundIdx++ ==
childIndex))
{
- if (foundIdx++ == childIndex)
- {
- return findNode(node, components, currentIdx + 1);
- }
+ return findNode(node, components, currentIdx + 1);
}
}
throw new NoSuchElementException("Cannot resolve child "
