Merge pull request open-feature#41 from rgrassian-split/evalContextIterator

justinabrahms · web-flow · commit e7757eca85e9 · 2022-08-03T15:54:05.000-07:00
iterators to get all integer, string, boolean, or structure map entries
diff --git a/src/main/java/dev/openfeature/javasdk/EvaluationContext.java b/src/main/java/dev/openfeature/javasdk/EvaluationContext.java
@@ -39,6 +39,10 @@ public <T> T getStructureAttribute(String key, Class<T> klass) {
         return objMapper.readValue(val, klass);
     }
 
+    public Map<String, String> getStructureAttributes() {
+        return new HashMap<>(jsonAttributes);
+    }
+
     public void addStringAttribute(String key, String value) {
         stringAttributes.put(key, value);
     }
@@ -47,6 +51,10 @@ public String getStringAttribute(String key) {
         return stringAttributes.get(key);
     }
 
+    public Map<String, String> getStringAttributes() {
+        return new HashMap<>(stringAttributes);
+    }
+
     public void addIntegerAttribute(String key, Integer value) {
         integerAttributes.put(key, value);
     }
@@ -55,6 +63,10 @@ public Integer getIntegerAttribute(String key) {
         return integerAttributes.get(key);
     }
 
+    public Map<String, Integer> getIntegerAttributes() {
+        return new HashMap<>(integerAttributes);
+    }
+
     public Boolean getBooleanAttribute(String key) {
         return booleanAttributes.get(key);
     }
@@ -63,6 +75,10 @@ public void addBooleanAttribute(String key, Boolean b) {
         booleanAttributes.put(key, b);
     }
 
+    public Map<String, Boolean> getBooleanAttributes() {
+        return new HashMap<>(booleanAttributes);
+    }
+
     public void addDatetimeAttribute(String key, ZonedDateTime value) {
         this.stringAttributes.put(key, value.format(DateTimeFormatter.ISO_ZONED_DATE_TIME));
     }
diff --git a/src/test/java/dev/openfeature/javasdk/EvalContextTest.java b/src/test/java/dev/openfeature/javasdk/EvalContextTest.java
@@ -1,13 +1,19 @@
 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;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class EvalContextTest {
-    @Specification(number="3.1",
+    @Specification(number="3.1.1",
             text="The `evaluation context` structure **MUST** define an optional `targeting key` field of " +
                     "type string, identifying the subject of the flag evaluation.")
     @Test void requires_targeting_key() {
@@ -16,7 +22,7 @@ public class EvalContextTest {
         assertEquals("targeting-key", ec.getTargetingKey());
     }
 
-    @Specification(number="3.2", text="The evaluation context MUST support the inclusion of " +
+    @Specification(number="3.1.2", text="The evaluation context MUST support the inclusion of " +
             "custom fields, having keys of type `string`, and " +
             "values of type `boolean | string | number | datetime | structure`.")
     @Test void eval_context() {
@@ -36,7 +42,7 @@ public class EvalContextTest {
         assertEquals(dt, ec.getDatetimeAttribute("dt"));
     }
 
-    @Specification(number="3.2", text="The evaluation context MUST support the inclusion of " +
+    @Specification(number="3.1.2", text="The evaluation context MUST support the inclusion of " +
             "custom fields, having keys of type `string`, and " +
             "values of type `boolean | string | number | datetime | structure`.")
     @Test void eval_context__structure() {
@@ -59,4 +65,48 @@ public class EvalContextTest {
         assertEquals(2, nodeFromString.value);
         assertEquals(4, nodeFromString.left.value);
     }
+
+    @Specification(number="3.1.3", text="The evaluation context MUST support fetching the custom fields by key and " +
+            "also fetching all of the keys and values.")
+    @Test void fetch_all() {
+        EvaluationContext ec = new EvaluationContext();
+
+        ec.addStringAttribute("str", "test");
+        ec.addStringAttribute("str2", "test2");
+
+        ec.addBooleanAttribute("bool", true);
+        ec.addBooleanAttribute("bool2", false);
+
+        ec.addIntegerAttribute("int", 4);
+        ec.addIntegerAttribute("int2", 2);
+
+        ZonedDateTime dt = ZonedDateTime.now();
+        ec.addDatetimeAttribute("dt", dt);
+
+        Node<Integer> n1 = new Node<>();
+        n1.value = 4;
+        Node<Integer> n2 = new Node<>();
+        n2.value = 2;
+        n2.left = n1;
+        ec.addStructureAttribute("obj", n2);
+
+        Map<String, String> foundStr = ec.getStringAttributes();
+        assertEquals(ec.getStringAttribute("str"), foundStr.get("str"));
+        assertEquals(ec.getStringAttribute("str2"), foundStr.get("str2"));
+
+        Map<String, Boolean> foundBool = ec.getBooleanAttributes();
+        assertEquals(ec.getBooleanAttribute("bool"), foundBool.get("bool"));
+        assertEquals(ec.getBooleanAttribute("bool2"), foundBool.get("bool2"));
+
+        Map<String, Integer> foundInt = ec.getIntegerAttributes();
+        assertEquals(ec.getIntegerAttribute("int"), foundInt.get("int"));
+        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);
+        }
+    }
 }
diff --git a/src/test/java/dev/openfeature/javasdk/HookSpecTest.java b/src/test/java/dev/openfeature/javasdk/HookSpecTest.java
@@ -411,7 +411,7 @@ public void finallyAfter(HookContext<Boolean> ctx, Map<String, Object> hints) {
 
 
         Client client = getClient(null);
-        client.getBooleanValue("key", false, new EvaluationContext(),
+        client.getBooleanValue("key", false, ctx,
                 FlagEvaluationOptions.builder()
                         .hook(hook2)
                         .hook(hook)

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ public <T> T getStructureAttribute(String key, Class<T> klass) {`
`39`	`39`	`return objMapper.readValue(val, klass);`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ public Map<String, String> getStructureAttributes() {`
	`43`	`+ return new HashMap<>(jsonAttributes);`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`public void addStringAttribute(String key, String value) {`
`43`	`47`	`stringAttributes.put(key, value);`
`44`	`48`	`}`
`@@ -47,6 +51,10 @@ public String getStringAttribute(String key) {`
`47`	`51`	`return stringAttributes.get(key);`
`48`	`52`	`}`
`49`	`53`
	`54`	`+ public Map<String, String> getStringAttributes() {`
	`55`	`+ return new HashMap<>(stringAttributes);`
	`56`	`+ }`
	`57`	`+`
`50`	`58`	`public void addIntegerAttribute(String key, Integer value) {`
`51`	`59`	`integerAttributes.put(key, value);`
`52`	`60`	`}`
`@@ -55,6 +63,10 @@ public Integer getIntegerAttribute(String key) {`
`55`	`63`	`return integerAttributes.get(key);`
`56`	`64`	`}`
`57`	`65`
	`66`	`+ public Map<String, Integer> getIntegerAttributes() {`
	`67`	`+ return new HashMap<>(integerAttributes);`
	`68`	`+ }`
	`69`	`+`
`58`	`70`	`public Boolean getBooleanAttribute(String key) {`
`59`	`71`	`return booleanAttributes.get(key);`
`60`	`72`	`}`
`@@ -63,6 +75,10 @@ public void addBooleanAttribute(String key, Boolean b) {`
`63`	`75`	`booleanAttributes.put(key, b);`
`64`	`76`	`}`
`65`	`77`
	`78`	`+ public Map<String, Boolean> getBooleanAttributes() {`
	`79`	`+ return new HashMap<>(booleanAttributes);`
	`80`	`+ }`
	`81`	`+`
`66`	`82`	`public void addDatetimeAttribute(String key, ZonedDateTime value) {`
`67`	`83`	`this.stringAttributes.put(key, value.format(DateTimeFormatter.ISO_ZONED_DATE_TIME));`
`68`	`84`	`}`