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 dea655cca1df26bdb33dbfde6f5b0ed7b1268b95 Author: 2011shenlin <[email protected]> AuthorDate: Mon Sep 19 09:58:18 2022 +0800 release: add the apache license and prepare for release. --- .gitignore | 2 + adapter/api/pom.xml | 4 +- adapter/persistence/pom.xml | 4 +- .../mybatis/converter/ApiDestinationConverter.java | 13 +++--- .../mybatis/converter/ConnectConverter.java | 22 ++++++---- adapter/pom.xml | 7 +-- adapter/rpc/pom.xml | 4 +- common/pom.xml | 7 +-- domain/pom.xml | 11 ++--- pom.xml | 50 ++++++++++------------ start/pom.xml | 7 +-- 11 files changed, 65 insertions(+), 66 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/api/pom.xml b/adapter/api/pom.xml index b4518e7..eecba00 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.0-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.0-SNAPSHOT</version> <properties> <jakarta.version>2.1.6</jakarta.version> diff --git a/adapter/persistence/pom.xml b/adapter/persistence/pom.xml index db1e65f..b83aa2a 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.0-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.0-SNAPSHOT</version> <properties> <mysql-connector-java.version>8.0.28</mysql-connector-java.version> 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/adapter/pom.xml b/adapter/pom.xml index 1c4bf6e..381f39f 100644 --- a/adapter/pom.xml +++ b/adapter/pom.xml @@ -9,16 +9,17 @@ 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</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>rocketmq-eventbridge-adapter</artifactId> - <version> 1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/adapter/rpc/pom.xml b/adapter/rpc/pom.xml index 673ed08..46008ad 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.0-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.0-SNAPSHOT</version> <dependencies> <!-- Project Modules --> <dependency> diff --git a/common/pom.xml b/common/pom.xml index acd9284..bd275ba 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -9,16 +9,17 @@ 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</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>rocketmq-eventbridge-common</artifactId> - <version> 1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <properties> <maven.compiler.source>8</maven.compiler.source> diff --git a/domain/pom.xml b/domain/pom.xml index 7bc106d..d49bee5 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -9,16 +9,17 @@ 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</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>rocketmq-eventbridge-domain</artifactId> - <version> 1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <dependencies> <!-- Project Modules --> @@ -68,10 +69,6 @@ <groupId>com.github.ben-manes.caffeine</groupId> <artifactId>caffeine</artifactId> </dependency> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>fastjson</artifactId> - </dependency> <!-- Test --> <dependency> diff --git a/pom.xml b/pom.xml index 5979fd8..25ba1c7 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.0-SNAPSHOT</version> <name>Apache RocketMQ EventBridge ${project.version}</name> <url>https://github.com/apache/rocketmq-eventbridge</url> @@ -29,7 +29,7 @@ <url>[email protected]:apache/rocketmq-eventbridge.git</url> <connection>scm:git:[email protected]:apache/rocketmq-eventbridge.git</connection> <developerConnection>scm:git:[email protected]:apache/rocketmq-eventbridge.git</developerConnection> - <tag> 1.0.0</tag> + <tag>1.0.0</tag> </scm> <mailingLists> @@ -89,7 +89,6 @@ <apache.commons-text.version>1.9</apache.commons-text.version> <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> @@ -195,11 +194,6 @@ <artifactId>guava</artifactId> <version>${guava.version}</version> </dependency> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>fastjson</artifactId> - <version>${fastjson.version}</version> - </dependency> <dependency> <groupId>com.jayway.jsonpath</groupId> @@ -328,26 +322,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 3c60a05..4141361 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -9,16 +9,17 @@ 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</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>rocketmq-eventbridge-start</artifactId> - <version> 1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <properties> <maven.compiler.source>8</maven.compiler.source>
