Skip to content

Commit 0efc4ad

Browse files
committed
fix: bugs in KeyGet2Func and KeyGetFunc
Signed-off-by: AaronLin <[email protected]>
1 parent 6a40ed3 commit 0efc4ad

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/main/java/org/casbin/jcasbin/util/function/KeyGet2Func.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import com.googlecode.aviator.runtime.function.AbstractFunction;
1818
import com.googlecode.aviator.runtime.function.FunctionUtils;
19-
import com.googlecode.aviator.runtime.type.AviatorBoolean;
2019
import com.googlecode.aviator.runtime.type.AviatorObject;
20+
import com.googlecode.aviator.runtime.type.AviatorString;
2121
import org.casbin.jcasbin.util.BuiltInFunctions;
2222

2323
import java.util.Map;
@@ -30,15 +30,16 @@
3030
*/
3131
public class KeyGet2Func extends AbstractFunction {
3232
@Override
33-
public AviatorObject call(Map<String, Object> env, AviatorObject arg1, AviatorObject arg2) {
33+
public AviatorObject call(Map<String, Object> env, AviatorObject arg1, AviatorObject arg2, AviatorObject arg3) {
3434
String key1 = FunctionUtils.getStringValue(arg1, env);
3535
String key2 = FunctionUtils.getStringValue(arg2, env);
36+
String pathVar = FunctionUtils.getStringValue(arg3, env);
3637

37-
return AviatorBoolean.valueOf(BuiltInFunctions.keyMatch(key1, key2));
38+
return new AviatorString(BuiltInFunctions.keyGet2Func(key1, key2, pathVar));
3839
}
3940

4041
@Override
4142
public String getName() {
42-
return "ketGet2";
43+
return "keyGet2";
4344
}
4445
}

src/main/java/org/casbin/jcasbin/util/function/KeyGetFunc.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import com.googlecode.aviator.runtime.function.AbstractFunction;
1818
import com.googlecode.aviator.runtime.function.FunctionUtils;
19-
import com.googlecode.aviator.runtime.type.AviatorBoolean;
2019
import com.googlecode.aviator.runtime.type.AviatorObject;
20+
import com.googlecode.aviator.runtime.type.AviatorString;
2121
import org.casbin.jcasbin.util.BuiltInFunctions;
2222

2323
import java.util.Map;
@@ -34,7 +34,7 @@ public AviatorObject call(Map<String, Object> env, AviatorObject arg1, AviatorOb
3434
String key1 = FunctionUtils.getStringValue(arg1, env);
3535
String key2 = FunctionUtils.getStringValue(arg2, env);
3636

37-
return AviatorBoolean.valueOf(BuiltInFunctions.keyMatch(key1, key2));
37+
return new AviatorString(BuiltInFunctions.keyGetFunc(key1, key2));
3838
}
3939

4040
@Override

0 commit comments

Comments
 (0)