This is an automated email from the ASF dual-hosted git repository. shenlin pushed a commit to branch release/1.0.0 in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit cf153da8c4dcf94422cd9e97b6dcf77e0f3475d2 Author: 2011shenlin <[email protected]> AuthorDate: Mon Sep 19 09:57:00 2022 +0800 release: add the apache license and prepare for release. --- .../org/apache/rocketmq/eventbridge/tools/NetUtil.java | 4 ---- .../apache/rocketmq/eventbridge/tools/TokenUtil.java | 4 ---- .../eventbridge/tools/pattern/FilterPatternTool.java | 2 +- .../tools/transform/DeleteFieldTransform.java | 3 --- .../rocketmq/eventbridge/tools/transform/Extract.java | 2 -- .../tools/transform/InsertFieldTransform.java | 17 ++++++++++------- .../eventbridge/tools/transform/JsonPathExtract.java | 8 ++++---- .../eventbridge/tools/transform/JsonPathTransform.java | 2 +- .../eventbridge/tools/transform/OriginalTransform.java | 2 +- .../tools/transform/StringSubstitutorTemplate.java | 3 --- .../eventbridge/tools/transform/TemplateTransform.java | 3 +-- .../tools/transform/UpdateFieldTransform.java | 17 ++++++++++------- .../domain/model/connection/ConnectionService.java | 8 ++++---- 13 files changed, 32 insertions(+), 43 deletions(-) diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/NetUtil.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/NetUtil.java index 41bf466..02a2213 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/NetUtil.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/NetUtil.java @@ -23,10 +23,6 @@ import java.net.Inet4Address; import java.net.InetAddress; import java.net.UnknownHostException; -/** - * @Author changfeng - * @Date 2022/4/25 11:21 上午 - */ public class NetUtil { public static boolean isIpv4(String ip) { ip = ip.trim(); diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/TokenUtil.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/TokenUtil.java index 7a27fdf..72fd683 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/TokenUtil.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/TokenUtil.java @@ -19,10 +19,6 @@ package org.apache.rocketmq.eventbridge.tools; import java.util.UUID; -/** - * @Author changfeng - * @Date 2022/5/9 5:15 下午 - */ public class TokenUtil { /** * Generate the token of the http source. diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/pattern/FilterPatternTool.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/pattern/FilterPatternTool.java index 46e1d14..a24aa5b 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/pattern/FilterPatternTool.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/pattern/FilterPatternTool.java @@ -24,7 +24,7 @@ import static org.apache.rocketmq.eventbridge.exception.code.FiltterPatternError public abstract class FilterPatternTool { - public static void checkFilterPattern(String filterPattern){ + public static void checkFilterPattern(String filterPattern) { if (Strings.isNullOrEmpty(filterPattern)) { throw new EventBridgeException(EventRuleFilterPatternEmpty); } diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/DeleteFieldTransform.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/DeleteFieldTransform.java index cf95456..d1ddd5a 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/DeleteFieldTransform.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/DeleteFieldTransform.java @@ -18,10 +18,8 @@ package org.apache.rocketmq.eventbridge.tools.transform; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -45,7 +43,6 @@ public class DeleteFieldTransform implements Transform { Map<String, Object> dataMap = new Gson().fromJson(inputData.toString(), new TypeToken<Map<String, Object>>(){}.getType()); for (String field : fieldList) { String[] dataList = field.split("\\."); - System.out.println("dataList is " + Arrays.stream(dataList).collect(Collectors.toList())); Map<String, Object> tempMap = dataMap; for (int i = 1; i < dataList.length - 1; i++) { Object temp = tempMap.get(dataList[i]); diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/Extract.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/Extract.java index 69bf29b..7cdc466 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/Extract.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/Extract.java @@ -20,8 +20,6 @@ package org.apache.rocketmq.eventbridge.tools.transform; import java.util.List; import org.apache.rocketmq.eventbridge.exception.EventBridgeException; -import org.apache.rocketmq.eventbridge.tools.transform.Data; -import org.apache.rocketmq.eventbridge.tools.transform.Variable; public interface Extract { /** diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/InsertFieldTransform.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/InsertFieldTransform.java index c8edd30..9c56ecf 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/InsertFieldTransform.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/InsertFieldTransform.java @@ -35,26 +35,29 @@ public class InsertFieldTransform implements Transform { public InsertFieldTransform(String extractJsonList) throws EventBridgeException { JsonElement jsonElement = JsonUtil.parseJsonElement(extractJsonList); for (JsonElement element : jsonElement.getAsJsonArray()) { - fieldList.add(new Variable(element.getAsJsonObject().getAsJsonPrimitive( - TransformFieldEnum.FIELD).getAsString(), - element.getAsJsonObject().getAsJsonPrimitive(TransformFieldEnum.VALUE))); + fieldList.add(new Variable(element.getAsJsonObject() + .getAsJsonPrimitive(TransformFieldEnum.FIELD) + .getAsString(), element.getAsJsonObject() + .getAsJsonPrimitive(TransformFieldEnum.VALUE))); } } @Override public Data process(Data inputData) throws EventBridgeException { - Map<String, Object> dataMap = new Gson().fromJson(inputData.toString(), new TypeToken<Map<String, Object>>(){}.getType()); + Map<String, Object> dataMap = new Gson().fromJson(inputData.toString(), + new TypeToken<Map<String, Object>>() {}.getType()); for (Variable v : fieldList) { - String[] dataList = v.getName().split("\\."); + String[] dataList = v.getName() + .split("\\."); Map<String, Object> tempMap = dataMap; for (int i = 1; i < dataList.length - 1; i++) { Object temp = tempMap.get(dataList[i]); if (!(temp instanceof Map)) { throw new EventBridgeException(TransformErrorCode.InvalidConfig); } - tempMap = (Map<String, Object>) temp; + tempMap = (Map<String, Object>)temp; } - tempMap.put(dataList[dataList.length - 1], ((JsonPrimitive) v.getValue()).getAsString()); + tempMap.put(dataList[dataList.length - 1], ((JsonPrimitive)v.getValue()).getAsString()); } String jsonString = JSONObject.toJSONString(dataMap); return new StringData(jsonString); diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathExtract.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathExtract.java index c7b0a86..1138dfe 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathExtract.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathExtract.java @@ -29,10 +29,10 @@ import org.apache.rocketmq.eventbridge.exception.EventBridgeException; import static org.apache.rocketmq.eventbridge.tools.transform.Transform.DEFAULT_VALUE_NAME; /** - * ALL：[{"name":"SYS_DEFAULT","valueFromJsonPath":"$"}] - * JSON_PATH：[{"name":"SYS_DEFAULT","valueFromJsonPath":"$.data.template"}] - * CONSTANT：[{"name":"SYS_DEFAULT","value":"I am a constant value!"}] - * TEMPLATE：[ + * ALL:[{"name":"SYS_DEFAULT","valueFromJsonPath":"$"}] + * JSON_PATH:[{"name":"SYS_DEFAULT","valueFromJsonPath":"$.data.template"}] + * CONSTANT:[{"name":"SYS_DEFAULT","value":"I am a constant value!"}] + * TEMPLATE:[ * {"name":"k1","valueFromJsonPath":"$.data.v1"}, * {"name":"k2","valueFromJsonPath":"$.data.v2"} * ] diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathTransform.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathTransform.java index e17aa7a..9b02a78 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathTransform.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathTransform.java @@ -25,7 +25,7 @@ public class JsonPathTransform implements Transform { /** * The extact expr - * e.g："{"id":"$.id","name":"$.data.name"}" + * e.g:"{"id":"$.id","name":"$.data.name"}" */ private Extract jsonPathExtract; diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/OriginalTransform.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/OriginalTransform.java index b644517..ac769e0 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/OriginalTransform.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/OriginalTransform.java @@ -20,7 +20,7 @@ package org.apache.rocketmq.eventbridge.tools.transform; public class OriginalTransform implements Transform { @Override - public Data process(Data inputData){ + public Data process(Data inputData) { return inputData; } } diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/StringSubstitutorTemplate.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/StringSubstitutorTemplate.java index 3bf371e..3671ba9 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/StringSubstitutorTemplate.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/StringSubstitutorTemplate.java @@ -64,7 +64,6 @@ public class StringSubstitutorTemplate implements Template { log.debug("template: " + outputTemplate); List<Map.Entry<String, JsonElement>> jsonTemplateEntryList = getAndCheckEmbedObject(); - // 如果template中包含EB_SYS_EMBED_OBJECT，则判断Data中该EB_SYS_EMBED_OBJECT对应的数据是否为json，如果是则进行替换并打平 if (jsonTemplateEntryList.size() > 0) { for (Map.Entry<String, JsonElement> entry : jsonTemplateEntryList) { String key = removeVariableMark(entry.getValue().getAsJsonObject().get(EB_SYS_EMBED_OBJECT).getAsString()); @@ -93,8 +92,6 @@ public class StringSubstitutorTemplate implements Template { return jsonTemplateEntryList; } JsonElement jsonElement = JsonParser.parseString(outputTemplate); - // 遍历template，如果有Entry<String, JsonElement>中的JsonElement包含EB_SYS_EMBED_OBJECT， - // 就将这个entry保存起来，以便后面替换 Deque<Map.Entry<String, JsonElement>> deque = new ArrayDeque<>(jsonElement.getAsJsonObject().entrySet()); while (!deque.isEmpty()) { Map.Entry<String, JsonElement> elementEntry = deque.pop(); diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/TemplateTransform.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/TemplateTransform.java index ee125c4..7bb5652 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/TemplateTransform.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/TemplateTransform.java @@ -25,7 +25,7 @@ public class TemplateTransform implements Transform { /** * The extact expr - * e.g："{"id":"$.id","name":"$.data.name"}" + * e.g:"{"id":"$.id","name":"$.data.name"}" */ private Extract jsonPathExtract; @@ -39,7 +39,6 @@ public class TemplateTransform implements Transform { this.template = template; } - @Override public Data process(Data inputData) throws EventBridgeException { List<Variable> variableList = extract(inputData, jsonPathExtract); diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/UpdateFieldTransform.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/UpdateFieldTransform.java index ead7742..dc308f3 100644 --- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/UpdateFieldTransform.java +++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/UpdateFieldTransform.java @@ -35,30 +35,33 @@ public class UpdateFieldTransform implements Transform { public UpdateFieldTransform(String extractJsonList) throws EventBridgeException { JsonElement jsonElement = JsonUtil.parseJsonElement(extractJsonList); for (JsonElement element : jsonElement.getAsJsonArray()) { - fieldList.add(new Variable(element.getAsJsonObject().getAsJsonPrimitive( - TransformFieldEnum.FIELD).getAsString(), - element.getAsJsonObject().getAsJsonPrimitive(TransformFieldEnum.VALUE))); + fieldList.add(new Variable(element.getAsJsonObject() + .getAsJsonPrimitive(TransformFieldEnum.FIELD) + .getAsString(), element.getAsJsonObject() + .getAsJsonPrimitive(TransformFieldEnum.VALUE))); } } @Override public Data process(Data inputData) throws EventBridgeException { - Map<String, Object> dataMap = new Gson().fromJson(inputData.toString(), new TypeToken<Map<String, Object>>(){}.getType()); + Map<String, Object> dataMap = new Gson().fromJson(inputData.toString(), + new TypeToken<Map<String, Object>>() {}.getType()); for (Variable v : fieldList) { - String[] dataList = v.getName().split("\\."); + String[] dataList = v.getName() + .split("\\."); Map<String, Object> tempMap = dataMap; for (int i = 1; i < dataList.length - 1; i++) { Object temp = tempMap.get(dataList[i]); if (!(temp instanceof Map)) { throw new EventBridgeException(TransformErrorCode.InvalidConfig); } - tempMap = (Map<String, Object>) temp; + tempMap = (Map<String, Object>)temp; } if (tempMap.get(dataList[dataList.length - 1]) == null) { throw new EventBridgeException(TransformErrorCode.InvalidConfig); } - tempMap.put(dataList[dataList.length - 1], ((JsonPrimitive) v.getValue()).getAsString()); + tempMap.put(dataList[dataList.length - 1], ((JsonPrimitive)v.getValue()).getAsString()); } String jsonString = JSONObject.toJSONString(dataMap); return new StringData(jsonString); diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java index 079260c..e5d5f8b 100644 --- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java +++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java @@ -17,8 +17,8 @@ package org.apache.rocketmq.eventbridge.domain.model.connection; -import com.alibaba.fastjson.JSON; import com.google.common.collect.Maps; +import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.eventbridge.domain.common.EventBridgeConstants; import org.apache.rocketmq.eventbridge.domain.common.enums.NetworkTypeEnum; @@ -171,14 +171,14 @@ public class ConnectionService extends AbstractResourceService { Map<String, String> basicAuthParametersMap = Maps.newHashMap(); basicAuthParametersMap.put("username", basicAuthParameters.getUsername()); basicAuthParametersMap.put("password", basicAuthParameters.getPassword()); - secretManagerAPI.createSecretName(accountId, connectionName, JSON.toJSONString(basicAuthParametersMap)); + secretManagerAPI.createSecretName(accountId, connectionName, new Gson().toJson(basicAuthParametersMap)); return authParameters; } if (apiKeyAuthParameters != null) { Map<String, String> apiKeyAuthParametersMap = Maps.newHashMap(); apiKeyAuthParametersMap.put("apiKeyName", apiKeyAuthParameters.getApiKeyName()); apiKeyAuthParametersMap.put("apiKeyValue", apiKeyAuthParameters.getApiKeyValue()); - secretManagerAPI.createSecretName(accountId, connectionName, JSON.toJSONString(apiKeyAuthParametersMap)); + secretManagerAPI.createSecretName(accountId, connectionName, new Gson().toJson(apiKeyAuthParametersMap)); return authParameters; } return authParameters; @@ -222,7 +222,7 @@ public class ConnectionService extends AbstractResourceService { Map<String, String> queryStringParameterMap = Maps.newHashMap(); queryStringParameterMap.put("oauthHttpParameterKey", key); queryStringParameterMap.put("oauthHttpParameterValue", value); - return secretManagerAPI.createSecretName(accountId, connectionName, JSON.toJSONString(queryStringParameterMap)); + return secretManagerAPI.createSecretName(accountId, connectionName, new Gson().toJson(queryStringParameterMap)); } private void checkNetworkType(String type) {
