Eliminate excessive JsonPrimitive construction in an attempt to avoid performance issues with TargetRule matching

Author: jkodumal

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

@@ -78,7 +78,7 @@ private Float paramForUser(LDUser user) {
     String hash;
 
     if (user.getKey() != null) {
-      idHash = user.getKey();
+      idHash = user.getKey().getAsString();
     }
     else {
       return null;

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

@@ -5,6 +5,6 @@
 class IdentifyEvent extends Event {
 
   IdentifyEvent(LDUser user) {
-    super("identify", user.getKey(), user);
+    super("identify", user.getKey().getAsString(), user);
   }
 }

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

@@ -24,17 +24,17 @@
  * launch a feature to the top 10% of users on a site.
  */
 public class LDUser {
-  private String key;
-  private String secondary;
-  private String ip;
-  private String email;
-  private String name;
-  private String avatar;
-  private String firstName;
-  private String lastName;
-  private Boolean anonymous;
-
-  private LDCountryCode country;
+  private JsonPrimitive key;
+  private JsonPrimitive secondary;
+  private JsonPrimitive ip;
+  private JsonPrimitive email;
+  private JsonPrimitive name;
+  private JsonPrimitive avatar;
+  private JsonPrimitive firstName;
+  private JsonPrimitive lastName;
+  private JsonPrimitive anonymous;
+
+  private JsonPrimitive country;
   private Map<String, JsonElement> custom;
   private static final Logger logger = LoggerFactory.getLogger(LDUser.class);
 
@@ -44,16 +44,16 @@ public class LDUser {
   }
 
   protected LDUser(Builder builder) {
-    this.key = builder.key;
-    this.ip = builder.ip;
-    this.country = builder.country;
-    this.secondary = builder.secondary;
-    this.firstName = builder.firstName;
-    this.lastName = builder.lastName;
-    this.email = builder.email;
-    this.name = builder.name;
-    this.avatar = builder.avatar;
-    this.anonymous = builder.anonymous;
+    this.key = builder.key == null? null : new JsonPrimitive(builder.key);
+    this.ip = builder.ip == null? null : new JsonPrimitive(builder.ip);
+    this.country = builder.country == null? null : new JsonPrimitive(builder.country.getAlpha2());
+    this.secondary = builder.secondary == null ? null : new JsonPrimitive(builder.secondary);
+    this.firstName = builder.firstName == null ? null : new JsonPrimitive(builder.firstName);
+    this.lastName = builder.lastName == null ? null : new JsonPrimitive(builder.lastName);
+    this.email = builder.email == null ? null : new JsonPrimitive(builder.email);
+    this.name = builder.name == null ? null : new JsonPrimitive(builder.name);
+    this.avatar = builder.avatar == null ? null : new JsonPrimitive(builder.avatar);
+    this.anonymous =  builder.anonymous == null ? null : new JsonPrimitive(builder.anonymous);
     this.custom = new HashMap<String, JsonElement>(builder.custom);
   }
 
@@ -62,31 +62,31 @@ protected LDUser(Builder builder) {
    * @param key a {@code String} that uniquely identifies a user
    */
   public LDUser(String key) {
-    this.key = key;
+    this.key = new JsonPrimitive(key);
     this.custom = new HashMap<String, JsonElement>();
   }
 
-  String getKey() {
+  JsonPrimitive getKey() {
     return key;
   }
 
-  String getIp() { return ip; }
+  JsonPrimitive getIp() { return ip; }
 
-  LDCountryCode getCountry() { return country; }
+  JsonPrimitive getCountry() { return country; }
 
-  String getSecondary() { return secondary; }
+  JsonPrimitive getSecondary() { return secondary; }
 
-  String getName() { return name; }
+  JsonPrimitive getName() { return name; }
 
-  String getFirstName() { return firstName; }
+  JsonPrimitive getFirstName() { return firstName; }
 
-  String getLastName() { return lastName; }
+  JsonPrimitive getLastName() { return lastName; }
 
-  String getEmail() { return email; }
+  JsonPrimitive getEmail() { return email; }
 
-  String getAvatar() { return avatar; }
+  JsonPrimitive getAvatar() { return avatar; }
 
-  Boolean getAnonymous() { return anonymous; }
+  JsonPrimitive getAnonymous() { return anonymous; }
 
   JsonElement getCustom(String key) {
     return custom.get(key);

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

@@ -137,47 +137,47 @@ public boolean matchTarget(LDUser user) {
       Object uValue = null;
       if (attribute.equals("key")) {
         if (user.getKey() != null) {
-          uValue = new JsonPrimitive(user.getKey());
+          uValue = user.getKey();
         }
       }
       else if (attribute.equals("ip") && user.getIp() != null) {
         if (user.getIp() != null) {
-          uValue = new JsonPrimitive(user.getIp());
+          uValue = user.getIp();
         }
       }
       else if (attribute.equals("country")) {
         if (user.getCountry() != null) {
-          uValue = new JsonPrimitive(user.getCountry().getAlpha2());
+          uValue = user.getCountry();
         }
       }
       else if (attribute.equals("email")) {
         if (user.getEmail() != null) {
-          uValue = new JsonPrimitive(user.getEmail());
+          uValue = user.getEmail();
         }
       }
       else if (attribute.equals("firstName")) {
         if (user.getFirstName() != null ) {
-          uValue = new JsonPrimitive(user.getFirstName());
+          uValue = user.getFirstName();
         }
       }
       else if (attribute.equals("lastName")) {
         if (user.getLastName() != null) {
-          uValue = new JsonPrimitive(user.getLastName());
+          uValue = user.getLastName();
         }
       }
       else if (attribute.equals("avatar")) {
         if (user.getAvatar() != null) {
-          uValue = new JsonPrimitive(user.getAvatar());
+          uValue = user.getAvatar();
         }
       }
       else if (attribute.equals("name")) {
         if (user.getName() != null) {
-          uValue = new JsonPrimitive(user.getName());
+          uValue = user.getName();
         }
       }
       else if (attribute.equals("anonymous")) {
         if (user.getAnonymous() != null) {
-          uValue = new JsonPrimitive(user.getAnonymous());
+          uValue = user.getAnonymous();
         }
       }
       else { // Custom attribute

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

@@ -1,37 +1,40 @@
 package com.launchdarkly.client;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonPrimitive;
 import org.junit.Test;
 
 public class LDUserTest {
 
+  private JsonPrimitive us = new JsonPrimitive(LDCountryCode.US.getAlpha2());
+
   @Test
   public void testValidCountryCodeSetsCountry() {
     LDUser user = new LDUser.Builder("key").country(LDCountryCode.US).build();
 
-    assert(user.getCountry().equals(LDCountryCode.US));
+    assert(user.getCountry().equals(us));
   }
 
 
   @Test
   public void testValidCountryCodeStringSetsCountry() {
     LDUser user = new LDUser.Builder("key").country("US").build();
 
-    assert(user.getCountry().equals(LDCountryCode.US));
+    assert(user.getCountry().equals(us));
   }
 
   @Test
   public void testValidCountryCode3SetsCountry() {
     LDUser user = new LDUser.Builder("key").country("USA").build();
 
-    assert(user.getCountry().equals(LDCountryCode.US));
+    assert(user.getCountry().equals(us));
   }
 
   @Test
   public void testAmbiguousCountryNameSetsCountryWithExactMatch() {
     // "United States" is ambiguous: can also match "United States Minor Outlying Islands"
     LDUser user = new LDUser.Builder("key").country("United States").build();
-    assert(user.getCountry().equals(LDCountryCode.US));
+    assert(user.getCountry().equals(us));
   }
 
   @Test
@@ -45,7 +48,7 @@ public void testAmbiguousCountryNameSetsCountryWithPartialMatch() {
   @Test
   public void testPartialUniqueMatchSetsCountry() {
     LDUser user = new LDUser.Builder("key").country("United States Minor").build();
-    assert(user.getCountry().equals(LDCountryCode.UM));
+    assert(user.getCountry().equals(new JsonPrimitive(LDCountryCode.UM.getAlpha2())));
   }
 
   @Test
@@ -63,6 +66,6 @@ public void testLDUserJsonSerializationContainsCountryAsTwoDigitCode() {
 
     LDUser deserialized = gson.fromJson(jsonStr, LDUser.class);
 
-    assert(deserialized.getCountry().equals(LDCountryCode.US));
+    assert(deserialized.getCountry().equals(us));
   }
 }