updates

Author: fahad19

src/main/java/com/featurevisor/sdk/Featurevisor.java

@@ -4,6 +4,7 @@
 import com.featurevisor.types.Feature;
 import com.featurevisor.types.EvaluatedFeature;
 import com.featurevisor.types.EvaluatedFeatures;
+import com.featurevisor.types.VariableType;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Map;
@@ -526,11 +527,9 @@ public Object getVariable(String featureKey, String variableKey, Map<String, Obj
                 Object value = evaluation.getVariableValue();
                 if (value instanceof String) {
                     String strValue = (String) value;
-                    boolean looksLikeJson = (strValue.startsWith("{") && strValue.endsWith("}")) ||
-                                            (strValue.startsWith("[") && strValue.endsWith("]"));
                     boolean isJsonType = evaluation.getVariableSchema() != null &&
-                                         "json".equals(evaluation.getVariableSchema().getType());
-                    if (isJsonType || looksLikeJson) {
+                                         evaluation.getVariableSchema().getType() == VariableType.JSON;
+                    if (isJsonType) {
                         try {
                             ObjectMapper mapper = new ObjectMapper();
                             return mapper.readValue(strValue, Object.class);

src/main/java/com/featurevisor/sdk/Helpers.java

@@ -40,18 +40,17 @@ public static <T> T getValueByType(Object value, String fieldType) {
                     }
                     return null;
                 case "boolean":
-                    if (value instanceof Boolean) {
-                        return (T) value;
-                    } else if (value instanceof String) {
-                        return (T) Boolean.valueOf((String) value);
-                    } else if (value instanceof Number) {
-                        return (T) Boolean.valueOf(((Number) value).intValue() != 0);
-                    }
-                    return null;
+                    return (T) Boolean.valueOf(Boolean.TRUE.equals(value));
                 case "array":
                     return (T) (value instanceof List ? value : null);
                 case "object":
-                    return (T) (value instanceof Map ? value : null);
+                    if (value instanceof Map) {
+                        return (T) value;
+                    }
+                    if (value instanceof List) {
+                        return (T) value;
+                    }
+                    return null;
                 case "json":
                     // JSON type is handled specially in the calling code
                     return (T) value;

src/main/java/com/featurevisor/types/VariableType.java

@@ -1,6 +1,8 @@
 package com.featurevisor.types;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum VariableType {
     @JsonProperty("boolean")
@@ -24,7 +26,23 @@ public enum VariableType {
         this.value = value;
     }
 
+    @JsonValue
     public String getValue() {
         return value;
     }
+
+    @JsonCreator
+    public static VariableType fromValue(String value) {
+        if (value == null) {
+            return null;
+        }
+
+        for (VariableType type : values()) {
+            if (type.value.equalsIgnoreCase(value)) {
+                return type;
+            }
+        }
+
+        return null;
+    }
 }

src/test/java/com/featurevisor/sdk/HelpersTest.java

@@ -0,0 +1,66 @@
+package com.featurevisor.sdk;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class HelpersTest {
+
+    @Test
+    public void testStringMismatchReturnsNull() {
+        assertNull(Helpers.getValueByType(1, "string"));
+    }
+
+    @Test
+    public void testStringValueReturnedAsIs() {
+        assertEquals("1", Helpers.getValueByType("1", "string"));
+    }
+
+    @Test
+    public void testBooleanValueReturnedAsIs() {
+        assertEquals(Boolean.TRUE, Helpers.getValueByType(true, "boolean"));
+    }
+
+    @Test
+    public void testBooleanStrictness() {
+        assertEquals(Boolean.FALSE, Helpers.getValueByType("true", "boolean"));
+        assertEquals(Boolean.FALSE, Helpers.getValueByType(1, "boolean"));
+    }
+
+    @Test
+    public void testObjectValueReturnedAsIs() {
+        Map<String, Integer> value = Map.of("a", 1, "b", 2);
+        assertEquals(value, Helpers.getValueByType(value, "object"));
+    }
+
+    @Test
+    public void testJsonValueReturnedAsIs() {
+        String json = "{\"a\":1,\"b\":2}";
+        assertEquals(json, Helpers.getValueByType(json, "json"));
+    }
+
+    @Test
+    public void testArrayValueReturnedAsIs() {
+        List<String> arr = List.of("1", "2", "3");
+        assertEquals(arr, Helpers.getValueByType(arr, "array"));
+    }
+
+    @Test
+    public void testIntegerParsing() {
+        assertEquals(Integer.valueOf(1), Helpers.getValueByType("1", "integer"));
+    }
+
+    @Test
+    public void testDoubleParsing() {
+        assertEquals(1.1d, Helpers.getValueByType("1.1", "double"));
+    }
+
+    @Test
+    public void testNullValueReturnsNull() {
+        assertNull(Helpers.getValueByType(null, "string"));
+    }
+}