Add proxy methods context->structure

toddbaert · toddbaert · commit f36b641395b8 · 2022-08-24T11:03:22.000-04:00
Signed-off-by: Todd Baert &lt;toddbaert@gmail.com&gt;
diff --git a/src/main/java/dev/openfeature/javasdk/EvaluationContext.java b/src/main/java/dev/openfeature/javasdk/EvaluationContext.java
@@ -1,5 +1,8 @@
 package dev.openfeature.javasdk;
 
+import java.time.ZonedDateTime;
+import java.util.List;
+
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -49,4 +52,41 @@ public static EvaluationContext merge(EvaluationContext ctx1, EvaluationContext
 
         return ec;
     }
+
+    // overrides so we can use "add" methods and still return EvaluationContext, not superclass
+    @Override
+    public EvaluationContext add(String key, Boolean value) {
+        return (EvaluationContext)super.add(key, value);
+    }
+
+    @Override
+    public EvaluationContext add(String key, String value) {
+        return (EvaluationContext)super.add(key, value);
+    }
+
+    @Override
+    public EvaluationContext add(String key, Integer value) {
+        return (EvaluationContext)super.add(key, value);
+    }
+
+    @Override
+    public EvaluationContext add(String key, Double value) {
+        return (EvaluationContext)super.add(key, value);
+    }
+
+    @Override
+    public EvaluationContext add(String key, ZonedDateTime value) {
+        return (EvaluationContext)super.add(key, value);
+    }
+
+    @Override
+    public EvaluationContext add(String key, Structure value) {
+        return (EvaluationContext)super.add(key, value);
+    }
+
+    @Override
+    public <T> EvaluationContext add(String key, List<T> value) {
+        return (EvaluationContext)super.add(key, value);
+    }
+
 }
diff --git a/src/main/java/dev/openfeature/javasdk/Structure.java b/src/main/java/dev/openfeature/javasdk/Structure.java
@@ -87,8 +87,16 @@ public Structure add(String key, Double value) {
         return this;
     }
 
+    /** 
+     * Add date-time relevant key.
+     * 
+     * @param key feature key
+     * @param value date-time value
+     * @return Structure
+     */
     public Structure add(String key, ZonedDateTime value) {
-        attributes.put(key, new Pair<>(FlagValueType.STRING, value.format(DateTimeFormatter.ISO_ZONED_DATE_TIME)));
+        attributes.put(key, new Pair<>(FlagValueType.STRING, value != null 
+            ? value.format(DateTimeFormatter.ISO_ZONED_DATE_TIME) : null));
         return this;
     }
 
diff --git a/src/test/java/dev/openfeature/javasdk/EvalContextTest.java b/src/test/java/dev/openfeature/javasdk/EvalContextTest.java
@@ -107,13 +107,30 @@ public class EvalContextTest {
 
     @Test void can_chain_attribute_addition() {
         EvaluationContext ec = new EvaluationContext();
-        Structure out = ec.add("str", "test")
+        EvaluationContext out = ec.add("str", "test")
                 .add("int", 4)
                 .add("bool", false)
                 .add("str", new Structure());
         assertEquals(EvaluationContext.class, out.getClass());
     }
 
+    @Test void can_add_key_with_null() {
+        EvaluationContext ec = new EvaluationContext()
+                .add("Boolean", (Boolean)null)
+                .add("String", (String)null)
+                .add("Double", (Double)null)
+                .add("Structure", (Structure)null)
+                .add("List", (List<Object>)null)
+                .add("ZonedDateTime", (ZonedDateTime)null);
+        assertEquals(6, ec.getAllAttributes().size());
+        assertEquals(null, ec.getBooleanAttribute("Boolean"));
+        assertEquals(null, ec.getStringAttribute("String"));
+        assertEquals(null, ec.getDoubleAttribute("Double"));
+        assertEquals(null, ec.getStructureAttribute("Structure"));
+        assertEquals(null, ec.getDoubleAttribute("List"));
+        assertEquals(null, ec.getStructureAttribute("ZonedDateTime"));
+    }
+
     @Test void merge_targeting_key() {
         String key1 = "key1";
         EvaluationContext ctx1 = new EvaluationContext(key1);
