From 74335f5a36debf2170cc5c764bfe75101d803fe1 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Mon, 15 Mar 2021 17:21:44 +0900 Subject: [PATCH 1/2] HADOOP-17544. Mark KeyProvider as Stable. --- .../src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java index d51bf38e4ff9d..3499bd3d30362 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java @@ -57,7 +57,7 @@ * KeyProvider implementations must be thread safe. */ @InterfaceAudience.Public -@InterfaceStability.Unstable +@InterfaceStability.Stable public abstract class KeyProvider implements Closeable { public static final String DEFAULT_CIPHER_NAME = CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_DEFAULT_CIPHER_KEY; From 50028ea8620b3db2c80b0d50209e30157159293d Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Wed, 11 Aug 2021 00:21:45 +0900 Subject: [PATCH 2/2] Removed commons-lang3 dependency --- .../apache/hadoop/crypto/key/KeyProvider.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java index 3499bd3d30362..dafdaf7e15b25 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProvider.java @@ -27,17 +27,17 @@ import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; import java.security.Security; +import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import org.bouncycastle.jce.provider.BouncyCastleProvider; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -135,20 +135,14 @@ public boolean equals(Object rhs) { return false; } final KeyVersion kv = (KeyVersion) rhs; - return new EqualsBuilder(). - append(name, kv.name). - append(versionName, kv.versionName). - append(material, kv.material). - isEquals(); + return Objects.equals(name, kv.name) + && Objects.equals(versionName, kv.versionName) + && Arrays.equals(material, kv.material); } @Override public int hashCode() { - return new HashCodeBuilder(). - append(name). - append(versionName). - append(material). - toHashCode(); + return Objects.hash(name, versionName, Arrays.hashCode(material)); } }