You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by sh...@apache.org on 2022/10/12 09:14:15 UTC
[rocketmq-eventbridge] branch main updated (65fe834 -> 2a063c7)
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
from 65fe834 release: add the apache license and prepare for release.
new ee361f2 prepare to release 1.0.0 (#33)
new 594082e [maven-release-plugin] prepare release rocketmq-eventbridge-1.0.0
new 7ee414d [maven-release-plugin] prepare for next development iteration
new 1985741 prepare to release 1.0.0
new 7c369bf prepare to release 1.0.0
new 2a063c7 doc:update README.md
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 +
README.md | 3 +
adapter/api/pom.xml | 8 +-
adapter/persistence/pom.xml | 8 +-
.../mybatis/converter/ApiDestinationConverter.java | 13 +-
.../mybatis/converter/ConnectConverter.java | 22 +--
adapter/pom.xml | 6 +-
adapter/rpc/pom.xml | 8 +-
bin/eventbridge.sh | 93 ++++++++++++
bin/runserver.sh | 93 ++++++++++++
common/pom.xml | 6 +-
.../apache/rocketmq/eventbridge/tools/NetUtil.java | 4 -
.../rocketmq/eventbridge/tools/TokenUtil.java | 4 -
.../tools/pattern/FilterPatternTool.java | 2 +-
.../tools/transform/DeleteFieldTransform.java | 3 -
.../eventbridge/tools/transform/Extract.java | 2 -
.../tools/transform/InsertFieldTransform.java | 17 ++-
.../tools/transform/JsonPathExtract.java | 8 +-
.../tools/transform/JsonPathTransform.java | 2 +-
.../eventbridge/tools/transform/JsonPathUtil.java | 4 +-
.../tools/transform/OriginalTransform.java | 2 +-
.../tools/transform/StringSubstitutorTemplate.java | 3 -
.../tools/transform/TemplateTransform.java | 3 +-
.../tools/transform/UpdateFieldTransform.java | 17 ++-
domain/pom.xml | 6 +-
.../domain/model/connection/ConnectionService.java | 8 +-
pom.xml | 166 +++++++++++++++++----
start/pom.xml | 47 +++++-
28 files changed, 443 insertions(+), 117 deletions(-)
create mode 100755 bin/eventbridge.sh
create mode 100755 bin/runserver.sh
[rocketmq-eventbridge] 04/06: prepare to release 1.0.0
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 1985741530af3faa68725a443d6ff695dc81cbf2
Author: 2011shenlin <20...@gmail.com>
AuthorDate: Sun Sep 25 21:47:53 2022 +0800
prepare to release 1.0.0
---
.../eventbridge/tools/transform/JsonPathUtil.java | 4 ++--
pom.xml | 20 --------------------
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathUtil.java b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathUtil.java
index 38d01c6..11e1ec5 100644
--- a/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathUtil.java
+++ b/common/src/main/java/org/apache/rocketmq/eventbridge/tools/transform/JsonPathUtil.java
@@ -46,7 +46,7 @@ public class JsonPathUtil {
.jsonProvider(new GsonJsonProvider())
.build());
- private static final Logger logger = LoggerFactory.getLogger(JsonPathUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(JsonPathUtil.class);
public static String removeDataOfJsonPath(String jsonPath) {
if (!jsonPath.startsWith(JSONPATH_DATA)) {
@@ -136,7 +136,7 @@ public class JsonPathUtil {
//return "";
return null;
} catch (InvalidPathException invalidPathException) {
- logger.warn("Invalid json path:" + jsonPath, invalidPathException);
+ log.warn("Invalid json path:" + jsonPath, invalidPathException);
return jsonPath;
}
if (element.isJsonPrimitive()) {
diff --git a/pom.xml b/pom.xml
index d1440a4..7596064 100644
--- a/pom.xml
+++ b/pom.xml
@@ -328,26 +328,6 @@
</execution>
</executions>
</plugin>
-<!-- <plugin>-->
-<!-- <artifactId>maven-checkstyle-plugin</artifactId>-->
-<!-- <version>2.17</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <id>verify</id>-->
-<!-- <phase>verify</phase>-->
-<!-- <configuration>-->
-<!-- <configLocation>style/rmq_checkstyle.xml</configLocation>-->
-<!-- <encoding>UTF-8</encoding>-->
-<!-- <consoleOutput>true</consoleOutput>-->
-<!-- <failsOnError>true</failsOnError>-->
-<!-- <includeTestSourceDirectory>false</includeTestSourceDirectory>-->
-<!-- </configuration>-->
-<!-- <goals>-->
-<!-- <goal>check</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
[rocketmq-eventbridge] 05/06: prepare to release 1.0.0
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 7c369bf3d6d222c047812dba339969ff07b02cc9
Author: 2011shenlin <20...@gmail.com>
AuthorDate: Mon Sep 26 01:24:52 2022 +0800
prepare to release 1.0.0
---
bin/eventbridge.sh | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
bin/runserver.sh | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
start/pom.xml | 41 ++++++++++++++++++++++++
3 files changed, 227 insertions(+)
diff --git a/bin/eventbridge.sh b/bin/eventbridge.sh
new file mode 100755
index 0000000..3ace2ed
--- /dev/null
+++ b/bin/eventbridge.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+#
+# /*
+# * Licensed to the Apache Software Foundation (ASF) under one or more
+# * contributor license agreements. See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The ASF licenses this file to You under the Apache License, Version 2.0
+# * (the "License"); you may not use this file except in compliance with
+# * the License. You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+#
+
+if [ -z "$ROCKETMQ_EVENTBRIDGE_HOME" ]; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ]; do
+ ls=$(ls -ld "$PRG")
+ link=$(expr "$ls" : '.*-> \(.*\)$')
+ if expr "$link" : '/.*' >/dev/null; then
+ PRG="$link"
+ else
+ PRG="$(dirname "$PRG")/$link"
+ fi
+ done
+
+ saveddir=$(pwd)
+
+ ROCKETMQ_EVENTBRIDGE_HOME=$(dirname "$PRG")
+
+ # make it fully qualified
+ ROCKETMQ_EVENTBRIDGE_HOME=$(cd "$ROCKETMQ_EVENTBRIDGE_HOME" && pwd)
+
+ cd "$saveddir"
+fi
+
+export ROCKETMQ_EVENTBRIDGE_HOME
+
+BASEDIR=$HOME
+mkdir -p $BASEDIR/logs
+
+mainClass="org.apache.rocketmq.eventbridge.Main"
+
+function startup() {
+ pid=`ps aux|grep $mainClass|grep -v grep |awk '{print $2}'`
+ if [ ! -z "$pid" ]; then
+ echo "java is runing..."
+ exit 1
+ fi
+ nohup ${ROCKETMQ_EVENTBRIDGE_HOME}/runserver.sh -jar rocketmq-eventbridge.jar $@ >$BASEDIR/logs/rocketmq-eventbridge.log 2>&1 &
+}
+
+function stop() {
+ pid=`ps aux|grep $mainClass|grep -v grep |awk '{print $2}'`
+ if [ -z "$pid" ]; then
+ echo "no java to kill"
+ fi
+ printf 'stop...'
+ kill $pid
+ sleep 3
+ pid=`ps aux|grep $mainClass|grep -v grep |awk '{print $2}'`
+
+ if [ ! -z $pid ]; then
+ kill -9 $pid
+ fi
+}
+
+case "$1" in
+start)
+ startup $@
+ ;;
+stop)
+ stop
+ ;;
+restart)
+ stop
+ startup
+ ;;
+*)
+ printf "Usage: sh $0 %s {start|stop|restart}\n"
+ exit 1
+ ;;
+esac
diff --git a/bin/runserver.sh b/bin/runserver.sh
new file mode 100755
index 0000000..de9541c
--- /dev/null
+++ b/bin/runserver.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#===========================================================================================
+# Java Environment Setting
+#===========================================================================================
+error_exit ()
+{
+ echo "ERROR: $1 !!"
+ exit 1
+}
+
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java
+[ ! -e "$JAVA_HOME/bin/java" ] && error_exit "Please set the JAVA_HOME variable in your environment, We need java(x64)!"
+
+export JAVA_HOME
+export JAVA="$JAVA_HOME/bin/java"
+export BASE_DIR=$(dirname $0)/..
+export CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH}
+
+#===========================================================================================
+# JVM Configuration
+#===========================================================================================
+# The RAMDisk initializing size in MB on Darwin OS for gc-log
+DIR_SIZE_IN_MB=600
+
+choose_gc_log_directory()
+{
+ case "`uname`" in
+ Darwin)
+ if [ ! -d "/Volumes/RAMDisk" ]; then
+ # create ram disk on Darwin systems as gc-log directory
+ DEV=`hdiutil attach -nomount ram://$((2 * 1024 * DIR_SIZE_IN_MB))` > /dev/null
+ diskutil eraseVolume HFS+ RAMDisk ${DEV} > /dev/null
+ echo "Create RAMDisk /Volumes/RAMDisk for gc logging on Darwin OS."
+ fi
+ GC_LOG_DIR="/Volumes/RAMDisk"
+ ;;
+ *)
+ # check if /dev/shm exists on other systems
+ if [ -d "/dev/shm" ]; then
+ GC_LOG_DIR="/dev/shm"
+ else
+ GC_LOG_DIR=${BASE_DIR}
+ fi
+ ;;
+ esac
+}
+
+choose_gc_options()
+{
+ # Example of JAVA_MAJOR_VERSION value : '1', '9', '10', '11', ...
+ # '1' means releases befor Java 9
+ JAVA_MAJOR_VERSION=$("$JAVA" -version 2>&1 | sed -r -n 's/.* version "([0-9]*).*$/\1/p')
+ if [ -z "$JAVA_MAJOR_VERSION" ] || [ "$JAVA_MAJOR_VERSION" -lt "9" ] ; then
+ JAVA_OPT="${JAVA_OPT} -server -Xms4g -Xmx4g -Xmn2g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
+ JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:-UseParNewGC"
+ JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:${GC_LOG_DIR}/rmq_srv_gc_%p_%t.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
+ JAVA_OPT="${JAVA_OPT} -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=30m"
+ else
+ JAVA_OPT="${JAVA_OPT} -server -Xms4g -Xmx4g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
+ JAVA_OPT="${JAVA_OPT} -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0"
+ JAVA_OPT="${JAVA_OPT} -Xlog:gc*:file=${GC_LOG_DIR}/rmq_srv_gc_%p_%t.log:time,tags:filecount=5,filesize=30M"
+ fi
+}
+
+choose_gc_log_directory
+choose_gc_options
+JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow"
+JAVA_OPT="${JAVA_OPT} -XX:-UseLargePages"
+JAVA_OPT="${JAVA_OPT} -Djava.ext.dirs=${JAVA_HOME}/jre/lib/ext:${BASE_DIR}/lib:${JAVA_HOME}/lib/ext"
+#JAVA_OPT="${JAVA_OPT} -Xdebug -Xrunjdwp:transport=dt_socket,address=9555,server=y,suspend=n"
+JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}"
+JAVA_OPT="${JAVA_OPT} -cp ${CLASSPATH}"
+
+JAVA_OPT="${JAVA_OPT} -Dlogback.configurationFile=${BASE_DIR}/conf/logback.xml"
+
+$JAVA ${JAVA_OPT} $@
\ No newline at end of file
diff --git a/start/pom.xml b/start/pom.xml
index bdae820..282cbf7 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -70,4 +70,45 @@
</dependency>
</dependencies>
+ <build>
+ <finalName>rocketmq-eventbridge</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>logback.xml</include>
+ <include>application.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.tld</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.2.10.RELEASE</version>
+ <executions>
+ <execution>
+ <id>repackage</id>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.apache.rocketmq.eventbridge.Main</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
[rocketmq-eventbridge] 01/06: prepare to release 1.0.0 (#33)
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit ee361f2a3b03d5f1e6329af32440af55e7e9bbcc
Author: shenlin <20...@gmail.com>
AuthorDate: Mon Sep 19 22:13:30 2022 +0800
prepare to release 1.0.0 (#33)
prepare to release 1.0.0
---
.gitignore | 2 +
.../mybatis/converter/ApiDestinationConverter.java | 13 +-
.../mybatis/converter/ConnectConverter.java | 22 +--
.../apache/rocketmq/eventbridge/tools/NetUtil.java | 4 -
.../rocketmq/eventbridge/tools/TokenUtil.java | 4 -
.../tools/pattern/FilterPatternTool.java | 2 +-
.../tools/transform/DeleteFieldTransform.java | 3 -
.../eventbridge/tools/transform/Extract.java | 2 -
.../tools/transform/InsertFieldTransform.java | 17 +-
.../tools/transform/JsonPathExtract.java | 8 +-
.../tools/transform/JsonPathTransform.java | 2 +-
.../tools/transform/OriginalTransform.java | 2 +-
.../tools/transform/StringSubstitutorTemplate.java | 3 -
.../tools/transform/TemplateTransform.java | 3 +-
.../tools/transform/UpdateFieldTransform.java | 17 +-
.../domain/model/connection/ConnectionService.java | 8 +-
pom.xml | 180 ++++++++++++++++++---
17 files changed, 212 insertions(+), 80 deletions(-)
diff --git a/.gitignore b/.gitignore
index 89cb037..088abd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ devenv
!LICENSE-BIN
.DS_Store
*.class
+target/
+adapter/target/
adapter/api/target/
adapter/persistence/target/
adapter/rpc/target/
diff --git a/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/converter/ApiDestinationConverter.java b/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/converter/ApiDestinationConverter.java
index abe2c13..a2a50d5 100644
--- a/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/converter/ApiDestinationConverter.java
+++ b/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/apidestination/mybatis/converter/ApiDestinationConverter.java
@@ -17,16 +17,15 @@
package org.apache.rocketmq.eventbridge.adapter.persistence.apidestination.mybatis.converter;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.google.gson.Gson;
import org.apache.rocketmq.eventbridge.adapter.persistence.apidestination.mybatis.dataobject.ApiDestinationDO;
import org.apache.rocketmq.eventbridge.domain.model.apidestination.ApiDestinationDTO;
import org.apache.rocketmq.eventbridge.domain.model.apidestination.parameter.HttpApiParameters;
import org.springframework.beans.BeanUtils;
-import java.util.List;
-import java.util.stream.Collectors;
-
public class ApiDestinationConverter {
public static ApiDestinationDO dtoConverterDo(ApiDestinationDTO apiDestinationDTO) {
@@ -35,7 +34,7 @@ public class ApiDestinationConverter {
}
ApiDestinationDO apiDestinationDO = new ApiDestinationDO();
BeanUtils.copyProperties(apiDestinationDTO, apiDestinationDO);
- apiDestinationDO.setApiParams(JSON.toJSONString(apiDestinationDTO.getApiParams()));
+ apiDestinationDO.setApiParams(new Gson().toJson(apiDestinationDTO.getApiParams()));
return apiDestinationDO;
}
@@ -45,7 +44,7 @@ public class ApiDestinationConverter {
}
ApiDestinationDTO apiDestinationDTO = new ApiDestinationDTO();
BeanUtils.copyProperties(apiDestinationDO, apiDestinationDTO);
- apiDestinationDTO.setApiParams(JSONObject.parseObject(apiDestinationDO.getApiParams(), HttpApiParameters.class));
+ apiDestinationDTO.setApiParams(new Gson().fromJson(apiDestinationDO.getApiParams(), HttpApiParameters.class));
return apiDestinationDTO;
}
diff --git a/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/connect/mybatis/converter/ConnectConverter.java b/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/connect/mybatis/converter/ConnectConverter.java
index 683422b..5eca675 100644
--- a/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/connect/mybatis/converter/ConnectConverter.java
+++ b/adapter/persistence/src/main/java/org/apache/rocketmq/eventbridge/adapter/persistence/connect/mybatis/converter/ConnectConverter.java
@@ -17,8 +17,7 @@
package org.apache.rocketmq.eventbridge.adapter.persistence.connect.mybatis.converter;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
import org.apache.rocketmq.eventbridge.adapter.persistence.connect.mybatis.dataobject.ConnectionDO;
import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.AuthParameters;
import org.apache.rocketmq.eventbridge.domain.model.connection.ConnectionDTO;
@@ -36,8 +35,9 @@ public class ConnectConverter {
ConnectionDTO connectionDTO = new ConnectionDTO();
connectionDTO.setConnectionName(connectionDO.getName());
connectionDTO.setDescription(connectionDO.getDescription());
- connectionDTO.setAuthParameters(JSONObject.parseObject(connectionDO.getAuthParameters(), AuthParameters.class));
- connectionDTO.setNetworkParameters(JSONObject.parseObject(connectionDO.getNetworkParameters(), NetworkParameters.class));
+ connectionDTO.setAuthParameters(new Gson().fromJson(connectionDO.getAuthParameters(), AuthParameters.class));
+ connectionDTO.setNetworkParameters(
+ new Gson().fromJson(connectionDO.getNetworkParameters(), NetworkParameters.class));
return connectionDTO;
}
@@ -47,16 +47,20 @@ public class ConnectConverter {
}
ConnectionDO connectionDO = new ConnectionDO();
connectionDO.setAccountId(connectionDTO.getAccountId());
- connectionDO.setAuthorizationType(connectionDTO.getAuthParameters().getAuthorizationType());
+ connectionDO.setAuthorizationType(connectionDTO.getAuthParameters()
+ .getAuthorizationType());
connectionDO.setName(connectionDTO.getConnectionName());
- connectionDO.setNetworkParameters(JSON.toJSONString(connectionDTO.getNetworkParameters()));
+ connectionDO.setNetworkParameters(new Gson().toJson(connectionDTO.getNetworkParameters()));
connectionDO.setDescription(connectionDTO.getDescription());
- connectionDO.setNetworkType(connectionDTO.getNetworkParameters().getNetworkType());
- connectionDO.setAuthParameters(JSONObject.toJSONString(connectionDTO.getAuthParameters()));
+ connectionDO.setNetworkType(connectionDTO.getNetworkParameters()
+ .getNetworkType());
+ connectionDO.setAuthParameters(new Gson().toJson(connectionDTO.getAuthParameters()));
return connectionDO;
}
public static List<ConnectionDTO> doListConvertDtoList(List<ConnectionDO> connectionDOS) {
- return connectionDOS.stream().map(ConnectConverter::doConvertDto).collect(Collectors.toList());
+ return connectionDOS.stream()
+ .map(ConnectConverter::doConvertDto)
+ .collect(Collectors.toList());
}
}
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) {
diff --git a/pom.xml b/pom.xml
index 3650c28..bebffb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,12 +12,62 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>18</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-eventbridge</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
+ <name>Apache RocketMQ EventBridge ${project.version}</name>
+ <url>https://github.com/apache/rocketmq-eventbridge</url>
+
+ <scm>
+ <url>git@github.com:apache/rocketmq-eventbridge.git</url>
+ <connection>scm:git:git@github.com:apache/rocketmq-eventbridge.git</connection>
+ <developerConnection>scm:git:git@github.com:apache/rocketmq-eventbridge.git</developerConnection>
+ <tag>HEAD</tag>
+ </scm>
+
+ <mailingLists>
+ <mailingList>
+ <name>Development List</name>
+ <subscribe>dev-subscribe@rocketmq.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@rocketmq.apache.org</unsubscribe>
+ <post>dev@rocketmq.apache.org</post>
+ </mailingList>
+ <mailingList>
+ <name>User List</name>
+ <subscribe>users-subscribe@rocketmq.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe@rocketmq.apache.org</unsubscribe>
+ <post>users@rocketmq.apache.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Commits List</name>
+ <subscribe>commits-subscribe@rocketmq.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@rocketmq.apache.org</unsubscribe>
+ <post>commits@rocketmq.apache.org</post>
+ </mailingList>
+ </mailingLists>
+
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -42,7 +92,10 @@
<mockito.version>2.13.0</mockito.version>
<caffeine.version>2.9.3</caffeine.version>
<fastjson.version>2.0.2</fastjson.version>
+ <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
+ <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
</properties>
+
<modules>
<module>start</module>
<module>adapter</module>
@@ -277,26 +330,111 @@
</execution>
</executions>
</plugin>
-<!-- <plugin>-->
-<!-- <artifactId>maven-checkstyle-plugin</artifactId>-->
-<!-- <version>2.17</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <id>verify</id>-->
-<!-- <phase>verify</phase>-->
-<!-- <configuration>-->
-<!-- <configLocation>style/rmq_checkstyle.xml</configLocation>-->
-<!-- <encoding>UTF-8</encoding>-->
-<!-- <consoleOutput>true</consoleOutput>-->
-<!-- <failsOnError>true</failsOnError>-->
-<!-- <includeTestSourceDirectory>false</includeTestSourceDirectory>-->
-<!-- </configuration>-->
-<!-- <goals>-->
-<!-- <goal>check</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <configuration>
+ <configLocation>style/rmq_checkstyle.xml</configLocation>
+ <encoding>UTF-8</encoding>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <includeTestSourceDirectory>false</includeTestSourceDirectory>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>default-prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/jacoco.exec</destFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-prepare-agent-integration</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent-integration</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/jacoco-it.exec</destFile>
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-report</id>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-report-integration</id>
+ <goals>
+ <goal>report-integration</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ <configuration>
+ <skipAfterFailureCount>1</skipAfterFailureCount>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <excludes>
+ <exclude>**/IT*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>3.0.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.12</version>
+ <configuration>
+ <excludes>
+ <exclude>.gitignore</exclude>
+ <exclude>.travis.yml</exclude>
+ <exclude>CONTRIBUTING.md</exclude>
+ <exclude>**/README.md</exclude>
+ <exclude>**/README_zh_CN.md</exclude>
+ <exclude>.github/**</exclude>
+ <exclude>src/test/resources/certs/*</exclude>
+ <exclude>src/test/**/*.log</exclude>
+ <exclude>src/test/resources/META-INF/service/*</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>*/*.iml</exclude>
+ <exclude>**/*/spring.factories</exclude>
+ <exclude>**/application.properties</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
[rocketmq-eventbridge] 06/06: doc:update README.md
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 2a063c7fa862eb5d3d2995069b95a393e80364d7
Author: 2011shenlin <20...@gmail.com>
AuthorDate: Thu Sep 29 12:27:37 2022 +0800
doc:update README.md
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
index d78d934..f77d276 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,9 @@ RocketMQ EventBridge is a subproject of rocketmq to make it easier to build even
## Architecture
Events are sent to the event bus in two ways: 1) Push events through the SDK or Webhook actively; 2) Pulled events by eventbridge passively. Events obtained in both ways will be stored on the event bus. EventBus is the core concept in EventBridge, which allows you to subscribe to the events, filter the events, and push to the specified target by creating the event rule. The event on the event bus is stored by rocketmq. Through rocketmq-connect, we can pull the event from the register sou [...]
+<img width="919" alt="image" src="https://user-images.githubusercontent.com/8605835/192938456-bc158f1c-ca4a-458c-9044-7c98cf048a5d.png">
+
+The code architecture of EventBridge include 4 core modules:
- `adapter` Adapt to different operating environments
- `persistence` Implement the repository API in the domain layer and persist the model data.
- `api` The open API provided by EventBridge.
[rocketmq-eventbridge] 02/06: [maven-release-plugin] prepare release rocketmq-eventbridge-1.0.0
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 594082e2d58ca49d89c37c8b89a63c123677045e
Author: 2011shenlin <20...@gmail.com>
AuthorDate: Mon Sep 19 22:48:18 2022 +0800
[maven-release-plugin] prepare release rocketmq-eventbridge-1.0.0
---
adapter/api/pom.xml | 8 +++-----
adapter/persistence/pom.xml | 8 +++-----
adapter/pom.xml | 6 ++----
adapter/rpc/pom.xml | 8 +++-----
common/pom.xml | 6 ++----
domain/pom.xml | 6 ++----
pom.xml | 48 ++++++++++++++++++++++-----------------------
start/pom.xml | 6 ++----
8 files changed, 40 insertions(+), 56 deletions(-)
diff --git a/adapter/api/pom.xml b/adapter/api/pom.xml
index 67748f9..8b7c3b0 100644
--- a/adapter/api/pom.xml
+++ b/adapter/api/pom.xml
@@ -9,18 +9,16 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rocketmq-eventbridge-adapter</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rocketmq-eventbridge-adapter-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<properties>
<jakarta.version>2.1.6</jakarta.version>
diff --git a/adapter/persistence/pom.xml b/adapter/persistence/pom.xml
index 5fb2f24..2e2a2f1 100644
--- a/adapter/persistence/pom.xml
+++ b/adapter/persistence/pom.xml
@@ -9,18 +9,16 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rocketmq-eventbridge-adapter</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rocketmq-eventbridge-adapter-persistence</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<properties>
<mysql-connector-java.version>8.0.28</mysql-connector-java.version>
diff --git a/adapter/pom.xml b/adapter/pom.xml
index dd34136..cbf99f4 100644
--- a/adapter/pom.xml
+++ b/adapter/pom.xml
@@ -9,13 +9,11 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rocketmq-eventbridge</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapter/rpc/pom.xml b/adapter/rpc/pom.xml
index 70ee7e5..1e6b23e 100644
--- a/adapter/rpc/pom.xml
+++ b/adapter/rpc/pom.xml
@@ -9,13 +9,11 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rocketmq-eventbridge-adapter</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +25,7 @@
<reactor.version>3.1.7.RELEASE</reactor.version>
</properties>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<dependencies>
<!-- Project Modules -->
<dependency>
diff --git a/common/pom.xml b/common/pom.xml
index 75d01a4..6e1fda9 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -9,13 +9,11 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rocketmq-eventbridge</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/domain/pom.xml b/domain/pom.xml
index fd92923..925f9f5 100644
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -9,13 +9,11 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rocketmq-eventbridge</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index bebffb2..2c52545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,7 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache</groupId>
@@ -23,7 +21,7 @@
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-eventbridge</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Apache RocketMQ EventBridge ${project.version}</name>
<url>https://github.com/apache/rocketmq-eventbridge</url>
@@ -31,7 +29,7 @@
<url>git@github.com:apache/rocketmq-eventbridge.git</url>
<connection>scm:git:git@github.com:apache/rocketmq-eventbridge.git</connection>
<developerConnection>scm:git:git@github.com:apache/rocketmq-eventbridge.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>rocketmq-eventbridge-1.0.0</tag>
</scm>
<mailingLists>
@@ -330,26 +328,26 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <executions>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <configuration>
- <configLocation>style/rmq_checkstyle.xml</configLocation>
- <encoding>UTF-8</encoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- <includeTestSourceDirectory>false</includeTestSourceDirectory>
- </configuration>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+<!-- <plugin>-->
+<!-- <artifactId>maven-checkstyle-plugin</artifactId>-->
+<!-- <version>2.17</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>verify</id>-->
+<!-- <phase>verify</phase>-->
+<!-- <configuration>-->
+<!-- <configLocation>style/rmq_checkstyle.xml</configLocation>-->
+<!-- <encoding>UTF-8</encoding>-->
+<!-- <consoleOutput>true</consoleOutput>-->
+<!-- <failsOnError>true</failsOnError>-->
+<!-- <includeTestSourceDirectory>false</includeTestSourceDirectory>-->
+<!-- </configuration>-->
+<!-- <goals>-->
+<!-- <goal>check</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
diff --git a/start/pom.xml b/start/pom.xml
index 070cdff..436d7a2 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -9,13 +9,11 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rocketmq-eventbridge</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[rocketmq-eventbridge] 03/06: [maven-release-plugin] prepare for next development iteration
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 7ee414db3c40f4d411a4e03c7797b3f4f85bfe3c
Author: 2011shenlin <20...@gmail.com>
AuthorDate: Mon Sep 19 22:51:55 2022 +0800
[maven-release-plugin] prepare for next development iteration
---
adapter/api/pom.xml | 4 ++--
adapter/persistence/pom.xml | 4 ++--
adapter/pom.xml | 2 +-
adapter/rpc/pom.xml | 4 ++--
common/pom.xml | 2 +-
domain/pom.xml | 2 +-
pom.xml | 4 ++--
start/pom.xml | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/adapter/api/pom.xml b/adapter/api/pom.xml
index 8b7c3b0..d875dfe 100644
--- a/adapter/api/pom.xml
+++ b/adapter/api/pom.xml
@@ -13,12 +13,12 @@
<parent>
<artifactId>rocketmq-eventbridge-adapter</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rocketmq-eventbridge-adapter-api</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<jakarta.version>2.1.6</jakarta.version>
diff --git a/adapter/persistence/pom.xml b/adapter/persistence/pom.xml
index 2e2a2f1..735e514 100644
--- a/adapter/persistence/pom.xml
+++ b/adapter/persistence/pom.xml
@@ -13,12 +13,12 @@
<parent>
<artifactId>rocketmq-eventbridge-adapter</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rocketmq-eventbridge-adapter-persistence</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<mysql-connector-java.version>8.0.28</mysql-connector-java.version>
diff --git a/adapter/pom.xml b/adapter/pom.xml
index cbf99f4..219520d 100644
--- a/adapter/pom.xml
+++ b/adapter/pom.xml
@@ -13,7 +13,7 @@
<parent>
<artifactId>rocketmq-eventbridge</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/adapter/rpc/pom.xml b/adapter/rpc/pom.xml
index 1e6b23e..38a296d 100644
--- a/adapter/rpc/pom.xml
+++ b/adapter/rpc/pom.xml
@@ -13,7 +13,7 @@
<parent>
<artifactId>rocketmq-eventbridge-adapter</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -25,7 +25,7 @@
<reactor.version>3.1.7.RELEASE</reactor.version>
</properties>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<dependencies>
<!-- Project Modules -->
<dependency>
diff --git a/common/pom.xml b/common/pom.xml
index 6e1fda9..64d8319 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -13,7 +13,7 @@
<parent>
<artifactId>rocketmq-eventbridge</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/domain/pom.xml b/domain/pom.xml
index 925f9f5..f596ee8 100644
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -13,7 +13,7 @@
<parent>
<artifactId>rocketmq-eventbridge</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 2c52545..d1440a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-eventbridge</artifactId>
<packaging>pom</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Apache RocketMQ EventBridge ${project.version}</name>
<url>https://github.com/apache/rocketmq-eventbridge</url>
@@ -29,7 +29,7 @@
<url>git@github.com:apache/rocketmq-eventbridge.git</url>
<connection>scm:git:git@github.com:apache/rocketmq-eventbridge.git</connection>
<developerConnection>scm:git:git@github.com:apache/rocketmq-eventbridge.git</developerConnection>
- <tag>rocketmq-eventbridge-1.0.0</tag>
+ <tag>HEAD</tag>
</scm>
<mailingLists>
diff --git a/start/pom.xml b/start/pom.xml
index 436d7a2..bdae820 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -13,7 +13,7 @@
<parent>
<artifactId>rocketmq-eventbridge</artifactId>
<groupId>org.apache.rocketmq</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>