JAVA-2923: Detect and use Guava's new HostAndPort.getHost method (#1533)

Author: adutra

changelog/README.md

@@ -5,9 +5,10 @@
   3.x versions get published.
 -->
 
-### 3.11.0 (in progress)
+## 3.11.0 (in progress)
 
 - [improvement] JAVA-2705: Remove protocol v5 beta status, add v6-beta.
+- [bug] JAVA-2923: Detect and use Guava's new HostAndPort.getHost method.
 
 ## 3.10.2
 

driver-core/src/main/java/com/datastax/driver/core/CloudConfigFactory.java

@@ -228,8 +228,8 @@ protected InetSocketAddress getSniProxyAddress(JsonNode proxyMetadata) {
         throw new IllegalStateException(
             "Invalid proxy metadata: missing port from field sni_proxy_address");
       }
-      return InetSocketAddress.createUnresolved(
-          sniProxyHostAndPort.getHostText(), sniProxyHostAndPort.getPort());
+      String host = GuavaCompatibility.INSTANCE.getHost(sniProxyHostAndPort);
+      return InetSocketAddress.createUnresolved(host, sniProxyHostAndPort.getPort());
     } else {
       throw new IllegalStateException("Invalid proxy metadata: missing field sni_proxy_address");
     }

driver-core/src/main/java/com/datastax/driver/core/GuavaCompatibility.java

@@ -19,6 +19,7 @@
 import com.google.common.base.Function;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.Maps;
+import com.google.common.net.HostAndPort;
 import com.google.common.reflect.TypeToken;
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.FutureCallback;
@@ -180,6 +181,24 @@ public abstract <I, O> ListenableFuture<O> transformAsync(
    */
   public abstract Executor sameThreadExecutor();
 
+  /**
+   * Returns the portion of the given {@link HostAndPort} instance that should represent the
+   * hostname or IPv4/IPv6 literal.
+   *
+   * <p>The method {@code HostAndPort.getHostText} has been replaced with {@code
+   * HostAndPort.getHost} starting with Guava 20.0; it has been completely removed in Guava 22.0.
+   */
+  @SuppressWarnings("JavaReflectionMemberAccess")
+  public String getHost(HostAndPort hostAndPort) {
+    try {
+      // Guava >= 20.0
+      return (String) HostAndPort.class.getMethod("getHost").invoke(hostAndPort);
+    } catch (Exception e) {
+      // Guava < 22.0
+      return hostAndPort.getHostText();
+    }
+  }
+
   private static GuavaCompatibility selectImplementation() {
     if (isGuava_19_0_OrHigher()) {
       logger.info("Detected Guava >= 19 in the classpath, using modern compatibility layer");