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 100636e Use final.
100636e is described below
commit 100636ec3b1514bc6778c7257c8e8aae8c809f21
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 10 09:44:31 2021 -0400
Use final.
Simplify expressions.
Remove dead in-line comments.
Use primitive parsing.
---
src/main/java/org/apache/commons/configuration2/XMLConfiguration.java | 4 ++--
src/main/java/org/apache/commons/configuration2/io/FileUtils.java | 3 +--
.../java/org/apache/commons/configuration2/tree/ModelTransaction.java | 2 +-
src/test/java/org/apache/commons/configuration2/test/HsqlDB.java | 4 ++--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index 6b15078..95d75ef 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -611,12 +611,12 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements
final Map<String, String> attrmap =
constructHierarchy(childNode, refChildValue, child,
elemRefs, trimFlag, level + 1);
- final Boolean childTrim =
Boolean.valueOf(attrmap.remove(ATTR_SPACE_INTERNAL));
+ final boolean childTrim =
Boolean.parseBoolean(attrmap.remove(ATTR_SPACE_INTERNAL));
childNode.addAttributes(attrmap);
final ImmutableNode newChild =
createChildNodeWithValue(node, childNode, child,
refChildValue.getValue(),
- childTrim.booleanValue(), attrmap, elemRefs);
+ childTrim, attrmap, elemRefs);
if (elemRefs != null && !elemRefs.containsKey(newChild))
{
elemRefs.put(newChild, child);
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileUtils.java
b/src/main/java/org/apache/commons/configuration2/io/FileUtils.java
index 170b4b8..ec63add 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileUtils.java
@@ -35,7 +35,6 @@ class FileUtils {
*/
private static final Charset UTF8 = Charset.forName("UTF-8");
- //-----------------------------------------------------------------------
/**
* Convert from a {@code URL} to a {@code File}.
* <p>
@@ -77,7 +76,7 @@ class FileUtils {
String decoded = url;
if (url != null && url.indexOf('%') >= 0) {
final int n = url.length();
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
final ByteBuffer bytes = ByteBuffer.allocate(n);
for (int i = 0; i < n;) {
if (url.charAt(i) == '%') {
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
index 8675a24..9548f38 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
@@ -360,7 +360,7 @@ class ModelTransaction
final Integer nodeLevel =
Integer.valueOf(level == LEVEL_UNKNOWN ? level(target)
: level);
- Map<ImmutableNode, Operations> levelOperations =
operations.computeIfAbsent(nodeLevel, k -> new HashMap<>());
+ final Map<ImmutableNode, Operations> levelOperations =
operations.computeIfAbsent(nodeLevel, k -> new HashMap<>());
Operations ops = levelOperations.get(target);
if (ops == null)
{
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 f0e1b5b..b2dd914 100644
--- a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
+++ b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory;
public class HsqlDB
{
- private Connection connection;
+ private final Connection connection;
private static final Log log = LogFactory.getLog(HsqlDB.class);
public HsqlDB(final String uri, final String databaseDriver, final String
loadFile)
@@ -97,7 +97,7 @@ public class HsqlDB
try (final FileReader fr = new FileReader(fileName)) {
final char fileBuf[] = new char[1024];
- final StringBuffer sb = new StringBuffer(1000);
+ final StringBuilder sb = new StringBuilder(1000);
int res = -1;
while ((res = fr.read(fileBuf, 0, 1024)) > -1)
