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 7c4446d2 Add PMD check to default Maven goal
7c4446d2 is described below
commit 7c4446d223f00a51f23df4bc9109c99cbef09f5f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun May 12 10:17:18 2024 -0400
Add PMD check to default Maven goal
---
pom.xml | 2 +-
src/changes/changes.xml | 1 +
.../java/org/apache/commons/validator/CreditCardValidator.java | 7 +------
src/main/java/org/apache/commons/validator/GenericValidator.java | 3 ++-
src/main/java/org/apache/commons/validator/ValidatorResult.java | 2 +-
.../commons/validator/routines/AbstractCalendarValidator.java | 3 +--
.../apache/commons/validator/routines/AbstractNumberValidator.java | 3 +--
7 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5e0729e3..bc1c1b65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
</distributionManagement>
<build>
- <defaultGoal>clean verify apache-rat:check japicmp:cmp checkstyle:check
spotbugs:check javadoc:javadoc</defaultGoal>
+ <defaultGoal>clean verify apache-rat:check japicmp:cmp checkstyle:check
spotbugs:check pmd:check javadoc:javadoc</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bce70d2f..44a93636 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -70,6 +70,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="add" dev="ggregory" due-to="ashoknan2, Gary
Gregory">ISINValidator: Add 9 additional exception country code #129.</action>
<action type="add" dev="ggregory" due-to="Gary Gregory">ISINValidator: Add
all codes from ISO 3166-1 alpha-2 except unassigned code elements.</action>
<action type="add" dev="ggregory" due-to="homebeaver, Gary Gregory">Add
validator CASNumberCheckDigit for Chemical Registry CAS Numbers and
ECNumberCheckDigit #217.</action>
+ <action type="add" dev="ggregory" due-to="Gary Gregory">Add PMD check to
default Maven goal.</action>
<!-- FIX -->
<action type="fix" issue="VALIDATOR-492" dev="ggregory" due-to="Tobias
Wildgruber, Gary Gregory">ValidatorUtils.copyFastHashMap is broken.</action>
<action type="fix" dev="ggregory" due-to="Sebb">DomainValidator: Changes
from Version 2024040200, Apr 2 07:07:02 2024 UTC.</action>
diff --git
a/src/main/java/org/apache/commons/validator/CreditCardValidator.java
b/src/main/java/org/apache/commons/validator/CreditCardValidator.java
index 971ae185..20e746b5 100644
--- a/src/main/java/org/apache/commons/validator/CreditCardValidator.java
+++ b/src/main/java/org/apache/commons/validator/CreditCardValidator.java
@@ -212,18 +212,15 @@ public class CreditCardValidator {
if (card == null || card.length() < 13 || card.length() > 19) {
return false;
}
-
if (!this.luhnCheck(card)) {
return false;
}
-
for (final Object cardType : this.cardTypes) {
final CreditCardType type = (CreditCardType) cardType;
if (type.matches(card)) {
return true;
}
}
-
return false;
}
@@ -244,7 +241,6 @@ public class CreditCardValidator {
} catch (final NumberFormatException e) {
return false;
}
-
if ((count & 1 ^ oddOrEven) == 0) { // not
digit *= 2;
if (digit > 9) {
@@ -253,8 +249,7 @@ public class CreditCardValidator {
}
sum += digit;
}
-
- return sum == 0 ? false : sum % 10 == 0;
+ return sum != 0 && sum % 10 == 0;
}
}
diff --git a/src/main/java/org/apache/commons/validator/GenericValidator.java
b/src/main/java/org/apache/commons/validator/GenericValidator.java
index 814537fe..4309b33a 100644
--- a/src/main/java/org/apache/commons/validator/GenericValidator.java
+++ b/src/main/java/org/apache/commons/validator/GenericValidator.java
@@ -62,7 +62,8 @@ public class GenericValidator implements Serializable {
rCount++;
}
}
- return nCount * lineEndLength - (rCount + nCount);
+ final int rnCount = rCount + nCount;
+ return nCount * lineEndLength - rnCount;
}
/**
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResult.java
b/src/main/java/org/apache/commons/validator/ValidatorResult.java
index 87c41ca6..6f763bd4 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResult.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResult.java
@@ -199,7 +199,7 @@ public class ValidatorResult implements Serializable {
*/
public boolean isValid(final String validatorName) {
final ResultStatus status = hAction.get(validatorName);
- return status == null ? false : status.isValid();
+ return status != null && status.isValid();
}
}
\ No newline at end of file
diff --git
a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
index cc0c9ea4..804ebf0a 100644
---
a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
@@ -392,8 +392,7 @@ public abstract class AbstractCalendarValidator extends
AbstractFormatValidator
*/
@Override
public boolean isValid(final String value, final String pattern, final
Locale locale) {
- final Object parsedValue = parse(value, pattern, locale, (TimeZone)
null);
- return parsedValue == null ? false : true;
+ return parse(value, pattern, locale, (TimeZone) null) != null;
}
/**
diff --git
a/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
b/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
index f50cad07..8226e20f 100644
---
a/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
+++
b/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
@@ -217,8 +217,7 @@ public abstract class AbstractNumberValidator extends
AbstractFormatValidator {
*/
@Override
public boolean isValid(final String value, final String pattern, final
Locale locale) {
- final Object parsedValue = parse(value, pattern, locale);
- return parsedValue == null ? false : true;
+ return parse(value, pattern, locale) != null;
}
/**
