This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 50dda77 HADOOP-17544. Mark KeyProvider as Stable. (#2776)
50dda77 is described below
commit 50dda774f13a83547e41db4e835d7106ae66c1ff
Author: Akira Ajisaka <[email protected]>
AuthorDate: Mon Aug 30 09:55:53 2021 +0900
HADOOP-17544. Mark KeyProvider as Stable. (#2776)
Reviewed-by: Masatake Iwasaki <[email protected]>
---
.../org/apache/hadoop/crypto/key/KeyProvider.java | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 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 d51bf38..dafdaf7 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.io.OutputStreamWriter;
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;
@@ -57,7 +57,7 @@ import static
org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY
* <code>KeyProvider</code> implementations must be thread safe.
*/
@InterfaceAudience.Public
[email protected]
[email protected]
public abstract class KeyProvider implements Closeable {
public static final String DEFAULT_CIPHER_NAME =
CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_DEFAULT_CIPHER_KEY;
@@ -135,20 +135,14 @@ public abstract class KeyProvider implements Closeable {
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));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
