You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by do...@apache.org on 2022/12/16 18:02:48 UTC
[accumulo] branch main updated: Replace copied HostAndPort with guava (#3129)
This is an automated email from the ASF dual-hosted git repository.
domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new d9dc304ff7 Replace copied HostAndPort with guava (#3129)
d9dc304ff7 is described below
commit d9dc304ff7c1d8aa3a3be089ae74d5e18204d1a2
Author: Dom G <do...@apache.org>
AuthorDate: Fri Dec 16 13:02:42 2022 -0500
Replace copied HostAndPort with guava (#3129)
* Use guava HostAndPort in place of copied class
* Modify test, make comparator util class
---
.../core/clientImpl/ActiveCompactionImpl.java | 3 +-
.../core/clientImpl/ConditionalWriterImpl.java | 3 +-
.../core/clientImpl/InstanceOperationsImpl.java | 3 +-
.../core/clientImpl/TableOperationsImpl.java | 2 +-
.../TabletServerBatchReaderIterator.java | 3 +-
.../core/clientImpl/TabletServerBatchWriter.java | 2 +-
.../accumulo/core/clientImpl/ThriftScanner.java | 3 +-
.../core/clientImpl/ThriftTransportKey.java | 2 +-
.../core/clientImpl/ThriftTransportPool.java | 2 +-
.../apache/accumulo/core/clientImpl/Writer.java | 3 +-
.../apache/accumulo/core/logging/TabletLogger.java | 2 +-
.../core/manager/balancer/TabletServerIdImpl.java | 3 +-
.../accumulo/core/metadata/SuspendingTServer.java | 3 +-
.../accumulo/core/metadata/TServerInstance.java | 3 +-
.../core/metadata/schema/TabletMetadata.java | 2 +-
.../apache/accumulo/core/metrics/MetricsUtil.java | 3 +-
.../accumulo/core/rpc/TTimeoutTransport.java | 3 +-
.../org/apache/accumulo/core/rpc/ThriftUtil.java | 3 +-
.../accumulo/core/rpc/clients/ManagerClient.java | 3 +-
.../org/apache/accumulo/core/summary/Gatherer.java | 2 +-
.../org/apache/accumulo/core/util/AddressUtil.java | 2 +
.../org/apache/accumulo/core/util/HostAndPort.java | 289 ---------------------
.../accumulo/core/util/HostAndPortComparator.java | 27 +-
.../apache/accumulo/core/util/ServerServices.java | 2 +
.../util/compaction/ExternalCompactionUtil.java | 3 +-
.../core/clientImpl/ThriftTransportKeyTest.java | 3 +-
.../core/metadata/schema/TabletMetadataTest.java | 3 +-
...ortTest.java => HostAndPortComparatorTest.java} | 39 +--
.../MiniAccumuloClusterControl.java | 2 +-
.../accumulo/server/client/BulkImporter.java | 3 +-
.../accumulo/server/manager/LiveTServerSet.java | 3 +-
.../manager/balancer/BalancerEnvironmentImpl.java | 3 +-
.../manager/state/LoggingTabletStateStore.java | 3 +-
.../apache/accumulo/server/rpc/ServerAddress.java | 3 +-
.../apache/accumulo/server/rpc/TServerUtils.java | 3 +-
.../org/apache/accumulo/server/util/Admin.java | 2 +-
.../org/apache/accumulo/server/util/ECAdmin.java | 2 +-
.../server/util/VerifyTabletAssignments.java | 6 +-
.../server/manager/LiveTServerSetTest.java | 3 +-
.../manager/state/RootTabletStateStoreTest.java | 2 +-
.../coordinator/CompactionCoordinator.java | 2 +-
.../coordinator/CompactionCoordinatorTest.java | 2 +-
.../org/apache/accumulo/compactor/Compactor.java | 2 +-
.../apache/accumulo/compactor/CompactorTest.java | 3 +-
.../apache/accumulo/gc/SimpleGarbageCollector.java | 3 +-
.../manager/tableOps/bulkVer1/LoadFiles.java | 3 +-
.../manager/tableOps/bulkVer2/LoadFiles.java | 2 +-
.../manager/tserverOps/ShutdownTServer.java | 3 +-
.../accumulo/manager/upgrade/Upgrader9to10.java | 2 +-
.../manager/tableOps/ShutdownTServerTest.java | 3 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 3 +-
.../rest/compactions/CompactionsResource.java | 3 +-
.../rest/compactions/external/CoordinatorInfo.java | 2 +-
.../external/ExternalCompactionInfo.java | 2 +-
.../accumulo/monitor/rest/scans/ScansResource.java | 3 +-
.../rest/tservers/TabletServerResource.java | 3 +-
.../org/apache/accumulo/tserver/ScanServer.java | 2 +-
.../org/apache/accumulo/tserver/TabletServer.java | 2 +-
.../apache/accumulo/tserver/ScanServerTest.java | 3 +-
.../test/ScanServerMetadataEntriesCleanIT.java | 3 +-
.../accumulo/test/ScanServerMetadataEntriesIT.java | 3 +-
.../org/apache/accumulo/test/TotalQueuedIT.java | 3 +-
.../apache/accumulo/test/TransportCachingIT.java | 3 +-
.../compaction/ExternalCompactionTestUtils.java | 2 +-
.../accumulo/test/functional/BulkFailureIT.java | 3 +-
.../test/functional/WatchTheWatchCountIT.java | 3 +-
.../accumulo/test/functional/ZombieTServer.java | 3 +-
.../apache/accumulo/test/manager/MergeStateIT.java | 3 +-
.../accumulo/test/manager/SuspendedTabletsIT.java | 2 +-
.../accumulo/test/performance/NullTserver.java | 2 +-
.../test/performance/scan/CollectTabletStats.java | 2 +-
71 files changed, 146 insertions(+), 390 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
index b7889c3bfa..46c0c1014c 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
@@ -30,7 +30,8 @@ import org.apache.accumulo.core.data.TabletId;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.dataImpl.TabletIdImpl;
import org.apache.accumulo.core.dataImpl.thrift.IterInfo;
-import org.apache.accumulo.core.util.HostAndPort;
+
+import com.google.common.net.HostAndPort;
/**
* @since 1.6.0
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
index e865de7c61..e01a45ba0b 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
@@ -77,7 +77,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.BadArgumentException;
import org.apache.accumulo.core.util.ByteBufferUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.core.util.threads.Threads;
import org.apache.commons.collections4.map.LRUMap;
@@ -88,6 +87,8 @@ import org.apache.thrift.TException;
import org.apache.thrift.TServiceClient;
import org.apache.thrift.transport.TTransportException;
+import com.google.common.net.HostAndPort;
+
class ConditionalWriterImpl implements ConditionalWriter {
private static final int MAX_SLEEP = 30000;
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
index 37229b88c0..146385dbfd 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
@@ -60,7 +60,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.AddressUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
import org.apache.accumulo.core.util.Retry;
@@ -69,6 +68,8 @@ import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransport;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
/**
* Provides a class for administering the accumulo instance
*/
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
index c36677fe17..0f3925f5fd 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
@@ -135,7 +135,6 @@ import org.apache.accumulo.core.summary.SummaryCollection;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
import org.apache.accumulo.core.util.MapCounter;
@@ -156,6 +155,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
+import com.google.common.net.HostAndPort;
public class TableOperationsImpl extends TableOperationsHelper {
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
index b2cf5460a6..0b22d92478 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
@@ -75,7 +75,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TSampleNotPresentException;
import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.ByteBufferUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.OpTimer;
import org.apache.thrift.TApplicationException;
import org.apache.thrift.TException;
@@ -83,6 +82,8 @@ import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value>> {
private static final Logger log = LoggerFactory.getLogger(TabletServerBatchReaderIterator.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
index 505b1a55ba..c8a5965357 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
@@ -72,7 +72,6 @@ import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.core.util.threads.Threads;
import org.apache.thrift.TApplicationException;
@@ -83,6 +82,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Joiner;
+import com.google.common.net.HostAndPort;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Scope;
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java
index 64544d3d09..b6a59e5656 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java
@@ -73,7 +73,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TSampleNotPresentException;
import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
import org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.OpTimer;
import org.apache.hadoop.io.Text;
import org.apache.thrift.TApplicationException;
@@ -81,6 +80,8 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Scope;
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportKey.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportKey.java
index 8be320dcc5..02446f0192 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportKey.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportKey.java
@@ -24,9 +24,9 @@ import java.util.Objects;
import org.apache.accumulo.core.rpc.SaslConnectionParams;
import org.apache.accumulo.core.rpc.SslConnectionParams;
-import org.apache.accumulo.core.util.HostAndPort;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.net.HostAndPort;
@VisibleForTesting
public class ThriftTransportKey {
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportPool.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportPool.java
index bd23c5dcbd..c5e748182b 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportPool.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportPool.java
@@ -41,7 +41,6 @@ import java.util.function.LongSupplier;
import java.util.function.Supplier;
import org.apache.accumulo.core.rpc.ThriftUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.threads.Threads;
import org.apache.thrift.TConfiguration;
@@ -52,6 +51,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
+import com.google.common.net.HostAndPort;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/Writer.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/Writer.java
index 9f908fc556..16d8cf84a9 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/Writer.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/Writer.java
@@ -38,13 +38,14 @@ import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TDurability;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
import org.apache.thrift.TServiceClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
public class Writer {
private static final Logger log = LoggerFactory.getLogger(Writer.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/logging/TabletLogger.java b/core/src/main/java/org/apache/accumulo/core/logging/TabletLogger.java
index 50dae7a00d..e85e443233 100644
--- a/core/src/main/java/org/apache/accumulo/core/logging/TabletLogger.java
+++ b/core/src/main/java/org/apache/accumulo/core/logging/TabletLogger.java
@@ -34,12 +34,12 @@ import org.apache.accumulo.core.metadata.TabletFile;
import org.apache.accumulo.core.spi.compaction.CompactionJob;
import org.apache.accumulo.core.spi.compaction.CompactionKind;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Collections2;
+import com.google.common.net.HostAndPort;
/**
* This class contains source for logs messages about a tablets internal state, like its location,
diff --git a/core/src/main/java/org/apache/accumulo/core/manager/balancer/TabletServerIdImpl.java b/core/src/main/java/org/apache/accumulo/core/manager/balancer/TabletServerIdImpl.java
index 9eff55a517..2fefb466d3 100644
--- a/core/src/main/java/org/apache/accumulo/core/manager/balancer/TabletServerIdImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/manager/balancer/TabletServerIdImpl.java
@@ -22,7 +22,8 @@ import static java.util.Objects.requireNonNull;
import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.spi.balancer.data.TabletServerId;
-import org.apache.accumulo.core.util.HostAndPort;
+
+import com.google.common.net.HostAndPort;
/**
* @since 2.1.0
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/SuspendingTServer.java b/core/src/main/java/org/apache/accumulo/core/metadata/SuspendingTServer.java
index 8b307ca535..9f59a30cd8 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/SuspendingTServer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/SuspendingTServer.java
@@ -21,7 +21,8 @@ package org.apache.accumulo.core.metadata;
import java.util.Objects;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.util.HostAndPort;
+
+import com.google.common.net.HostAndPort;
/**
* For a suspended tablet, the time of suspension and the server it was suspended from.
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/TServerInstance.java b/core/src/main/java/org/apache/accumulo/core/metadata/TServerInstance.java
index 2bf8ca41a6..56aaa06a8a 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/TServerInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/TServerInstance.java
@@ -22,9 +22,10 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.util.AddressUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.hadoop.io.Text;
+import com.google.common.net.HostAndPort;
+
/**
* A tablet is assigned to a tablet server at the given address as long as it is alive and well.
* When the tablet server is restarted, the instance information it advertises will change.
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
index d4ed6315f6..fd89e874aa 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
@@ -69,7 +69,6 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Se
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.SuspendLocationColumn;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.ServerServices;
import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
@@ -80,6 +79,7 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSortedMap;
+import com.google.common.net.HostAndPort;
public class TabletMetadata {
private static final Logger log = LoggerFactory.getLogger(TabletMetadata.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
index 21c57cf35a..7db81aab64 100644
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
@@ -27,10 +27,11 @@ import java.util.concurrent.ExecutorService;
import org.apache.accumulo.core.classloader.ClassLoaderUtil;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.util.HostAndPort;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.Tag;
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/TTimeoutTransport.java b/core/src/main/java/org/apache/accumulo/core/rpc/TTimeoutTransport.java
index 1e1f4a3287..88f9adecd9 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/TTimeoutTransport.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/TTimeoutTransport.java
@@ -28,7 +28,6 @@ import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.spi.SelectorProvider;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.hadoop.net.NetUtils;
import org.apache.thrift.transport.TIOStreamTransport;
import org.apache.thrift.transport.TTransport;
@@ -36,6 +35,8 @@ import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
/**
* A utility class for setting up a {@link TTransport} with various necessary configurations for
* ideal performance in Accumulo. These configurations include:
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
index d961188509..08f221cf94 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/ThriftUtil.java
@@ -37,7 +37,6 @@ import javax.net.ssl.TrustManagerFactory;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.rpc.SaslConnectionParams.SaslMechanism;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod;
import org.apache.thrift.TException;
@@ -53,6 +52,8 @@ import org.apache.thrift.transport.layered.TFramedTransport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
/**
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerClient.java b/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerClient.java
index 2561d609bb..787c4165cb 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerClient.java
@@ -25,11 +25,12 @@ import java.util.List;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.rpc.ThriftUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.thrift.TServiceClient;
import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
+import com.google.common.net.HostAndPort;
+
public interface ManagerClient<C extends TServiceClient> {
default C getManagerConnection(Logger log, ThriftClientTypes<C> type, ClientContext context) {
diff --git a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
index 3f318eb7e5..30581fc9aa 100644
--- a/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
+++ b/core/src/main/java/org/apache/accumulo/core/summary/Gatherer.java
@@ -73,7 +73,6 @@ import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CancelFlagFuture;
import org.apache.accumulo.core.util.CompletableFutureUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -87,6 +86,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.cache.Cache;
import com.google.common.hash.Hashing;
+import com.google.common.net.HostAndPort;
/**
* This class implements using multiple tservers to gather summaries.
diff --git a/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java b/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
index 5fb0d40ac3..880944c5f8 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
@@ -25,6 +25,8 @@ import java.security.Security;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
public class AddressUtil {
private static final Logger log = LoggerFactory.getLogger(AddressUtil.class);
diff --git a/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java b/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java
deleted file mode 100644
index 08c556979f..0000000000
--- a/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (C) 2011 The Guava Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.core.util;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-
-import java.io.Serializable;
-import java.util.Comparator;
-import java.util.Objects;
-
-/**
- * This class was copied from Guava release 23.0 to replace the older Guava 14 version that had been
- * used in Accumulo. It was annotated as Beta by Google, therefore unstable to use in a core
- * Accumulo library. We learned this the hard way when Guava version 20 deprecated the getHostText
- * method and then removed the method all together in version 22. See ACCUMULO-4702
- *
- * Unused methods and annotations were removed to reduce maintenance costs.
- *
- * Javadoc from Guava 23.0 release: An immutable representation of a host and port.
- *
- * <p>
- * Example usage:
- *
- * <pre>
- * HostAndPort hp =
- * HostAndPort.fromString("[2001:db8::1]").withDefaultPort(80).requireBracketsForIPv6();
- * hp.getHost(); // returns "2001:db8::1"
- * hp.getPort(); // returns 80
- * hp.toString(); // returns "[2001:db8::1]:80"
- * </pre>
- *
- * <p>
- * Here are some examples of recognized formats:
- * <ul>
- * <li>example.com
- * <li>example.com:80
- * <li>192.0.2.1
- * <li>192.0.2.1:80
- * <li>[2001:db8::1] - {@link #getHost()} omits brackets
- * <li>[2001:db8::1]:80 - {@link #getHost()} omits brackets
- * <li>2001:db8::1 - Use requireBracketsForIPv6() to prohibit this
- * </ul>
- *
- * <p>
- * Note that this is not an exhaustive list, because these methods are only concerned with brackets,
- * colons, and port numbers. Full validation of the host field (if desired) is the caller's
- * responsibility.
- */
-public final class HostAndPort implements Serializable, Comparable<HostAndPort> {
- /** Magic value indicating the absence of a port number. */
- private static final int NO_PORT = -1;
-
- /** Hostname, IPv4/IPv6 literal, or unvalidated nonsense. */
- private final String host;
-
- /** Validated port number in the range [0..65535], or NO_PORT */
- private final int port;
-
- /** True if the parsed host has colons, but no surrounding brackets. */
- private final boolean hasBracketlessColons;
-
- private HostAndPort(String host, int port, boolean hasBracketlessColons) {
- this.host = host;
- this.port = port;
- this.hasBracketlessColons = hasBracketlessColons;
- }
-
- private static final Comparator<HostAndPort> COMPARATOR = Comparator.nullsFirst(
- Comparator.comparing(HostAndPort::getHost).thenComparingInt(h -> h.getPortOrDefault(0)));
-
- /**
- * Returns the portion of this {@code HostAndPort} instance that should represent the hostname or
- * IPv4/IPv6 literal.
- *
- * <p>
- * A successful parse does not imply any degree of sanity in this field. For additional
- * validation, see the HostSpecifier class.
- *
- * @since 20.0 (since 10.0 as {@code getHostText})
- */
- public String getHost() {
- return host;
- }
-
- /** Return true if this instance has a defined port. */
- public boolean hasPort() {
- return port >= 0;
- }
-
- /**
- * Get the current port number, failing if no port is defined.
- *
- * @return a validated port number, in the range [0..65535]
- * @throws IllegalStateException if no port is defined. You can use {@link #withDefaultPort(int)}
- * to prevent this from occurring.
- */
- public int getPort() {
- checkState(hasPort(), "the address does not include a port");
- return port;
- }
-
- /**
- * Build a HostAndPort instance from separate host and port values.
- *
- * <p>
- * Note: Non-bracketed IPv6 literals are allowed. Use #requireBracketsForIPv6() to prohibit these.
- *
- * @param host the host string to parse. Must not contain a port number.
- * @param port a port number from [0..65535]
- * @return if parsing was successful, a populated HostAndPort object.
- * @throws IllegalArgumentException if {@code host} contains a port number, or {@code port} is out
- * of range.
- */
- public static HostAndPort fromParts(String host, int port) {
- checkArgument(isValidPort(port), "Port out of range: %s", port);
- HostAndPort parsedHost = fromString(host);
- checkArgument(!parsedHost.hasPort(), "Host has a port: %s", host);
- return new HostAndPort(parsedHost.host, port, parsedHost.hasBracketlessColons);
- }
-
- /**
- * Split a freeform string into a host and port, without strict validation.
- *
- * Note that the host-only formats will leave the port field undefined. You can use
- * {@link #withDefaultPort(int)} to patch in a default value.
- *
- * @param hostPortString the input string to parse.
- * @return if parsing was successful, a populated HostAndPort object.
- * @throws IllegalArgumentException if nothing meaningful could be parsed.
- */
- public static HostAndPort fromString(String hostPortString) {
- Objects.requireNonNull(hostPortString, "hostPortString variable was null!");
- String host;
- String portString = null;
- boolean hasBracketlessColons = false;
-
- if (hostPortString.startsWith("[")) {
- String[] hostAndPort = getHostAndPortFromBracketedHost(hostPortString);
- host = hostAndPort[0];
- portString = hostAndPort[1];
- } else {
- int colonPos = hostPortString.indexOf(':');
- if (colonPos >= 0 && hostPortString.indexOf(':', colonPos + 1) == -1) {
- // Exactly 1 colon. Split into host:port.
- host = hostPortString.substring(0, colonPos);
- portString = hostPortString.substring(colonPos + 1);
- } else {
- // 0 or 2+ colons. Bare hostname or IPv6 literal.
- host = hostPortString;
- hasBracketlessColons = (colonPos >= 0);
- }
- }
-
- int port = NO_PORT;
- if (portString != null && !portString.trim().isEmpty()) {
- // Try to parse the whole port string as a number.
- // JDK7 accepts leading plus signs. We don't want to.
- checkArgument(!portString.startsWith("+"), "Unparseable port number: %s", hostPortString);
- try {
- port = Integer.parseInt(portString);
- } catch (NumberFormatException e) {
- throw new IllegalArgumentException("Unparseable port number: " + hostPortString);
- }
- checkArgument(isValidPort(port), "Port number out of range: %s", hostPortString);
- }
-
- return new HostAndPort(host, port, hasBracketlessColons);
- }
-
- /**
- * Parses a bracketed host-port string, throwing IllegalArgumentException if parsing fails.
- *
- * @param hostPortString the full bracketed host-port specification. Post might not be specified.
- * @return an array with 2 strings: host and port, in that order.
- * @throws IllegalArgumentException if parsing the bracketed host-port string fails.
- */
- private static String[] getHostAndPortFromBracketedHost(String hostPortString) {
- int colonIndex = 0;
- int closeBracketIndex = 0;
- checkArgument(hostPortString.charAt(0) == '[',
- "Bracketed host-port string must start with a bracket: %s", hostPortString);
- colonIndex = hostPortString.indexOf(':');
- closeBracketIndex = hostPortString.lastIndexOf(']');
- checkArgument(colonIndex > -1 && closeBracketIndex > colonIndex,
- "Invalid bracketed host/port: %s", hostPortString);
-
- String host = hostPortString.substring(1, closeBracketIndex);
- if (closeBracketIndex + 1 == hostPortString.length()) {
- return new String[] {host, ""};
- } else {
- checkArgument(hostPortString.charAt(closeBracketIndex + 1) == ':',
- "Only a colon may follow a close bracket: %s", hostPortString);
- for (int i = closeBracketIndex + 2; i < hostPortString.length(); ++i) {
- checkArgument(Character.isDigit(hostPortString.charAt(i)), "Port must be numeric: %s",
- hostPortString);
- }
- return new String[] {host, hostPortString.substring(closeBracketIndex + 2)};
- }
- }
-
- /**
- * Provide a default port if the parsed string contained only a host.
- *
- * You can chain this after {@link #fromString(String)} to include a port in case the port was
- * omitted from the input string. If a port was already provided, then this method is a no-op.
- *
- * @param defaultPort a port number, from [0..65535]
- * @return a HostAndPort instance, guaranteed to have a defined port.
- */
- public HostAndPort withDefaultPort(int defaultPort) {
- checkArgument(isValidPort(defaultPort));
- if (hasPort() || port == defaultPort) {
- return this;
- }
- return new HostAndPort(host, defaultPort, hasBracketlessColons);
- }
-
- @Override
- public boolean equals(Object other) {
- if (this == other) {
- return true;
- }
- if (other instanceof HostAndPort) {
- HostAndPort that = (HostAndPort) other;
- return java.util.Objects.equals(this.host, that.host) && this.port == that.port
- && this.hasBracketlessColons == that.hasBracketlessColons;
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return java.util.Objects.hash(host, port, hasBracketlessColons);
- }
-
- /** Rebuild the host:port string, including brackets if necessary. */
- @Override
- public String toString() {
- // "[]:12345" requires 8 extra bytes.
- StringBuilder builder = new StringBuilder(host.length() + 8);
- if (host.indexOf(':') >= 0) {
- builder.append('[').append(host).append(']');
- } else {
- builder.append(host);
- }
- if (hasPort()) {
- builder.append(':').append(port);
- }
- return builder.toString();
- }
-
- /** Return true for valid port numbers. */
- private static boolean isValidPort(int port) {
- return port >= 0 && port <= 65535;
- }
-
- private static final long serialVersionUID = 0;
-
- /**
- * Returns the current port number, with a default if no port is defined.
- */
- public int getPortOrDefault(int defaultPort) {
- return hasPort() ? port : defaultPort;
- }
-
- /**
- * HostAndPort must implement compareTo. This method orders HostAndPort values using a String
- * compare on the Host value with a secondary integer compare on the Port value.
- */
- @Override
- public int compareTo(HostAndPort other) {
- return COMPARATOR.compare(this, other);
- }
-
-}
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/ServerAddress.java b/core/src/main/java/org/apache/accumulo/core/util/HostAndPortComparator.java
similarity index 59%
copy from server/base/src/main/java/org/apache/accumulo/server/rpc/ServerAddress.java
copy to core/src/main/java/org/apache/accumulo/core/util/HostAndPortComparator.java
index 2b06387915..548267f15c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/ServerAddress.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/HostAndPortComparator.java
@@ -16,28 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.server.rpc;
+package org.apache.accumulo.core.util;
-import org.apache.accumulo.core.util.HostAndPort;
-import org.apache.thrift.server.TServer;
+import java.util.Comparator;
-/**
- * Encapsulate a Thrift server and the address, host and port, to which it is bound.
- */
-public class ServerAddress {
- public final TServer server;
- public final HostAndPort address;
+import com.google.common.net.HostAndPort;
- public ServerAddress(TServer server, HostAndPort address) {
- this.server = server;
- this.address = address;
- }
+public class HostAndPortComparator implements Comparator<HostAndPort> {
- public TServer getServer() {
- return server;
- }
+ private static final Comparator<HostAndPort> COMPARATOR = Comparator.nullsFirst(
+ Comparator.comparing(HostAndPort::getHost).thenComparingInt(h -> h.getPortOrDefault(0)));
- public HostAndPort getAddress() {
- return address;
+ @Override
+ public int compare(HostAndPort o1, HostAndPort o2) {
+ return COMPARATOR.compare(o1, o2);
}
}
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
index fd900774d9..039608c1c5 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
@@ -20,6 +20,8 @@ package org.apache.accumulo.core.util;
import java.util.EnumMap;
+import com.google.common.net.HostAndPort;
+
public class ServerServices implements Comparable<ServerServices> {
public static enum Service {
TSERV_CLIENT, GC_CLIENT, COMPACTOR_CLIENT, SSERV_CLIENT;
diff --git a/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java b/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
index 4946027fe5..fc3d2e0040 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/compaction/ExternalCompactionUtil.java
@@ -42,7 +42,6 @@ import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction;
import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.thrift.TException;
import org.apache.zookeeper.KeeperException;
@@ -50,6 +49,8 @@ import org.apache.zookeeper.KeeperException.NoNodeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
public class ExternalCompactionUtil {
private static class RunningCompactionFuture {
diff --git a/core/src/test/java/org/apache/accumulo/core/clientImpl/ThriftTransportKeyTest.java b/core/src/test/java/org/apache/accumulo/core/clientImpl/ThriftTransportKeyTest.java
index 7539ca3b66..ee2d9b12c7 100644
--- a/core/src/test/java/org/apache/accumulo/core/clientImpl/ThriftTransportKeyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/clientImpl/ThriftTransportKeyTest.java
@@ -35,7 +35,6 @@ import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.core.rpc.SaslConnectionParams;
import org.apache.accumulo.core.rpc.SslConnectionParams;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.security.UserGroupInformation;
@@ -43,6 +42,8 @@ import org.easymock.EasyMock;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import com.google.common.net.HostAndPort;
+
public class ThriftTransportKeyTest {
private static final String primary = "accumulo";
diff --git a/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java b/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
index 4f545d0140..7cad30694d 100644
--- a/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
@@ -61,10 +61,11 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Ta
import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.LocationType;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.Test;
+import com.google.common.net.HostAndPort;
+
public class TabletMetadataTest {
@Test
diff --git a/core/src/test/java/org/apache/accumulo/core/util/HostAndPortTest.java b/core/src/test/java/org/apache/accumulo/core/util/HostAndPortComparatorTest.java
similarity index 77%
rename from core/src/test/java/org/apache/accumulo/core/util/HostAndPortTest.java
rename to core/src/test/java/org/apache/accumulo/core/util/HostAndPortComparatorTest.java
index 2a4f34ff76..fae4dbbf3b 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/HostAndPortTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/HostAndPortComparatorTest.java
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -29,57 +30,62 @@ import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
-class HostAndPortTest {
+import com.google.common.net.HostAndPort;
+
+class HostAndPortComparatorTest {
+
+ final static private Comparator<HostAndPort> COMPARATOR = new HostAndPortComparator();
@Test
- void testCompareTo() {
+ void testCompare() {
+
HostAndPort hostAndPort1 = HostAndPort.fromString("example.info");
HostAndPort hostAndPort2 = HostAndPort.fromString("example.com");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) > 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) > 0);
HostAndPort hostPortSame = HostAndPort.fromString("www.test.com");
- assertTrue(hostPortSame.compareTo(hostPortSame) == 0);
+ assertTrue(COMPARATOR.compare(hostPortSame, hostPortSame) == 0);
hostAndPort1 = HostAndPort.fromString("www.example.com");
hostAndPort2 = HostAndPort.fromString("www.example.com");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) == 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) == 0);
hostAndPort1 = HostAndPort.fromString("192.0.2.1:80");
hostAndPort2 = HostAndPort.fromString("192.0.2.1");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) > 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) > 0);
hostAndPort1 = HostAndPort.fromString("[2001:db8::1]");
hostAndPort2 = HostAndPort.fromString("[2001:db9::1]");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) < 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) < 0);
hostAndPort1 = HostAndPort.fromString("2001:db8:3333:4444:5555:6676:7777:8888");
hostAndPort2 = HostAndPort.fromString("2001:db8:3333:4444:5555:6666:7777:8888");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) > 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) > 0);
hostAndPort1 = HostAndPort.fromString("192.0.2.1:80");
hostAndPort2 = HostAndPort.fromString("192.1.2.1");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) < 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) < 0);
hostAndPort1 = HostAndPort.fromString("12.1.2.1");
hostAndPort2 = HostAndPort.fromString("192.1.2.1");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) < 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) < 0);
hostAndPort1 = HostAndPort.fromString("wwww.example.com");
hostAndPort2 = HostAndPort.fromString("192.1.2.1");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) > 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) > 0);
hostAndPort1 = HostAndPort.fromString("2001:db8::1");
hostAndPort2 = HostAndPort.fromString("2001:db9::1");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) < 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) < 0);
hostAndPort1 = HostAndPort.fromString("");
hostAndPort2 = HostAndPort.fromString("2001:db9::1");
- assertTrue(hostAndPort1.compareTo(hostAndPort2) < 0);
- assertTrue(hostAndPort2.compareTo(hostAndPort1) > 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) < 0);
+ assertTrue(COMPARATOR.compare(hostAndPort2, hostAndPort1) > 0);
hostAndPort1 = HostAndPort.fromString("2001:db8::1");
hostAndPort2 = null;
- assertTrue(hostAndPort1.compareTo(hostAndPort2) > 0);
+ assertTrue(COMPARATOR.compare(hostAndPort1, hostAndPort2) > 0);
}
@Test
@@ -92,7 +98,8 @@ class HostAndPortTest {
"2.2.2.2:10000", "192.12.2.1:79", "1.1.1.1:24", "1.1.1.1", "192.12.2.1:79", "a.b.c.d",
"1.100.100.100", "2.2.2.2:9999", "a.b.b.d", "www.example.com", "www.alpha.org",
"a.b.c.d:10", "a.b.b.d:10", "a.b.b.d:11")
- .map(HostAndPort::fromString).collect(Collectors.toCollection(TreeSet::new));
+ .map(HostAndPort::fromString)
+ .collect(Collectors.toCollection(() -> new TreeSet<>(COMPARATOR)));
hostPortSet.add(HostAndPort.fromParts("localhost", 1));
hostPortSet.add(HostAndPort.fromParts("localhost", 000001));
diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
index ea3d46935e..ca3480cfeb 100644
--- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
@@ -41,7 +41,6 @@ import org.apache.accumulo.core.compaction.thrift.TExternalCompactionList;
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
import org.apache.accumulo.gc.SimpleGarbageCollector;
@@ -59,6 +58,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
+import com.google.common.net.HostAndPort;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index b4090c324d..08e0017785 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -59,7 +59,6 @@ import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.spi.crypto.CryptoService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.StopWatch;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.server.ServerContext;
@@ -72,6 +71,8 @@ import org.apache.thrift.TServiceClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
public class BulkImporter {
private static final Logger log = LoggerFactory.getLogger(BulkImporter.class);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
index e91dcf9209..1881a424b3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
@@ -48,7 +48,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.AddressUtil;
import org.apache.accumulo.core.util.Halt;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.ServerServices;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.server.ServerContext;
@@ -62,6 +61,8 @@ import org.apache.zookeeper.Watcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
public class LiveTServerSet implements Watcher {
public interface Listener {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/manager/balancer/BalancerEnvironmentImpl.java b/server/base/src/main/java/org/apache/accumulo/server/manager/balancer/BalancerEnvironmentImpl.java
index 485751355f..0eab40119f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/manager/balancer/BalancerEnvironmentImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/manager/balancer/BalancerEnvironmentImpl.java
@@ -44,7 +44,6 @@ import org.apache.accumulo.core.spi.balancer.data.TabletServerId;
import org.apache.accumulo.core.spi.balancer.data.TabletStatistics;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.ServiceEnvironmentImpl;
import org.apache.thrift.TException;
@@ -52,6 +51,8 @@ import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
public class BalancerEnvironmentImpl extends ServiceEnvironmentImpl implements BalancerEnvironment {
private static final Logger log = LoggerFactory.getLogger(BalancerEnvironmentImpl.class);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/manager/state/LoggingTabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/manager/state/LoggingTabletStateStore.java
index 6ef48fdc07..b5b16e61d4 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/manager/state/LoggingTabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/manager/state/LoggingTabletStateStore.java
@@ -26,9 +26,10 @@ import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.logging.TabletLogger;
import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.metadata.TabletLocationState;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.hadoop.fs.Path;
+import com.google.common.net.HostAndPort;
+
/**
* Wraps a tablet state store and logs important events.
*/
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/ServerAddress.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/ServerAddress.java
index 2b06387915..0e033b9056 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/ServerAddress.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/ServerAddress.java
@@ -18,9 +18,10 @@
*/
package org.apache.accumulo.server.rpc;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.thrift.server.TServer;
+import com.google.common.net.HostAndPort;
+
/**
* Encapsulate a Thrift server and the address, host and port, to which it is bound.
*/
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index b1a4f2e50b..651b70d66b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -46,7 +46,6 @@ import org.apache.accumulo.core.rpc.SslConnectionParams;
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.rpc.UGIAssumingTransportFactory;
import org.apache.accumulo.core.util.Halt;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.core.util.threads.Threads;
@@ -69,6 +68,8 @@ import org.apache.thrift.transport.TTransportFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
/**
* Factory methods for creating Thrift server objects
*/
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index ff9c4d9592..7d73b663ba 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -72,7 +72,6 @@ import org.apache.accumulo.core.singletons.SingletonManager;
import org.apache.accumulo.core.singletons.SingletonManager.Mode;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.AddressUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.tables.TableMap;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.cli.ServerUtilOpts;
@@ -89,6 +88,7 @@ import com.beust.jcommander.Parameters;
import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSortedMap;
import com.google.common.collect.Lists;
+import com.google.common.net.HostAndPort;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ECAdmin.java b/server/base/src/main/java/org/apache/accumulo/server/util/ECAdmin.java
index c9ade197ec..e293458c46 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ECAdmin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ECAdmin.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.singletons.SingletonManager;
import org.apache.accumulo.core.singletons.SingletonManager.Mode;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
import org.apache.accumulo.core.util.compaction.RunningCompaction;
import org.apache.accumulo.core.util.compaction.RunningCompactionInfo;
@@ -41,6 +40,7 @@ import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.google.auto.service.AutoService;
+import com.google.common.net.HostAndPort;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
index 91d4ddabf4..51e0e7d6d5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
@@ -51,7 +51,7 @@ import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
+import org.apache.accumulo.core.util.HostAndPortComparator;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
@@ -59,6 +59,8 @@ import org.apache.thrift.TServiceClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Scope;
@@ -95,7 +97,7 @@ public class VerifyTabletAssignments {
final HashSet<KeyExtent> failures = new HashSet<>();
- Map<HostAndPort,List<KeyExtent>> extentsPerServer = new TreeMap<>();
+ Map<HostAndPort,List<KeyExtent>> extentsPerServer = new TreeMap<>(new HostAndPortComparator());
for (Entry<KeyExtent,String> entry : tabletLocations.entrySet()) {
KeyExtent keyExtent = entry.getKey();
diff --git a/server/base/src/test/java/org/apache/accumulo/server/manager/LiveTServerSetTest.java b/server/base/src/test/java/org/apache/accumulo/server/manager/LiveTServerSetTest.java
index e767f3b23b..f67b7cb80d 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/manager/LiveTServerSetTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/manager/LiveTServerSetTest.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.accumulo.core.metadata.TServerInstance;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.manager.LiveTServerSet.Listener;
import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection;
@@ -33,6 +32,8 @@ import org.apache.accumulo.server.manager.LiveTServerSet.TServerInfo;
import org.easymock.EasyMock;
import org.junit.jupiter.api.Test;
+import com.google.common.net.HostAndPort;
+
public class LiveTServerSetTest {
@Test
diff --git a/server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java b/server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java
index 4f124e6405..86e8eb96bc 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java
@@ -40,11 +40,11 @@ import org.apache.accumulo.core.metadata.schema.RootTabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.server.metadata.TabletMutatorBase;
import org.junit.jupiter.api.Test;
import com.google.common.base.Preconditions;
+import com.google.common.net.HostAndPort;
public class RootTabletStateStoreTest {
diff --git a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
index 41c3bca2b8..c5a29e5737 100644
--- a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
+++ b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
@@ -69,7 +69,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats;
import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
import org.apache.accumulo.core.util.compaction.RunningCompaction;
@@ -94,6 +93,7 @@ import org.slf4j.LoggerFactory;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.google.common.collect.Sets;
+import com.google.common.net.HostAndPort;
public class CompactionCoordinator extends AbstractServer
implements CompactionCoordinatorService.Iface, LiveTServerSet.Listener {
diff --git a/server/compaction-coordinator/src/test/java/org/apache/accumulo/coordinator/CompactionCoordinatorTest.java b/server/compaction-coordinator/src/test/java/org/apache/accumulo/coordinator/CompactionCoordinatorTest.java
index 9e52237d55..6c5c47aea7 100644
--- a/server/compaction-coordinator/src/test/java/org/apache/accumulo/coordinator/CompactionCoordinatorTest.java
+++ b/server/compaction-coordinator/src/test/java/org/apache/accumulo/coordinator/CompactionCoordinatorTest.java
@@ -52,7 +52,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
import org.apache.accumulo.core.util.compaction.RunningCompaction;
import org.apache.accumulo.server.AbstractServer;
@@ -72,6 +71,7 @@ import org.powermock.core.classloader.annotations.SuppressStaticInitializationFo
import org.powermock.modules.junit4.PowerMockRunner;
import com.google.common.collect.Sets;
+import com.google.common.net.HostAndPort;
@RunWith(PowerMockRunner.class)
@PrepareForTest({CompactionCoordinator.class, DeadCompactionDetector.class, ThriftUtil.class,
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index af3b094a60..45135e7466 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -85,7 +85,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats;
import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.Halt;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.ServerServices;
import org.apache.accumulo.core.util.ServerServices.Service;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -115,6 +114,7 @@ import org.slf4j.LoggerFactory;
import com.beust.jcommander.Parameter;
import com.google.common.base.Preconditions;
+import com.google.common.net.HostAndPort;
import io.micrometer.core.instrument.LongTaskTimer;
import io.micrometer.core.instrument.MeterRegistry;
diff --git a/server/compactor/src/test/java/org/apache/accumulo/compactor/CompactorTest.java b/server/compactor/src/test/java/org/apache/accumulo/compactor/CompactorTest.java
index ac2384add6..83ca676294 100644
--- a/server/compactor/src/test/java/org/apache/accumulo/compactor/CompactorTest.java
+++ b/server/compactor/src/test/java/org/apache/accumulo/compactor/CompactorTest.java
@@ -45,7 +45,6 @@ import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats;
import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
import org.apache.accumulo.core.util.Halt;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.server.AbstractServer;
import org.apache.accumulo.server.ServerContext;
@@ -64,6 +63,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
@RunWith(PowerMockRunner.class)
@PrepareForTest({Compactor.class})
@SuppressStaticInitializationFor({"org.apache.log4j.LogManager"})
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 33cd65652e..8f13fb3e0c 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -45,7 +45,6 @@ import org.apache.accumulo.core.metrics.MetricsUtil;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.Halt;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.ServerServices;
import org.apache.accumulo.core.util.ServerServices.Service;
import org.apache.accumulo.core.util.threads.ThreadPools;
@@ -63,6 +62,8 @@ import org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Scope;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/LoadFiles.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/LoadFiles.java
index 85d1e577e9..79ef39e45b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/LoadFiles.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer1/LoadFiles.java
@@ -49,7 +49,6 @@ import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.manager.tableOps.ManagerRepo;
@@ -60,6 +59,8 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
class LoadFiles extends ManagerRepo {
private static final long serialVersionUID = 1L;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
index a9cb992b15..fe9bfb438f 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
@@ -58,7 +58,6 @@ import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.MapCounter;
import org.apache.accumulo.core.util.PeekingIterator;
import org.apache.accumulo.core.util.TextUtil;
@@ -72,6 +71,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
+import com.google.common.net.HostAndPort;
/**
* Make asynchronous load calls to each overlapping Tablet. This RepO does its work on the isReady
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java
index 0cf05ac0c0..3d42615437 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.TServerInstance;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.manager.tableOps.ManagerRepo;
import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection;
@@ -35,6 +34,8 @@ import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
public class ShutdownTServer extends ManagerRepo {
private static final long serialVersionUID = 2L;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java
index c406766445..9d01be5d8f 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader9to10.java
@@ -75,7 +75,6 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.spi.compaction.SimpleCompactionDispatcher;
import org.apache.accumulo.core.spi.crypto.NoCryptoServiceFactory;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.conf.store.TablePropKey;
import org.apache.accumulo.server.conf.util.ConfigPropertyUpgrader;
@@ -101,6 +100,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
+import com.google.common.net.HostAndPort;
/**
* Handles upgrading from 2.0 to 2.1.
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/ShutdownTServerTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/ShutdownTServerTest.java
index 8384a4a1b0..bf35459c67 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/ShutdownTServerTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/ShutdownTServerTest.java
@@ -29,13 +29,14 @@ import org.apache.accumulo.core.fate.Repo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.metadata.TServerInstance;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.manager.tserverOps.ShutdownTServer;
import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection;
import org.easymock.EasyMock;
import org.junit.jupiter.api.Test;
+import com.google.common.net.HostAndPort;
+
public class ShutdownTServerTest {
@Test
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 98c6d7a331..3c1961be1d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -70,7 +70,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.Halt;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.ServerServices;
import org.apache.accumulo.core.util.ServerServices.Service;
@@ -100,6 +99,8 @@ import org.glassfish.jersey.servlet.ServletContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
/**
* Serve manager statistics with an embedded web server.
*/
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionsResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionsResource.java
index 236c6f827d..7e2e2a4ca0 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionsResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionsResource.java
@@ -28,9 +28,10 @@ import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.monitor.Monitor;
+import com.google.common.net.HostAndPort;
+
/**
* Generate a new Compaction list JSON object
*
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/CoordinatorInfo.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/CoordinatorInfo.java
index ebd133bd4c..5f015fcd88 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/CoordinatorInfo.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/CoordinatorInfo.java
@@ -21,7 +21,7 @@ package org.apache.accumulo.monitor.rest.compactions.external;
import java.util.List;
import java.util.Optional;
-import org.apache.accumulo.core.util.HostAndPort;
+import com.google.common.net.HostAndPort;
public class CoordinatorInfo {
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/ExternalCompactionInfo.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/ExternalCompactionInfo.java
index b4639e3ae3..0d0d467517 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/ExternalCompactionInfo.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/external/ExternalCompactionInfo.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import org.apache.accumulo.core.util.HostAndPort;
+import com.google.common.net.HostAndPort;
/**
* Bag of everything going on with external compactions.
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
index 92093bdb12..34317a8525 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
@@ -28,10 +28,11 @@ import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.monitor.Monitor;
import org.apache.accumulo.monitor.Monitor.ScanStats;
+import com.google.common.net.HostAndPort;
+
/**
* Generate a new Scan list JSON object
*
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
index 820f3476d0..d6c8d35a3a 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
@@ -49,12 +49,13 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.AddressUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.monitor.Monitor;
import org.apache.accumulo.monitor.rest.manager.ManagerResource;
import org.apache.accumulo.server.manager.state.DeadServerList;
import org.apache.accumulo.server.util.ActionStatsUpdator;
+import com.google.common.net.HostAndPort;
+
/**
* Generates tserver lists as JSON objects
*
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index 2acac0512e..da37d486f2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@ -82,7 +82,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TSamplerConfiguration;
import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
import org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException;
import org.apache.accumulo.core.util.Halt;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.server.AbstractServer;
@@ -121,6 +120,7 @@ import com.github.benmanes.caffeine.cache.Scheduler;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
+import com.google.common.net.HostAndPort;
public class ScanServer extends AbstractServer
implements TabletScanClientService.Iface, TabletHostingServer {
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 22c610d664..755c6fd6d3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -97,7 +97,6 @@ import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.ComparablePair;
import org.apache.accumulo.core.util.Halt;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.MapCounter;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.Retry;
@@ -166,6 +165,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Iterators;
+import com.google.common.net.HostAndPort;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Scope;
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/ScanServerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/ScanServerTest.java
index 535b574a03..85001588b5 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/ScanServerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/ScanServerTest.java
@@ -48,7 +48,6 @@ import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TSamplerConfiguration;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.tserver.ScanServer.ScanReservation;
import org.apache.accumulo.tserver.session.ScanSession.TabletResolver;
import org.apache.accumulo.tserver.tablet.SnapshotTablet;
@@ -57,6 +56,8 @@ import org.apache.accumulo.tserver.tablet.TabletBase;
import org.apache.thrift.TException;
import org.junit.jupiter.api.Test;
+import com.google.common.net.HostAndPort;
+
public class ScanServerTest {
public class TestScanServer extends ScanServer {
diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
index 6cd6ba7f03..a11385d955 100644
--- a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.accumulo.core.metadata.ScanServerRefTabletFile;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.util.ScanServerMetadataEntries;
@@ -37,6 +36,8 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+import com.google.common.net.HostAndPort;
+
@Tag(MINI_CLUSTER_ONLY)
public class ScanServerMetadataEntriesCleanIT extends SharedMiniClusterBase {
diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
index 58a92b0faa..4e1f3dafb4 100644
--- a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
@@ -53,7 +53,6 @@ import org.apache.accumulo.core.metadata.ScanServerRefTabletFile;
import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.ScanServerFileReferenceSection;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.gc.GCRun;
import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
import org.apache.accumulo.harness.SharedMiniClusterBase;
@@ -67,6 +66,8 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
@Tag(MINI_CLUSTER_ONLY)
public class ScanServerMetadataEntriesIT extends SharedMiniClusterBase {
diff --git a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java
index dafb43bad4..855010ff3e 100644
--- a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java
@@ -34,13 +34,14 @@ import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.functional.ConfigurableMacBase;
import org.apache.hadoop.conf.Configuration;
import org.junit.jupiter.api.Test;
+import com.google.common.net.HostAndPort;
+
public class TotalQueuedIT extends ConfigurableMacBase {
@Override
diff --git a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
index 8306b6a764..2a17353fd9 100644
--- a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java
@@ -32,7 +32,6 @@ import org.apache.accumulo.core.clientImpl.ThriftTransportKey;
import org.apache.accumulo.core.clientImpl.ThriftTransportPool;
import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
@@ -40,6 +39,8 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
/**
* Test that {@link ThriftTransportPool} actually adheres to the cachedConnection argument
*/
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
index e0ba4cf04d..2bf601ca7a 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
@@ -63,7 +63,6 @@ import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner;
import org.apache.accumulo.core.spi.compaction.SimpleCompactionDispatcher;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
@@ -76,6 +75,7 @@ import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransportException;
import com.beust.jcommander.internal.Maps;
+import com.google.common.net.HostAndPort;
public class ExternalCompactionTestUtils {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkFailureIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkFailureIT.java
index 98f3e47f29..f1497129a5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkFailureIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkFailureIT.java
@@ -62,7 +62,6 @@ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.manager.tableOps.bulkVer1.BulkImport;
import org.apache.accumulo.server.ServerContext;
@@ -78,6 +77,8 @@ import org.apache.thrift.transport.TTransportException;
import org.apache.zookeeper.KeeperException;
import org.junit.jupiter.api.Test;
+import com.google.common.net.HostAndPort;
+
public class BulkFailureIT extends AccumuloClusterHarness {
interface Loader {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
index 85414a426f..47348aa054 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
@@ -27,13 +27,14 @@ import java.util.Properties;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.conf.ClientProperty;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
import org.apache.hadoop.conf.Configuration;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
// ACCUMULO-2757 - make sure we don't make too many more watchers
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index d2fdb779d1..a687972052 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -41,7 +41,6 @@ import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.ServerServices;
import org.apache.accumulo.core.util.ServerServices.Service;
import org.apache.accumulo.core.util.threads.ThreadPools;
@@ -56,6 +55,8 @@ import org.apache.thrift.TMultiplexedProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.net.HostAndPort;
+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
/**
diff --git a/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java b/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
index b709d60193..1bd2da768c 100644
--- a/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
@@ -45,7 +45,6 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Cu
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.TablePermission;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.manager.state.MergeStats;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.manager.state.Assignment;
@@ -57,6 +56,8 @@ import org.apache.accumulo.test.functional.ConfigurableMacBase;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.Test;
+import com.google.common.net.HostAndPort;
+
public class MergeStateIT extends ConfigurableMacBase {
private static class MockCurrentState implements CurrentState {
diff --git a/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java b/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java
index bd395d8bab..1a7feb6fd2 100644
--- a/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java
@@ -60,7 +60,6 @@ import org.apache.accumulo.core.metadata.TabletLocationState;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.spi.balancer.HostRegexTableLoadBalancer;
import org.apache.accumulo.core.spi.balancer.data.TabletServerId;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
import org.apache.accumulo.miniclusterImpl.ProcessReference;
@@ -77,6 +76,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.SetMultimap;
+import com.google.common.net.HostAndPort;
public class SuspendedTabletsIT extends ConfigurableMacBase {
private static final Logger log = LoggerFactory.getLogger(SuspendedTabletsIT.class);
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
index 3545cbb08e..8c49918477 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
@@ -72,7 +72,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TUnloadTabletGoal;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.client.ClientServiceHandler;
@@ -87,6 +86,7 @@ import org.apache.thrift.TException;
import org.apache.thrift.TMultiplexedProcessor;
import com.beust.jcommander.Parameter;
+import com.google.common.net.HostAndPort;
/**
* The purpose of this class is to server as fake tserver that is a data sink like /dev/null.
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
index 63ec7fcf11..69ac1553aa 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
@@ -67,7 +67,6 @@ import org.apache.accumulo.core.metadata.MetadataServicer;
import org.apache.accumulo.core.metadata.TabletFile;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.spi.crypto.NoCryptoServiceFactory;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.Stat;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.cli.ServerUtilOpts;
@@ -83,6 +82,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.beust.jcommander.Parameter;
+import com.google.common.net.HostAndPort;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;