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

Merge branch 'develop' into feature/core

Browse Source
This commit is contained in:
linwaiwai
2021-07-20 14:12:16 +08:00
committed by GitHub
parent 6483ff54c2 003a055117
commit 9e662ac823
26 changed files with 693 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.en-us.md
View File

@@ -4,7 +4,7 @@ English | [简体中文](./README.md)
<a href="https://www.fizzgate.com"><img src="https://raw.githubusercontent.com/wiki/wehotel/fizz-gateway-community/img/icon-color.png" width="70%"></a>
</p>
<p>
<img alt="Version" src="https://img.shields.io/badge/version-2.1.0-blue.svg?cacheSeconds=2592000" />
<img alt="Version" src="https://img.shields.io/badge/version-2.2.0-blue.svg?cacheSeconds=2592000" />
<a href="http://www.fizzgate.com/fizz-gateway-community/" target="_blank">
<img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />
</a>
@@ -104,6 +104,7 @@ Starting from v1.3.0, the frontend and backend of the management backend are mer
| v1.5.1 | v1.5.1 |
| v2.0.0 | v2.0.0 |
| v2.1.0 | v2.1.0 |
| v2.2.0 | v2.2.0 |
Please download the corresponding management backend version according to the version of the community version

3
README.md
View File

@@ -3,7 +3,7 @@
<a href="https://www.fizzgate.com"><img src="https://raw.githubusercontent.com/wiki/wehotel/fizz-gateway-community/img/icon-color.png" width="70%"></a>
</p>
<p>
<img alt="Version" src="https://img.shields.io/badge/version-2.1.0-blue.svg?cacheSeconds=2592000" />
<img alt="Version" src="https://img.shields.io/badge/version-2.2.0-blue.svg?cacheSeconds=2592000" />
<a href="http://www.fizzgate.com/fizz-gateway-community/" target="_blank">
<img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />
</a>
@@ -104,6 +104,7 @@ API地址：http://demo.fizzgate.com/proxy/[服务名]/[API_Path]
| v1.5.1 | v1.5.1 |
| v2.0.0 | v2.0.0 |
| v2.1.0 | v2.1.0 |
| v2.2.0 | v2.2.0 |
请根据社区版的版本下载对应的管理后台版本

30
fizz-bootstrap/js/common.js
View File

@@ -190,6 +190,36 @@ var common = {
}
var result = ctx[stepName]['result'] || {};
return field ? result[field] : result;
},
/**
* 获取步骤循环结果
* @param {*} ctx 上下文 【必填】
* @param {*} stepName 步骤名【必填】
*/
getStepCircle: function (ctx, stepName){
if(!ctx || !stepName || !ctx[stepName]){
return null;
}
// 返回循环结果数组
return ctx[stepName]['circle'];
},
/**
* 获取请求的循环结果
* @param {*} ctx 上下文 【必填】
* @param {*} stepName 步骤名【必填】
*/
getRequestCircle: function (ctx, stepName, requestName){
if(!ctx || !stepName || !requestName){
return null;
}
if(!ctx[stepName] || !ctx[stepName]['requests'] || !ctx[stepName]['requests'][requestName] ||
!ctx[stepName]['requests'][requestName]['request']){
return null;
}
// 返回循环结果数组
return ctx[stepName]['requests'][requestName]['circle'];
}
/* *********** step request end ************ */

68
fizz-bootstrap/js/context.js
View File

@@ -35,6 +35,28 @@ var context = {
requests: {
// 接口1
request1: {
// 请求相关参数
request:{
url: "",
method: "GET/POST",
headers: {},
body: {}
},
// 根据转换规则转换后的接口响应
response: {
headers: {},
body: {}
},
// 请求循环组件当前循环对象
item: null,
// 请求循环组件当前循环对象的下标
index: null,
// 请求循环的结果
circle: [{
// 循环对象
item: null,
// 循环对象的下标
index: null,
// 请求相关参数
request:{
url: "",
@@ -47,6 +69,11 @@ var context = {
headers: {},
body: {}
}
}],
// 条件组件的执行结果
conditionResults: [
{'我的条件1': true}
]
},
// 接口2
request2: {
@@ -56,16 +83,55 @@ var context = {
headers: {},
body: {}
},
response: {
headers: {},
body: {}
},
// 请求循环组件当前循环对象
item: null,
// 请求循环组件当前循环对象的下标
index: null,
// 请求循环的结果
circle: [{
// 循环对象
item: null,
// 循环对象的下标
index: null,
// 请求相关参数
request:{
url: "",
method: "GET/POST",
headers: {},
body: {}
},
// 根据转换规则转换后的接口响应
response: {
headers: {},
body: {}
}
}],
// 条件组件的执行结果
conditionResults: [
{'我的条件1': true}
]
}
//...
},
// 步骤结果
result: {},
// 步骤循环组件当前循环对象
item: null,
// 步骤循环组件当前循环对象的下标
index: null,
// 步骤循环的结果
circle:[{
// 循环对象
item: null,
// 循环对象的下标
index: null,
// 步骤结果
result: {}
}]
}
}

2
fizz-bootstrap/pom.xml
View File

@@ -12,7 +12,7 @@
<groupId>com.fizzgate</groupId>
<artifactId>fizz-bootstrap</artifactId>
<version>2.2.0-beta9</version>
<version>2.2.0-beta11</version>
<properties>
<java.version>1.8</java.version>

30
fizz-bootstrap/src/main/resources/js/common.js
View File

@@ -190,6 +190,36 @@ var common = {
}
var result = ctx[stepName]['result'] || {};
return field ? result[field] : result;
},
/**
* 获取步骤循环结果
* @param {*} ctx 上下文 【必填】
* @param {*} stepName 步骤名【必填】
*/
getStepCircle: function (ctx, stepName){
if(!ctx || !stepName || !ctx[stepName]){
return null;
}
// 返回循环结果数组
return ctx[stepName]['circle'];
},
/**
* 获取请求的循环结果
* @param {*} ctx 上下文 【必填】
* @param {*} stepName 步骤名【必填】
*/
getRequestCircle: function (ctx, stepName, requestName){
if(!ctx || !stepName || !requestName){
return null;
}
if(!ctx[stepName] || !ctx[stepName]['requests'] || !ctx[stepName]['requests'][requestName] ||
!ctx[stepName]['requests'][requestName]['request']){
return null;
}
// 返回循环结果数组
return ctx[stepName]['requests'][requestName]['circle'];
}
/* *********** step request end ************ */

2
fizz-common/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>fizz-gateway-community</artifactId>
<groupId>com.fizzgate</groupId>
<version>2.2.0-beta9</version>
<version>2.2.0-beta11</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

126
fizz-common/src/main/java/we/util/MapUtil.java
View File

@@ -17,6 +17,7 @@
package we.util;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,6 +37,10 @@ import org.springframework.util.MultiValueMap;
*/
public class MapUtil {
private static final String KEY = "key";
private static final String VALUE = "value";
public static HttpHeaders toHttpHeaders(Map<String, Object> params) {
HttpHeaders headers = new HttpHeaders();
@@ -66,7 +71,6 @@ public class MapUtil {
return headers;
}
public static MultiValueMap<String, String> toMultiValueMap(Map<String, Object> params) {
MultiValueMap<String, String> mvmap = new LinkedMultiValueMap<>();
@@ -124,15 +128,16 @@ public class MapUtil {
return mvmap;
}
/**
* Extract form data from multipart map exclude file
*
* @param params
* @param fileKeyPrefix
* @param filePartMap Map
* @return
*/
public static Map<String, Object> extractFormData(MultiValueMap<String, Part> params, String fileKeyPrefix, Map<String, FilePart> filePartMap) {
public static Map<String, Object> extractFormData(MultiValueMap<String, Part> params, String fileKeyPrefix,
Map<String, FilePart> filePartMap) {
HashMap<String, Object> m = new HashMap<>();
if (params == null || params.isEmpty()) {
return m;
@@ -174,11 +179,13 @@ public class MapUtil {
/**
* Replace file field with FilePart object
*
* @param params
* @param fileKeyPrefix
* @param filePartMap
*/
public static void replaceWithFilePart(MultiValueMap<String, Object> params, String fileKeyPrefix, Map<String, FilePart> filePartMap) {
public static void replaceWithFilePart(MultiValueMap<String, Object> params, String fileKeyPrefix,
Map<String, FilePart> filePartMap) {
if (params == null || params.isEmpty() || filePartMap == null || filePartMap.isEmpty()) {
return;
}
@@ -190,7 +197,7 @@ public class MapUtil {
for (int i = 0; i < list.size(); i++) {
if (list.get(i).toString().startsWith(fileKeyPrefix)) {
newlist.add(filePartMap.get(list.get(i).toString()));
}else {
} else {
newlist.add(list.get(i));
}
}
@@ -255,9 +262,24 @@ public class MapUtil {
return rs;
}
public static MultiValueMap<String, Object> upperCaseKey(MultiValueMap<String, Object> m) {
MultiValueMap<String, Object> rs = new LinkedMultiValueMap<>();
if (m == null || m.isEmpty()) {
return rs;
}
for (Entry<String, List<Object>> entry : m.entrySet()) {
rs.put(entry.getKey().toUpperCase(), entry.getValue());
}
return rs;
}
/**
* Set value by path，support multiple levels，eg：a.b.c <br>
* Do NOT use this method if field name contains a dot <br>
*
* @param data
* @param path
* @param value
@@ -265,18 +287,18 @@ public class MapUtil {
@SuppressWarnings("unchecked")
public static void set(Map<String, Object> data, String path, Object value) {
String[] fields = path.split("\\.");
if(fields.length < 2) {
if (fields.length < 2) {
data.put(path, value);
}else {
} else {
Map<String, Object> next = data;
for (int i = 0; i < fields.length - 1; i++) {
Map<String, Object> val = (Map<String, Object>) next.get(fields[i]);
if(val == null) {
if (val == null) {
val = new HashMap<>();
next.put(fields[i], val);
}
if(i == fields.length - 2) {
val.put(fields[i+1], value);
if (i == fields.length - 2) {
val.put(fields[i + 1], value);
break;
}
next = val;
@@ -287,26 +309,27 @@ public class MapUtil {
/**
* Get value by path, support multiple levels，eg：a.b.c <br>
* Do NOT use this method if field name contains a dot <br>
*
* @param data
* @param path
* @return
*/
public static Object get(Map<String, Object> data, String path) {
String[] fields = path.split("\\.");
if(fields.length < 2) {
if (fields.length < 2) {
return data.get(path);
}else {
} else {
Map<String, Object> next = data;
for (int i = 0; i < fields.length - 1; i++) {
if(!(next.get(fields[i]) instanceof Map)) {
if (!(next.get(fields[i]) instanceof Map)) {
return null;
}
Map<String, Object> val = (Map<String, Object>) next.get(fields[i]);
if(val == null) {
if (val == null) {
return null;
}
if(i == fields.length - 2) {
return val.get(fields[i+1]);
if (i == fields.length - 2) {
return val.get(fields[i + 1]);
}
next = val;
}
@@ -316,17 +339,18 @@ public class MapUtil {
/**
* Merge maps, merge src to target
*
* @param target
* @param src
* @return
*/
@SuppressWarnings("unchecked")
public static Map<String, Object> merge(Map<String, Object> target, Map<String, Object> src) {
if(src == null || src.isEmpty()) {
if (src == null || src.isEmpty()) {
return target;
}
src.forEach((key, value) -> {
if(value != null) {
if (value != null) {
target.merge(key, value, (oldValue, newValue) -> {
if (oldValue instanceof Map && newValue instanceof Map) {
oldValue = merge((Map<String, Object>) oldValue, (Map<String, Object>) newValue);
@@ -339,4 +363,70 @@ public class MapUtil {
return target;
}
/**
* Convert list to map and merge multiple values<br>
* Example: <br>
* List as:<br>
* [{"key": "abc", "value": "aaa"},{"key": "abc", "value": "xyz"},{"key":
* "a123", "value": 666}]<br>
* Merge Result:<br>
* {"abc": ["aaa","xyz"], "a123": 666} <br>
*
* @param obj
* @return
*/
@SuppressWarnings("unchecked")
public static Map<String, Object> list2Map(Object obj) {
// Compatible with older version configuration
if (obj instanceof Map) {
return (Map<String, Object>) obj;
}
if (obj instanceof List) {
Map<String, Object> rs = new HashMap<>();
List<Map<String, Object>> list = (List<Map<String, Object>>) obj;
if (list == null || list.size() == 0) {
return rs;
}
for (Map<String, Object> m : list) {
String k = m.get(KEY).toString();
Object v = m.get(VALUE);
if (rs.containsKey(k)) {
List<Object> vals = null;
if (rs.get(k) instanceof List) {
vals = (List<Object>) rs.get(k);
} else {
vals = new ArrayList<>();
vals.add(rs.get(k));
}
vals.add(v);
rs.put(k, vals);
} else {
rs.put(k, v);
}
}
return rs;
}
return null;
}
/**
* Convert list to MultiValueMap<br>
* List format example:<br>
* [{"key": "abc", "value": "aaa"},{"key": "abc", "value": "xyz"},,{"key":
* "a123", "value": 666}]<br>
*
* @param list
* @return
*/
public static MultiValueMap<String, Object> listToMultiValueMap(List<Map<String, Object>> list) {
MultiValueMap<String, Object> mvmap = new LinkedMultiValueMap<>();
if (list == null || list.size() == 0) {
return mvmap;
}
for (Map<String, Object> m : list) {
mvmap.add(m.get(KEY).toString(), m.get(VALUE));
}
return mvmap;
}
}

2
fizz-core/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>fizz-gateway-community</artifactId>
<groupId>com.fizzgate</groupId>
<version>2.2.0-beta9</version>
<version>2.2.0-beta11</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

14
fizz-core/src/main/java/we/filter/FilterExceptionHandlerConfig.java
View File

@@ -32,6 +32,7 @@ import reactor.core.publisher.Mono;
import we.exception.ExecuteScriptException;
import we.exception.RedirectException;
import we.exception.StopAndResponseException;
import we.fizz.exception.FizzRuntimeException;
import we.flume.clients.log4j2appender.LogService;
import we.legacy.RespEntity;
import we.util.JacksonUtils;
@@ -81,6 +82,19 @@ public class FilterExceptionHandlerConfig {
return resp.writeWith(Mono.just(resp.bufferFactory().wrap(rs.toString().getBytes())));
}
}
if (t instanceof FizzRuntimeException) {
FizzRuntimeException ex = (FizzRuntimeException) t;
resp.getHeaders().add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
RespEntity rs = null;
String reqId = exchange.getRequest().getId();
if (ex.getStepContext() != null && ex.getStepContext().returnContext()) {
rs = new RespEntity(HttpStatus.INTERNAL_SERVER_ERROR.value(), t.getMessage(), reqId, ex.getStepContext());
return resp.writeWith(Mono.just(resp.bufferFactory().wrap(JacksonUtils.writeValueAsString(rs).getBytes())));
} else {
rs = new RespEntity(HttpStatus.INTERNAL_SERVER_ERROR.value(), t.getMessage(), reqId);
return resp.writeWith(Mono.just(resp.bufferFactory().wrap(rs.toString().getBytes())));
}
}
Mono<Void> vm;
Object fc = exchange.getAttributes().get(WebUtils.FILTER_CONTEXT);
if (fc == null) { // t came from flow control filter

10
fizz-core/src/main/java/we/fizz/Pipeline.java
View File

@@ -119,12 +119,12 @@ public class Pipeline {
}else {
LinkedList<Step> opSteps = (LinkedList<Step>) steps.clone();
Step step1 = opSteps.removeFirst();
Mono<List<StepResponse>> result = runStep(step1, null).expand(response -> {
if (opSteps.isEmpty() || response.isStop()) {
Mono<List<StepResponse>> result = runStep(step1, null).expand(lastStepResponse -> {
if (opSteps.isEmpty() || lastStepResponse.isStop()) {
return Mono.empty();
}
Step step = opSteps.pop();
return runStep(step, response);
return runStep(step, lastStepResponse);
}).flatMap(response -> Flux.just(response)).collectList();
return result.flatMap(clientResponse -> {
return handleOutput(input);
@@ -132,7 +132,9 @@ public class Pipeline {
}
}
private Mono<StepResponse> runStep(Step step, StepResponse response){
private Mono<StepResponse> runStep(Step step, StepResponse lastStepResponse){
StepResponse stepResponse = new StepResponse(step, null, new HashMap<String, Map<String, Object>>());
stepContext.put(step.getName(), stepResponse);
List<IComponent> components = step.getComponents();
if (components != null && components.size() > 0) {
StepContextPosition stepCtxPos = new StepContextPosition(step.getName());

3
fizz-core/src/main/java/we/fizz/Step.java
View File

@@ -115,8 +115,7 @@ public class Step {
public void beforeRun(StepContext<String, Object> stepContext2, StepResponse response ) {
stepContext = stepContext2;
lastStepResponse = response;
StepResponse stepResponse = new StepResponse(this, null, new HashMap<String, Map<String, Object>>());
stepContext.put(name, stepResponse);
StepResponse stepResponse = (StepResponse) stepContext.get(this.name);
Map<String, InputConfig> configs = this.getRequestConfigs();
for(String configName :configs.keySet()) {
InputConfig inputConfig = configs.get(configName);

50
fizz-core/src/main/java/we/fizz/StepContext.java
View File

@@ -801,6 +801,48 @@ public class StepContext<K, V> extends ConcurrentHashMap<K, V> {
circle.add(circleResult);
}
/**
* 设置判断条件组件结果<br>
* Set result of condition components <br>
*
* @param stepName step name
* @param requestName request name
* @param conditionDesc condition description, such as: <br>
* circle[0]-execCondition:my condition 1<br>
* circle[1]-breakCondition:my condition 2<br>
* condition:my condition 3<br>
* @param rs result of condition component
*/
public void addConditionResult(String stepName, String requestName, String conditionDesc, boolean rs) {
if (requestName == null) {
StepResponse stepResponse = (StepResponse) this.get(stepName);
if (stepResponse == null) {
return;
}
List<Map<String, Object>> results = (List<Map<String, Object>>) stepResponse.getConditionResults();
if (results == null) {
results = new ArrayList<>();
stepResponse.setConditionResults(results);
}
Map<String, Object> result = new HashMap<>();
result.put(conditionDesc, rs);
results.add(result);
} else {
Map<String, Object> request = getStepRequest(stepName, requestName);
if (request == null) {
return;
}
List<Map<String, Object>> results = (List<Map<String, Object>>) request.get("conditionResults");
if (results == null) {
results = new ArrayList<>();
request.put("conditionResults", results);
}
Map<String, Object> result = new HashMap<>();
result.put(conditionDesc, rs);
results.add(result);
}
}
/**
* 获取请求的循环对象<br>
* Returns the current circle item of request<br>
@@ -808,12 +850,12 @@ public class StepContext<K, V> extends ConcurrentHashMap<K, V> {
* @param stepName
* @param requestName
*/
public List<Map<String, Object>> getRequestCircleItem(String stepName, String requestName) {
public Object getRequestCircleItem(String stepName, String requestName) {
Map<String, Object> request = getStepRequest(stepName, requestName);
if (request == null) {
return null;
}
return (List<Map<String, Object>>) request.get("circle");
return request.get("item");
}
/**
@@ -823,12 +865,12 @@ public class StepContext<K, V> extends ConcurrentHashMap<K, V> {
* @param stepName
* @param requestName
*/
public Object getRequestCircle(String stepName, String requestName) {
public List<Map<String, Object>> getRequestCircle(String stepName, String requestName) {
Map<String, Object> request = getStepRequest(stepName, requestName);
if (request == null) {
return null;
}
return request.get("item");
return (List<Map<String, Object>>) request.get("circle");
}
private Object deepCopy(Object obj) {

8
fizz-core/src/main/java/we/fizz/StepResponse.java
View File

@@ -35,6 +35,8 @@ public class StepResponse {
private Integer index;
// circle results
private List<Map<String,Object>> circle;
// result of condition components
private List<Map<String,Object>> conditionResults;
public StepResponse(Step aStep, HashMap item, Map<String, Map<String, Object>> requests) {
setStepName(aStep.getName());
@@ -96,5 +98,11 @@ public class StepResponse {
public void setIndex(Integer index) {
this.index = index;
}
public List<Map<String, Object>> getConditionResults() {
return conditionResults;
}
public void setConditionResults(List<Map<String, Object>> conditionResults) {
this.conditionResults = conditionResults;
}
}

54
fizz-core/src/main/java/we/fizz/component/ComponentHelper.java
View File

@@ -98,60 +98,20 @@ public class ComponentHelper {
if (conditions != null && conditions.size() > 0) {
ONode ctxNode = toONode(stepContext);
for (Condition c : conditions) {
if (!c.exec(ctxNode)) {
return null;
boolean rs = c.exec(ctxNode);
stepContext.addConditionResult(stepCtxPos.getStepName(), stepCtxPos.getRequestName(), c.getDesc(),
rs);
if (!rs) {
return Mono.empty();
}
}
}
if (circle != null) {
return circle.exec(stepContext, stepCtxPos, f);
} else {
return f.apply(stepContext, stepCtxPos);
}
// // conditions before circle component
// List<Condition> conditions1 = new ArrayList<>();
// // conditions after circle component
// List<Condition> conditions2 = new ArrayList<>();
// Circle circle = null;
// for (IComponent component : components) {
// if (ComponentTypeEnum.CIRCLE == component.getType()) {
// circle = (Circle) component;
// }
// if (circle == null && ComponentTypeEnum.CONDITION == component.getType()) {
// conditions1.add((Condition) component);
// }
// if (circle != null && ComponentTypeEnum.CONDITION == component.getType()) {
// conditions2.add((Condition) component);
// }
// }
//
// if (conditions1 != null && conditions1.size() > 0) {
// ONode ctxNode = toONode(stepContext);
// for (Condition c : conditions1) {
// if (!c.exec(ctxNode)) {
// return null;
// }
// }
// }
//
// if (circle != null) {
// return circle.exec(stepContext, (ctx) -> {
// boolean canRun = true;
// if (conditions2 != null && conditions2.size() > 0) {
// ONode ctxNode = toONode(ctx);
// for (Condition c : conditions2) {
// if (!c.exec(ctxNode)) {
// canRun = false;
// }
// }
// }
// if (canRun) {
// return f.apply(ctx);
// } else {
// return Mono.empty();
// }
//
// });
// }
}
return Mono.empty();
}

6
fizz-core/src/main/java/we/fizz/component/OperatorEnum.java
View File

@@ -25,9 +25,9 @@ package we.fizz.component;
*/
public enum OperatorEnum {
EQ("eq"), NE("ne"), GT("gt"), GE("ge"), LT("lt"), LE("le"), CONTAINS("contains"), NOT_CONTAIN("notContain"), CONTAINS_ANY("containsAny"),
IS_NULL("isNull"), IS_NOT_NULL("isNotNull"), IS_BLANK("isBlank"), IS_NOT_BLANK("isNotBlank"), IS_EMPTY("isEmpty"),
IS_NOT_EMPTY("isNotEmpty");
EQ("eq"), NE("ne"), GT("gt"), GE("ge"), LT("lt"), LE("le"), CONTAINS("contains"), NOTCONTAIN("notContain"), CONTAINSANY("containsAny"),
ISNULL("isNull"), ISNOTNULL("isNotNull"), ISBLANK("isBlank"), ISNOTBLANK("isNotBlank"), ISEMPTY("isEmpty"),
ISNOTEMPTY("isNotEmpty");
private String code;

101
fizz-core/src/main/java/we/fizz/component/circle/Circle.java
View File

@@ -21,11 +21,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.function.BiFunction;
import java.util.function.Function;
import org.noear.snack.ONode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.Data;
import reactor.core.publisher.Flux;
@@ -39,7 +36,6 @@ import we.fizz.component.ValueTypeEnum;
import we.fizz.component.condition.Condition;
import we.fizz.exception.FizzRuntimeException;
import we.fizz.input.PathMapping;
import we.fizz.input.RPCInput;
/**
* Circle component
@@ -102,7 +98,7 @@ public class Circle implements IComponent {
/**
* Reference value of dataSource
*/
private List<Object> refValue;
private Object refValue;
private boolean refReadFlag;
@@ -113,8 +109,12 @@ public class Circle implements IComponent {
if (dataSource == null) {
return fixedValue;
}
if (dataSource instanceof Integer || dataSource instanceof Long) {
if (dataSource instanceof Integer || dataSource instanceof Long || dataSource instanceof String) {
try {
fixedValue = Integer.valueOf(dataSource.toString());
} catch (Exception e) {
throw new FizzRuntimeException("invalid data source, fixed data source must be a positive integer");
}
if (fixedValue.intValue() < 1) {
throw new FizzRuntimeException("invalid data source, fixed data source must be a positive integer");
}
@@ -125,7 +125,7 @@ public class Circle implements IComponent {
}
@SuppressWarnings("unchecked")
private List<Object> getRefValue(ONode ctxNode) {
private Object getRefValue(ONode ctxNode) {
if (refReadFlag) {
return refValue;
}
@@ -136,8 +136,24 @@ public class Circle implements IComponent {
if (value instanceof Collection) {
refValue = (List<Object>) value;
return refValue;
} else if (value instanceof Integer || value instanceof Long || value instanceof String) {
try {
Integer times = Integer.valueOf(value.toString());
if (times.intValue() < 1) {
throw new FizzRuntimeException(
"invalid data source, data source must be a positive integer or an array");
}
refValue = times;
} catch (FizzRuntimeException e) {
throw e;
} catch (Exception e) {
throw new FizzRuntimeException(
"invalid data source, data source must be a positive integer or an array");
}
return refValue;
} else {
throw new FizzRuntimeException("invalid data source, referenced data source must be a array");
throw new FizzRuntimeException(
"invalid data source, referenced data source must be a positive integer or an array");
}
}
@@ -146,22 +162,25 @@ public class Circle implements IComponent {
*
* @return
*/
@SuppressWarnings("unchecked")
public CircleItem next(ONode ctxNode) {
if (ValueTypeEnum.FIXED.equals(dataSourceType)) {
Integer total = this.getFixedValue(ctxNode);
if (index == null) {
index = 0;
currentItem = index;
currentItem = index + 1;
return new CircleItem(currentItem, index);
} else if (index.intValue() < total.intValue() - 1) {
index = index + 1;
currentItem = index;
currentItem = index + 1;
return new CircleItem(currentItem, index);
} else {
return null;
}
} else if (ValueTypeEnum.REF.equals(dataSourceType)) {
List<Object> list = this.getRefValue(ctxNode);
Object refValue = this.getRefValue(ctxNode);
if (refValue instanceof Collection) {
List<Object> list = (List<Object>) refValue;
if (index == null) {
index = 0;
currentItem = list.get(index);
@@ -173,6 +192,20 @@ public class Circle implements IComponent {
} else {
return null;
}
} else if (refValue instanceof Integer) {
Integer total = (Integer) refValue;
if (index == null) {
index = 0;
currentItem = index + 1;
return new CircleItem(currentItem, index);
} else if (index.intValue() < total.intValue() - 1) {
index = index + 1;
currentItem = index + 1;
return new CircleItem(currentItem, index);
} else {
return null;
}
}
}
return null;
}
@@ -183,11 +216,15 @@ public class Circle implements IComponent {
* @param ctxNode
* @return
*/
public boolean canExec(ONode ctxNode) {
public boolean canExec(int index, ONode ctxNode, StepContext<String, Object> stepContext,
StepContextPosition stepCtxPos) {
if (this.execConditions != null && this.execConditions.size() > 0) {
try {
for (Condition condition : execConditions) {
if (!condition.exec(ctxNode)) {
for (Condition c : execConditions) {
boolean rs = c.exec(ctxNode);
stepContext.addConditionResult(stepCtxPos.getStepName(), stepCtxPos.getRequestName(),
"circle[" + index + "]-execCondition:" + c.getDesc(), rs);
if (!rs) {
return false;
}
}
@@ -204,11 +241,15 @@ public class Circle implements IComponent {
* @param ctxNode
* @return
*/
public boolean breakCircle(ONode ctxNode) {
public boolean breakCircle(int index, ONode ctxNode, StepContext<String, Object> stepContext,
StepContextPosition stepCtxPos) {
if (this.breakConditions != null && this.breakConditions.size() > 0) {
try {
for (Condition condition : breakConditions) {
if (condition.exec(ctxNode)) {
for (Condition c : breakConditions) {
boolean rs = c.exec(ctxNode);
stepContext.addConditionResult(stepCtxPos.getStepName(), stepCtxPos.getRequestName(),
"circle[" + index + "]-breakCondition:" + c.getDesc(), rs);
if (rs) {
return true;
}
}
@@ -219,11 +260,11 @@ public class Circle implements IComponent {
return false;
}
@SuppressWarnings("unchecked")
@SuppressWarnings({ "unchecked", "rawtypes" })
public Mono<Object> exec(StepContext<String, Object> stepContext, StepContextPosition stepCtxPos,
BiFunction<StepContext, StepContextPosition, Mono> f) {
ONode ctxNode = ComponentHelper.toONode(stepContext);
CircleItem nextItem = this.next(ctxNode);
ONode ctxNode1 = ComponentHelper.toONode(stepContext);
CircleItem nextItem = this.next(ctxNode1);
if (nextItem != null) {
Mono<List<CircleItemResult>> colloctList = Mono.just(new CircleItemResult(nextItem, null)).expand(circleItemResult -> {
// put nextItem to step context and ctxNode for further JSON path mapping
@@ -234,21 +275,23 @@ public class Circle implements IComponent {
} else {
stepContext.setStepCircleItem(stepCtxPos.getStepName(), cItem.getItem(), cItem.getIndex());
}
ONode ctxNode = circleItemResult.ctxNode;
PathMapping.setByPath(ctxNode, stepCtxPos.getPath() + ".item", cItem.getItem(), true);
PathMapping.setByPath(ctxNode, stepCtxPos.getPath() + ".index", cItem.getIndex(), true);
if (!this.canExec(ctxNode)) {
return Mono.just(new CircleItemResult(this.next(ctxNode), null));
}
if (this.breakCircle(ctxNode)) {
return Mono.empty();
if (!this.canExec(cItem.getIndex(), ctxNode, stepContext, stepCtxPos)) {
return Mono.just(new CircleItemResult(ctxNode, this.next(ctxNode), null));
}
return f.apply(stepContext, stepCtxPos).flatMap(r -> {
CircleItem nextItem2 = this.next(ctxNode);
ONode ctxNode2 = ComponentHelper.toONode(stepContext);
if (this.breakCircle(cItem.getIndex(), ctxNode, stepContext, stepCtxPos)) {
return Mono.empty();
}
CircleItem nextItem2 = this.next(ctxNode2);
if (nextItem2 == null) {
return Mono.empty();
}
return Mono.just(new CircleItemResult(nextItem2, r));
return Mono.just(new CircleItemResult(ctxNode2, nextItem2, r));
});
}).flatMap(circleItemResult -> Flux.just(circleItemResult)).collectList();
return colloctList.flatMap(list -> {
@@ -269,10 +312,12 @@ public class Circle implements IComponent {
@Data
class CircleItemResult {
private ONode ctxNode;
private CircleItem nextItem;
private Object result;
public CircleItemResult(CircleItem nextItem, Object result) {
public CircleItemResult(ONode ctxNode, CircleItem nextItem, Object result) {
this.ctxNode = ctxNode;
this.nextItem = nextItem;
this.result = result;
}

30
fizz-core/src/main/java/we/fizz/component/condition/Condition.java
View File

@@ -28,6 +28,7 @@ import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import we.fizz.component.ComponentTypeEnum;
import we.fizz.component.IComponent;
import we.fizz.component.OperatorEnum;
@@ -43,7 +44,6 @@ import we.fizz.input.PathMapping;
*
*/
@Data
@AllArgsConstructor
public class Condition implements IComponent {
private static final String type = ComponentTypeEnum.CONDITION.getCode();
@@ -56,6 +56,13 @@ public class Condition implements IComponent {
private ConditionValue value2;
public Condition(String desc, ConditionValue value1, OperatorEnum operator, ConditionValue value2) {
this.desc = desc;
this.value1 = value1;
this.operator = operator;
this.value2 = value2;
}
@Override
public ComponentTypeEnum getType() {
return ComponentTypeEnum.getEnumByCode(type);
@@ -124,6 +131,7 @@ public class Condition implements IComponent {
case CONTAINS:
if (v1 == null) {
rs = false;
break;
}
if (v1 instanceof Collection && !(v2 instanceof Collection)) {
Collection coll1 = (Collection) v1;
@@ -140,9 +148,10 @@ public class Condition implements IComponent {
throw new FizzRuntimeException("value2 can not be a collection");
}
break;
case NOT_CONTAIN:
case NOTCONTAIN:
if (v1 == null) {
rs = true;
break;
}
if (v1 instanceof Collection && !(v2 instanceof Collection)) {
Collection coll1 = (Collection) v1;
@@ -159,9 +168,10 @@ public class Condition implements IComponent {
throw new FizzRuntimeException("value2 can not be a collection");
}
break;
case CONTAINS_ANY:
case CONTAINSANY:
if (v1 == null || v2 == null) {
rs = false;
break;
}
if (v1 instanceof Collection && v2 instanceof Collection) {
Collection coll1 = (Collection) v1;
@@ -173,23 +183,23 @@ public class Condition implements IComponent {
throw new FizzRuntimeException("value2 must be a collection");
}
break;
case IS_NULL:
case ISNULL:
rs = v1 == null;
break;
case IS_NOT_NULL:
case ISNOTNULL:
rs = v1 != null;
break;
case IS_BLANK:
case ISBLANK:
rs = v1 == null || StringUtils.isBlank(v1.toString());
break;
case IS_NOT_BLANK:
case ISNOTBLANK:
rs = v1 != null && StringUtils.isNotBlank(v1.toString());
break;
case IS_EMPTY:
case ISEMPTY:
rs = v1 == null || (v1 instanceof Collection && ((Collection) v1).isEmpty())
|| (v1 instanceof Map && ((Map) v1).isEmpty());
break;
case IS_NOT_EMPTY:
case ISNOTEMPTY:
if (v1 != null) {
if (v1 instanceof Collection) {
rs = !((Collection) v1).isEmpty();
@@ -235,7 +245,7 @@ public class Condition implements IComponent {
}
private Object cast(RefDataTypeEnum type, Object val) {
if (type != null) {
if (type != null && val != null) {
switch (type) {
case INT:
val = Integer.valueOf(val.toString());

26
fizz-core/src/main/java/we/fizz/exception/FizzRuntimeException.java
View File

@@ -1,11 +1,37 @@
package we.fizz.exception;
import we.fizz.StepContext;
public class FizzRuntimeException extends RuntimeException {
private StepContext<String, Object> stepContext;
public FizzRuntimeException(String message) {
super(message);
}
public FizzRuntimeException(String message, Throwable cause) {
super(message, cause);
this.setStackTrace(cause.getStackTrace());
}
public FizzRuntimeException(String message, StepContext<String, Object> stepContext) {
super(message);
this.stepContext = stepContext;
}
public FizzRuntimeException(String message, Throwable cause, StepContext<String, Object> stepContext) {
super(message, cause);
this.setStackTrace(cause.getStackTrace());
this.stepContext = stepContext;
}
public StepContext<String, Object> getStepContext() {
return stepContext;
}
public void setStepContext(StepContext<String, Object> stepContext) {
this.stepContext = stepContext;
}
}

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

@@ -19,13 +19,14 @@ package we.fizz.input;
import java.util.*;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.noear.snack.ONode;
import we.constants.CommonConstants;
import we.fizz.StepContext;
import we.fizz.exception.FizzRuntimeException;
import we.util.MapUtil;
/**
@@ -105,14 +106,15 @@ public class PathMapping {
return target.toObject(Map.class);
}
@SuppressWarnings("unchecked")
public static ONode transform(ONode ctxNode, Map<String, Object> rules, boolean supportMultiLevels) {
ONode target = ONode.load(new HashMap());
if (rules.isEmpty()) {
return target;
}
Map<String, String> rs = new HashMap<>();
Map<String, String> types = new HashMap<>();
Map<String, Object> rs = new HashMap<>();
Map<String, Object> types = new HashMap<>();
for (Entry<String, Object> entry : rules.entrySet()) {
if (entry.getValue() instanceof String) {
String val = (String) entry.getValue();
@@ -123,6 +125,25 @@ public class PathMapping {
} else {
rs.put(entry.getKey(), val);
}
} else if (entry.getValue() instanceof List) {
List<Object> values = (List<Object>) entry.getValue();
List<String> vList = new ArrayList<>();
List<String> tList = new ArrayList<>();
for (Object v : values) {
if (v instanceof String) {
String val = (String) v;
Optional<String> optType = typeList.stream().filter(s -> val.startsWith(s + " ")).findFirst();
if (optType.isPresent()) {
vList.add(val.substring(optType.get().length() + 1));
tList.add(optType.get());
} else {
vList.add(val);
tList.add(null);
}
}
}
rs.put(entry.getKey(), vList);
types.put(entry.getKey(), tList);
}
}
@@ -134,8 +155,46 @@ public class PathMapping {
Object starValObj = null;
String starEntryKey = null;
for (Entry<String, String> entry : rs.entrySet()) {
String path = entry.getValue();
for (Entry<String, Object> entry : rs.entrySet()) {
if (entry.getValue() instanceof String) {
String path = (String) entry.getValue();
String type = (String) types.get(entry.getKey());
Object obj = getRefValue(ctxNode, type, path);
if (CommonConstants.WILDCARD_STAR.equals(entry.getKey())) {
starValObj = obj;
starEntryKey = entry.getKey();
} else {
setByPath(target, entry.getKey(), obj, supportMultiLevels);
}
} else if (entry.getValue() instanceof List) {
List<String> refs = (List<String>) entry.getValue();
List<String> tList = (List<String>) types.get(entry.getKey());
List<Object> refValList = new ArrayList<>();
for (int i = 0; i < refs.size(); i++) {
String path = refs.get(i);
String type = tList.get(i);
Object obj = getRefValue(ctxNode, type, path);
// Only header form-data and query Parameter support multiple values, merge result into
// one a list
if (obj instanceof List) {
refValList.addAll((List<Object>) obj);
} else {
refValList.add(obj);
}
}
setByPath(target, entry.getKey(), refValList, supportMultiLevels);
}
}
if(starEntryKey != null) {
setByPath(target, starEntryKey, starValObj, supportMultiLevels);
}
return target;
}
private static Object getRefValue(ONode ctxNode, String type, String path) {
Object obj = null;
try {
String p = path;
String defaultValue = null;
if (path.indexOf("|") != -1) {
@@ -143,15 +202,23 @@ public class PathMapping {
defaultValue = path.substring(path.indexOf("|") + 1);
}
ONode val = select(ctxNode, handlePath(p));
Object obj = null;
if (val != null && !val.isNull()) {
obj = val;
} else {
obj = defaultValue;
}
if (obj != null && types.containsKey(entry.getKey())) {
switch (types.get(entry.getKey())) {
if (obj != null && type != null) {
obj = cast(obj, type);
}
} catch (Exception e) {
e.printStackTrace();
throw new FizzRuntimeException(String.format("path mapping errer: %s , path mapping data: %s %s", e.getMessage(), type, path), e);
}
return obj;
}
private static Object cast(Object obj, String type) {
switch (type) {
case "Integer":
case "int": {
if (obj instanceof ONode) {
@@ -205,20 +272,7 @@ public class PathMapping {
break;
}
}
}
if (CommonConstants.WILDCARD_STAR.equals(entry.getKey())) {
starValObj = obj;
starEntryKey = entry.getKey();
} else {
setByPath(target, entry.getKey(), obj, supportMultiLevels);
}
}
if(starEntryKey != null) {
setByPath(target, starEntryKey, starValObj, supportMultiLevels);
}
return target;
return obj;
}
public static ONode select(ONode ctxNode, String path) {
@@ -251,6 +305,9 @@ public class PathMapping {
* @return
*/
public static Object getValueByPath(ONode ctxNode, String path) {
if (StringUtils.isBlank(path)) {
return null;
}
String p = path;
String defaultValue = null;
if (path.indexOf("|") != -1) {
@@ -270,7 +327,14 @@ public class PathMapping {
}
Map<String, Object> rs = new HashMap<>();
for (Entry<String, Object> entry : rules.entrySet()) {
if (!(entry.getValue() instanceof String)) {
if (entry.getValue() instanceof List) {
List<Object> values = (List<Object>) entry.getValue();
for (Object v : values) {
if (!(v instanceof String)) {
rs.put(entry.getKey(), v);
}
}
} else if (!(entry.getValue() instanceof String) && entry.getValue() instanceof Map) {
rs.put(entry.getKey(), entry.getValue());
}
}
@@ -418,6 +482,7 @@ public class PathMapping {
*/
public static Map<String, Object> transform(ONode ctxNode, StepContext<String, Object> stepContext,
Map<String, Object> fixed, Map<String, Object> mappingRules, boolean supportMultiLevels) {
try {
if (fixed != null && fixed.containsKey(CommonConstants.WILDCARD_TILDE)) {
Object val = fixed.get(CommonConstants.WILDCARD_TILDE);
fixed = new HashMap<>();
@@ -434,15 +499,18 @@ public class PathMapping {
}
if (mappingRules != null) {
// 路径映射
ONode target = PathMapping.transform(ctxNode, mappingRules, supportMultiLevels);
ONode target = transform(ctxNode, mappingRules, supportMultiLevels);
// 脚本转换
Map<String, Object> scriptRules = PathMapping.getScriptRules(mappingRules);
Map<String, Object> scriptRules = getScriptRules(mappingRules);
Map<String, Object> scriptResult = ScriptHelper.executeScripts(target, scriptRules, ctxNode, stepContext, supportMultiLevels);
if (scriptResult != null && !scriptResult.isEmpty()) {
result = MapUtil.merge(result, scriptResult);
}
}
return result;
}catch(FizzRuntimeException e) {
throw new FizzRuntimeException(e.getMessage(), e, stepContext);
}
}
public static Map<String, Object> convertPath(Map<String, Object> fixed, boolean supportMultiLevels) {

12
fizz-core/src/main/java/we/fizz/input/extension/request/RequestInput.java
View File

@@ -143,8 +143,8 @@ public class RequestInput extends RPCInput implements IInput{
// headers
Map<String, Object> headers = PathMapping.transform(ctxNode, stepContext,
MapUtil.upperCaseKey((Map<String, Object>) requestMapping.get("fixedHeaders")),
MapUtil.upperCaseKey((Map<String, Object>) requestMapping.get("headers")), false);
MapUtil.upperCaseKey(MapUtil.list2Map(requestMapping.get("fixedHeaders"))),
MapUtil.upperCaseKey(MapUtil.list2Map(requestMapping.get("headers"))), false);
if (headers.containsKey(CommonConstants.WILDCARD_TILDE)
&& headers.get(CommonConstants.WILDCARD_TILDE) instanceof Map) {
request.put("headers", headers.get(CommonConstants.WILDCARD_TILDE));
@@ -154,8 +154,8 @@ public class RequestInput extends RPCInput implements IInput{
// params
params.putAll(PathMapping.transform(ctxNode, stepContext,
(Map<String, Object>) requestMapping.get("fixedParams"),
(Map<String, Object>) requestMapping.get("params"), false));
MapUtil.list2Map(requestMapping.get("fixedParams")),
MapUtil.list2Map(requestMapping.get("params")), false));
if (params.containsKey(CommonConstants.WILDCARD_TILDE)
&& params.get(CommonConstants.WILDCARD_TILDE) instanceof Map) {
request.put("params", params.get(CommonConstants.WILDCARD_TILDE));
@@ -170,8 +170,8 @@ public class RequestInput extends RPCInput implements IInput{
supportMultiLevels = false;
}
Map<String,Object> body = PathMapping.transform(ctxNode, stepContext,
(Map<String, Object>) requestMapping.get("fixedBody"),
(Map<String, Object>) requestMapping.get("body"), supportMultiLevels);
MapUtil.list2Map(requestMapping.get("fixedBody")),
MapUtil.list2Map(requestMapping.get("body")), supportMultiLevels);
if (body.containsKey(CommonConstants.WILDCARD_TILDE)) {
request.put("body", body.get(CommonConstants.WILDCARD_TILDE));
} else {

15
fizz-core/src/test/java/we/fizz/component/CircleTests.java
View File

@@ -25,6 +25,7 @@ import java.util.List;
import org.junit.jupiter.api.Test;
import org.noear.snack.ONode;
import we.fizz.StepContext;
import we.fizz.component.circle.Circle;
import we.fizz.component.circle.CircleItem;
import we.fizz.component.condition.Condition;
@@ -41,7 +42,6 @@ class CircleTests {
void contextLoads() {
}
@SuppressWarnings("rawtypes")
@Test
void testNextFixedDataSource() {
@@ -50,14 +50,14 @@ class CircleTests {
// FIXED data source
Circle c = new Circle(null, ValueTypeEnum.FIXED, 3, null, null);
CircleItem circleItem = c.next(ctxNode);
assertEquals(0, (Integer) circleItem.getItem());
circleItem = c.next(ctxNode);
assertEquals(1, (Integer) circleItem.getItem());
circleItem = c.next(ctxNode);
assertEquals(2, (Integer) circleItem.getItem());
circleItem = c.next(ctxNode);
assertEquals(3, (Integer) circleItem.getItem());
circleItem = c.next(ctxNode);
assertEquals(null, circleItem);
@@ -115,7 +115,8 @@ class CircleTests {
CircleItem circleItem = circle.next(ctxNode);
PathMapping.setByPath(ctxNode, "item", circleItem.getItem(), true);
PathMapping.setByPath(ctxNode, "index", circleItem.getIndex(), true);
boolean rs = circle.canExec(ctxNode);
boolean rs = circle.canExec(circleItem.getIndex(), ctxNode, new StepContext<String, Object>(),
new StepContextPosition("step1", null));
assertEquals(i, circleItem.getIndex());
if (i < 3) {
assertEquals(true, rs);
@@ -154,7 +155,9 @@ class CircleTests {
CircleItem circleItem = circle.next(ctxNode);
PathMapping.setByPath(ctxNode, "item", circleItem.getItem(), true);
PathMapping.setByPath(ctxNode, "index", circleItem.getIndex(), true);
boolean rs = circle.breakCircle(ctxNode);
boolean rs = circle.breakCircle(circleItem.getIndex(), ctxNode, new StepContext<String, Object>(),
new StepContextPosition("step1", null));
assertEquals(i, circleItem.getIndex());
if (i < 3) {
assertEquals(false, rs);

74
fizz-core/src/test/java/we/fizz/component/ConditionTests.java
View File

@@ -158,17 +158,17 @@ class ConditionTests {
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.CONTAINS, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list1", ValueTypeEnum.FIXED,
FixedDataTypeEnum.STRING, "2", OperatorEnum.NOT_CONTAIN, FALSE });
FixedDataTypeEnum.STRING, "2", OperatorEnum.NOTCONTAIN, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list1", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_1", OperatorEnum.NOT_CONTAIN, FALSE });
RefDataTypeEnum.STRING, "data.m.string_1", OperatorEnum.NOTCONTAIN, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list1", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.NOT_CONTAIN, TRUE });
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.NOTCONTAIN, TRUE });
// collection contains any
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list1", ValueTypeEnum.REF,
RefDataTypeEnum.ARRAY, "data.list2", OperatorEnum.CONTAINS_ANY, TRUE });
RefDataTypeEnum.ARRAY, "data.list2", OperatorEnum.CONTAINSANY, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list1", ValueTypeEnum.REF,
RefDataTypeEnum.ARRAY, "data.intList", OperatorEnum.CONTAINS_ANY, FALSE });
RefDataTypeEnum.ARRAY, "data.intList", OperatorEnum.CONTAINSANY, FALSE });
// Collection<int>
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.intList", ValueTypeEnum.FIXED,
@@ -181,13 +181,13 @@ class ConditionTests {
RefDataTypeEnum.INT, 9, OperatorEnum.CONTAINS, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.intList", ValueTypeEnum.FIXED,
FixedDataTypeEnum.STRING, "2", OperatorEnum.NOT_CONTAIN, TRUE });
FixedDataTypeEnum.STRING, "2", OperatorEnum.NOTCONTAIN, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.intList", ValueTypeEnum.REF,
RefDataTypeEnum.INT, "data.m.int", OperatorEnum.NOT_CONTAIN, FALSE });
RefDataTypeEnum.INT, "data.m.int", OperatorEnum.NOTCONTAIN, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.intList", ValueTypeEnum.FIXED,
RefDataTypeEnum.INT, 2, OperatorEnum.NOT_CONTAIN, FALSE });
RefDataTypeEnum.INT, 2, OperatorEnum.NOTCONTAIN, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.intList", ValueTypeEnum.FIXED,
RefDataTypeEnum.INT, 9, OperatorEnum.NOT_CONTAIN, TRUE });
RefDataTypeEnum.INT, 9, OperatorEnum.NOTCONTAIN, TRUE });
// Collection<Float>
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.floatList",
@@ -235,71 +235,71 @@ class ConditionTests {
// Is null
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_NULL, TRUE });
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISNULL, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8",
ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_NULL, FALSE });
ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISNULL, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", null, null, null,
OperatorEnum.IS_NULL, TRUE });
OperatorEnum.ISNULL, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", null, null, null,
OperatorEnum.IS_NULL, FALSE });
OperatorEnum.ISNULL, FALSE });
// Is not null
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_NOT_NULL, FALSE });
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISNOTNULL, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8",
ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_NOT_NULL, TRUE });
ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISNOTNULL, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", null, null, null,
OperatorEnum.IS_NOT_NULL, FALSE });
OperatorEnum.ISNOTNULL, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", null, null, null,
OperatorEnum.IS_NOT_NULL, TRUE });
OperatorEnum.ISNOTNULL, TRUE });
// Is Blank
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_BLANK, TRUE });
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISBLANK, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8",
ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_BLANK, FALSE });
ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISBLANK, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", null, null, null,
OperatorEnum.IS_BLANK, TRUE });
OperatorEnum.ISBLANK, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", null, null, null,
OperatorEnum.IS_BLANK, FALSE });
OperatorEnum.ISBLANK, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_blank", null, null,
null, OperatorEnum.IS_BLANK, TRUE });
null, OperatorEnum.ISBLANK, TRUE });
// Is not Blank
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_NOT_BLANK, FALSE });
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISNOTBLANK, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8",
ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_NOT_BLANK, TRUE });
ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISNOTBLANK, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", null, null, null,
OperatorEnum.IS_NOT_BLANK, FALSE });
OperatorEnum.ISNOTBLANK, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_8", null, null, null,
OperatorEnum.IS_NOT_BLANK, TRUE });
OperatorEnum.ISNOTBLANK, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.STRING, "data.m.string_blank", null, null,
null, OperatorEnum.IS_NOT_BLANK, FALSE });
null, OperatorEnum.ISNOTBLANK, FALSE });
// Is empty
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_EMPTY, TRUE });
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISEMPTY, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list1", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_EMPTY, FALSE });
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISEMPTY, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", null, null, null,
OperatorEnum.IS_EMPTY, TRUE });
OperatorEnum.ISEMPTY, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list1", null, null, null,
OperatorEnum.IS_EMPTY, FALSE });
OperatorEnum.ISEMPTY, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.emptyList", null, null, null,
OperatorEnum.IS_EMPTY, TRUE });
OperatorEnum.ISEMPTY, TRUE });
// Is not empty
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_NOT_EMPTY, FALSE });
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISNOTEMPTY, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list1", ValueTypeEnum.REF,
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.IS_NOT_EMPTY, TRUE });
RefDataTypeEnum.STRING, "data.m.string_8", OperatorEnum.ISNOTEMPTY, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list11111", null, null, null,
OperatorEnum.IS_NOT_EMPTY, FALSE });
OperatorEnum.ISNOTEMPTY, FALSE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.list1", null, null, null,
OperatorEnum.IS_NOT_EMPTY, TRUE });
OperatorEnum.ISNOTEMPTY, TRUE });
this.run(ctxNode, new Object[] { ValueTypeEnum.REF, RefDataTypeEnum.ARRAY, "data.emptyList", null, null, null,
OperatorEnum.IS_NOT_EMPTY, FALSE });
OperatorEnum.ISNOTEMPTY, FALSE });
}

2
fizz-plugin/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>fizz-gateway-community</artifactId>
<groupId>com.fizzgate</groupId>
<version>2.2.0-beta9</version>
<version>2.2.0-beta11</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fizz-spring-boot-starter/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>fizz-gateway-community</artifactId>
<groupId>com.fizzgate</groupId>
<version>2.2.0-beta9</version>
<version>2.2.0-beta11</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@@ -33,7 +33,7 @@
<artifactId>fizz-gateway-community</artifactId>
<name>${project.artifactId}</name>
<description>fizz gateway community</description>
<version>2.2.0-beta9</version>
<version>2.2.0-beta11</version>
<packaging>pom</packaging>
<modules>
<module>fizz-common</module>