This is an automated email from the ASF dual-hosted git repository.
mxsm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new f948cc56f [ISSUE #4513]Add eventmesh filter & transform sub module
(#4514)
f948cc56f is described below
commit f948cc56f11178fff6301503f37ee48c6476b9b0
Author: mike_xwm <[email protected]>
AuthorDate: Fri Oct 27 15:35:53 2023 +0800
[ISSUE #4513]Add eventmesh filter & transform sub module (#4514)
* [ISSUE #4513]Add eventmesh filter & transform sub module
* fix check error
---
build.gradle | 1 +
eventmesh-common/build.gradle | 4 ++--
.../Variable.java => eventmesh-filter/build.gradle | 13 ++--------
.../org/apache/eventmesh}/filter/PatternEntry.java | 4 ++--
.../filter/condition/AnythingButCondition.java | 6 ++---
.../eventmesh}/filter/condition/Condition.java | 2 +-
.../filter/condition/ConditionsBuilder.java | 4 ++--
.../filter/condition/ExistsCondition.java | 4 ++--
.../filter/condition/NumericCondition.java | 4 ++--
.../filter/condition/PrefixCondition.java | 6 ++---
.../filter/condition/SpecifiedCondition.java | 4 ++--
.../filter/condition/SuffixCondition.java | 4 ++--
.../apache/eventmesh}/filter/pattern/Pattern.java | 4 ++--
.../filter/patternbuild/PatternBuilder.java | 10 ++++----
.../org/apache/eventmesh}/filter/PatternTest.java | 6 ++---
.../build.gradle | 7 ++----
.../transformer}/ConstantTransformer.java | 8 +++----
.../eventmesh/transformer}/JsonPathParser.java | 6 ++---
.../transformer}/OriginalTransformer.java | 2 +-
.../apache/eventmesh/transformer}/Template.java | 23 +++++++++++-------
.../transformer}/TemplateTransformer.java | 2 +-
.../eventmesh/transformer/TransformException.java | 22 ++++++++---------
.../apache/eventmesh/transformer}/Transformer.java | 2 +-
.../eventmesh/transformer}/TransformerBuilder.java | 6 ++---
.../eventmesh/transformer}/TransformerType.java | 2 +-
.../apache/eventmesh/transformer}/Variable.java | 28 +++++++++++++++++-----
.../apache/eventmesh}/transform/TransformTest.java | 6 ++++-
settings.gradle | 2 ++
tools/dependency-check/known-dependencies.txt | 1 -
29 files changed, 101 insertions(+), 92 deletions(-)
diff --git a/build.gradle b/build.gradle
index 432d410ca..99aaf4e09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -521,6 +521,7 @@ subprojects {
dependency "com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0"
dependency "com.mebigfatguy.fb-contrib:fb-contrib:7.6.0"
+ dependency "com.jayway.jsonpath:json-path:2.7.0"
dependency
"org.springframework.boot:spring-boot-starter-web:2.7.10"
dependency "io.openmessaging:registry-server:0.0.1"
diff --git a/eventmesh-common/build.gradle b/eventmesh-common/build.gradle
index f2c627acd..67cb886de 100644
--- a/eventmesh-common/build.gradle
+++ b/eventmesh-common/build.gradle
@@ -25,8 +25,8 @@ dependencies {
api "org.apache.commons:commons-text"
api "org.apache.commons:commons-lang3"
- implementation group: 'com.jayway.jsonpath', name: 'json-path', version:
'2.7.0'
- implementation 'commons-net:commons-net:3.9.0'
+ api "com.jayway.jsonpath:json-path"
+
api "io.cloudevents:cloudevents-core"
api "io.cloudevents:cloudevents-json-jackson"
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Variable.java
b/eventmesh-filter/build.gradle
similarity index 79%
copy from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Variable.java
copy to eventmesh-filter/build.gradle
index b7f139f2b..ba88591b4 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Variable.java
+++ b/eventmesh-filter/build.gradle
@@ -15,16 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class Variable {
-
- private String name;
- private String jsonPath;
+dependencies {
+ implementation project(":eventmesh-common")
}
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/PatternEntry.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/PatternEntry.java
similarity index 94%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/PatternEntry.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/PatternEntry.java
index b6f747e67..73878fb65 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/PatternEntry.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/PatternEntry.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter;
+package org.apache.eventmesh.filter;
-import org.apache.eventmesh.common.filter.condition.Condition;
+import org.apache.eventmesh.filter.condition.Condition;
import java.util.ArrayList;
import java.util.List;
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/AnythingButCondition.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/AnythingButCondition.java
similarity index 93%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/AnythingButCondition.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/AnythingButCondition.java
index f64dd1fc4..2d58136a7 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/AnythingButCondition.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/AnythingButCondition.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.condition;
+package org.apache.eventmesh.filter.condition;
import java.util.ArrayList;
import java.util.Iterator;
@@ -24,11 +24,11 @@ import java.util.Map.Entry;
import com.fasterxml.jackson.databind.JsonNode;
-class AnythingButCondition implements Condition {
+public class AnythingButCondition implements Condition {
private List<Condition> conditionList = new ArrayList<>();
- AnythingButCondition(JsonNode condition) {
+ public AnythingButCondition(JsonNode condition) {
if (condition.isValueNode()) {
this.conditionList.add(new SpecifiedCondition(condition));
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/Condition.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/Condition.java
similarity index 94%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/Condition.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/Condition.java
index 4ae08616b..fbb4276c7 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/Condition.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/Condition.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.condition;
+package org.apache.eventmesh.filter.condition;
import com.fasterxml.jackson.databind.JsonNode;
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/ConditionsBuilder.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/ConditionsBuilder.java
similarity index 94%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/ConditionsBuilder.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/ConditionsBuilder.java
index bceb09d57..4e207663a 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/ConditionsBuilder.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/ConditionsBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.condition;
+package org.apache.eventmesh.filter.condition;
import com.fasterxml.jackson.databind.JsonNode;
@@ -38,7 +38,7 @@ public class ConditionsBuilder {
Condition condition = null;
switch (this.key) {
case "prefix":
- condition = new PrefixxCondition(this.jsonNode);
+ condition = new PrefixCondition(this.jsonNode);
break;
case "suffix":
condition = new SuffixCondition(this.jsonNode);
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/ExistsCondition.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/ExistsCondition.java
similarity index 91%
copy from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/ExistsCondition.java
copy to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/ExistsCondition.java
index 95d765d71..53c15bb29 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/ExistsCondition.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/ExistsCondition.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.condition;
+package org.apache.eventmesh.filter.condition;
import com.fasterxml.jackson.databind.JsonNode;
-class ExistsCondition implements Condition {
+public class ExistsCondition implements Condition {
private JsonNode exists;
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/NumericCondition.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/NumericCondition.java
similarity index 96%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/NumericCondition.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/NumericCondition.java
index b5c28a4d1..5eb5374c7 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/NumericCondition.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/NumericCondition.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.condition;
+package org.apache.eventmesh.filter.condition;
import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.databind.JsonNode;
-class NumericCondition implements Condition {
+public class NumericCondition implements Condition {
List<String> operators = new ArrayList<>();
List<Double> nums = new ArrayList<>();
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/PrefixxCondition.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/PrefixCondition.java
similarity index 87%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/PrefixxCondition.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/PrefixCondition.java
index 22c1afa61..633ed1fb0 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/PrefixxCondition.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/PrefixCondition.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.condition;
+package org.apache.eventmesh.filter.condition;
import com.fasterxml.jackson.databind.JsonNode;
-class PrefixxCondition implements Condition {
+public class PrefixCondition implements Condition {
private final String prefix;
- public PrefixxCondition(JsonNode suffix) {
+ public PrefixCondition(JsonNode suffix) {
this.prefix = suffix.asText();
}
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/SpecifiedCondition.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/SpecifiedCondition.java
similarity index 91%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/SpecifiedCondition.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/SpecifiedCondition.java
index b6fa884a1..f9cc3fb5d 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/SpecifiedCondition.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/SpecifiedCondition.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.condition;
+package org.apache.eventmesh.filter.condition;
import com.fasterxml.jackson.databind.JsonNode;
-class SpecifiedCondition implements Condition {
+public class SpecifiedCondition implements Condition {
private final JsonNode specified;
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/SuffixCondition.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/SuffixCondition.java
similarity index 91%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/SuffixCondition.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/SuffixCondition.java
index b7187d6c1..805df0ee1 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/SuffixCondition.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/condition/SuffixCondition.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.condition;
+package org.apache.eventmesh.filter.condition;
import com.fasterxml.jackson.databind.JsonNode;
-class SuffixCondition implements Condition {
+public class SuffixCondition implements Condition {
private final String suffix;
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/pattern/Pattern.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/pattern/Pattern.java
similarity index 96%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/pattern/Pattern.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/pattern/Pattern.java
index 6187a668b..8abb306b8 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/pattern/Pattern.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/pattern/Pattern.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.pattern;
+package org.apache.eventmesh.filter.pattern;
-import org.apache.eventmesh.common.filter.PatternEntry;
import org.apache.eventmesh.common.utils.JsonPathUtils;
+import org.apache.eventmesh.filter.PatternEntry;
import org.apache.commons.lang3.StringUtils;
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/patternbuild/PatternBuilder.java
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/patternbuild/PatternBuilder.java
similarity index 95%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/patternbuild/PatternBuilder.java
rename to
eventmesh-filter/src/main/java/org/apache/eventmesh/filter/patternbuild/PatternBuilder.java
index 4abf2af06..0a2fb0176 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/patternbuild/PatternBuilder.java
+++
b/eventmesh-filter/src/main/java/org/apache/eventmesh/filter/patternbuild/PatternBuilder.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.patternbuild;
+package org.apache.eventmesh.filter.patternbuild;
import org.apache.eventmesh.common.exception.JsonException;
-import org.apache.eventmesh.common.filter.PatternEntry;
-import org.apache.eventmesh.common.filter.condition.Condition;
-import org.apache.eventmesh.common.filter.condition.ConditionsBuilder;
-import org.apache.eventmesh.common.filter.pattern.Pattern;
+import org.apache.eventmesh.filter.PatternEntry;
+import org.apache.eventmesh.filter.condition.Condition;
+import org.apache.eventmesh.filter.condition.ConditionsBuilder;
+import org.apache.eventmesh.filter.pattern.Pattern;
import java.util.ArrayDeque;
import java.util.Iterator;
diff --git
a/eventmesh-common/src/test/java/org/apache/eventmesh/common/filter/PatternTest.java
b/eventmesh-filter/src/test/java/org/apache/eventmesh/filter/PatternTest.java
similarity index 96%
rename from
eventmesh-common/src/test/java/org/apache/eventmesh/common/filter/PatternTest.java
rename to
eventmesh-filter/src/test/java/org/apache/eventmesh/filter/PatternTest.java
index f5b14515f..207992b0c 100644
---
a/eventmesh-common/src/test/java/org/apache/eventmesh/common/filter/PatternTest.java
+++
b/eventmesh-filter/src/test/java/org/apache/eventmesh/filter/PatternTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter;
+package org.apache.eventmesh.filter;
-import org.apache.eventmesh.common.filter.pattern.Pattern;
-import org.apache.eventmesh.common.filter.patternbuild.PatternBuilder;
+import org.apache.eventmesh.filter.pattern.Pattern;
+import org.apache.eventmesh.filter.patternbuild.PatternBuilder;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TransformerType.java
b/eventmesh-transformer/build.gradle
similarity index 87%
copy from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TransformerType.java
copy to eventmesh-transformer/build.gradle
index 13a5c05d4..ba88591b4 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TransformerType.java
+++ b/eventmesh-transformer/build.gradle
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
-public enum TransformerType {
- ORIGINAL,
- CONSTANT,
- TEMPLATE
+dependencies {
+ implementation project(":eventmesh-common")
}
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/ConstantTransformer.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/ConstantTransformer.java
similarity index 81%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/ConstantTransformer.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/ConstantTransformer.java
index e3df38e1e..dd7c20aac 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/ConstantTransformer.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/ConstantTransformer.java
@@ -15,11 +15,9 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
+package org.apache.eventmesh.transformer;
-import org.apache.eventmesh.common.exception.EventMeshException;
-
-class ConstantTransformer implements Transformer {
+public class ConstantTransformer implements Transformer {
private final String jsonpath;
@@ -28,7 +26,7 @@ class ConstantTransformer implements Transformer {
}
@Override
- public String transform(String json) throws EventMeshException {
+ public String transform(String json) throws TransformException {
return this.jsonpath;
}
}
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/JsonPathParser.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/JsonPathParser.java
similarity index 93%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/JsonPathParser.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/JsonPathParser.java
index d35a22205..a220fc0ab 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/JsonPathParser.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/JsonPathParser.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
+package org.apache.eventmesh.transformer;
-import org.apache.eventmesh.common.exception.EventMeshException;
import org.apache.eventmesh.common.utils.JsonPathUtils;
import java.util.ArrayList;
@@ -52,7 +51,7 @@ public class JsonPathParser {
if (valueNode.isValueNode()) {
variablesList.add(new Variable(name, valueNode.asText()));
} else {
- throw new EventMeshException("invalid config:" +
jsonPathString);
+ throw new TransformException("invalid config:" +
jsonPathString);
}
}
@@ -67,7 +66,6 @@ public class JsonPathParser {
*/
public List<Variable> match(String json) throws JsonProcessingException {
-
if (json == null || json.isEmpty()) {
return new ArrayList<>();
}
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/OriginalTransformer.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/OriginalTransformer.java
similarity index 95%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/OriginalTransformer.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/OriginalTransformer.java
index 708a2aeb2..61aa059d5 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/OriginalTransformer.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/OriginalTransformer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
+package org.apache.eventmesh.transformer;
class OriginalTransformer implements Transformer {
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Template.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/Template.java
similarity index 78%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Template.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/Template.java
index 348ed1a93..5d2358dfe 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Template.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/Template.java
@@ -15,9 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
-
-import org.apache.eventmesh.common.exception.EventMeshException;
+package org.apache.eventmesh.transformer;
import org.apache.commons.text.StringSubstitutor;
@@ -25,16 +23,15 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
public class Template {
private String template;
- public String substitute(List<Variable> variables) throws
EventMeshException {
+ public Template(String template) {
+ this.template = template;
+ }
+
+ public String substitute(List<Variable> variables) throws
TransformException {
Map<String, String> valuesMap = variables.stream()
.filter(variable -> variable.getJsonPath() != null)
@@ -44,4 +41,12 @@ public class Template {
return sub.replace(template);
}
+
+ public String getTemplate() {
+ return template;
+ }
+
+ public void setTemplate(String template) {
+ this.template = template;
+ }
}
\ No newline at end of file
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TemplateTransformer.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TemplateTransformer.java
similarity index 96%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TemplateTransformer.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TemplateTransformer.java
index ea42d05de..2a4db5fc3 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TemplateTransformer.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TemplateTransformer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
+package org.apache.eventmesh.transformer;
import java.util.List;
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/ExistsCondition.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TransformException.java
similarity index 68%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/ExistsCondition.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TransformException.java
index 95d765d71..1b11a29d8 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/filter/condition/ExistsCondition.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TransformException.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.filter.condition;
+package org.apache.eventmesh.transformer;
-import com.fasterxml.jackson.databind.JsonNode;
-
-class ExistsCondition implements Condition {
+/**
+ * Transform exception
+ */
+public class TransformException extends RuntimeException {
- private JsonNode exists;
+ private static final long serialVersionUID = -4351489859520642285L;
- ExistsCondition(JsonNode exists) {
- this.exists = exists;
+ public TransformException(String message) {
+ super(message);
}
- @Override
- public boolean match(JsonNode inputEvent) {
-
- return this.exists.asBoolean() == (inputEvent != null);
+ public TransformException(String message, Throwable cause) {
+ super(message, cause);
}
+
}
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Transformer.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/Transformer.java
similarity index 95%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Transformer.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/Transformer.java
index fecfe4b18..8239dfcb6 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Transformer.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/Transformer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
+package org.apache.eventmesh.transformer;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TransformerBuilder.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TransformerBuilder.java
similarity index 93%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TransformerBuilder.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TransformerBuilder.java
index 0eafdebb7..05ad58355 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TransformerBuilder.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TransformerBuilder.java
@@ -15,9 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
-
-import org.apache.eventmesh.common.exception.EventMeshException;
+package org.apache.eventmesh.transformer;
public class TransformerBuilder {
@@ -50,7 +48,7 @@ public class TransformerBuilder {
case TEMPLATE:
return buildTemplateTransFormer(this.content,
this.template);
default:
- throw new EventMeshException("invalid config");
+ throw new TransformException("invalid config");
}
}
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TransformerType.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TransformerType.java
similarity index 94%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TransformerType.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TransformerType.java
index 13a5c05d4..5ca2142c3 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/TransformerType.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/TransformerType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
+package org.apache.eventmesh.transformer;
public enum TransformerType {
ORIGINAL,
diff --git
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Variable.java
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/Variable.java
similarity index 66%
rename from
eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Variable.java
rename to
eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/Variable.java
index b7f139f2b..6b3cc4da4 100644
---
a/eventmesh-common/src/main/java/org/apache/eventmesh/common/transform/Variable.java
+++
b/eventmesh-transformer/src/main/java/org/apache/eventmesh/transformer/Variable.java
@@ -15,16 +15,32 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
+package org.apache.eventmesh.transformer;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
public class Variable {
private String name;
+
private String jsonPath;
+ public Variable(String name, String jsonPath) {
+ this.name = name;
+ this.jsonPath = jsonPath;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getJsonPath() {
+ return jsonPath;
+ }
+
+ public void setJsonPath(String jsonPath) {
+ this.jsonPath = jsonPath;
+ }
}
diff --git
a/eventmesh-common/src/test/java/org/apache/eventmesh/common/transform/TransformTest.java
b/eventmesh-transformer/src/test/java/org/apache/eventmesh/transform/TransformTest.java
similarity index 96%
rename from
eventmesh-common/src/test/java/org/apache/eventmesh/common/transform/TransformTest.java
rename to
eventmesh-transformer/src/test/java/org/apache/eventmesh/transform/TransformTest.java
index f91681a42..b17460a41 100644
---
a/eventmesh-common/src/test/java/org/apache/eventmesh/common/transform/TransformTest.java
+++
b/eventmesh-transformer/src/test/java/org/apache/eventmesh/transform/TransformTest.java
@@ -15,7 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.common.transform;
+package org.apache.eventmesh.transform;
+
+import org.apache.eventmesh.transformer.Transformer;
+import org.apache.eventmesh.transformer.TransformerBuilder;
+import org.apache.eventmesh.transformer.TransformerType;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/settings.gradle b/settings.gradle
index a1b63fd37..676cc6e79 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,6 +23,8 @@ include 'eventmesh-common'
include 'eventmesh-starter'
include 'eventmesh-examples'
include 'eventmesh-spi'
+include 'eventmesh-filter'
+include 'eventmesh-transformer'
include 'eventmesh-openconnect:eventmesh-openconnect-java'
include
'eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api'
diff --git a/tools/dependency-check/known-dependencies.txt
b/tools/dependency-check/known-dependencies.txt
index 6022c3fbd..7ccc8115b 100644
--- a/tools/dependency-check/known-dependencies.txt
+++ b/tools/dependency-check/known-dependencies.txt
@@ -38,7 +38,6 @@ commons-digester-2.1.jar
commons-io-2.11.0.jar
commons-lang3-3.6.jar
commons-logging-1.2.jar
-commons-net-3.9.0.jar
commons-text-1.9.jar
commons-validator-1.7.jar
consul-api-1.4.5.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
