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-validator.git
The following commit(s) were added to refs/heads/master by this push:
new f3894856 [VALIDATOR-502] Circular dependency in static initialization
causes NPE in GenericValidator.isCreditCard()
f3894856 is described below
commit f389485693a508dbd3959b4ff47751bc22476b5d
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Nov 4 17:36:05 2025 -0500
[VALIDATOR-502] Circular dependency in static initialization causes NPE
in GenericValidator.isCreditCard()
---
src/changes/changes.xml | 1 +
.../org/apache/commons/validator/Constants.java | 37 ++++++++++++++++++++++
.../apache/commons/validator/GenericValidator.java | 16 ++--------
.../routines/CreditCardValidatorTest.java | 13 ++++++++
4 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fe7e60a4..3471d56a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -64,6 +64,7 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="1.10.1" 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="Mark Miller, Gary Gregory"
issue="VALIDATOR-502">Circular dependency in static initialization causes NPE
in GenericValidator.isCreditCard().</action>
<!-- ADD -->
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory,
Dependabot">Bump org.apache.commons:commons-parent from 85 to 90 #361,
#370.</action>
diff --git a/src/main/java/org/apache/commons/validator/Constants.java
b/src/main/java/org/apache/commons/validator/Constants.java
new file mode 100644
index 00000000..2d9dbeb7
--- /dev/null
+++ b/src/main/java/org/apache/commons/validator/Constants.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.validator;
+
+import org.apache.commons.validator.routines.CreditCardValidator;
+import org.apache.commons.validator.routines.UrlValidator;
+
+/**
+ * Defines constants to avoid an NPE for [VALIDATOR-502] Circular dependency
in static initialization causes NPE in GenericValidator.isCreditCard().
+ */
+final class Constants {
+
+ /**
+ * CreditCardValidator used in wrapper method.
+ */
+ static final CreditCardValidator CREDIT_CARD_VALIDATOR = new
CreditCardValidator();
+
+ /**
+ * UrlValidator used in wrapper method.
+ */
+ static final UrlValidator URL_VALIDATOR = new UrlValidator();
+}
diff --git a/src/main/java/org/apache/commons/validator/GenericValidator.java
b/src/main/java/org/apache/commons/validator/GenericValidator.java
index defc2800..03bf08a1 100644
--- a/src/main/java/org/apache/commons/validator/GenericValidator.java
+++ b/src/main/java/org/apache/commons/validator/GenericValidator.java
@@ -22,10 +22,8 @@ import java.text.SimpleDateFormat;
import java.util.Locale;
import java.util.regex.Pattern;
-import org.apache.commons.validator.routines.CreditCardValidator;
import org.apache.commons.validator.routines.DateValidator;
import org.apache.commons.validator.routines.EmailValidator;
-import org.apache.commons.validator.routines.UrlValidator;
/**
* This class contains basic methods for performing validations.
@@ -34,16 +32,6 @@ public class GenericValidator implements Serializable {
private static final long serialVersionUID = -7212095066891517618L;
- /**
- * UrlValidator used in wrapper method.
- */
- private static final UrlValidator URL_VALIDATOR = new UrlValidator();
-
- /**
- * CreditCardValidator used in wrapper method.
- */
- private static final CreditCardValidator CREDIT_CARD_VALIDATOR = new
CreditCardValidator();
-
/**
* Calculate an adjustment amount for line endings.
*
@@ -96,7 +84,7 @@ public class GenericValidator implements Serializable {
* @return true if the value is valid Credit Card Number.
*/
public static boolean isCreditCard(final String value) {
- return CREDIT_CARD_VALIDATOR.isValid(value);
+ return Constants.CREDIT_CARD_VALIDATOR.isValid(value);
}
/**
@@ -277,7 +265,7 @@ public class GenericValidator implements Serializable {
* @return true if the value is valid Url.
*/
public static boolean isUrl(final String value) {
- return URL_VALIDATOR.isValid(value);
+ return Constants.URL_VALIDATOR.isValid(value);
}
/**
diff --git
a/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
b/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
index e91a9cee..4a8abbbb 100644
---
a/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
+++
b/src/test/java/org/apache/commons/validator/routines/CreditCardValidatorTest.java
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.commons.validator.GenericValidator;
import
org.apache.commons.validator.routines.CreditCardValidator.CreditCardRange;
import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit;
import org.junit.jupiter.api.Test;
@@ -347,6 +348,18 @@ class CreditCardValidatorTest {
}
}
+ /**
+ * Tests [VALIDATOR-502] Circular dependency in static initialization
causes NPE in GenericValidator.isCreditCard().
+ */
+ @Test
+ public void testGenericValidatorCircularDependency() {
+ // Before the fix, commenting out this line will avoid the NPE.
+ @SuppressWarnings("unused")
+ final CreditCardValidator ccv = new CreditCardValidator();
+ // Threw an NPE.
+ GenericValidator.isCreditCard("1234567890");
+ }
+
@Test
void testIsValid() {
CreditCardValidator ccv = new CreditCardValidator();
