(commons-validator) branch master updated: Prepare to drop protected static field defaultLocale

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git


The following commit(s) were added to refs/heads/master by this push:
     new f1005ee2 Prepare to drop protected static field defaultLocale
f1005ee2 is described below

commit f1005ee2c12573e709114eb0fcd95abad85a39f0
Author: Sebb <s...@apache.org>
AuthorDate: Sun Dec 28 18:02:57 2025 +0000

    Prepare to drop protected static field defaultLocale
    
    No longer needed
---
 src/main/java/org/apache/commons/validator/ValidatorResources.java | 3 ++-
 src/test/java/org/apache/commons/validator/ExtensionTest.java      | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/validator/ValidatorResources.java 
b/src/main/java/org/apache/commons/validator/ValidatorResources.java
index e2adeec2..02c7806d 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResources.java
+++ b/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";
diff --git a/src/test/java/org/apache/commons/validator/ExtensionTest.java 
b/src/test/java/org/apache/commons/validator/ExtensionTest.java
index e436ba75..7c9a2b94 100644
--- a/src/test/java/org/apache/commons/validator/ExtensionTest.java
+++ b/src/test/java/org/apache/commons/validator/ExtensionTest.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 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 @@ class ExtensionTest {
      */
     @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);