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 2021/06/26 15:34:25 UTC
[commons-configuration] branch master updated: CONFIGURATION-802 -
Set field as Final (#111)
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 b9ba4a8 CONFIGURATION-802 - Set field as Final (#111)
b9ba4a8 is described below
commit b9ba4a8e8ce5883db731aaf1aab4d9f06c532fb5
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sat Jun 26 17:34:16 2021 +0200
CONFIGURATION-802 - Set field as Final (#111)
---
.../org/apache/commons/configuration2/AbstractConfiguration.java | 4 ++--
.../org/apache/commons/configuration2/ConfigurationConverter.java | 2 +-
.../org/apache/commons/configuration2/DatabaseConfiguration.java | 2 +-
.../java/org/apache/commons/configuration2/INIConfiguration.java | 4 ++--
.../configuration2/PatternSubtreeConfigurationWrapper.java | 2 +-
.../apache/commons/configuration2/PropertiesConfiguration.java | 4 ++--
.../java/org/apache/commons/configuration2/XMLConfiguration.java | 4 ++--
.../java/org/apache/commons/configuration2/XMLDocumentHelper.java | 4 ++--
.../org/apache/commons/configuration2/beanutils/BeanHelper.java | 2 +-
.../commons/configuration2/beanutils/XMLBeanDeclaration.java | 2 +-
.../commons/configuration2/builder/BasicConfigurationBuilder.java | 2 +-
.../builder/combined/CombinedConfigurationBuilder.java | 4 ++--
.../builder/combined/CombinedConfigurationBuilderProvider.java | 2 +-
.../apache/commons/configuration2/convert/PropertyConverter.java | 2 +-
.../org/apache/commons/configuration2/io/DefaultFileSystem.java | 8 ++++----
.../java/org/apache/commons/configuration2/io/FileHandler.java | 4 ++--
.../org/apache/commons/configuration2/io/FileLocatorUtils.java | 2 +-
.../java/org/apache/commons/configuration2/io/VFSFileSystem.java | 4 ++--
.../configuration2/plist/XMLPropertyListConfiguration.java | 2 +-
.../org/apache/commons/configuration2/tree/InMemoryNodeModel.java | 6 +++---
.../commons/configuration2/sync/TestReadWriteSynchronizer.java | 2 +-
.../apache/commons/configuration2/tree/NodeStructureHelper.java | 4 ++--
.../commons/configuration2/web/TestAppletConfiguration.java | 2 +-
23 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index 67f0f48..2b62bf1 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -1427,7 +1427,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
public List<Object> getList(final String key, final List<?> defaultValue)
{
final Object value = getProperty(key);
- List<Object> list;
+ final List<Object> list;
if (value instanceof String)
{
@@ -1856,7 +1856,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
return null;
}
- Collection<T> result;
+ final Collection<T> result;
if (target == null)
{
result = new ArrayList<>(defaultValue);
diff --git a/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java b/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java
index 92448cc..6e19c8c 100644
--- a/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java
+++ b/src/main/java/org/apache/commons/configuration2/ConfigurationConverter.java
@@ -67,7 +67,7 @@ public final class ConfigurationConverter
public static Properties getProperties(final ImmutableConfiguration config)
{
final Properties props = new Properties();
- ListDelimiterHandler listHandler;
+ final ListDelimiterHandler listHandler;
boolean useDelimiterHandler;
if (config instanceof AbstractConfiguration)
diff --git a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
index 2d8554a..ea7bf68 100644
--- a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
@@ -785,7 +785,7 @@ public class DatabaseConfiguration extends AbstractConfiguration
protected PreparedStatement createStatement(final String sql, final boolean nameCol)
throws SQLException
{
- String statement;
+ final String statement;
if (nameCol && configurationNameColumn != null)
{
final StringBuilder buf = new StringBuilder(sql);
diff --git a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
index 76099e5..d01f9c3 100644
--- a/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
@@ -734,7 +734,7 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements
*/
private boolean lineContinues(final String line, final int pos)
{
- String s;
+ final String s;
if (pos >= line.length())
{
@@ -1116,7 +1116,7 @@ public class INIConfiguration extends BaseHierarchicalConfiguration implements
private List<ImmutableNode> filterChildrenOfGlobalSection(
final ImmutableNode node, final List<ImmutableNode> children)
{
- List<ImmutableNode> filteredList;
+ final List<ImmutableNode> filteredList;
if (node == getRootNode())
{
filteredList =
diff --git a/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java b/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
index 9b6de2c..813315b 100644
--- a/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
+++ b/src/main/java/org/apache/commons/configuration2/PatternSubtreeConfigurationWrapper.java
@@ -441,7 +441,7 @@ public class PatternSubtreeConfigurationWrapper extends BaseHierarchicalConfigur
*/
private String makePath(final String item)
{
- String pathPattern;
+ final String pathPattern;
if ((item.isEmpty() || item.startsWith("/")) && trailing)
{
pathPattern = path.substring(0, path.length() - 1);
diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index adbec5a..60b16ef 100644
--- a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -507,7 +507,7 @@ public class PropertiesConfiguration extends BaseConfiguration
super(writer, delHandler, value -> {
String valueString = String.valueOf(value);
- CharSequenceTranslator translator;
+ final CharSequenceTranslator translator;
if (escapeUnicode)
{
translator = new AggregateTranslator(new LookupTranslator(JUP_CHARS_ESCAPE), ESCAPER);
@@ -1744,7 +1744,7 @@ public class PropertiesConfiguration extends BaseConfiguration
boolean propertyLoaded(final String key, final String value, final Deque<URL> seenStack)
throws ConfigurationException
{
- boolean result;
+ final boolean result;
if (StringUtils.isNotEmpty(getInclude())
&& key.equalsIgnoreCase(getInclude()))
diff --git a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index f1271d0..6b15078 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -709,8 +709,8 @@ public class XMLConfiguration extends BaseHierarchicalConfiguration implements
final boolean trim, final Map<String, String> attrmap,
final Map<ImmutableNode, Object> elemRefs)
{
- ImmutableNode addedChildNode;
- Collection<String> values;
+ final ImmutableNode addedChildNode;
+ final Collection<String> values;
if (value != null)
{
diff --git a/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java b/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
index 259134e..0ea2f6d 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
@@ -139,8 +139,8 @@ class XMLDocumentHelper
public static XMLDocumentHelper forSourceDocument(final Document srcDoc)
throws ConfigurationException
{
- String pubID;
- String sysID;
+ final String pubID;
+ final String sysID;
if (srcDoc.getDoctype() != null)
{
pubID = srcDoc.getDoctype().getPublicId();
diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
index a34d6e6..3556203 100644
--- a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
+++ b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
@@ -384,7 +384,7 @@ public final class BeanHelper
private static Collection<Object> createPropertyCollection(final String propName,
final Class<?> propertyClass)
{
- Collection<Object> beanCollection;
+ final Collection<Object> beanCollection;
if (List.class.isAssignableFrom(propertyClass))
{
diff --git a/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java b/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
index e23b1e8..311e4fd 100644
--- a/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
+++ b/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
@@ -374,7 +374,7 @@ public class XMLBeanDeclaration implements BeanDeclaration
if (nested.containsKey(child.nodeName()))
{
final Object obj = nested.get(child.nodeName());
- List<BeanDeclaration> list;
+ final List<BeanDeclaration> list;
if (obj instanceof List)
{
// Safe because we created the lists ourselves.
diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
index 09f3e9d..0188284 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
@@ -329,7 +329,7 @@ public class BasicConfigurationBuilder<T extends ImmutableConfiguration> impleme
*/
public void resetResult()
{
- T oldResult;
+ final T oldResult;
synchronized (this)
{
oldResult = result;
diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
index 387a02a..a0cffc9 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
@@ -1449,7 +1449,7 @@ public class CombinedConfigurationBuilder extends BasicConfigurationBuilder<Comb
throws ConfigurationException
{
final boolean createBuilders = builders.isEmpty();
- List<ConfigurationBuilder<? extends Configuration>> newBuilders;
+ final List<ConfigurationBuilder<? extends Configuration>> newBuilders;
if (createBuilders)
{
newBuilders = new ArrayList<>(srcDecl.size());
@@ -1461,7 +1461,7 @@ public class CombinedConfigurationBuilder extends BasicConfigurationBuilder<Comb
for (int i = 0; i < srcDecl.size(); i++)
{
- ConfigurationBuilder<? extends Configuration> b;
+ final ConfigurationBuilder<? extends Configuration> b;
if (createBuilders)
{
b = createConfigurationBuilder(srcDecl.get(i));
diff --git a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
index b85c6cb..7dfcb8d 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
@@ -83,7 +83,7 @@ public class CombinedConfigurationBuilderProvider extends
final ConfigurationDeclaration decl, final Collection<BuilderParameters> params)
throws Exception
{
- CombinedConfigurationBuilder builder;
+ final CombinedConfigurationBuilder builder;
if (decl.isReload())
{
builder = new ReloadingCombinedConfigurationBuilder();
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 ddf98f4..ea843f9 100644
--- a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++ b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -663,7 +663,7 @@ final class PropertyConverter
}
// parse the transparency
- int alpha;
+ final int alpha;
if (color.length() >= minlength + 2)
{
alpha = Integer.parseInt(color.substring(minlength, minlength + 2), HEX_RADIX);
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 c91201c..10238ed 100644
--- a/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
+++ b/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
@@ -161,7 +161,7 @@ public class DefaultFileSystem extends FileSystem
@Override
public String getBasePath(final String path)
{
- URL url;
+ final URL url;
try
{
url = getURL(null, path);
@@ -176,7 +176,7 @@ public class DefaultFileSystem extends FileSystem
@Override
public String getFileName(final String path)
{
- URL url;
+ final URL url;
try
{
url = getURL(null, path);
@@ -219,7 +219,7 @@ public class DefaultFileSystem extends FileSystem
{
try
{
- URL url;
+ final URL url;
if (basePath == null)
{
return new URL(fileName);
@@ -229,7 +229,7 @@ public class DefaultFileSystem extends FileSystem
url = new URL(baseURL, fileName);
// check if the file exists
- try (InputStream in = url.openStream())
+ try (final InputStream in = url.openStream())
{
// nothing
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
index 36cc74a..e583b94 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
@@ -730,7 +730,7 @@ public class FileHandler
*/
public void load(final File file) throws ConfigurationException
{
- URL url;
+ final URL url;
try
{
url = FileLocatorUtils.toURL(file);
@@ -1221,7 +1221,7 @@ public class FileHandler
private void save(final String fileName, final FileLocator locator)
throws ConfigurationException
{
- URL url;
+ final URL url;
try
{
url = FileLocatorUtils.obtainFileSystem(locator).getURL(
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
index e06b60f..60eb057 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
@@ -157,7 +157,7 @@ public final class FileLocatorUtils
*/
static File constructFile(final String basePath, final String fileName)
{
- File file;
+ final File file;
final File absolute = new File(fileName);
if (StringUtils.isEmpty(basePath) || absolute.isAbsolute())
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 af126e1..b65dc16 100644
--- a/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java
+++ b/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java
@@ -116,7 +116,7 @@ public class VFSFileSystem extends DefaultFileSystem
@Override
public InputStream getInputStream(final URL url) throws ConfigurationException
{
- FileObject file;
+ final FileObject file;
try
{
final FileSystemOptions opts = getOptions(url.getProtocol());
@@ -273,7 +273,7 @@ public class VFSFileSystem extends DefaultFileSystem
}
try
{
- FileName path;
+ final FileName path;
if (basePath != null && UriParser.extractScheme(file) == null)
{
final FileName base = resolveURI(basePath);
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 9c2d5b9..8f0ba1a 100644
--- a/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
@@ -421,7 +421,7 @@ public class XMLPropertyListConfiguration extends BaseHierarchicalConfiguration
}
else if (value instanceof byte[])
{
- String base64;
+ final String base64;
try
{
base64 = new String(Base64.encodeBase64((byte[]) value), DATA_ENCODING);
diff --git a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
index 8527551..3892218 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
@@ -986,7 +986,7 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode>
final Collection<ImmutableNode> newNodes)
{
final String nodeName = it.next();
- ImmutableNode.Builder builder;
+ final ImmutableNode.Builder builder;
if (it.hasNext())
{
builder = new ImmutableNode.Builder(1);
@@ -1155,7 +1155,7 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode>
final TransactionInitializer txInit, final NodeSelector selector,
final TreeData currentData, final NodeKeyResolver<ImmutableNode> resolver)
{
- boolean done;
+ final boolean done;
final ModelTransaction tx =
new ModelTransaction(currentData, selector, resolver);
if (!txInit.initTransaction(tx))
@@ -1315,7 +1315,7 @@ public class InMemoryNodeModel implements NodeModel<ImmutableNode>
final NodeKeyResolver<ImmutableNode> resolver,
final MutableObject<NodeSelector> refSelector)
{
- TreeData newData;
+ final TreeData newData;
final List<ImmutableNode> namedChildren =
current.getChildren(parent, childName);
if (!namedChildren.isEmpty())
diff --git a/src/test/java/org/apache/commons/configuration2/sync/TestReadWriteSynchronizer.java b/src/test/java/org/apache/commons/configuration2/sync/TestReadWriteSynchronizer.java
index 6025766..b98f3ea 100644
--- a/src/test/java/org/apache/commons/configuration2/sync/TestReadWriteSynchronizer.java
+++ b/src/test/java/org/apache/commons/configuration2/sync/TestReadWriteSynchronizer.java
@@ -273,7 +273,7 @@ public class TestReadWriteSynchronizer
for (int i = 0; i < numberOfUpdates; i++)
{
sync.beginWrite();
- Account acSource;
+ final Account acSource;
Account acDest;
if (account1.getAmount() < account2.getAmount())
{
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 f155a92..f220984 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
@@ -576,8 +576,8 @@ public class NodeStructureHelper
}
final Matcher m = PAT_KEY_WITH_INDEX.matcher(components[currentIdx]);
- String childName;
- int childIndex;
+ final String childName;
+ final int childIndex;
if (m.matches())
{
childName = m.group(1);
diff --git a/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java b/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java
index dfffcdb..20172a9 100644
--- a/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java
@@ -64,7 +64,7 @@ public class TestAppletConfiguration extends TestAbstractConfiguration
@Override
protected AbstractConfiguration getConfiguration()
{
- AbstractConfiguration config;
+ final AbstractConfiguration config;
final Properties parameters = new Properties();
parameters.setProperty("key1", "value1");
parameters.setProperty("key2", "value2");