Drop multi-map implementation of context for a single type-annotated map

Author: justinabrahms

pom.xml

@@ -54,13 +54,6 @@
       <scope>provided</scope>
     </dependency>
 
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.13.2.1</version>
-    </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

src/main/java/dev/openfeature/javasdk/EvaluationContext.java

@@ -1,6 +1,6 @@
 package dev.openfeature.javasdk;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import dev.openfeature.javasdk.internal.Pair;
 import lombok.*;
 
 import java.time.ZonedDateTime;
@@ -11,80 +11,90 @@
 @ToString @EqualsAndHashCode
 @SuppressWarnings("PMD.BeanMembersShouldSerialize")
 public class EvaluationContext {
-    @EqualsAndHashCode.Exclude private final ObjectMapper objMapper;
     @Setter @Getter private String targetingKey;
-    private final Map<String, Integer> integerAttributes;
-    private final Map<String, String> stringAttributes;
-    private final Map<String, Boolean> booleanAttributes;
-    final Map<String, String> jsonAttributes;
+    private final Map<String, dev.openfeature.javasdk.internal.Pair<FlagValueType, Object>> attributes;
 
     public EvaluationContext() {
-        objMapper = new ObjectMapper();
         this.targetingKey = "";
-        this.integerAttributes = new HashMap<>();
-        this.stringAttributes = new HashMap<>();
-        booleanAttributes = new HashMap<>();
-        jsonAttributes = new HashMap<>();
+        this.attributes = new HashMap<>();
     }
 
     // TODO Not sure if I should have sneakythrows or checked exceptions here..
     @SneakyThrows
     public <T> void addStructureAttribute(String key, T value) {
-        jsonAttributes.put(key, objMapper.writeValueAsString(value));
+        attributes.put(key, new Pair<>(FlagValueType.OBJECT, value));
     }
 
     @SneakyThrows
-    public <T> T getStructureAttribute(String key, Class<T> klass) {
-        String val = jsonAttributes.get(key);
-        return objMapper.readValue(val, klass);
+    public <T> T getStructureAttribute(String key) {
+        return getAttributeByType(key, FlagValueType.OBJECT);
     }
 
     public Map<String, String> getStructureAttributes() {
-        return new HashMap<>(jsonAttributes);
+        return getAttributesByType(FlagValueType.OBJECT);
     }
 
     public void addStringAttribute(String key, String value) {
-        stringAttributes.put(key, value);
+        attributes.put(key, new Pair<>(FlagValueType.STRING, value));
     }
 
     public String getStringAttribute(String key) {
-        return stringAttributes.get(key);
+        return getAttributeByType(key, FlagValueType.STRING);
+    }
+
+    private <T> Map<String, T> getAttributesByType(FlagValueType type) {
+        HashMap<String, T> hm = new HashMap<>();
+        for (Map.Entry<String, Pair<FlagValueType, Object>> entry : attributes.entrySet()) {
+            String key = entry.getKey();
+            if (entry.getValue().getFirst() == type) {
+                hm.put(key, (T) entry.getValue().getSecond());
+            }
+        }
+        return hm;
+    }
+
+    private <T> T getAttributeByType(String key, FlagValueType type) {
+        Pair<FlagValueType, Object> val = attributes.get(key);
+        if (val.getFirst() == type) {
+            return (T) val.getSecond();
+        }
+        return null;
     }
 
     public Map<String, String> getStringAttributes() {
-        return new HashMap<>(stringAttributes);
+        return getAttributesByType(FlagValueType.STRING);
     }
 
     public void addIntegerAttribute(String key, Integer value) {
-        integerAttributes.put(key, value);
+        attributes.put(key, new Pair<>(FlagValueType.INTEGER, value));
     }
 
     public Integer getIntegerAttribute(String key) {
-        return integerAttributes.get(key);
+        return getAttributeByType(key, FlagValueType.INTEGER);
     }
 
     public Map<String, Integer> getIntegerAttributes() {
-        return new HashMap<>(integerAttributes);
+        return getAttributesByType(FlagValueType.INTEGER);
     }
 
     public Boolean getBooleanAttribute(String key) {
-        return booleanAttributes.get(key);
+        return getAttributeByType(key, FlagValueType.BOOLEAN);
     }
 
     public void addBooleanAttribute(String key, Boolean b) {
-        booleanAttributes.put(key, b);
+        attributes.put(key, new Pair<>(FlagValueType.BOOLEAN, b));
     }
 
     public Map<String, Boolean> getBooleanAttributes() {
-        return new HashMap<>(booleanAttributes);
+        return getAttributesByType(FlagValueType.BOOLEAN);
     }
 
     public void addDatetimeAttribute(String key, ZonedDateTime value) {
-        this.stringAttributes.put(key, value.format(DateTimeFormatter.ISO_ZONED_DATE_TIME));
+        attributes.put(key, new Pair<>(FlagValueType.STRING, value.format(DateTimeFormatter.ISO_ZONED_DATE_TIME)));
     }
 
     public ZonedDateTime getDatetimeAttribute(String key) {
-        String attr = this.stringAttributes.get(key);
+        String attr = getAttributeByType(key, FlagValueType.STRING);
         if (attr == null) {
             return null;
         }
@@ -96,18 +106,8 @@ public ZonedDateTime getDatetimeAttribute(String key) {
      */
     public static EvaluationContext merge(EvaluationContext ctx1, EvaluationContext ctx2) {
         EvaluationContext ec = new EvaluationContext();
-
-        ec.stringAttributes.putAll(ctx1.stringAttributes);
-        ec.stringAttributes.putAll(ctx2.stringAttributes);
-
-        ec.integerAttributes.putAll(ctx1.integerAttributes);
-        ec.integerAttributes.putAll(ctx2.integerAttributes);
-
-        ec.booleanAttributes.putAll(ctx1.booleanAttributes);
-        ec.booleanAttributes.putAll(ctx2.booleanAttributes);
-
-        ec.jsonAttributes.putAll(ctx1.jsonAttributes);
-        ec.jsonAttributes.putAll(ctx2.jsonAttributes);
+        ec.attributes.putAll(ctx1.attributes);
+        ec.attributes.putAll(ctx2.attributes);
 
         if (ctx1.getTargetingKey() != null) {
             ec.setTargetingKey(ctx1.getTargetingKey());

src/main/java/dev/openfeature/javasdk/internal/Pair.java

@@ -0,0 +1,9 @@
+package dev.openfeature.javasdk.internal;
+
+import lombok.Value;
+
+@Value
+public class Pair<K,V> {
+    private K first;
+    private V second;
+}

src/test/java/dev/openfeature/javasdk/EvalContextTest.java

@@ -1,7 +1,5 @@
 package dev.openfeature.javasdk;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 
 import java.time.ZonedDateTime;
@@ -55,11 +53,7 @@ public class EvalContextTest {
         EvaluationContext ec = new EvaluationContext();
         ec.addStructureAttribute("obj", n2);
 
-
-        String stringyObject = ec.jsonAttributes.get("obj");
-        assertEquals("{\"left\":{\"left\":null,\"right\":null,\"value\":4},\"right\":null,\"value\":2}", stringyObject);
-
-        Node nodeFromString = ec.getStructureAttribute("obj", Node.class);
+        Node nodeFromString = ec.getStructureAttribute("obj");
         assertEquals(n2, nodeFromString);
         assertEquals(n1, nodeFromString.left);
         assertEquals(2, nodeFromString.value);
@@ -102,10 +96,17 @@ public class EvalContextTest {
         assertEquals(ec.getIntegerAttribute("int2"), foundInt.get("int2"));
 
         Map<String, String> foundObj = ec.getStructureAttributes();
-        try {
-            assertEquals(ec.getStructureAttribute("obj", Node.class), new ObjectMapper().readValue(foundObj.get("obj"), Node.class));
-        } catch (JsonProcessingException e) {
-            fail("Unexpected exception occurred: ", e);
-        }
+        assertEquals(ec.<Node>getStructureAttribute("obj"), n2);
+    }
+
+    @Specification(number="3.1.4", text="The evaluation context fields MUST have an unique key.")
+    @Test void unique_key_across_types() {
+        EvaluationContext ec = new EvaluationContext();
+        ec.addStringAttribute("key", "val");
+        ec.addStringAttribute("key", "val2");
+        assertEquals("val2", ec.getStringAttribute("key"));
+        ec.addIntegerAttribute("key", 3);
+        assertEquals(null, ec.getStringAttribute("key"));
+        assertEquals(3, ec.getIntegerAttribute("key"));
     }
 }