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

Merge remote-tracking branch 'we__/develop' into develop

Browse Source
This commit is contained in:
hongqiaowei
2021-10-15 12:30:46 +08:00
parent 51e05b6dc1 a9b85c7d9a
commit dd299d6b70
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fizz-core/src/main/java/we/fizz/input/PathMapping.java
View File

@@ -29,6 +29,7 @@ import we.fizz.StepContext;
import we.fizz.exception.FizzRuntimeException; import we.fizz.exception.FizzRuntimeException;
import we.fizz.function.FuncExecutor; import we.fizz.function.FuncExecutor;
import we.fizz.function.IFunc; import we.fizz.function.IFunc;
import we.global_resource.GlobalResourceService;
import we.util.MapUtil; import we.util.MapUtil;
/** /**
@@ -37,6 +38,8 @@ import we.util.MapUtil;
* *
*/ */
public class PathMapping { public class PathMapping {
private static final String GLOBAL_RESOURCE_PREFIX = "g.";
private static List<String> typeList = Arrays.asList("Integer", "int", "Boolean", "boolean", "Float", "float", private static List<String> typeList = Arrays.asList("Integer", "int", "Boolean", "boolean", "Float", "float",
"Double", "double", "String", "string", "Long", "long", "Number", "number"); "Double", "double", "String", "string", "Long", "long", "Number", "number");
@@ -195,6 +198,9 @@ public class PathMapping {
} }
private static Object getRefValue(ONode ctxNode, String type, String path) { private static Object getRefValue(ONode ctxNode, String type, String path) {
if (StringUtils.isBlank(path)) {
return null;
}
Object obj = null; Object obj = null;
// check if it is a function // check if it is a function
if (path.startsWith(IFunc.NAME_SPACE_PREFIX)) { if (path.startsWith(IFunc.NAME_SPACE_PREFIX)) {
@@ -210,7 +216,12 @@ public class PathMapping {
p = path.substring(0, path.indexOf("|")); p = path.substring(0, path.indexOf("|"));
defaultValue = path.substring(path.indexOf("|") + 1); defaultValue = path.substring(path.indexOf("|") + 1);
} }
ONode val = select(ctxNode, handlePath(p)); ONode val = null;
if (path.startsWith(GLOBAL_RESOURCE_PREFIX)) {
val = select(GlobalResourceService.resNode, p);
} else {
val = select(ctxNode, handlePath(p));
}
if (val != null && !val.isNull()) { if (val != null && !val.isNull()) {
obj = val; obj = val;
} else { } else {
@@ -331,7 +342,12 @@ public class PathMapping {
p = path.substring(0, path.indexOf("|")); p = path.substring(0, path.indexOf("|"));
defaultValue = path.substring(path.indexOf("|") + 1); defaultValue = path.substring(path.indexOf("|") + 1);
} }
ONode val = select(ctxNode, handlePath(p)); ONode val = null;
if (path.startsWith(GLOBAL_RESOURCE_PREFIX)) {
val = select(GlobalResourceService.resNode, p);
} else {
val = select(ctxNode, handlePath(p));
}
if (val != null && !val.isNull()) { if (val != null && !val.isNull()) {
return val.toData(); return val.toData();
} }