commit 855dcf0f09ab07fbdf67d7e471432a8b89eecb72
author Gary Gregory <garydgregory@gmail.com> Thu Jun 09 08:26:41 2022 -0400
committer Gary Gregory <garydgregory@gmail.com> Thu Jun 09 08:26:41 2022 -0400
tree c7e0f116c8790e8e2e513b1782d0e641100ad302
parent 0f4aadfbff57c8b7a0d4ce1577bcadbe8a5f1435

Add PMD check and remove unnecessary parentheses

pom.xml

diff --git a/pom.xml b/pom.xml
index ed894b7..a4c570d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,7 +323,7 @@
     </properties> 
 
     <build>
-        <defaultGoal>clean verify apache-rat:check japicmp:cmp spotbugs:check javadoc:javadoc</defaultGoal>
+        <defaultGoal>clean verify apache-rat:check japicmp:cmp pmd:check spotbugs:check javadoc:javadoc</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/main/java/org/apache/commons/mail/EmailUtils.java

diff --git a/src/main/java/org/apache/commons/mail/EmailUtils.java b/src/main/java/org/apache/commons/mail/EmailUtils.java
index 1bf9f0c..d97435a 100644
--- a/src/main/java/org/apache/commons/mail/EmailUtils.java
+++ b/src/main/java/org/apache/commons/mail/EmailUtils.java
@@ -254,8 +254,8 @@
                 ch = chars[random.nextInt(gap) + start];
             }
 
-            if ((letters && numbers && Character.isLetterOrDigit(ch)) || (letters && Character.isLetter(ch))
-                            || (numbers && Character.isDigit(ch)) || (!letters && !numbers))
+            if (letters && numbers && Character.isLetterOrDigit(ch) || letters && Character.isLetter(ch)
+                            || numbers && Character.isDigit(ch) || !letters && !numbers)
             {
                 buffer.append(ch);
             }
@@ -309,7 +309,7 @@
             else
             {
                 builder.append(ESCAPE_CHAR);
-                final char hex1 = Character.toUpperCase(Character.forDigit((b >> 4) & 0xF, RADIX));
+                final char hex1 = Character.toUpperCase(Character.forDigit(b >> 4 & 0xF, RADIX));
                 final char hex2 = Character.toUpperCase(Character.forDigit(b & 0xF, RADIX));
                 builder.append(hex1);
                 builder.append(hex2);