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
commit c48c7a06348f9dd171d5849ce6b445c1fdbdc332 Author: Gary Gregory <[email protected]> AuthorDate: Wed Jun 29 17:40:23 2022 -0400 PMD rule UselessParentheses --- .../java/org/apache/commons/configuration2/INIConfiguration.java | 6 +++--- .../org/apache/commons/configuration2/PropertiesConfiguration.java | 2 +- .../commons/configuration2/PropertiesConfigurationLayout.java | 2 +- .../java/org/apache/commons/configuration2/XMLConfiguration.java | 4 ++-- .../configuration2/builder/combined/ConfigurationDeclaration.java | 6 +++--- .../commons/configuration2/convert/DefaultConversionHandler.java | 4 ++-- .../commons/configuration2/convert/LegacyListDelimiterHandler.java | 2 +- .../org/apache/commons/configuration2/io/DefaultFileSystem.java | 2 +- .../java/org/apache/commons/configuration2/io/VFSFileSystem.java | 2 +- .../apache/commons/configuration2/tree/DefaultConfigurationKey.java | 6 +++--- .../org/apache/commons/configuration2/TestPropertiesSequence.java | 4 ++-- .../org/apache/commons/configuration2/tree/NodeStructureHelper.java | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java index 4ef3e956..216b4896 100644 --- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java @@ -589,7 +589,7 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F */ private static boolean lineContinues(final String line) { final String s = line.trim(); - return s.equals(LINE_CONT) || (s.length() > 2 && s.endsWith(LINE_CONT) && Character.isWhitespace(s.charAt(s.length() - 2))); + return s.equals(LINE_CONT) || s.length() > 2 && s.endsWith(LINE_CONT) && Character.isWhitespace(s.charAt(s.length() - 2)); } /** @@ -657,7 +657,7 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F for (int i = 0; i < separators.length(); i++) { final char sep = separators.charAt(i); final int pos = line.indexOf(sep); - if ((pos >= 0) && (index < 0 || pos < index)) { + if (pos >= 0 && (index < 0 || pos < index)) { index = pos; } } @@ -869,7 +869,7 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F @Override public int getChildrenCount(final ImmutableNode node, final String name) { - final List<ImmutableNode> children = (name != null) ? super.getChildren(node, name) : super.getChildren(node); + final List<ImmutableNode> children = name != null ? super.getChildren(node, name) : super.getChildren(node); return filterChildrenOfGlobalSection(node, children).size(); } diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java index 6bd3e83f..cbf76bef 100644 --- a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java @@ -346,7 +346,7 @@ public class PropertiesConfiguration extends BaseConfiguration implements FileBa // while a property line continues there are no comments (even if the line from // the file looks like one) - if (isCommentLine(line) && (buffer.length() == 0)) { + if (isCommentLine(line) && buffer.length() == 0) { getCommentLines().add(line); continue; } diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java index 6cf2f033..587ee4ef 100644 --- a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java +++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java @@ -622,7 +622,7 @@ public class PropertiesConfigurationLayout implements EventListener<Configuratio * @return the line without comment character */ static String stripCommentChar(final String s, final boolean comment) { - if (StringUtils.isBlank(s) || (isCommentLine(s) == comment)) { + if (StringUtils.isBlank(s) || isCommentLine(s) == comment) { return s; } if (!comment) { diff --git a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java index 1224254c..1db1a594 100644 --- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java @@ -527,7 +527,7 @@ public class XMLConfiguration extends BaseHierarchicalConfiguration implements F childrenFlag = hasChildren || attributes.size() > 1; } final String text = determineValue(buffer.toString(), childrenFlag, trimFlag); - if (!text.isEmpty() || (!childrenFlag && level != 0)) { + if (!text.isEmpty() || !childrenFlag && level != 0) { refValue.setValue(text); } return attributes; @@ -544,7 +544,7 @@ public class XMLConfiguration extends BaseHierarchicalConfiguration implements F * @return the value to be stored for this node */ private static String determineValue(final String content, final boolean hasChildren, final boolean trimFlag) { - final boolean shouldTrim = trimFlag || (StringUtils.isBlank(content) && hasChildren); + final boolean shouldTrim = trimFlag || StringUtils.isBlank(content) && hasChildren; return shouldTrim ? content.trim() : content; } diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java b/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java index dfabc1e3..5ca39dce 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java +++ b/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java @@ -148,8 +148,8 @@ public class ConfigurationDeclaration extends XMLBeanDeclaration { } final Set<String> attributes = getAttributeNames(); - return (CombinedConfigurationBuilder.ATTR_ATNAME.equals(name) && !attributes.contains(RESERVED_PREFIX + CombinedConfigurationBuilder.ATTR_ATNAME)) - || (CombinedConfigurationBuilder.ATTR_OPTIONALNAME.equals(name) - && !attributes.contains(RESERVED_PREFIX + CombinedConfigurationBuilder.ATTR_OPTIONALNAME)); + return CombinedConfigurationBuilder.ATTR_ATNAME.equals(name) && !attributes.contains(RESERVED_PREFIX + CombinedConfigurationBuilder.ATTR_ATNAME) + || CombinedConfigurationBuilder.ATTR_OPTIONALNAME.equals(name) + && !attributes.contains(RESERVED_PREFIX + CombinedConfigurationBuilder.ATTR_OPTIONALNAME); } } diff --git a/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java b/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java index f47fda2c..2f326014 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java +++ b/src/main/java/org/apache/commons/configuration2/convert/DefaultConversionHandler.java @@ -149,7 +149,7 @@ public class DefaultConversionHandler implements ConversionHandler { * @return <b>true</b> if this is a complex object, <b>false</b> otherwise */ protected boolean isComplexObject(final Object src) { - return src instanceof Iterator<?> || src instanceof Iterable<?> || (src != null && src.getClass().isArray()); + return src instanceof Iterator<?> || src instanceof Iterable<?> || src != null && src.getClass().isArray(); } /** @@ -162,7 +162,7 @@ public class DefaultConversionHandler implements ConversionHandler { * @return a flag whether this object is an empty element */ protected boolean isEmptyElement(final Object src) { - return (src instanceof CharSequence) && ((CharSequence) src).length() == 0; + return src instanceof CharSequence && ((CharSequence) src).length() == 0; } /** diff --git a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java index bdee687b..7ad3930c 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java +++ b/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java @@ -99,7 +99,7 @@ public class LegacyListDelimiterHandler extends AbstractListDelimiterHandler { // if the last value ended with an escape character, it has // to be escaped itself; otherwise the list delimiter will // be escaped - if (lastValue.endsWith(ESCAPE) && (countTrailingBS(lastValue) / 2) % 2 != 0) { + if (lastValue.endsWith(ESCAPE) && countTrailingBS(lastValue) / 2 % 2 != 0) { buf.append(ESCAPE).append(ESCAPE); } buf.append(getDelimiter()); 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 94650e57..122b6591 100644 --- a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java +++ b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java @@ -202,7 +202,7 @@ public class DefaultFileSystem extends FileSystem { // create the path to the file if the file doesn't exist if (file != null && !file.exists()) { final File parent = file.getParentFile(); - if ((parent != null && !parent.exists()) && !parent.mkdirs()) { + if (parent != null && !parent.exists() && !parent.mkdirs()) { throw new ConfigurationException("Cannot create path: " + parent); } } diff --git a/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java b/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java index 3fd2b214..6702c83b 100644 --- a/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java +++ b/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java @@ -216,7 +216,7 @@ public class VFSFileSystem extends DefaultFileSystem { @Override public URL getURL(final String basePath, final String file) throws MalformedURLException { - if ((basePath != null && UriParser.extractScheme(basePath) == null) || (basePath == null && UriParser.extractScheme(file) == null)) { + if (basePath != null && UriParser.extractScheme(basePath) == null || basePath == null && UriParser.extractScheme(file) == null) { return super.getURL(basePath, file); } try { diff --git a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java index 779043f6..c8efed2b 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java +++ b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java @@ -400,7 +400,7 @@ public class DefaultConfigurationKey { */ private String removeAttributeMarkers(final String key) { return key.substring(getSymbols().getAttributeStart().length(), - key.length() - ((getSymbols().getAttributeEnd() != null) ? getSymbols().getAttributeEnd().length() : 0)); + key.length() - (getSymbols().getAttributeEnd() != null ? getSymbols().getAttributeEnd().length() : 0)); } /** @@ -430,7 +430,7 @@ public class DefaultConfigurationKey { * @return the escaped key */ private String escapeDelimiters(final String key) { - return (getSymbols().getEscapedDelimiter() == null || key.indexOf(getSymbols().getPropertyDelimiter()) < 0) ? key + return getSymbols().getEscapedDelimiter() == null || key.indexOf(getSymbols().getPropertyDelimiter()) < 0 ? key : StringUtils.replace(key, getSymbols().getPropertyDelimiter(), getSymbols().getEscapedDelimiter()); } @@ -560,7 +560,7 @@ public class DefaultConfigurationKey { public boolean isAttribute() { // if attribute emulation mode is active, the last part of a key is // always an attribute key, too - return attribute || (isAttributeEmulatingMode() && !hasNext()); + return attribute || isAttributeEmulatingMode() && !hasNext(); } /** diff --git a/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java b/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java index ef4c88ad..75bd9c30 100644 --- a/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java +++ b/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java @@ -117,7 +117,7 @@ public class TestPropertiesSequence { final String key = keys.next(); final String[] keyParts = StringUtils.split(key, "."); - if ((keyParts.length == 3) && keyParts[0].equals("prefix") && keyParts[2].equals("postfix")) { + if (keyParts.length == 3 && keyParts[0].equals("prefix") && keyParts[2].equals("postfix")) { final String serviceKey = keyParts[1]; if (!mapping.containsKey(serviceKey)) { @@ -130,7 +130,7 @@ public class TestPropertiesSequence { final String key = keys.next(); final String[] keyParts = StringUtils.split(key, "."); - if ((keyParts.length == 3) && keyParts[0].equals("prefix") && keyParts[2].equals("postfix")) { + if (keyParts.length == 3 && keyParts[0].equals("prefix") && keyParts[2].equals("postfix")) { final String serviceKey = keyParts[1]; if (!mapping2.containsKey(serviceKey)) { 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 56632488..8cdceb92 100644 --- a/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java +++ b/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java @@ -310,7 +310,7 @@ public class NodeStructureHelper { int foundIdx = 0; for (final ImmutableNode node : parent) { - if (childName.equals(node.getNodeName()) && (foundIdx++ == childIndex)) { + if (childName.equals(node.getNodeName()) && foundIdx++ == childIndex) { return findNode(node, components, currentIdx + 1); } }
