From 111f518bf0fd63956992e4b9623262611c0e8a19 Mon Sep 17 00:00:00 2001 From: Andor Molnar Date: Wed, 20 Jul 2022 15:35:06 +0200 Subject: [PATCH] HBASE-26666. Spotless fix 2. --- .../org/apache/hadoop/hbase/exceptions/X509Exception.java | 4 +++- .../apache/hadoop/hbase/io/crypto/tls/KeyStoreFileType.java | 6 ++++-- .../hadoop/hbase/io/crypto/tls/SSLContextAndOptions.java | 4 +++- .../org/apache/hadoop/hbase/io/crypto/tls/X509Util.java | 6 ++++-- .../hbase/io/crypto/tls/BaseX509ParameterizedTestCase.java | 6 ++++-- .../org/apache/hadoop/hbase/io/crypto/tls/TestX509Util.java | 4 +++- .../org/apache/hadoop/hbase/io/crypto/tls/X509KeyType.java | 6 ++++-- .../apache/hadoop/hbase/io/crypto/tls/X509TestContext.java | 6 ++++-- .../apache/hadoop/hbase/io/crypto/tls/X509TestHelpers.java | 2 +- 9 files changed, 30 insertions(+), 14 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/exceptions/X509Exception.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/exceptions/X509Exception.java index 12dd8a46cecd..3e75c260b754 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/exceptions/X509Exception.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/exceptions/X509Exception.java @@ -21,7 +21,9 @@ /** * This file has been copied from the Apache ZooKeeper project. - * @see Base revision + * @see Base + * revision */ @SuppressWarnings("serial") @InterfaceAudience.Private diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/KeyStoreFileType.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/KeyStoreFileType.java index 9059ba87f10a..851b68124236 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/KeyStoreFileType.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/KeyStoreFileType.java @@ -22,9 +22,11 @@ /** * This enum represents the file type of a KeyStore or TrustStore. Currently, JKS (Java keystore), * PEM, PKCS12, and BCFKS types are supported. - * + *

* This file has been copied from the Apache ZooKeeper project. - * @see Base revision + * @see Base + * revision */ @InterfaceAudience.Private public enum KeyStoreFileType { diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/SSLContextAndOptions.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/SSLContextAndOptions.java index 91e78856eb3c..de5318138eae 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/SSLContextAndOptions.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/SSLContextAndOptions.java @@ -34,7 +34,9 @@ /** * This file has been copied from the Apache ZooKeeper project. - * @see Base revision + * @see Base + * revision */ @InterfaceAudience.Private public class SSLContextAndOptions { diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/X509Util.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/X509Util.java index 8ce3ce1fd94b..3377f382583d 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/X509Util.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/tls/X509Util.java @@ -50,9 +50,11 @@ * Utility code for X509 handling Default cipher suites: Performance testing done by Facebook * engineers shows that on Intel x86_64 machines, Java9 performs better with GCM and Java8 performs * better with CBC, so these seem like reasonable defaults. - * + *

* This file has been copied from the Apache ZooKeeper project. - * @see Base revision + * @see Base + * revision */ @InterfaceAudience.Private public class X509Util { diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/BaseX509ParameterizedTestCase.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/BaseX509ParameterizedTestCase.java index cdc2339052c1..f2001e5173c2 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/BaseX509ParameterizedTestCase.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/BaseX509ParameterizedTestCase.java @@ -34,9 +34,11 @@ * parameter combinations (CA key type, cert key type, with/without a password, with/without * hostname verification, etc). This base class takes care of setting up / cleaning up the test * environment, and caching the X509TestContext objects used by the tests. - * + *

* This file has been copied from the Apache ZooKeeper project. - * @see Base revision + * @see Base + * revision */ public abstract class BaseX509ParameterizedTestCase { protected static final String KEY_NON_EMPTY_PASSWORD = "pa$$w0rd"; diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/TestX509Util.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/TestX509Util.java index 3e0231a7b6c0..0def0bd894be 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/TestX509Util.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/TestX509Util.java @@ -41,7 +41,9 @@ /** * This file has been copied from the Apache ZooKeeper project. - * @see Base revision + * @see Base + * revision */ @RunWith(Parameterized.class) @Category({ MiscTests.class, SmallTests.class }) diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509KeyType.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509KeyType.java index fd5460c829e8..1d5c042f04a6 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509KeyType.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509KeyType.java @@ -20,9 +20,11 @@ /** * Represents a type of key pair used for X509 certs in tests. The two options are RSA or EC * (elliptic curve). - * + *

* This file has been copied from the Apache ZooKeeper project. - * @see Base revision + * @see Base + * revision */ public enum X509KeyType { RSA, diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java index 0c985ff1d95a..3eee7e64f766 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java @@ -40,9 +40,11 @@ /** * This class simplifies the creation of certificates and private keys for SSL/TLS connections. - * + *

* This file has been copied from the Apache ZooKeeper project. - * @see Base revision + * @see Base + * revision */ @InterfaceAudience.Private public final class X509TestContext { diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestHelpers.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestHelpers.java index 07d4305288d0..869c4633005c 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestHelpers.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestHelpers.java @@ -72,7 +72,7 @@ /** * This class contains helper methods for creating X509 certificates and key pairs, and for * serializing them to JKS, PEM or other keystore type files. - * + *

* This file has been copied from the Apache ZooKeeper project. * @see Base