chore: Remove dependency on Gson (#7)

* chore: Remove dependency on Gson

* bump major version

* minor cleanup

* move more android tests

* spotless

Author: felipecsl

build.gradle

@@ -6,18 +6,13 @@ plugins {
 }
 
 group = 'cloud.eppo'
-version = '1.1.0-SNAPSHOT'
+version = '2.0.0-SNAPSHOT'
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
 dependencies {
-  // TODO: Consolidate these into a single JSON parsing dependency
-  // For RAC DTOs
   implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1'
-  implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.1'
-  implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.17.1'
   // For UFC DTOs
   implementation 'commons-codec:commons-codec:1.17.0'
-  implementation "com.google.code.gson:gson:2.9.1"
   implementation 'org.slf4j:slf4j-api:2.0.13'
   testImplementation platform('org.junit:junit-bom:5.10.2')
   testImplementation 'org.junit.jupiter:junit-jupiter'

src/main/java/cloud/eppo/Utils.java

@@ -1,6 +1,6 @@
 package cloud.eppo;
 
-import com.google.gson.JsonElement;
+import com.fasterxml.jackson.databind.JsonNode;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -13,7 +13,7 @@
 import org.slf4j.LoggerFactory;
 
 public final class Utils {
-  private static final SimpleDateFormat isoUtcDateFormat = buildUtcIsoDateFormat();
+  private static final SimpleDateFormat UTC_ISO_DATE_FORMAT = buildUtcIsoDateFormat();
   private static final Logger log = LoggerFactory.getLogger(Utils.class);
 
   public static String getMD5Hex(String input) {
@@ -33,14 +33,14 @@ public static String getMD5Hex(String input) {
     return hashText.toString();
   }
 
-  public static Date parseUtcISODateElement(JsonElement isoDateStringElement) {
-    if (isoDateStringElement == null || isoDateStringElement.isJsonNull()) {
+  public static Date parseUtcISODateElement(JsonNode isoDateStringElement) {
+    if (isoDateStringElement == null || isoDateStringElement.isNull()) {
       return null;
     }
-    String isoDateString = isoDateStringElement.getAsString();
+    String isoDateString = isoDateStringElement.asText();
     Date result = null;
     try {
-      result = isoUtcDateFormat.parse(isoDateString);
+      result = UTC_ISO_DATE_FORMAT.parse(isoDateString);
     } catch (ParseException e) {
       // We expect to fail parsing if the date is base 64 encoded
       // Thus we'll leave the result null for now and try again with the decoded value
@@ -50,7 +50,7 @@ public static Date parseUtcISODateElement(JsonElement isoDateStringElement) {
       // Date may be encoded
       String decodedIsoDateString = base64Decode(isoDateString);
       try {
-        result = isoUtcDateFormat.parse(decodedIsoDateString);
+        result = UTC_ISO_DATE_FORMAT.parse(decodedIsoDateString);
       } catch (ParseException e) {
         log.warn("Date \"{}\" not in ISO date format", isoDateString);
       }
@@ -60,7 +60,7 @@ public static Date parseUtcISODateElement(JsonElement isoDateStringElement) {
   }
 
   public static String getISODate(Date date) {
-    return isoUtcDateFormat.format(date);
+    return UTC_ISO_DATE_FORMAT.format(date);
   }
 
   public static String base64Decode(String input) {

src/main/java/cloud/eppo/ufc/dto/FlagConfig.java

@@ -4,63 +4,49 @@
 import java.util.Map;
 
 public class FlagConfig {
-  private String key;
-
-  private boolean enabled;
-
-  private int totalShards;
-
-  private VariationType variationType;
-
-  private Map<String, Variation> variations;
-
-  private List<Allocation> allocations;
+  private final String key;
+  private final boolean enabled;
+  private final int totalShards;
+  private final VariationType variationType;
+  private final Map<String, Variation> variations;
+  private final List<Allocation> allocations;
+
+  public FlagConfig(
+      String key,
+      boolean enabled,
+      int totalShards,
+      VariationType variationType,
+      Map<String, Variation> variations,
+      List<Allocation> allocations) {
+    this.key = key;
+    this.enabled = enabled;
+    this.totalShards = totalShards;
+    this.variationType = variationType;
+    this.variations = variations;
+    this.allocations = allocations;
+  }
 
   public String getKey() {
     return this.key;
   }
 
-  public void setKey(String key) {
-    this.key = key;
-  }
-
   public int getTotalShards() {
     return totalShards;
   }
 
-  public void setTotalShards(int totalShards) {
-    this.totalShards = totalShards;
-  }
-
   public boolean isEnabled() {
     return enabled;
   }
 
-  public void setEnabled(boolean enabled) {
-    this.enabled = enabled;
-  }
-
   public VariationType getVariationType() {
     return variationType;
   }
 
-  public void setVariationType(VariationType variationType) {
-    this.variationType = variationType;
-  }
-
   public Map<String, Variation> getVariations() {
     return variations;
   }
 
-  public void setVariations(Map<String, Variation> variations) {
-    this.variations = variations;
-  }
-
   public List<Allocation> getAllocations() {
     return allocations;
   }
-
-  public void setAllocations(List<Allocation> allocations) {
-    this.allocations = allocations;
-  }
 }

src/main/java/cloud/eppo/ufc/dto/FlagConfigResponse.java

@@ -1,15 +1,20 @@
 package cloud.eppo.ufc.dto;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class FlagConfigResponse {
-  private Map<String, FlagConfig> flags;
+  private final Map<String, FlagConfig> flags;
 
-  public Map<String, FlagConfig> getFlags() {
-    return this.flags;
+  public FlagConfigResponse(Map<String, FlagConfig> flags) {
+    this.flags = flags;
   }
 
-  public void setFlags(Map<String, FlagConfig> flags) {
-    this.flags = flags;
+  public FlagConfigResponse() {
+    this(new ConcurrentHashMap<>());
+  }
+
+  public Map<String, FlagConfig> getFlags() {
+    return this.flags;
   }
 }

src/main/java/cloud/eppo/ufc/dto/Shard.java

@@ -4,22 +4,19 @@
 import java.util.Set;
 
 public class Shard {
-  private String salt;
-  private Set<ShardRange> ranges;
+  private final String salt;
+  private final Set<ShardRange> ranges;
 
-  public String getSalt() {
-    return salt;
+  public Shard(String salt, Set<ShardRange> ranges) {
+    this.salt = salt;
+    this.ranges = ranges;
   }
 
-  public void setSalt(String salt) {
-    this.salt = salt;
+  public String getSalt() {
+    return salt;
   }
 
   public Set<ShardRange> getRanges() {
     return ranges;
   }
-
-  public void setRanges(Set<ShardRange> ranges) {
-    this.ranges = ranges;
-  }
 }

src/main/java/cloud/eppo/ufc/dto/Split.java

@@ -4,34 +4,25 @@
 import java.util.Set;
 
 public class Split {
+  private final String variationKey;
+  private final Set<Shard> shards;
+  private final Map<String, String> extraLogging;
 
-  private String variationKey;
-
-  private Set<Shard> shards;
-
-  private Map<String, String> extraLogging;
+  public Split(String variationKey, Set<Shard> shards, Map<String, String> extraLogging) {
+    this.variationKey = variationKey;
+    this.shards = shards;
+    this.extraLogging = extraLogging;
+  }
 
   public String getVariationKey() {
     return variationKey;
   }
 
-  public void setVariationKey(String variationKey) {
-    this.variationKey = variationKey;
-  }
-
   public Set<Shard> getShards() {
     return shards;
   }
 
-  public void setShards(Set<Shard> shards) {
-    this.shards = shards;
-  }
-
   public Map<String, String> getExtraLogging() {
     return extraLogging;
   }
-
-  public void setExtraLogging(Map<String, String> extraLogging) {
-    this.extraLogging = extraLogging;
-  }
 }

src/main/java/cloud/eppo/ufc/dto/TargetingCondition.java

@@ -1,33 +1,25 @@
 package cloud.eppo.ufc.dto;
 
 public class TargetingCondition {
-  private OperatorType operator;
+  private final OperatorType operator;
+  private final String attribute;
+  private final EppoValue value;
 
-  private String attribute;
-
-  private EppoValue value;
+  public TargetingCondition(OperatorType operator, String attribute, EppoValue value) {
+    this.operator = operator;
+    this.attribute = attribute;
+    this.value = value;
+  }
 
   public OperatorType getOperator() {
     return operator;
   }
 
-  public void setOperator(OperatorType operatorType) {
-    this.operator = operatorType;
-  }
-
   public String getAttribute() {
     return attribute;
   }
 
-  public void setAttribute(String attribute) {
-    this.attribute = attribute;
-  }
-
   public EppoValue getValue() {
     return value;
   }
-
-  public void setValue(EppoValue value) {
-    this.value = value;
-  }
 }

src/main/java/cloud/eppo/ufc/dto/TargetingRule.java

@@ -3,14 +3,13 @@
 import java.util.Set;
 
 public class TargetingRule {
+  private final Set<TargetingCondition> conditions;
 
-  private Set<TargetingCondition> conditions;
+  public TargetingRule(Set<TargetingCondition> conditions) {
+    this.conditions = conditions;
+  }
 
   public Set<TargetingCondition> getConditions() {
     return conditions;
   }
-
-  public void setConditions(Set<TargetingCondition> conditions) {
-    this.conditions = conditions;
-  }
 }

src/main/java/cloud/eppo/ufc/dto/Variation.java

@@ -1,24 +1,19 @@
 package cloud.eppo.ufc.dto;
 
 public class Variation {
+  private final String key;
+  private final EppoValue value;
 
-  private String key;
-
-  private EppoValue value;
+  public Variation(String key, EppoValue value) {
+    this.key = key;
+    this.value = value;
+  }
 
   public String getKey() {
     return this.key;
   }
 
-  public void setKey(String key) {
-    this.key = key;
-  }
-
   public EppoValue getValue() {
     return value;
   }
-
-  public void setValue(EppoValue value) {
-    this.value = value;
-  }
 }