Merge pull request #181 from aaronlinv/master

fix: bugs in KeyGet2Func and KeyGetFunc
casbin · Apr 27, 2021 · ec22a57 · ec22a57
2 parents 02142b3 + 0efc4ad
commit ec22a57
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/org/casbin/jcasbin/util/function/KeyGet2Func.java b/src/main/java/org/casbin/jcasbin/util/function/KeyGet2Func.java
@@ -16,8 +16,8 @@
 
 import com.googlecode.aviator.runtime.function.AbstractFunction;
 import com.googlecode.aviator.runtime.function.FunctionUtils;
-import com.googlecode.aviator.runtime.type.AviatorBoolean;
 import com.googlecode.aviator.runtime.type.AviatorObject;
+import com.googlecode.aviator.runtime.type.AviatorString;
 import org.casbin.jcasbin.util.BuiltInFunctions;
 
 import java.util.Map;
@@ -30,15 +30,16 @@
  */
 public class KeyGet2Func extends AbstractFunction {
     @Override
-    public AviatorObject call(Map<String, Object> env, AviatorObject arg1, AviatorObject arg2) {
+    public AviatorObject call(Map<String, Object> env, AviatorObject arg1, AviatorObject arg2, AviatorObject arg3) {
         String key1 = FunctionUtils.getStringValue(arg1, env);
         String key2 = FunctionUtils.getStringValue(arg2, env);
+        String pathVar = FunctionUtils.getStringValue(arg3, env);
 
-        return AviatorBoolean.valueOf(BuiltInFunctions.keyMatch(key1, key2));
+        return new AviatorString(BuiltInFunctions.keyGet2Func(key1, key2, pathVar));
     }
 
     @Override
     public String getName() {
-        return "ketGet2";
+        return "keyGet2";
     }
 }
diff --git a/src/main/java/org/casbin/jcasbin/util/function/KeyGetFunc.java b/src/main/java/org/casbin/jcasbin/util/function/KeyGetFunc.java
@@ -16,8 +16,8 @@
 
 import com.googlecode.aviator.runtime.function.AbstractFunction;
 import com.googlecode.aviator.runtime.function.FunctionUtils;
-import com.googlecode.aviator.runtime.type.AviatorBoolean;
 import com.googlecode.aviator.runtime.type.AviatorObject;
+import com.googlecode.aviator.runtime.type.AviatorString;
 import org.casbin.jcasbin.util.BuiltInFunctions;
 
 import java.util.Map;
@@ -34,7 +34,7 @@ public AviatorObject call(Map<String, Object> env, AviatorObject arg1, AviatorOb
         String key1 = FunctionUtils.getStringValue(arg1, env);
         String key2 = FunctionUtils.getStringValue(arg2, env);
 
-        return AviatorBoolean.valueOf(BuiltInFunctions.keyMatch(key1, key2));
+        return new AviatorString(BuiltInFunctions.keyGetFunc(key1, key2));
     }
 
     @Override