fix: bug in type inference (#20)

Author: dsun0720

.gitignore

@@ -119,3 +119,4 @@ fabric.properties
 
 #sonarlint
 /.idea/sonarlint/issuestore/index.pb
+/.idea/copilot/

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>co.featbit</groupId>
     <artifactId>featbit-java-sdk</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
 
     <name>featbit/featbit-java-sdk</name>
 

src/main/java/co/featbit/server/FBClientImp.java

@@ -212,13 +212,13 @@ public EvalDetail<Long> longVariationDetail(String featureFlagKey, FBUser user,
 
     @Override
     public <T> T jsonVariation(String featureFlagKey, FBUser user, Class<T> clazz, T defaultValue) {
-        String json = variation(featureFlagKey, user, DEFAULT_JSON_VALUE);
-        return Utils.parseJsonObject(json, defaultValue, clazz, DEFAULT_JSON_VALUE.equals(json));
+        Evaluator.EvalResult res = evaluateInternal(featureFlagKey, user, DEFAULT_JSON_VALUE, clazz);
+        return Utils.parseJsonObject(res.getValue(), defaultValue, clazz, DEFAULT_JSON_VALUE.equals(res.getValue()));
     }
 
     @Override
     public <T> EvalDetail<T> jsonVariationDetail(String featureFlagKey, FBUser user, Class<T> clazz, T defaultValue) {
-        Evaluator.EvalResult res = evaluateInternal(featureFlagKey, user, DEFAULT_JSON_VALUE, null);
+        Evaluator.EvalResult res = evaluateInternal(featureFlagKey, user, DEFAULT_JSON_VALUE, clazz);
         T value = Utils.parseJsonObject(res.getValue(), defaultValue, clazz, DEFAULT_JSON_VALUE.equals(res.getValue()));
         return res.toEvalDetail(value);
     }

src/main/java/co/featbit/server/Utils.java

@@ -10,7 +10,6 @@
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.commons.lang3.math.NumberUtils;
 
 import java.math.BigInteger;
 import java.net.InetSocketAddress;
@@ -194,11 +193,11 @@ public static boolean checkType(String variationType, Class<?> requiredType, Str
                 // bool value is generated by feature flag center
                 return requiredType == Boolean.class || requiredType == String.class;
             case FLAG_NUMERIC_TYPE:
-                return NumberUtils.isCreatable(returnValue);
+                return requiredType == Integer.class || requiredType == Long.class || requiredType == Double.class || requiredType == String.class;
             case FLAG_JSON_TYPE:
             case FLAG_STRING_TYPE:
                 if (requiredType == Boolean.class) {
-                    return BooleanUtils.toBooleanObject(returnValue) == null;
+                    return Objects.nonNull(BooleanUtils.toBooleanObject(returnValue));
                 }
                 if (requiredType == Integer.class || requiredType == Long.class || requiredType == Double.class) {
                     return StringUtils.isNumeric(returnValue);

src/test/java/co/featbit/server/FBClientTest.java

@@ -80,6 +80,16 @@ void testBoolVariation() throws IOException {
             ed = client.boolVariationDetail("ff-test-bool", user4, false);
             assertTrue(ed.getVariation());
             assertEquals(REASON_FALLTHROUGH, ed.getReason());
+            String res1 = client.variation("ff-test-bool", user4, "error");
+            assertEquals("true", res1);
+            Integer res2 = client.intVariation("ff-test-bool", user4, -1);
+            assertEquals(-1, res2);
+            res = client.jsonVariation("ff-test-bool", user4, Boolean.class, false);
+            assertTrue(res);
+            res1 = client.jsonVariation("ff-test-bool", user4, String.class, "error");
+            assertEquals("true", res1);
+            res2 = client.jsonVariation("ff-test-bool", user4, Integer.class, -1);
+            assertEquals(-1, res2);
         }
     }
 
@@ -98,6 +108,22 @@ void testNumericVariation() throws IOException {
             EvalDetail<Double> ed1 = client.doubleVariationDetail("ff-test-number", user4, -1D);
             assertEquals(9999D, ed1.getVariation());
             assertEquals(REASON_FALLTHROUGH, ed1.getReason());
+            EvalDetail<Boolean> ed2 = client.boolVariationDetail("ff-test-number", user4, false);
+            assertFalse(ed2.getVariation());
+            assertEquals(REASON_WRONG_TYPE, ed2.getReason());
+            EvalDetail<String> ed3 = client.variationDetail("ff-test-number", user4, "error");
+            assertEquals("9999",ed3.getVariation());
+            assertEquals(REASON_FALLTHROUGH, ed3.getReason());
+            EvalDetail<Integer> ed4 = client.jsonVariationDetail("ff-test-number", user4, Integer.class, -1);
+            assertEquals(9999, ed4.getVariation());
+            assertEquals(REASON_FALLTHROUGH, ed4.getReason());
+            EvalDetail<Boolean> ed5 = client.jsonVariationDetail("ff-test-number", user4, Boolean.class, false);
+            assertFalse(ed5.getVariation());
+            assertEquals(REASON_WRONG_TYPE, ed5.getReason());
+            EvalDetail<String> ed6 = client.jsonVariationDetail("ff-test-number", user4, String.class, "error");
+            assertEquals("9999",ed6.getVariation());
+            assertEquals(REASON_FALLTHROUGH, ed6.getReason());
+
         }
     }
 
@@ -114,6 +140,21 @@ void testStringVariation() throws IOException {
             EvalDetail<String> ed = client.variationDetail("ff-test-string", user1, "error");
             assertEquals("others", ed.getVariation());
             assertEquals(REASON_FALLTHROUGH, ed.getReason());
+            EvalDetail<Boolean> ed1 = client.boolVariationDetail("ff-test-string", email, false);
+            assertFalse(ed1.getVariation());
+            assertEquals(REASON_WRONG_TYPE, ed1.getReason());
+            EvalDetail<Double> ed2 = client.doubleVariationDetail("ff-test-string", email, -1D);
+            assertEquals(-1D, ed2.getVariation());
+            assertEquals(REASON_WRONG_TYPE, ed2.getReason());
+            EvalDetail<Boolean> ed3 = client.jsonVariationDetail("ff-test-string", email, Boolean.class, false);
+            assertFalse(ed3.getVariation());
+            assertEquals(REASON_WRONG_TYPE, ed3.getReason());
+            EvalDetail<Long> ed4 = client.jsonVariationDetail("ff-test-string", email, Long.class, -1L);
+            assertEquals(-1L, ed4.getVariation());
+            assertEquals(REASON_WRONG_TYPE, ed4.getReason());
+            EvalDetail<String> ed5 = client.jsonVariationDetail("ff-test-string", email, String.class, "error");
+            assertEquals("email", ed5.getVariation());
+            assertEquals(REASON_RULE_MATCH, ed5.getReason());
         }
     }