You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/09/27 17:09:21 UTC
svn commit: r1842122 - in
/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree:
./ xpath/
Author: ggregory
Date: Thu Sep 27 17:09:21 2018
New Revision: 1842122
URL: http://svn.apache.org/viewvc?rev=1842122&view=rev
Log:
Statement unnecessarily nested within else clause.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java?rev=1842122&r1=1842121&r2=1842122&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java Thu Sep 27 17:09:21 2018
@@ -113,10 +113,7 @@ abstract class AbstractImmutableNodeHand
{
return node.getChildren().size();
}
- else
- {
- return getMatchingChildrenCount(node, NodeNameMatchers.EQUALS, name);
- }
+ return getMatchingChildrenCount(node, NodeNameMatchers.EQUALS, name);
}
@Override
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java?rev=1842122&r1=1842121&r2=1842122&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java Thu Sep 27 17:09:21 2018
@@ -362,16 +362,13 @@ public class DefaultConfigurationKey
{
return key;
}
- else
+ StringBuilder buf = new StringBuilder();
+ buf.append(getSymbols().getAttributeStart()).append(key);
+ if (getSymbols().getAttributeEnd() != null)
{
- StringBuilder buf = new StringBuilder();
- buf.append(getSymbols().getAttributeStart()).append(key);
- if (getSymbols().getAttributeEnd() != null)
- {
- buf.append(getSymbols().getAttributeEnd());
- }
- return buf.toString();
+ buf.append(getSymbols().getAttributeEnd());
}
+ return buf.toString();
}
/**
@@ -398,16 +395,13 @@ public class DefaultConfigurationKey
{
return StringUtils.EMPTY;
}
- else
+ String result = key;
+ while (hasLeadingDelimiter(result))
{
- String result = key;
- while (hasLeadingDelimiter(result))
- {
- result = result.substring(getSymbols()
- .getPropertyDelimiter().length());
- }
- return result;
+ result = result.substring(getSymbols()
+ .getPropertyDelimiter().length());
}
+ return result;
}
/**
@@ -422,18 +416,15 @@ public class DefaultConfigurationKey
{
return StringUtils.EMPTY;
}
- else
+ String result = key;
+ while (hasTrailingDelimiter(result))
{
- String result = key;
- while (hasTrailingDelimiter(result))
- {
- result = result
- .substring(0, result.length()
- - getSymbols().getPropertyDelimiter()
- .length());
- }
- return result;
+ result = result
+ .substring(0, result.length()
+ - getSymbols().getPropertyDelimiter()
+ .length());
}
+ return result;
}
/**
@@ -773,10 +764,7 @@ public class DefaultConfigurationKey
startIndex = endIndex - 1;
return keyBuffer.substring(startIndex, endIndex);
}
- else
- {
- return nextKeyPart();
- }
+ return nextKeyPart();
}
/**
@@ -873,10 +861,7 @@ public class DefaultConfigurationKey
return escapePos
+ getSymbols().getEscapedDelimiter().length();
}
- else
- {
- return -1;
- }
+ return -1;
}
/**
@@ -916,10 +901,7 @@ public class DefaultConfigurationKey
current = removeAttributeMarkers(key);
return true;
}
- else
- {
- return false;
- }
+ return false;
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java?rev=1842122&r1=1842121&r2=1842122&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java Thu Sep 27 17:09:21 2018
@@ -207,14 +207,10 @@ public class DefaultExpressionEngine imp
// this is the root node
return StringUtils.EMPTY;
}
-
- else
- {
- DefaultConfigurationKey key = new DefaultConfigurationKey(this,
- parentKey);
- key.append(handler.nodeName(node), true);
- return key.toString();
- }
+ DefaultConfigurationKey key = new DefaultConfigurationKey(this,
+ parentKey);
+ key.append(handler.nodeName(node), true);
+ return key.toString();
}
@Override
@@ -435,18 +431,11 @@ public class DefaultExpressionEngine imp
{
return node;
}
- else
- {
- return findLastPathNode(keyIt,
- findChildNodesByName(handler, node, keyPart).get(idx),
- handler);
- }
- }
-
- else
- {
- return node;
+ return findLastPathNode(keyIt,
+ findChildNodesByName(handler, node, keyPart).get(idx),
+ handler);
}
+ return node;
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java?rev=1842122&r1=1842121&r2=1842122&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeAddData.java Thu Sep 27 17:09:21 2018
@@ -147,10 +147,7 @@ public class NodeAddData<T>
{
return Collections.emptyList();
}
- else
- {
- return Collections.unmodifiableList(new ArrayList<>(
- intermediateNodes));
- }
+ return Collections.unmodifiableList(new ArrayList<>(
+ intermediateNodes));
}
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java?rev=1842122&r1=1842121&r2=1842122&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java Thu Sep 27 17:09:21 2018
@@ -430,16 +430,13 @@ class NodeTracker
{
return trackData.observerAdded();
}
- else
+ ImmutableNode target = selector.select(root, resolver, handler);
+ if (target == null)
{
- ImmutableNode target = selector.select(root, resolver, handler);
- if (target == null)
- {
- throw new ConfigurationRuntimeException(
- "Selector does not select unique node: " + selector);
- }
- return new TrackedNodeData(target);
+ throw new ConfigurationRuntimeException(
+ "Selector does not select unique node: " + selector);
}
+ return new TrackedNodeData(target);
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java?rev=1842122&r1=1842121&r2=1842122&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/NodeUpdateData.java Thu Sep 27 17:09:21 2018
@@ -139,10 +139,7 @@ public class NodeUpdateData<T>
{
return Collections.emptyMap();
}
- else
- {
- return Collections.unmodifiableMap(new HashMap<>(map));
- }
+ return Collections.unmodifiableMap(new HashMap<>(map));
}
/**
@@ -159,9 +156,6 @@ public class NodeUpdateData<T>
{
return Collections.emptySet();
}
- else
- {
- return Collections.unmodifiableCollection(new ArrayList<>(col));
- }
+ return Collections.unmodifiableCollection(new ArrayList<>(col));
}
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java?rev=1842122&r1=1842121&r2=1842122&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java Thu Sep 27 17:09:21 2018
@@ -142,9 +142,6 @@ public class OverrideCombiner extends No
{
return HANDLER.getChildren(node2, child.getNodeName()).get(0);
}
- else
- {
- return null;
- }
+ return null;
}
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java?rev=1842122&r1=1842121&r2=1842122&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java Thu Sep 27 17:09:21 2018
@@ -114,24 +114,21 @@ class ConfigurationNodeIteratorChildren<
{
return getNodeHandler().getChildren(node);
}
- else
+ if (test instanceof NodeNameTest)
{
- if (test instanceof NodeNameTest)
- {
- NodeNameTest nameTest = (NodeNameTest) test;
- QName name = nameTest.getNodeName();
- return nameTest.isWildcard() ? createSubNodeListForWildcardName(
- node, name) : createSubNodeListForName(node, name);
- }
+ NodeNameTest nameTest = (NodeNameTest) test;
+ QName name = nameTest.getNodeName();
+ return nameTest.isWildcard() ? createSubNodeListForWildcardName(
+ node, name) : createSubNodeListForName(node, name);
+ }
- else if (test instanceof NodeTypeTest)
+ else if (test instanceof NodeTypeTest)
+ {
+ NodeTypeTest typeTest = (NodeTypeTest) test;
+ if (typeTest.getNodeType() == Compiler.NODE_TYPE_NODE
+ || typeTest.getNodeType() == Compiler.NODE_TYPE_TEXT)
{
- NodeTypeTest typeTest = (NodeTypeTest) test;
- if (typeTest.getNodeType() == Compiler.NODE_TYPE_NODE
- || typeTest.getNodeType() == Compiler.NODE_TYPE_TEXT)
- {
- return getNodeHandler().getChildren(node);
- }
+ return getNodeHandler().getChildren(node);
}
}
@@ -176,20 +173,17 @@ class ConfigurationNodeIteratorChildren<
{
return children;
}
- else
+ List<T> prefixChildren = new ArrayList<>(children.size());
+ String prefix = prefixName(name.getPrefix(), null);
+ for (T child : children)
{
- List<T> prefixChildren = new ArrayList<>(children.size());
- String prefix = prefixName(name.getPrefix(), null);
- for (T child : children)
+ if (StringUtils.startsWith(getNodeHandler().nodeName(child),
+ prefix))
{
- if (StringUtils.startsWith(getNodeHandler().nodeName(child),
- prefix))
- {
- prefixChildren.add(child);
- }
+ prefixChildren.add(child);
}
- return prefixChildren;
}
+ return prefixChildren;
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java?rev=1842122&r1=1842121&r2=1842122&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java Thu Sep 27 17:09:21 2018
@@ -200,16 +200,13 @@ public class XPathExpressionEngine imple
QueryResult<T> result = createResult(root);
return Collections.singletonList(result);
}
- else
+ JXPathContext context = createContext(root, handler);
+ List<?> results = context.selectNodes(key);
+ if (results == null)
{
- JXPathContext context = createContext(root, handler);
- List<?> results = context.selectNodes(key);
- if (results == null)
- {
- results = Collections.emptyList();
- }
- return convertResults(results);
+ results = Collections.emptyList();
}
+ return convertResults(results);
}
/**
@@ -552,10 +549,7 @@ public class XPathExpressionEngine imple
{
return (QueryResult<T>) resObj;
}
- else
- {
- return QueryResult.createNodeResult((T) resObj);
- }
+ return QueryResult.createNodeResult((T) resObj);
}
// static initializer: registers the configuration node pointer factory