[ISSUE #4814] Migrate from fastjson 1.2.83 to fastjson2 (#4819)

* [Enhancement] Migrate from fastjson 1.2.83 to fastjson2 #4814 * fix_dependencies_problem * fix_check
apache · Apr 10, 2024 · a930f6d · a930f6d
1 parent c2af2d4
commit a930f6d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -569,7 +569,6 @@ subprojects {
             dependency "org.projectlombok:lombok:1.18.22"
             dependency "com.github.seancfoley:ipaddress:5.3.3"
             dependency "javax.annotation:javax.annotation-api:1.3.2"
-            dependency "com.alibaba:fastjson:1.2.83" // TODO migrate to fastjson2
             dependency "com.alibaba.fastjson2:fastjson2:2.0.48"
 
             dependency "software.amazon.awssdk:s3:2.20.29"

diff --git a/eventmesh-connectors/eventmesh-connector-prometheus/build.gradle b/eventmesh-connectors/eventmesh-connector-prometheus/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")
     implementation 'org.apache.httpcomponents:httpclient'
     implementation 'com.github.rholder:guava-retrying'
-    implementation 'com.alibaba:fastjson'
+    implementation 'com.alibaba.fastjson2:fastjson2'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
 }
diff --git a/...org/apache/eventmesh/connector/prometheus/source/connector/PrometheusSourceConnector.java b/...org/apache/eventmesh/connector/prometheus/source/connector/PrometheusSourceConnector.java
@@ -44,8 +44,8 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.github.rholder.retry.Attempt;
 import com.github.rholder.retry.RetryListener;
 import com.github.rholder.retry.Retryer;

diff --git a/eventmesh-connectors/eventmesh-connector-wechat/build.gradle b/eventmesh-connectors/eventmesh-connector-wechat/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     implementation project(":eventmesh-sdks:eventmesh-sdk-java")
     implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")
 
-    implementation 'com.alibaba:fastjson'
+    implementation 'com.alibaba.fastjson2:fastjson2'
     implementation 'com.google.guava:guava'
     implementation 'com.squareup.okhttp3:okhttp'
 

diff --git a/...c/main/java/org/apache/eventmesh/connector/wechat/sink/connector/WeChatSinkConnector.java b/...c/main/java/org/apache/eventmesh/connector/wechat/sink/connector/WeChatSinkConnector.java
@@ -32,8 +32,8 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 

diff --git a/eventmesh-runtime/build.gradle b/eventmesh-runtime/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     implementation "org.apache.httpcomponents:httpclient"
     implementation 'io.netty:netty-all'
 
-    implementation "com.alibaba:fastjson"
+    implementation "com.alibaba.fastjson2:fastjson2"
 
     implementation 'com.github.seancfoley:ipaddress'
 

diff --git a/tools/dependency-check/known-dependencies.txt b/tools/dependency-check/known-dependencies.txt
@@ -78,7 +78,7 @@ endpoints-spi-2.20.29.jar
 error_prone_annotations-2.9.0.jar
 eventstream-1.0.1.jar
 failureaccess-1.0.1.jar
-fastjson-1.2.83.jar
+fastjson-1.2.69_noneautotype.jar
 fastjson2-2.0.48.jar
 gateway-dingtalk-1.0.2.jar
 google-auth-library-credentials-0.22.2.jar

diff --git a/tools/third-party-licenses/LICENSE b/tools/third-party-licenses/LICENSE
@@ -251,7 +251,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     error_prone_annotations 2.7.1: https://github.com/google/error-prone, Apache 2.0
     failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
     listenablefuture 9999.0-empty-to-avoid-conflict-with-guava: https://github.com/google/guava, Apache 2.0
-    fastjson 1.2.83: https://github.com/alibaba/fastjson, Apache 2.0
+    fastjson2 2.0.48: https://github.com/alibaba/fastjson2, Apache 2.0
     guava 31.0.1-jre: https://github.com/google/guava, Apache 2.0
     gateway-dingtalk 1.0.2: https://github.com/aliyun/alibabacloud-gateway, Apache 2.0
     guice 4.2.2: https://github.com/google/guice, Apache 2.0