Merge branch 'master' of https://github.com/apache/commons-validator.git

Author: garydgregory

src/changes/changes.xml

@@ -65,6 +65,7 @@ The <action> type attribute can be add,update,fix,remove.
   <release version="1.10.2" date="YYYY-MM-DD" description="This is a feature and maintenance release. Java 8 or later is required.">
     <!-- FIX -->
     <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix Apache RAT plugin console warnings.</action>
+    <action type="fix" dev="sebb">Fixes to non-final static fields</action>
     <!-- ADD -->
     <!-- UPDATE -->
     <action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-parent from 92 to 93 #377.</action>

src/example/org/apache/commons/validator/example/ValidateExample.java

@@ -50,7 +50,7 @@ public class ValidateExample {
      * from.  Note that this is not strictly required to make the Validator
      * work, but is a good coding practice.
      */
-    private static ResourceBundle apps =
+    private static final ResourceBundle apps =
         ResourceBundle.getBundle(
             "org.apache.commons.validator.example.applicationResources");
 

src/main/java/org/apache/commons/validator/ValidatorResources.java

@@ -82,7 +82,8 @@ public class ValidatorResources implements Serializable {
     /**
      * The default locale on our server.
      */
-    protected static Locale defaultLocale = Locale.getDefault();
+    @Deprecated // ought to be final, but is not used, so could be dropped
+    protected static Locale defaultLocale = Locale.getDefault(); // NOPMD not used
 
     private static final String ARGS_PATTERN
                = "form-validation/formset/form/field/arg";

src/main/java/org/apache/commons/validator/routines/DomainValidator.java

@@ -1775,32 +1775,32 @@ private static class LazyHolder { // IODH
      * This field does not need to be volatile since it is only accessed from
      * synchronized methods.
      */
-    private static boolean inUse;
+    private static boolean inUse; //NOPMD @GuardedBy("this")
     /*
      * These arrays are mutable.
      * They can only be updated by the updateTLDOverride method, and readers must first get an instance
      * using the getInstance methods which are all (now) synchronized.
      * The only other access is via getTLDEntries which is now synchronized.
      */
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
-    private static String[] countryCodeTLDsPlus = EMPTY_STRING_ARRAY;
+    private static String[] countryCodeTLDsPlus = EMPTY_STRING_ARRAY; //NOPMD @GuardedBy("this")
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
-    private static String[] genericTLDsPlus = EMPTY_STRING_ARRAY;
+    private static String[] genericTLDsPlus = EMPTY_STRING_ARRAY; //NOPMD @GuardedBy("this")
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
-    private static String[] countryCodeTLDsMinus = EMPTY_STRING_ARRAY;
+    private static String[] countryCodeTLDsMinus = EMPTY_STRING_ARRAY; //NOPMD @GuardedBy("this")
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
-    private static String[] genericTLDsMinus = EMPTY_STRING_ARRAY;
+    private static String[] genericTLDsMinus = EMPTY_STRING_ARRAY; //NOPMD @GuardedBy("this")
 
     // The constructors are deliberately private to avoid possible problems with unsafe publication.
     // It is vital that the static override arrays are not mutable once they have been used in an instance
     // The arrays could be copied into the instance variables, however if the static array were changed it could
     // result in different settings for the shared default instances
 
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
-    private static String[] localTLDsMinus = EMPTY_STRING_ARRAY;
+    private static String[] localTLDsMinus = EMPTY_STRING_ARRAY; //NOPMD @GuardedBy("this")
 
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
-    private static String[] localTLDsPlus = EMPTY_STRING_ARRAY;
+    private static String[] localTLDsPlus = EMPTY_STRING_ARRAY; //NOPMD @GuardedBy("this")
 
     /**
      * Tests if a sorted array contains the specified key

src/test/java/org/apache/commons/validator/ExtensionTest.java

@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.InputStream;
+import java.util.Locale;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -81,9 +82,9 @@ protected void tearDown() {
      */
     @Test
     void testOrder() {
-
-        final Form form = resources.getForm(ValidatorResources.defaultLocale, FORM_KEY);
-        final Form form2 = resources.getForm(ValidatorResources.defaultLocale, FORM_KEY2);
+        final Locale defaultLocale = Locale.getDefault();
+        final Form form = resources.getForm(defaultLocale, FORM_KEY);
+        final Form form2 = resources.getForm(defaultLocale, FORM_KEY2);
 
         assertNotNull(form, FORM_KEY + " is null.");
         assertEquals(2, form.getFields().size(), "There should only be 2 fields in " + FORM_KEY);