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 2022/06/30 11:34:47 UTC
[commons-configuration] branch master updated (41823fe1 -> 265e1910)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
from 41823fe1 adding links to runtime dependencies page
new db62a50b Avoid creating BigDecimal with a decimal (float/double) literal.
new 3c2d55a9 Merged else if block
new c48c7a06 PMD rule UselessParentheses
new e1a07d86 PMD rule UnnecessaryModifier
new 265e1910 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/configuration2/DatabaseConfiguration.java | 12 ++++++------
.../apache/commons/configuration2/INIConfiguration.java | 14 ++++++--------
.../commons/configuration2/PropertiesConfiguration.java | 2 +-
.../configuration2/PropertiesConfigurationLayout.java | 2 +-
.../apache/commons/configuration2/XMLConfiguration.java | 4 ++--
.../builder/combined/ConfigurationDeclaration.java | 6 +++---
.../configuration2/convert/DefaultConversionHandler.java | 4 ++--
.../configuration2/convert/LegacyListDelimiterHandler.java | 2 +-
.../commons/configuration2/convert/PropertyConverter.java | 2 +-
.../commons/configuration2/io/DefaultFileSystem.java | 4 ++--
.../apache/commons/configuration2/io/VFSFileSystem.java | 2 +-
.../configuration2/tree/DefaultConfigurationKey.java | 6 +++---
.../commons/configuration2/TestBaseConfiguration.java | 2 +-
.../commons/configuration2/TestINIConfiguration.java | 2 +-
.../commons/configuration2/TestPropertiesSequence.java | 4 ++--
.../builder/TestFileBasedConfigurationBuilder.java | 2 +-
.../configuration2/convert/TestPropertyConverter.java | 3 ++-
.../reloading/TestVFSFileHandlerReloadingDetector.java | 2 +-
.../org/apache/commons/configuration2/test/HsqlDB.java | 2 +-
.../commons/configuration2/tree/NodeStructureHelper.java | 2 +-
20 files changed, 39 insertions(+), 40 deletions(-)
[commons-configuration] 04/05: PMD rule UnnecessaryModifier
Posted by gg...@apache.org.
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 e1a07d866fdae5371eecdc804349d8867ef04caf
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jun 29 17:42:21 2022 -0400
PMD rule UnnecessaryModifier
---
.../apache/commons/configuration2/DatabaseConfiguration.java | 12 ++++++------
.../apache/commons/configuration2/io/DefaultFileSystem.java | 2 +-
.../apache/commons/configuration2/TestINIConfiguration.java | 2 +-
.../builder/TestFileBasedConfigurationBuilder.java | 2 +-
.../reloading/TestVFSFileHandlerReloadingDetector.java | 2 +-
.../java/org/apache/commons/configuration2/test/HsqlDB.java | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
index 91d414a9..20c4f5fc 100644
--- a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
@@ -299,7 +299,7 @@ public class DatabaseConfiguration extends AbstractConfiguration {
@Override
protected Object performOperation() throws SQLException {
final List<Object> results = new ArrayList<>();
- try (final ResultSet rs = openResultSet(String.format(SQL_GET_PROPERTY, table, keyColumn), true, key)) {
+ try (ResultSet rs = openResultSet(String.format(SQL_GET_PROPERTY, table, keyColumn), true, key)) {
while (rs.next()) {
final Object value = extractPropertyValue(rs);
// Split value if it contains the list delimiter
@@ -344,7 +344,7 @@ public class DatabaseConfiguration extends AbstractConfiguration {
}
query.append(")");
- try (final PreparedStatement pstmt = initStatement(query.toString(), false, key, String.valueOf(obj))) {
+ try (PreparedStatement pstmt = initStatement(query.toString(), false, key, String.valueOf(obj))) {
if (configurationNameColumn != null) {
pstmt.setString(3, configurationName);
}
@@ -389,7 +389,7 @@ public class DatabaseConfiguration extends AbstractConfiguration {
final JdbcOperation<Integer> op = new JdbcOperation<Integer>(ConfigurationErrorEvent.READ, ConfigurationErrorEvent.READ, null, null) {
@Override
protected Integer performOperation() throws SQLException {
- try (final ResultSet rs = openResultSet(String.format(SQL_IS_EMPTY, table), true)) {
+ try (ResultSet rs = openResultSet(String.format(SQL_IS_EMPTY, table), true)) {
return rs.next() ? Integer.valueOf(rs.getInt(1)) : null;
}
}
@@ -412,7 +412,7 @@ public class DatabaseConfiguration extends AbstractConfiguration {
final JdbcOperation<Boolean> op = new JdbcOperation<Boolean>(ConfigurationErrorEvent.READ, ConfigurationErrorEvent.READ, key, null) {
@Override
protected Boolean performOperation() throws SQLException {
- try (final ResultSet rs = openResultSet(String.format(SQL_GET_PROPERTY, table, keyColumn), true, key)) {
+ try (ResultSet rs = openResultSet(String.format(SQL_GET_PROPERTY, table, keyColumn), true, key)) {
return rs.next();
}
}
@@ -434,7 +434,7 @@ public class DatabaseConfiguration extends AbstractConfiguration {
new JdbcOperation<Void>(ConfigurationErrorEvent.WRITE, ConfigurationEvent.CLEAR_PROPERTY, key, null) {
@Override
protected Void performOperation() throws SQLException {
- try (final PreparedStatement ps = initStatement(String.format(SQL_CLEAR_PROPERTY, table, keyColumn), true, key)) {
+ try (PreparedStatement ps = initStatement(String.format(SQL_CLEAR_PROPERTY, table, keyColumn), true, key)) {
ps.executeUpdate();
return null;
}
@@ -471,7 +471,7 @@ public class DatabaseConfiguration extends AbstractConfiguration {
new JdbcOperation<Collection<String>>(ConfigurationErrorEvent.READ, ConfigurationErrorEvent.READ, null, null) {
@Override
protected Collection<String> performOperation() throws SQLException {
- try (final ResultSet rs = openResultSet(String.format(SQL_GET_KEYS, keyColumn, table), true)) {
+ try (ResultSet rs = openResultSet(String.format(SQL_GET_KEYS, keyColumn, table), true)) {
while (rs.next()) {
keys.add(rs.getString(1));
}
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 122b6591..e02d5128 100644
--- a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
+++ b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
@@ -179,7 +179,7 @@ public class DefaultFileSystem extends FileSystem {
url = new URL(baseURL, fileName);
// check if the file exists
- try (final InputStream in = url.openStream()) {
+ try (InputStream in = url.openStream()) {
// nothing
in.available();
}
diff --git a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
index 9a118a90..77fc5724 100644
--- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
@@ -135,7 +135,7 @@ public class TestINIConfiguration {
* @throws ConfigurationException if an error occurs
*/
private static void load(final INIConfiguration instance, final String data) throws ConfigurationException {
- try (final StringReader reader = new StringReader(data)) {
+ try (StringReader reader = new StringReader(data)) {
instance.read(reader);
} catch (final IOException e) {
throw new ConfigurationException(e);
diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java
index 828cf738..bd79d905 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java
@@ -320,7 +320,7 @@ public class TestFileBasedConfigurationBuilder {
final URL jarResourceUrl = getClass().getClassLoader().getResource("org/apache/commons/configuration2/test.jar");
assertNotNull(jarResourceUrl);
final Path testJar = Paths.get(folder.getRoot().getAbsolutePath(), "test.jar");
- try (final InputStream inputStream = jarResourceUrl.openStream()) {
+ try (InputStream inputStream = jarResourceUrl.openStream()) {
Files.copy(inputStream, testJar);
}
final URL url = new URL("jar:" + testJar.toUri() + "!/configuration.properties");
diff --git a/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java b/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java
index 2e476946..6941f01a 100644
--- a/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java
+++ b/src/test/java/org/apache/commons/configuration2/reloading/TestVFSFileHandlerReloadingDetector.java
@@ -148,7 +148,7 @@ public class TestVFSFileHandlerReloadingDetector {
* @throws IOException if an error occurs
*/
private void writeTestFile(final File file, final String value) throws IOException {
- try (final FileWriter out = new FileWriter(file)) {
+ try (FileWriter out = new FileWriter(file)) {
out.write(String.format(FMT_XML, value));
}
}
diff --git a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
index a15e5214..870c0621 100644
--- a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
+++ b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
@@ -59,7 +59,7 @@ public class HsqlDB {
}
private String getFileContents(final String fileName) throws Exception {
- try (final FileReader fr = new FileReader(fileName)) {
+ try (FileReader fr = new FileReader(fileName)) {
final char fileBuf[] = new char[1024];
final StringBuilder sb = new StringBuilder(1000);
[commons-configuration] 01/05: Avoid creating BigDecimal with a decimal (float/double) literal.
Posted by gg...@apache.org.
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 db62a50b9ffe67cc4cfde8dff3868e94ec9779d5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jun 29 17:36:35 2022 -0400
Avoid creating BigDecimal with a decimal (float/double) literal.
PMD Error Prone violation
<file name="C:\d3vsrc\git\apache\commons-configuration\src\main\java\org\apache\commons\configuration2\convert\PropertyConverter.java">
<violation beginline="348" endline="348" begincolumn="16" endcolumn="46"
rule="AvoidDecimalLiteralsInBigDecimalConstructor" ruleset="Error Prone"
package="org.apache.commons.configuration2.convert"
class="PropertyConverter" method="toBigDecimal"
externalInfoUrl="https://pmd.github.io/pmd-6.44.0/pmd_rules_java_errorprone.html#avoiddecimalliteralsinbigdecimalconstructor"
priority="3">
Avoid creating BigDecimal with a decimal (float/double) literal. Use a
String literal
</violation>
---
.../org/apache/commons/configuration2/convert/PropertyConverter.java | 2 +-
.../java/org/apache/commons/configuration2/TestBaseConfiguration.java | 2 +-
.../apache/commons/configuration2/convert/TestPropertyConverter.java | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
index 261c248b..c65ed3d6 100644
--- a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++ b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -345,7 +345,7 @@ public final class PropertyConverter {
if (n instanceof BigDecimal) {
return (BigDecimal) n;
}
- return new BigDecimal(n.doubleValue());
+ return BigDecimal.valueOf(n.doubleValue());
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
index e5596f3c..50657766 100644
--- a/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
@@ -667,7 +667,7 @@ public class TestBaseConfiguration {
assertEquals("Wrong Long returned", Long.valueOf(42L), config.getLong(KEY_NUMBER, null));
assertEquals("Wrong BigInt returned", new BigInteger("42"), config.getBigInteger(KEY_NUMBER));
- assertEquals("Wrong DigDecimal returned", new BigDecimal("42"), config.getBigDecimal(KEY_NUMBER));
+ assertEquals("Wrong DigDecimal returned", new BigDecimal("42.0"), config.getBigDecimal(KEY_NUMBER));
}
@Test
diff --git a/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java b/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java
index 050eb84d..6e99e536 100644
--- a/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java
+++ b/src/test/java/org/apache/commons/configuration2/convert/TestPropertyConverter.java
@@ -48,7 +48,8 @@ public class TestPropertyConverter {
// The result is 0.1000000000000000055511151231257827021181583404541015625.
// See Sonar rule: https://rules.sonarsource.com/java/type/Bug/RSPEC-2111
final double d = 0.1;
- assertEquals("Incorrect BigDecimal value", new BigDecimal(d), PropertyConverter.toBigDecimal(d));
+ // Use BigDecimal#valueOf() Fix PMD AvoidDecimalLiteralsInBigDecimalConstructor
+ assertEquals("Incorrect BigDecimal value", BigDecimal.valueOf(d), PropertyConverter.toBigDecimal(d));
}
/**
[commons-configuration] 02/05: Merged else if block
Posted by gg...@apache.org.
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 3c2d55a9452c75e3b761b49a9e681e1daf5c26bc
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jun 29 17:38:57 2022 -0400
Merged else if block
---
.../java/org/apache/commons/configuration2/INIConfiguration.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
index 54eab0bf..4ef3e956 100644
--- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
@@ -543,11 +543,9 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements F
} else {
if (escape && quote == c) {
escape = false;
- } else {
- if (escape) {
- escape = false;
- result.append('\\');
- }
+ } else if (escape) {
+ escape = false;
+ result.append('\\');
}
result.append(c);
}
[commons-configuration] 03/05: PMD rule UselessParentheses
Posted by gg...@apache.org.
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 <ga...@gmail.com>
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);
}
}
[commons-configuration] 05/05: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration
Posted by gg...@apache.org.
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 265e1910575390d8900612ab61f74a4c69535134
Merge: e1a07d86 41823fe1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jun 30 07:33:35 2022 -0400
Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration
pom.xml | 4 +-
src/changes/changes.xml | 2 +-
.../configuration2/ImmutableConfiguration.java | 8 +--
.../PropertiesConfigurationLayout.java | 6 +--
.../builder/FileBasedBuilderProperties.java | 2 +-
.../configuration2/convert/PropertyConverter.java | 4 +-
.../interpol/ConfigurationInterpolator.java | 2 +-
.../commons/configuration2/io/FileHandler.java | 2 +-
.../commons/configuration2/io/FileSystem.java | 2 +-
.../configuration2/io/URLConnectionOptions.java | 2 +-
.../commons/configuration2/tree/ImmutableNode.java | 2 +-
src/site/site.xml | 3 +-
src/site/xdoc/dependencies.xml | 44 ++++++++--------
src/site/xdoc/userguide/howto_basicfeatures.xml | 41 ++++++++++++++-
src/site/xdoc/userguide/upgradeto2_0.xml | 2 +-
src/site/xdoc/userguide/upgradeto2_x.xml | 58 ++++++++++++++++++++++
src/site/xdoc/userguide/user_guide.xml | 1 +
17 files changed, 143 insertions(+), 42 deletions(-)