branch-2 spotless

more branch-2 compatibility

Author: Ray Mattingly

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncConnectionImpl.java

@@ -30,7 +30,6 @@
 
 import io.opentelemetry.api.trace.Span;
 import java.io.IOException;
-import java.net.SocketAddress;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
@@ -124,12 +123,12 @@ public class AsyncConnectionImpl implements AsyncConnection {
   private final ClusterStatusListener clusterStatusListener;
 
   public AsyncConnectionImpl(Configuration conf, ConnectionRegistry registry, String clusterId,
-    SocketAddress localAddress, User user) {
-    this(conf, registry, clusterId, localAddress, user, Collections.emptyMap());
+    User user) {
+    this(conf, registry, clusterId, user, Collections.emptyMap());
   }
 
   public AsyncConnectionImpl(Configuration conf, ConnectionRegistry registry, String clusterId,
-    SocketAddress localAddress, User user, Map<String, byte[]> connectionAttributes) {
+    User user, Map<String, byte[]> connectionAttributes) {
     this.conf = conf;
     this.user = user;
     this.metricsScope = MetricsConnection.getScope(conf, clusterId, this);
@@ -145,8 +144,8 @@ public AsyncConnectionImpl(Configuration conf, ConnectionRegistry registry, Stri
     } else {
       this.metrics = Optional.empty();
     }
-    this.rpcClient = RpcClientFactory.createClient(conf, clusterId, localAddress,
-      metrics.orElse(null), connectionAttributes);
+    this.rpcClient =
+      RpcClientFactory.createClient(conf, clusterId, metrics.orElse(null), connectionAttributes);
     this.rpcControllerFactory = RpcControllerFactory.instantiate(conf);
     this.rpcTimeout =
       (int) Math.min(Integer.MAX_VALUE, TimeUnit.NANOSECONDS.toMillis(connConf.getRpcTimeoutNs()));

hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java

@@ -210,9 +210,9 @@ public static Connection createConnection(Configuration conf, User user) throws
    * }
    * </pre>
    *
-   * @param conf configuration
-   * @param user the user the connection is for
-   * @param pool the thread pool to use for batch operations
+   * @param conf                 configuration
+   * @param user                 the user the connection is for
+   * @param pool                 the thread pool to use for batch operations
    * @param connectionAttributes attributes to be sent along to server during connection establish
    * @return Connection object for <code>conf</code>
    */

hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java

@@ -979,7 +979,6 @@ default long getOperationTimeout(TimeUnit unit) {
   }
 
   /**
-<<<<<<< HEAD
    * Get timeout (millisecond) of each operation for in Table instance.
    * @deprecated since 2.0 and will be removed in 3.0 version use
    *             {@link #getOperationTimeout(TimeUnit)} instead

hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientFactory.java

@@ -61,7 +61,7 @@ public static RpcClient createClient(Configuration conf, String clusterId) {
    */
   public static RpcClient createClient(Configuration conf, String clusterId,
     MetricsConnection metrics) {
-    return createClient(conf, clusterId, null, metrics, Collections.emptyMap());
+    return createClient(conf, clusterId, metrics, Collections.emptyMap());
   }
 
   private static String getRpcClientClass(Configuration conf) {
@@ -76,10 +76,25 @@ private static String getRpcClientClass(Configuration conf) {
   /**
    * Creates a new RpcClient by the class defined in the configuration or falls back to
    * RpcClientImpl
-   * @param conf      configuration
-   * @param clusterId the cluster id
-   * @param localAddr client socket bind address.
-   * @param metrics   the connection metrics
+   * @param conf                 configuration
+   * @param clusterId            the cluster id
+   * @param metrics              the connection metrics
+   * @param connectionAttributes attributes to be sent along to server during connection establish
+   * @return newly created RpcClient
+   */
+  public static RpcClient createClient(Configuration conf, String clusterId,
+    MetricsConnection metrics, Map<String, byte[]> connectionAttributes) {
+    return createClient(conf, clusterId, null, metrics, connectionAttributes);
+  }
+
+  /**
+   * Creates a new RpcClient by the class defined in the configuration or falls back to
+   * RpcClientImpl
+   * @param conf                 configuration
+   * @param clusterId            the cluster id
+   * @param localAddr            client socket bind address.
+   * @param metrics              the connection metrics
+   * @param connectionAttributes attributes to be sent along to server during connection establish
    * @return newly created RpcClient
    */
   public static RpcClient createClient(Configuration conf, String clusterId,

hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java

@@ -1605,8 +1605,8 @@ private static class ConfigurationCaptorConnection implements Connection {
 
     private final Connection delegate;
 
-    public ConfigurationCaptorConnection(Configuration conf, ExecutorService es, User user, Map<String, byte[]> connectionAttributes)
-      throws IOException {
+    public ConfigurationCaptorConnection(Configuration conf, ExecutorService es, User user,
+      Map<String, byte[]> connectionAttributes) throws IOException {
       Configuration confForDelegate = new Configuration(conf);
       confForDelegate.unset(ClusterConnection.HBASE_CLIENT_CONNECTION_IMPL);
       delegate = createConnection(confForDelegate, es, user, connectionAttributes);

hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerCall.java

@@ -18,7 +18,6 @@
 package org.apache.hadoop.hbase.ipc;
 
 import com.google.errorprone.annotations.RestrictedApi;
-
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Scope;
@@ -37,7 +36,6 @@
 import org.apache.hadoop.hbase.io.ByteBufferListOutputStream;
 import org.apache.hadoop.hbase.ipc.RpcServer.CallCleanup;
 import org.apache.hadoop.hbase.security.User;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.RPCProtos;
 import org.apache.hadoop.hbase.trace.TraceUtil;
 import org.apache.hadoop.hbase.util.ByteBufferUtils;
 import org.apache.hadoop.hbase.util.Bytes;

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

@@ -948,7 +948,7 @@ private void preRegistrationInitialization() {
       // Setup RPC client for master communication
       this.rpcClient = RpcClientFactory.createClient(conf, clusterId,
         new InetSocketAddress(this.rpcServices.isa.getAddress(), 0),
-        clusterConnection.getConnectionMetrics());
+        clusterConnection.getConnectionMetrics(), Collections.emptyMap());
       span.setStatus(StatusCode.OK);
     } catch (Throwable t) {
       // Call stop if error or process will stick around for ever since server

hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java

@@ -22,8 +22,8 @@
 
 import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
-import java.util.Random;
 import java.util.Map;
+import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.hadoop.conf.Configuration;

hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRequestAndConnectionAttributes.java

@@ -36,7 +36,7 @@
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellComparator;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -79,11 +79,11 @@ public class TestRequestAndConnectionAttributes {
   private static final TableName REQUEST_ATTRIBUTES_TEST_TABLE =
     TableName.valueOf("testRequestAttributes");
 
-  private static HBaseTestingUtil TEST_UTIL = null;
+  private static HBaseTestingUtility TEST_UTIL = null;
 
   @BeforeClass
   public static void setUp() throws Exception {
-    TEST_UTIL = new HBaseTestingUtil();
+    TEST_UTIL = new HBaseTestingUtility();
     TEST_UTIL.startMiniCluster(1);
     TEST_UTIL.createTable(REQUEST_ATTRIBUTES_TEST_TABLE,
       new byte[][] { REQUEST_ATTRIBUTES_TEST_TABLE_CF }, 1, HConstants.DEFAULT_BLOCKSIZE,