This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch 1.8 in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 8a966a0b1daf831c44b23569829b952b300c37b0 Author: Mike Miller <[email protected]> AuthorDate: Tue Sep 12 15:56:34 2017 -0400 ACCUMULO-4702 Replaced uses of Guava HostAndPort --- .../main/java/org/apache/accumulo/core/util/HostAndPort.java | 10 ++++------ .../apache/accumulo/server/master/state/SuspendingTServer.java | 3 +-- .../org/apache/accumulo/test/master/SuspendedTabletsIT.java | 2 +- .../java/org/apache/accumulo/test/proxy/SimpleProxyBase.java | 2 +- .../accumulo/test/proxy/TestProxyNamespaceOperations.java | 3 +-- 5 files changed, 8 insertions(+), 12 deletions(-) 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 index bae98be..59cb652 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java +++ b/core/src/main/java/org/apache/accumulo/core/util/HostAndPort.java @@ -22,15 +22,13 @@ import java.io.Serializable; import com.google.common.base.Strings; /** - * 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 + * 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. + * Javadoc from Guava 23.0 release: An immutable representation of a host and port. * * <p> * Example usage: diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/SuspendingTServer.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/SuspendingTServer.java index 9d9cc55..1769652 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/state/SuspendingTServer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/SuspendingTServer.java @@ -22,8 +22,7 @@ import java.util.Objects; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; - -import com.google.common.net.HostAndPort; +import org.apache.accumulo.core.util.HostAndPort; /** For a suspended tablet, the time of suspension and the server it was suspended from. */ public class SuspendingTServer { diff --git a/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java b/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java index de0cf4b..f7b7467 100644 --- a/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/master/SuspendedTabletsIT.java @@ -51,6 +51,7 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.master.thrift.MasterClientService; +import org.apache.accumulo.core.util.HostAndPort; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; @@ -70,7 +71,6 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; 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/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java index c8f311b..513132d 100644 --- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java +++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java @@ -64,8 +64,8 @@ import org.apache.accumulo.core.iterators.user.VersioningIterator; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.ByteBufferUtil; -import org.apache.accumulo.examples.simple.constraints.MaxMutationSize; import org.apache.accumulo.core.util.HostAndPort; +import org.apache.accumulo.examples.simple.constraints.MaxMutationSize; import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint; import org.apache.accumulo.harness.MiniClusterHarness; import org.apache.accumulo.harness.SharedMiniClusterBase; diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyNamespaceOperations.java b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyNamespaceOperations.java index 8dc2990..ce142e0 100644 --- a/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyNamespaceOperations.java +++ b/test/src/main/java/org/apache/accumulo/test/proxy/TestProxyNamespaceOperations.java @@ -30,6 +30,7 @@ import java.util.Set; import org.apache.accumulo.core.client.impl.Namespaces; import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.util.HostAndPort; import org.apache.accumulo.proxy.Proxy; import org.apache.accumulo.proxy.thrift.AccumuloException; import org.apache.accumulo.proxy.thrift.IteratorScope; @@ -44,8 +45,6 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import com.google.common.net.HostAndPort; - public class TestProxyNamespaceOperations { protected static TServer proxy; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
