Throw on invalid values

toddbaert · toddbaert · commit 60fad0507a4b · 2022-09-09T13:59:18.000-04:00
Signed-off-by: Todd Baert &lt;toddbaert@gmail.com&gt;
diff --git a/src/main/java/dev/openfeature/javasdk/Value.java b/src/main/java/dev/openfeature/javasdk/Value.java
@@ -19,11 +19,27 @@ public class Value {
     private final Object innerObject;
 
     public Value() {
-        this.innerObject = null; 
+        this.innerObject = null;
     }
 
-    public Value(Object value) {
-        this.innerObject = value; 
+    /**
+     * Construct a new Value with an Object.
+     * @param value to be wrapped.
+     * @throws InstantiationException if value is not a valid type
+     *      (boolean, string, int, double, list, structure, instant)
+     */
+    public Value(Object value) throws InstantiationException {
+        // integer is a special case, convert those.
+        this.innerObject = value instanceof Integer ? ((Integer)value).doubleValue() : value;
+        if (!this.isNull()
+            && !this.isBoolean()
+            && !this.isString()
+            && !this.isNumber()
+            && !this.isStructure()
+            && !this.isList()
+            && !this.isInstant()) {
+            throw new InstantiationException("Invalid value type: " + value.getClass());
+        }
     }
 
     public Value(Value value) {
diff --git a/src/test/java/dev/openfeature/javasdk/ValueTest.java b/src/test/java/dev/openfeature/javasdk/ValueTest.java
@@ -1,7 +1,9 @@
 package dev.openfeature.javasdk;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -16,9 +18,44 @@ public class ValueTest {
     }
 
     @Test public void objectArgShouldContainObject() {
-        Object innerValue = new Object();
-        Value value = new Value(innerValue);
-        assertEquals(innerValue, value.asObject());
+        try {
+            // int is a special case, see intObjectArgShouldConvertToInt()
+            List<Object> list = new ArrayList<>();
+            list.add(true);
+            list.add("val");
+            list.add(.5);
+            list.add(new Structure());
+            list.add(new ArrayList<Value>());
+            list.add(Instant.now());
+
+            int i = 0;
+            for (Object l: list) {
+                Value value = new Value(l);
+                assertEquals(list.get(i), value.asObject());
+                i++;
+            }
+        } catch (Exception e) {
+            fail("No exception expected.");
+        }
+    }
+
+    @Test public void intObjectArgShouldConvertToInt() {
+        try {
+            Object innerValue = 1;
+            Value value = new Value(innerValue);
+            assertEquals(innerValue, value.asInteger());
+        } catch (Exception e) {
+            fail("No exception expected.");
+        }
+    }
+
+    @Test public void invalidObjectArgShouldThrow() {
+
+        class Something {}
+
+        assertThrows(InstantiationException.class, () -> {
+            new Value(new Something());
+        });
     }
 
     @Test public void boolArgShouldContainBool() {
