Fix missed references and ide warnings

Fix the missed references caused by merging in the main branch.
Also fix code to eliminate warnings from the ide for code improvements.

Author: ddanielr

core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerClient.java

@@ -26,6 +26,7 @@
 import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockPaths;
+import org.apache.accumulo.core.rpc.RpcService;
 import org.apache.accumulo.core.rpc.ThriftUtil;
 import org.apache.thrift.TServiceClient;
 import org.apache.thrift.transport.TTransportException;
@@ -35,13 +36,13 @@
 
 public interface ManagerClient<C extends TServiceClient> {
 
-  public static String getPrimaryManagerLocation(ClientContext context) {
+  static String getPrimaryManagerLocation(ClientContext context) {
     String managerLocation = null;
     ServiceLockPaths.ServiceLockPath m = context.getServerPaths().getManager(true);
     if (m != null) {
       Optional<ServiceLockData> sld = context.getZooCache().getLockData(m);
       if (sld.isPresent()) {
-        managerLocation = sld.orElseThrow().getAddressString(ServiceLockData.ThriftService.MANAGER);
+        managerLocation = sld.orElseThrow().getAddressString(RpcService.MANAGER);
       }
     }
     return managerLocation;
@@ -67,15 +68,15 @@ default C getManagerConnection(Logger log, ThriftClientTypes<C> type, ClientCont
     }
     HostAndPort manager = HostAndPort.fromString(managerLocation);
     try {
-      // Manager requests can take a long time: don't ever time out
+      // Manager requests can take a long time so never time out
       return ThriftUtil.getClientNoTimeout(type, manager, context);
     } catch (TTransportException tte) {
       Throwable cause = tte.getCause();
-      if (cause != null && cause instanceof UnknownHostException) {
+      if (cause instanceof UnknownHostException) {
         // do not expect to recover from this
         throw new IllegalStateException(tte);
       }
-      log.debug("Failed to connect to manager=" + manager + ", will retry... ", tte);
+      log.debug("Failed to connect to manager= {}, will retry... ", manager, tte);
       return null;
     }
   }

server/base/src/test/java/org/apache/accumulo/server/manager/LiveTServerSetTest.java

@@ -32,10 +32,10 @@
 
 import org.apache.accumulo.core.data.ResourceGroupId;
 import org.apache.accumulo.core.lock.ServiceLockData;
-import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.lock.ServiceLockPaths;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
 import org.apache.accumulo.core.metadata.TServerInstance;
+import org.apache.accumulo.core.rpc.RpcService;
 import org.apache.accumulo.core.zookeeper.ZcStat;
 import org.apache.accumulo.core.zookeeper.ZooCache;
 import org.apache.accumulo.server.ServerContext;
@@ -121,7 +121,7 @@ public void testSameHostPortInDiffResourceGroups() {
 
     var locks = new HashMap<ServiceLockPath,LockInfo>();
     locks.put(path2, new LockInfo(
-        new ServiceLockData(UUID.randomUUID(), hp1.toString(), ThriftService.TSERV, g1), 123456));
+        new ServiceLockData(UUID.randomUUID(), hp1.toString(), RpcService.TSERV, g1), 123456));
 
     var deletedSeen = new HashSet<TServerInstance>();
     var addedSeen = new HashSet<TServerInstance>();
@@ -140,7 +140,7 @@ public void testSameHostPortInDiffResourceGroups() {
     // change which tserver has the lock
     locks.clear();
     locks.put(path1, new LockInfo(new ServiceLockData(UUID.randomUUID(), hp1.toString(),
-        ThriftService.TSERV, ResourceGroupId.DEFAULT), 654321));
+        RpcService.TSERV, ResourceGroupId.DEFAULT), 654321));
 
     addedSeen.clear();
     tservers.scanServers();