diff --git a/dev-support/pmd/pmd-ruleset.xml b/dev-support/pmd/pmd-ruleset.xml
index d03a463def62..a458ae3c81a1 100644
--- a/dev-support/pmd/pmd-ruleset.xml
+++ b/dev-support/pmd/pmd-ruleset.xml
@@ -39,6 +39,7 @@
+
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
index 2ddc18b55f54..6f1bef0a2dcb 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
@@ -272,9 +272,8 @@ private void updateCachedData(
}
private synchronized void updateCachedRootCAId(String s) {
- BigInteger candidateNewId = new BigInteger(s);
if (rootCaCertId == null
- || new BigInteger(rootCaCertId).compareTo(candidateNewId) < 0) {
+ || new BigInteger(rootCaCertId).compareTo(new BigInteger(s)) < 0) {
rootCaCertId = s;
}
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/utils/SelfSignedCertificate.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/utils/SelfSignedCertificate.java
index 87a7cbe4c326..1d9cd7d58477 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/utils/SelfSignedCertificate.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/utils/SelfSignedCertificate.java
@@ -117,7 +117,7 @@ private X509Certificate generateCertificate(BigInteger caCertSerialId) throws Op
BigInteger serial;
if (caCertSerialId == null) {
- serial = new BigInteger(Long.toString(Time.monotonicNow()));
+ serial = BigInteger.valueOf(Time.monotonicNow());
} else {
serial = caCertSerialId;
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
index 10017d970fe9..1b0caadcfbe4 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
@@ -378,8 +378,7 @@ public void run() {
CertificateServer newRootCAServer = null;
BigInteger newId = BigInteger.ONE;
try {
- newId = new BigInteger(String.valueOf(
- sequenceIdGen.getNextId(CERTIFICATE_ID)));
+ newId = BigInteger.valueOf(sequenceIdGen.getNextId(CERTIFICATE_ID));
newRootCAServer =
HASecurityUtils.initializeRootCertificateServer(secConf,
scm.getCertificateStore(), scmStorageConfig, newId,
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
index e23c22ea4747..d23bf0d06d27 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/security/TestRootCARotationManager.java
@@ -92,7 +92,7 @@ public class TestRootCARotationManager {
private File testDir;
private String cID = UUID.randomUUID().toString();
private String scmID = UUID.randomUUID().toString();
- private BigInteger certID = new BigInteger("1");
+ private BigInteger certID = BigInteger.ONE;
@BeforeEach
public void init() throws IOException, TimeoutException,