Add string vs integer parameter tests and examples

Author: FAUST-BENCHOU

examples/string_vs_integer_model.conf

@@ -0,0 +1,15 @@
+[request_definition]
+r = sub, obj, act, exp
+
+[policy_definition]
+p = sub, obj, act, exp
+
+[role_definition]
+g = _, _
+
+[policy_effect]
+e = some(where (p.eft == allow))
+
+[matchers]
+m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act && r.exp == "1"
+

examples/string_vs_integer_policy.csv

@@ -0,0 +1,2 @@
+p, reader, data, read, 1
+g, alice, reader

src/main/java/org/casbin/CommandExecutor.java

@@ -156,33 +156,28 @@ public String outputResult() throws InvocationTargetException, IllegalAccessExce
         return mapper.writeValueAsString(responseBody);
     }
 
-    /**
-     * @param value 
-     * @return 
-     */
     private Object smartConvertValue(String value) {
-        if (value == null || value.trim().isEmpty()) {
-            return value;
+        value = value.trim();
+    
+        if (value.startsWith("\"") && value.endsWith("\"")) {
+            return value.substring(1, value.length() - 1);  // 去掉引号
+        }
+    
+        if (value.matches("-?\\d+")) { 
+            return Integer.valueOf(value);  // Integer
         }
-        
-        String trimmed = value.trim();
-        
-        try {
-            return Integer.valueOf(trimmed);
-        } catch (NumberFormatException e) {
+    
+        if (value.matches("-?\\d*\\.\\d+")) { 
+            return Double.valueOf(value);  
         }
-        
-        if ("true".equalsIgnoreCase(trimmed)) {
+    
+        if ("true".equalsIgnoreCase(value)) {
             return Boolean.TRUE;
-        } else if ("false".equalsIgnoreCase(trimmed)) {
+        } else if ("false".equalsIgnoreCase(value)) {
             return Boolean.FALSE;
         }
-        
-        try {
-            return Double.valueOf(trimmed);
-        } catch (NumberFormatException e) {
-        }
-        
-        return value;
+    
+        return value; 
     }
-}
+    
+}

src/test/java/org/casbin/ClientTest.java

@@ -332,4 +332,10 @@ public void testKeyMatch5() {
         assertEquals(Client.run(new String[]{"enforceEx", "-m", "examples/keymatch5_model.conf", "-p", "examples/keymatch5_policy.csv", "alice", "/alice_data/hello/123", "GET"}), "{\"allow\":true,\"explain\":[\"alice\",\"/alice_data/{resource}/.*\",\"GET\"]}");
         assertEquals(Client.run(new String[]{"enforceEx", "-m", "examples/keymatch5_model.conf", "-p", "examples/keymatch5_policy.csv", "alice", "/alice_data/hello/123", "POST"}), "{\"allow\":false,\"explain\":[]}");
     }
+
+    @Test
+    public void testStringVsIntegerParameter() {
+        assertEquals(Client.run(new String[]{"enforceEx", "-m", "examples/string_vs_integer_model.conf", "-p", "examples/string_vs_integer_policy.csv", "alice", "data", "read", "\"1\""}), "{\"allow\":true,\"explain\":[\"reader\",\"data\",\"read\",\"1\"]}");
+        assertEquals(Client.run(new String[]{"enforceEx", "-m", "examples/string_vs_integer_model.conf", "-p", "examples/string_vs_integer_policy.csv", "alice", "data", "read", "1"}), "{\"allow\":false,\"explain\":[]}");
+    }
 }