fizzgate/fizz-gateway-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct regex expression

Browse Source
This commit is contained in:
Francis Dong
2021-09-06 23:54:31 +08:00
parent d2e689f58c
commit 63ab5973b6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fizz-core/src/main/java/we/fizz/function/FuncExecutor.java
View File

@@ -253,7 +253,7 @@ public class FuncExecutor {
throw new FizzRuntimeException( throw new FizzRuntimeException(
String.format("invalid argument: %s, Function Expression: %s", argsStr, funcExpression)); String.format("invalid argument: %s, Function Expression: %s", argsStr, funcExpression));
} }
} else if (argsStr.matches("^null\s*,.*") || argsStr.matches("^null\s*\\).*")) { // null } else if (argsStr.matches("^null\\s*,.*") || argsStr.matches("^null\\s*\\).*")) { // null
if (isVarArgs && i == paramTypes.length - 1) { if (isVarArgs && i == paramTypes.length - 1) {
varArgs.add(null); varArgs.add(null);
Object arr = Array.newInstance(clazz.getComponentType(), varArgs.size()); Object arr = Array.newInstance(clazz.getComponentType(), varArgs.size());
@@ -267,7 +267,7 @@ public class FuncExecutor {
argsStrContainer = this.trimArgStr(argsStrContainer, 4, isVarArgs, paramTypes.length, funcExpression); argsStrContainer = this.trimArgStr(argsStrContainer, 4, isVarArgs, paramTypes.length, funcExpression);
argsStr = argsStrContainer.getArgsStr(); argsStr = argsStrContainer.getArgsStr();
i = argsStrContainer.getIndex(); i = argsStrContainer.getIndex();
} else if (argsStr.matches("^true\s*,.*") || argsStr.matches("^true\s*\\).*")) { // boolean } else if (argsStr.matches("^true\\s*,.*") || argsStr.matches("^true\\s*\\).*")) { // boolean
if (isVarArgs && i == paramTypes.length - 1) { if (isVarArgs && i == paramTypes.length - 1) {
varArgs.add(true); varArgs.add(true);
args[i] = varArgs.toArray(new Boolean[varArgs.size()]); args[i] = varArgs.toArray(new Boolean[varArgs.size()]);
@@ -277,7 +277,7 @@ public class FuncExecutor {
argsStrContainer = this.trimArgStr(argsStrContainer, 4, isVarArgs, paramTypes.length, funcExpression); argsStrContainer = this.trimArgStr(argsStrContainer, 4, isVarArgs, paramTypes.length, funcExpression);
argsStr = argsStrContainer.getArgsStr(); argsStr = argsStrContainer.getArgsStr();
i = argsStrContainer.getIndex(); i = argsStrContainer.getIndex();
} else if (argsStr.matches("^false\s*,.*") || argsStr.matches("^false\s*\\).*")) { // boolean } else if (argsStr.matches("^false\\s*,.*") || argsStr.matches("^false\\s*\\).*")) { // boolean
if (isVarArgs && i == paramTypes.length - 1) { if (isVarArgs && i == paramTypes.length - 1) {
varArgs.add(false); varArgs.add(false);
args[i] = varArgs.toArray(new Boolean[varArgs.size()]); args[i] = varArgs.toArray(new Boolean[varArgs.size()]);