[commons-configuration] branch master updated: - Make private elements final where possible.

[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


The following commit(s) were added to refs/heads/master by this push:
     new 11ce212  - Make private elements final where possible.
11ce212 is described below

commit 11ce2129c98a634b7efbf15c562297aeb6654c50
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 17 16:43:21 2021 -0500

    - Make private elements final where possible.
---
 .../org/apache/commons/configuration2/SystemConfiguration.java    | 2 +-
 .../apache/commons/configuration2/interpol/ConstantLookup.java    | 2 +-
 .../commons/configuration2/TestDynamicCombinedConfiguration.java  | 8 ++++----
 .../org/apache/commons/configuration2/TestINIConfiguration.java   | 2 +-
 .../commons/configuration2/TestPatternSubtreeConfiguration.java   | 4 ++--
 .../commons/configuration2/TestPropertiesConfiguration.java       | 8 ++++----
 .../apache/commons/configuration2/interpol/TestExprLookup.java    | 6 +++---
 src/test/java/org/apache/commons/configuration2/test/HsqlDB.java  | 2 +-
 .../commons/configuration2/tree/TestDefaultExpressionEngine.java  | 6 +++---
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java b/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java
index 9b2f899..faaf0b4 100644
--- a/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/SystemConfiguration.java
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory;
 public class SystemConfiguration extends MapConfiguration
 {
     /** The logger. */
-    private static Log log = LogFactory.getLog(SystemConfiguration.class);
+    private static final Log log = LogFactory.getLog(SystemConfiguration.class);
 
     /**
      * Create a Configuration based on the system properties.
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java b/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java
index 8db7d60..1983b0c 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/ConstantLookup.java
@@ -53,7 +53,7 @@ public class ConstantLookup implements Lookup
     private static final char FIELD_SEPRATOR = '.';
 
     /** An internally used cache for already retrieved values. */
-    private static Map<String, Object> constantCache = new HashMap<>();
+    private static final Map<String, Object> constantCache = new HashMap<>();
 
     /** The logger. */
     private final Log log = LogFactory.getLog(getClass());
diff --git a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
index 5c02594..3138461 100644
--- a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
@@ -57,9 +57,9 @@ import org.junit.rules.TemporaryFolder;
 
 public class TestDynamicCombinedConfiguration
 {
-    private static String PATTERN = "${sys:Id}";
-    private static String PATTERN1 = "target/test-classes/testMultiConfiguration_${sys:Id}.xml";
-    private static String DEFAULT_FILE = "target/test-classes/testMultiConfiguration_default.xml";
+    private static final String PATTERN = "${sys:Id}";
+    private static final String PATTERN1 = "target/test-classes/testMultiConfiguration_${sys:Id}.xml";
+    private static final String DEFAULT_FILE = "target/test-classes/testMultiConfiguration_default.xml";
     private static final File MULTI_TENENT_FILE = ConfigurationAssert
             .getTestFile("testMultiTenentConfigurationBuilder4.xml");
     private static final File MULTI_DYNAMIC_FILE = ConfigurationAssert
@@ -548,7 +548,7 @@ public class TestDynamicCombinedConfiguration
 
     public static class ThreadLookup implements Lookup
     {
-        private static ThreadLocal<String> id = new ThreadLocal<>();
+        private static final ThreadLocal<String> id = new ThreadLocal<>();
 
         public ThreadLookup()
         {
diff --git a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
index 0676542..66b371c 100644
--- a/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java
@@ -61,7 +61,7 @@ import org.junit.rules.TemporaryFolder;
  */
 public class TestINIConfiguration
 {
-    private static String LINE_SEPARATOR = System.getProperty("line.separator");
+    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
 
     /** Constant for the content of an ini file. */
     private static final String INI_DATA = "[section1]" + LINE_SEPARATOR
diff --git a/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java
index 3ad3925..85e01e1 100644
--- a/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java
@@ -35,8 +35,8 @@ import org.junit.Test;
  */
 public class TestPatternSubtreeConfiguration
 {
-    private static File CONFIG_FILE = ConfigurationAssert.getTestFile("testPatternSubtreeConfig.xml");
-    private static String PATTERN = "BusinessClient[@name='${sys:Id}']";
+    private static final File CONFIG_FILE = ConfigurationAssert.getTestFile("testPatternSubtreeConfig.xml");
+    private static final String PATTERN = "BusinessClient[@name='${sys:Id}']";
     private XMLConfiguration conf;
 
     @Before
diff --git a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index 7b6c693..129b0e2 100644
--- a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -246,13 +246,13 @@ public class TestPropertiesConfiguration
     private static final String CR = System.getProperty("line.separator");
 
     /** The File that we test with */
-    private static String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
+    private static final String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
 
-    private static String testBasePath = ConfigurationAssert.TEST_DIR.getAbsolutePath();
+    private static final String testBasePath = ConfigurationAssert.TEST_DIR.getAbsolutePath();
 
-    private static String testBasePath2 = ConfigurationAssert.TEST_DIR.getParentFile().getAbsolutePath();
+    private static final String testBasePath2 = ConfigurationAssert.TEST_DIR.getParentFile().getAbsolutePath();
 
-    private static File testSavePropertiesFile = ConfigurationAssert.getOutFile("testsave.properties");
+    private static final File testSavePropertiesFile = ConfigurationAssert.getOutFile("testsave.properties");
 
     /**
      * Helper method for loading a configuration from a given file.
diff --git a/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java b/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java
index 0d24072..a4411a1 100644
--- a/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java
+++ b/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java
@@ -63,12 +63,12 @@ public class TestExprLookup
         }
     }
 
-    private static String PATTERN1 =
+    private static final String PATTERN1 =
         "String.replace(Util.message, 'Hello', 'Goodbye') + System.getProperty('user.name')";
-    private static String PATTERN2 =
+    private static final String PATTERN2 =
         "'$[element] ' + String.trimToEmpty('$[space.description]')";
 
-    private static File TEST_FILE = ConfigurationAssert.getTestFile("test.xml");
+    private static final File TEST_FILE = ConfigurationAssert.getTestFile("test.xml");
 
     /**
      * Loads the test configuration.
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 88a36fc..6c8d3a4 100644
--- a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
+++ b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
 public class HsqlDB
 {
     private Connection connection = null;
-    private static Log log = LogFactory.getLog(HsqlDB.class);
+    private static final Log log = LogFactory.getLog(HsqlDB.class);
 
     public HsqlDB(final String uri, final String databaseDriver, final String loadFile)
             throws Exception
diff --git a/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngine.java b/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngine.java
index f618e01..c96aa6f 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngine.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestDefaultExpressionEngine.java
@@ -35,15 +35,15 @@ import org.junit.Test;
 public class TestDefaultExpressionEngine
 {
     /** Stores the names of the test nodes representing tables. */
-    private static String[] tables =
+    private static final String[] tables =
     { "users", "documents"};
 
     /** Stores the types of the test table nodes. */
-    private static String[] tabTypes =
+    private static final String[] tabTypes =
     { "system", "application"};
 
     /** Test data fields for the node hierarchy. */
-    private static String[][] fields =
+    private static final String[][] fields =
     {
     { "uid", "uname", "firstName", "lastName", "email"},
     { "docid", "name", "creationDate", "authorID", "version"}};