Merge pull request #70 from launchdarkly/eb/ch17502/list-of-values

allow custom attribute to have list of mixed JSON values

Author: eli-darkly

src/main/java/com/launchdarkly/client/LDUser.java

@@ -690,7 +690,28 @@ public Builder customNumber(String k, List<Number> vs) {
       custom.put(k, array);
       return this;
     }
-
+    
+    /**
+     * Add a custom attribute with a list of arbitrary JSON values. When set to one of the
+     * <a href="http://docs.launchdarkly.com/docs/targeting-users#targeting-based-on-user-attributes">built-in
+     * user attribute keys</a>, this custom attribute will be ignored.
+     *
+     * @param k  the key for the list
+     * @param vs the values for the attribute
+     * @return the builder
+     */
+    public Builder customValues(String k, List<JsonElement> vs) {
+      checkCustomAttribute(k);
+      JsonArray array = new JsonArray();
+      for (JsonElement v : vs) {
+        if (v != null) {
+          array.add(v);
+        }
+      }
+      custom.put(k, array);
+      return this;
+    }
+    
     /**
      * Add a {@link java.lang.String}-valued custom attribute that will not be sent back to LaunchDarkly.
      * When set to one of the
@@ -766,6 +787,21 @@ public Builder privateCustomNumber(String k, List<Number> vs) {
       return customNumber(k, vs);
     }
 
+    /**
+     * Add a custom attribute with a list of arbitrary JSON values. When set to one of the
+     * <a href="http://docs.launchdarkly.com/docs/targeting-users#targeting-based-on-user-attributes">
+     * built-in user attribute keys</a>, this custom attribute will be ignored. The custom attribute value will not be sent
+     * back to LaunchDarkly in analytics events.
+     *
+     * @param k  the key for the list
+     * @param vs the values for the attribute
+     * @return the builder
+     */
+    public Builder privateCustomValues(String k, List<JsonElement> vs) {
+      privateAttrNames.add(k);
+      return customValues(k, vs);
+    }
+    
     private void checkCustomAttribute(String key) {
       for (UserAttribute a : UserAttribute.values()) {
         if (a.name().equals(key)) {

src/test/java/com/launchdarkly/client/LDUserTest.java

@@ -1,7 +1,10 @@
 package com.launchdarkly.client;
 
+import com.google.common.collect.ImmutableList;
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.reflect.TypeToken;
 
@@ -10,6 +13,10 @@
 import java.lang.reflect.Type;
 import java.util.Map;
 
+import static com.launchdarkly.client.TestUtil.jbool;
+import static com.launchdarkly.client.TestUtil.jdouble;
+import static com.launchdarkly.client.TestUtil.jint;
+import static com.launchdarkly.client.TestUtil.js;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
@@ -233,4 +240,44 @@ public void getValueReturnsNullIfNotFound() {
         .build();
     assertNull(user.getValueForEvaluation("height"));
   }
+  
+  @Test
+  public void canAddCustomAttrWithListOfStrings() {
+    LDUser user = new LDUser.Builder("key")
+        .customString("foo", ImmutableList.of("a", "b"))
+        .build();
+    JsonElement expectedAttr = makeCustomAttrWithListOfValues("foo", js("a"), js("b"));
+    JsonObject jo = LDConfig.DEFAULT.gson.toJsonTree(user).getAsJsonObject();
+    assertEquals(expectedAttr, jo.get("custom"));
+  }
+  
+  @Test
+  public void canAddCustomAttrWithListOfNumbers() {
+    LDUser user = new LDUser.Builder("key")
+        .customNumber("foo", ImmutableList.<Number>of(new Integer(1), new Double(2)))
+        .build();
+    JsonElement expectedAttr = makeCustomAttrWithListOfValues("foo", jint(1), jdouble(2));
+    JsonObject jo = LDConfig.DEFAULT.gson.toJsonTree(user).getAsJsonObject();
+    assertEquals(expectedAttr, jo.get("custom"));
+  }
+
+  @Test
+  public void canAddCustomAttrWithListOfMixedValues() {
+    LDUser user = new LDUser.Builder("key")
+        .customValues("foo", ImmutableList.<JsonElement>of(js("a"), jint(1), jbool(true)))
+        .build();
+    JsonElement expectedAttr = makeCustomAttrWithListOfValues("foo", js("a"), jint(1), jbool(true));
+    JsonObject jo = LDConfig.DEFAULT.gson.toJsonTree(user).getAsJsonObject();
+    assertEquals(expectedAttr, jo.get("custom"));
+  }
+  
+  private JsonElement makeCustomAttrWithListOfValues(String name, JsonElement... values) {
+    JsonObject ret = new JsonObject();
+    JsonArray a = new JsonArray();
+    for (JsonElement v: values) {
+      a.add(v);
+    }
+    ret.add(name, a);
+    return ret;
+  }
 }