Resolve addresses on init and use separate property to toggle address resolution

Author: alexsa

core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/SubnetAddressTranslator.java

@@ -17,8 +17,6 @@
  */
 package com.datastax.oss.driver.internal.core.addresstranslation;
 
-import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.RESOLVE_CONTACT_POINTS;
-
 import com.datastax.oss.driver.api.core.addresstranslation.AddressTranslator;
 import com.datastax.oss.driver.api.core.config.DriverOption;
 import com.datastax.oss.driver.api.core.context.DriverContext;
@@ -74,6 +72,13 @@ public class SubnetAddressTranslator implements AddressTranslator {
   public static final String ADDRESS_TRANSLATOR_DEFAULT_ADDRESS =
       "advanced.address-translator.default-address";
 
+  /**
+   * Whether to resolve the addresses on initialization (if true) or on each node (re-)connection
+   * (if false). Defaults to false.
+   */
+  public static final String ADDRESS_TRANSLATOR_RESOLVE_ADDRESSES =
+      "advanced.address-translator.resolve-addresses";
+
   public static DriverOption ADDRESS_TRANSLATOR_SUBNET_ADDRESSES_OPTION =
       new DriverOption() {
         @NonNull
@@ -92,13 +97,26 @@ public String getPath() {
         }
       };
 
+  public static DriverOption ADDRESS_TRANSLATOR_RESOLVE_ADDRESSES_OPTION =
+      new DriverOption() {
+        @NonNull
+        @Override
+        public String getPath() {
+          return ADDRESS_TRANSLATOR_RESOLVE_ADDRESSES;
+        }
+      };
+
   private final List<SubnetAddress> subnetAddresses;
-  private final Optional<String> defaultAddress;
-  private final boolean resolveAddresses;
+  private final Optional<InetSocketAddress> defaultAddress;
   private final String logPrefix;
 
   public SubnetAddressTranslator(@NonNull DriverContext context) {
     logPrefix = context.getSessionName();
+    boolean resolveAddresses =
+        context
+            .getConfig()
+            .getDefaultProfile()
+            .getBoolean(ADDRESS_TRANSLATOR_RESOLVE_ADDRESSES_OPTION, false);
     this.subnetAddresses =
         context.getConfig().getDefaultProfile()
             .getStringMap(ADDRESS_TRANSLATOR_SUBNET_ADDRESSES_OPTION).entrySet().stream()
@@ -109,20 +127,18 @@ public SubnetAddressTranslator(@NonNull DriverContext context) {
                   // "100.64.0.0/15" -> '"100.64.0.0/15"'
                   String subnetCIDR = e.getKey().replaceAll("\"", "");
                   String address = e.getValue();
-                  return new SubnetAddress(subnetCIDR, address);
+                  return new SubnetAddress(subnetCIDR, parseAddress(address, resolveAddresses));
                 })
             .collect(Collectors.toList());
     this.defaultAddress =
         Optional.ofNullable(
-            context
-                .getConfig()
-                .getDefaultProfile()
-                .getString(ADDRESS_TRANSLATOR_DEFAULT_ADDRESS_OPTION, null));
-    this.resolveAddresses =
-        context.getConfig().getDefaultProfile().getBoolean(RESOLVE_CONTACT_POINTS, true);
+                context
+                    .getConfig()
+                    .getDefaultProfile()
+                    .getString(ADDRESS_TRANSLATOR_DEFAULT_ADDRESS_OPTION, null))
+            .map(address -> parseAddress(address, resolveAddresses));
 
     validateSubnetsAreNotOverlapping(this.subnetAddresses);
-    this.defaultAddress.ifPresent(SubnetAddressTranslator::validateAddress);
   }
 
   @NonNull
@@ -131,32 +147,31 @@ public InetSocketAddress translate(@NonNull InetSocketAddress address) {
     InetSocketAddress translatedAddress = null;
     for (SubnetAddress subnetAddress : subnetAddresses) {
       if (subnetAddress.contains(address)) {
-        translatedAddress = parseAddress(subnetAddress.address, resolveAddresses);
+        translatedAddress = subnetAddress.address;
       }
     }
     if (translatedAddress == null && defaultAddress.isPresent()) {
-      translatedAddress = parseAddress(defaultAddress.get(), resolveAddresses);
+      translatedAddress = defaultAddress.get();
     }
     if (translatedAddress == null) {
       translatedAddress = address;
     }
-    LOG.debug("[{}] Resolved {} to {}", logPrefix, address, translatedAddress);
+    LOG.debug("[{}] Translated {} to {}", logPrefix, address, translatedAddress);
     return translatedAddress;
   }
 
   @Override
   public void close() {}
 
   @Nullable
-  private static InetSocketAddress parseAddress(String address, boolean resolve) {
-    return AddressUtils.extract(address, resolve).iterator().next();
-  }
-
-  private static void validateAddress(String address) {
+  private InetSocketAddress parseAddress(String address, boolean resolve) {
     try {
-      parseAddress(address, false);
+      InetSocketAddress parsedAddress = AddressUtils.extract(address, resolve).iterator().next();
+      LOG.debug("[{}] Parsed {} to {}", logPrefix, address, parsedAddress);
+      return parsedAddress;
     } catch (RuntimeException e) {
-      throw new IllegalArgumentException("Invalid address: " + address, e);
+      throw new IllegalArgumentException(
+          String.format("Invalid address %s (%s)", address, e.getMessage()));
     }
   }
 
@@ -177,13 +192,11 @@ private static void validateSubnetsAreNotOverlapping(List<SubnetAddress> subnetA
 
   private static class SubnetAddress {
     private final IPAddress subnet;
-    private final String address;
+    private final InetSocketAddress address;
 
-    private SubnetAddress(String subnetCIDR, String address) {
+    private SubnetAddress(String subnetCIDR, InetSocketAddress address) {
       this.subnet = parseSubnet(subnetCIDR);
       this.address = address;
-
-      validateAddress(this.address);
     }
 
     private static IPAddress parseSubnet(String subnetCIDR) {

core/src/main/resources/reference.conf

@@ -1044,8 +1044,9 @@ datastax-java-driver {
     # }
     # Optional. When configured, addresses not matching the configured subnets are translated to this address.
     # default-address = "cassandra.datacenter1.com:9042"
-    # Note: `advanced.resolve-contact-points` (see below) is used to determine whether to resolve subnet
-    # and default address on translation. 
+    # Whether to resolve the addresses once on initialization (if true) or on each node (re-)connection (if false).
+    # If not configured, defaults to false.
+    # resolve-addresses = false
   }
 
   # Whether to resolve the addresses passed to `basic.contact-points`.

core/src/test/java/com/datastax/oss/driver/internal/core/addresstranslation/SubnetAddressTranslatorTest.java

@@ -17,7 +17,6 @@
  */
 package com.datastax.oss.driver.internal.core.addresstranslation;
 
-import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.RESOLVE_CONTACT_POINTS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.mockito.Mockito.mock;
@@ -135,7 +134,7 @@ public void should_fail_on_subnet_address_without_port() {
     DefaultDriverContext context = context(subnetAddresses);
     assertThatIllegalArgumentException()
         .isThrownBy(() -> new SubnetAddressTranslator(context))
-        .withMessage("Invalid address: cassandra.datacenter1.com");
+        .withMessage("Invalid address cassandra.datacenter1.com (expecting format host:port)");
   }
 
   @Test
@@ -148,14 +147,13 @@ public void should_fail_on_default_address_without_port() {
         .thenReturn("cassandra.com");
     assertThatIllegalArgumentException()
         .isThrownBy(() -> new SubnetAddressTranslator(context))
-        .withMessage("Invalid address: cassandra.com");
+        .withMessage("Invalid address cassandra.com (expecting format host:port)");
   }
 
   private static DefaultDriverContext context(Map<String, String> subnetAddresses) {
     DriverExecutionProfile profile = mock(DriverExecutionProfile.class);
     when(profile.getStringMap(SubnetAddressTranslator.ADDRESS_TRANSLATOR_SUBNET_ADDRESSES_OPTION))
         .thenReturn(subnetAddresses);
-    when(profile.getBoolean(RESOLVE_CONTACT_POINTS, true)).thenReturn(false);
     return MockedDriverContextFactory.defaultDriverContext(Optional.of(profile));
   }
 }

manual/core/address_resolution/README.md

@@ -159,8 +159,9 @@ datastax-java-driver.advanced.address-translator {
   }
   # Optional. When configured, addresses not matching the configured subnets are translated to this address.
   default-address = "cassandra.datacenter1.com:9042"
-  # Note: `advanced.resolve-contact-points` is used to determine whether to resolve subnet and default address
-  # on translation.
+  # Whether to resolve the addresses once on initialization (if true) or on each node (re-)connection (if false).
+  # If not configured, defaults to false.
+  resolve-addresses = false
 }
 ```