Add map support to DriverConfigProfile

GregBestland · olim7t · commit 61fd21054743 · 2018-03-08T15:21:50.000-08:00
diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigProfile.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigProfile.java
@@ -17,6 +17,7 @@
 
 import java.time.Duration;
 import java.util.List;
+import java.util.Map;
 
 /**
  * A profile in the driver's configuration.
@@ -52,6 +53,10 @@ public interface DriverConfigProfile {
 
   DriverConfigProfile withStringList(DriverOption option, List<String> value);
 
+  Map<String, String> getStringMap(DriverOption option);
+
+  DriverConfigProfile withStringMap(DriverOption option, Map<String, String> value);
+
   /** Returns a size in bytes. */
   long getBytes(DriverOption option);
 
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverConfigProfile.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverConfigProfile.java
@@ -17,13 +17,17 @@
 
 import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
 import com.datastax.oss.driver.api.core.config.DriverOption;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.MapMaker;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValue;
 import com.typesafe.config.ConfigValueFactory;
+import com.typesafe.config.ConfigValueType;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -97,6 +101,33 @@ public DriverConfigProfile withStringList(DriverOption option, List<String> valu
     return with(option, value);
   }
 
+  @Override
+  public Map<String, String> getStringMap(DriverOption option) {
+    Config subConfig = getCached(option.getPath(), getEffectiveOptions()::getConfig);
+    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
+    for (Map.Entry<String, ConfigValue> entry : subConfig.entrySet()) {
+      if (entry.getValue().valueType().equals(ConfigValueType.STRING)) {
+        builder.put(entry.getKey(), (String) entry.getValue().unwrapped());
+      }
+    }
+    return builder.build();
+  }
+
+  @Override
+  public DriverConfigProfile withStringMap(DriverOption option, Map<String, String> map) {
+    Base base = getBaseProfile();
+    // Add the new option to any already derived options
+    Config newAdded = getAddedOptions();
+    for (String key : map.keySet()) {
+      newAdded =
+          newAdded.withValue(
+              option.getPath() + "." + key, ConfigValueFactory.fromAnyRef(map.get(key)));
+    }
+    Derived derived = new Derived(base, newAdded);
+    base.register(derived);
+    return derived;
+  }
+
   @Override
   public long getBytes(DriverOption option) {
     return getCached(option.getPath(), getEffectiveOptions()::getBytes);
diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/config/typesafe/MockOptions.java b/core/src/test/java/com/datastax/oss/driver/internal/core/config/typesafe/MockOptions.java
@@ -19,7 +19,8 @@
 
 enum MockOptions implements DriverOption {
   REQUIRED_INT("required_int", true),
-  OPTIONAL_INT("optional_int", false);
+  OPTIONAL_INT("optional_int", false),
+  OPTIONAL_AUTH("auth_provider", false);
 
   private final String path;
   private final boolean required;
diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/config/typesafe/TypeSafeDriverConfigTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/config/typesafe/TypeSafeDriverConfigTest.java
@@ -21,6 +21,8 @@
 import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import java.util.HashMap;
+import java.util.Map;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -94,6 +96,33 @@ public void should_create_derived_profile_overriding_option() {
     assertThat(derived.getInt(MockOptions.REQUIRED_INT)).isEqualTo(43);
   }
 
+  @Test
+  public void should_fetch_string_map() {
+    TypeSafeDriverConfig config =
+        parse(
+            "required_int = 42 \n auth_provider { auth_thing_one= one \n auth_thing_two = two \n auth_thing_three = three}");
+    DriverConfigProfile base = config.getDefaultProfile();
+    base.getStringMap(MockOptions.OPTIONAL_AUTH);
+    Map<String, String> map = base.getStringMap(MockOptions.OPTIONAL_AUTH);
+    assertThat(map.entrySet().size()).isEqualTo(3);
+    assertThat(map.get("auth_thing_one")).isEqualTo("one");
+    assertThat(map.get("auth_thing_two")).isEqualTo("two");
+    assertThat(map.get("auth_thing_three")).isEqualTo("three");
+  }
+
+  @Test
+  public void should_create_derived_profile_with_string_map() {
+    TypeSafeDriverConfig config = parse("required_int = 42");
+    Map<String, String> authThingMap = new HashMap<>();
+    authThingMap.put("auth_thing_one", "one");
+    authThingMap.put("auth_thing_two", "two");
+    authThingMap.put("auth_thing_three", "three");
+    DriverConfigProfile base = config.getDefaultProfile();
+    DriverConfigProfile mapBase = base.withStringMap(MockOptions.OPTIONAL_AUTH, authThingMap);
+    Map<String, String> fetchedMap = mapBase.getStringMap(MockOptions.OPTIONAL_AUTH);
+    assertThat(fetchedMap).isEqualTo(authThingMap);
+  }
+
   @Test
   public void should_reload() {
     TypeSafeDriverConfig config =
