Merge branch '2.x' into feat-add-registry-port

ban-xiu · web-flow · commit 786a19a70ce3 · 2026-03-13T15:31:12.000+08:00
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -46,6 +46,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7955](https://github.com/apache/incubator-seata/pull/7955)] change the getProperty call to resolvePlaceholders
 - [[#7971](https://github.com/apache/incubator-seata/pull/7971)] upgrade some dependencies
 - [[#7970](https://github.com/apache/incubator-seata/pull/7970)] Remove unnecessary refreshLeader from ClusterController cluster endpoint
+- [[#8019](https://github.com/apache/incubator-seata/pull/8019)] mark deprecated JSON parsers
 
 
 ### security:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -48,7 +48,7 @@
 - [[#7955](https://github.com/apache/incubator-seata/pull/7955)] 将 getProperty 调用改为 resolvePlaceholders
 - [[#7971](https://github.com/apache/incubator-seata/pull/7971)] 升级一些依赖
 - [[#7970](https://github.com/apache/incubator-seata/pull/7970)] 移除 ClusterController 中不必要的 refreshLeader 调用
-
+- [[#8019](https://github.com/apache/incubator-seata/pull/8019)] 标记弃用的json解析器
 
 
 
diff --git a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/json/JsonParser.java b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/json/JsonParser.java
@@ -18,6 +18,10 @@
 
 import java.io.IOException;
 
+/**
+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializer} in json-common module instead.
+ */
+@Deprecated
 public interface JsonParser {
 
     String toJSONString(Object object) throws IOException;
diff --git a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/json/JsonParserFactory.java b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/json/JsonParserFactory.java
@@ -24,6 +24,10 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
+/**
+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializerFactory} in json-common module instead.
+ */
+@Deprecated
 public class JsonParserFactory {
 
     private static final Map<String, JsonParserWrap> JSON_PARSER_INSTANCES = new ConcurrentHashMap<>();
diff --git a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/json/JsonParserWrap.java b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/json/JsonParserWrap.java
@@ -18,6 +18,10 @@
 
 import org.apache.seata.common.exception.JsonParseException;
 
+/**
+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializer} in json-common module instead.
+ */
+@Deprecated
 public class JsonParserWrap implements JsonParser {
 
     private JsonParser jsonParser;
diff --git a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/util/JsonUtil.java b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/util/JsonUtil.java
@@ -24,6 +24,10 @@
 
 import java.util.Objects;
 
+/**
+ * @deprecated use {@link org.apache.seata.common.json.JsonUtil} in json-common module instead.
+ */
+@Deprecated
 public class JsonUtil {
 
     private static final String CONFIG_JSON_PARSER_NAME = ConfigurationFactory.getInstance()
diff --git a/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/JsonParser.java b/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/JsonParser.java
@@ -19,7 +19,9 @@
 /**
  * Json Parser
  *
+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializer} in json-common module instead.
  */
+@Deprecated
 public interface JsonParser {
 
     /**
diff --git a/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/JsonParserFactory.java b/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/JsonParserFactory.java
@@ -25,7 +25,9 @@
 /**
  * JsonParserFactory
  *
+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializerFactory} in json-common module instead.
  */
+@Deprecated
 public class JsonParserFactory {
 
     private JsonParserFactory() {}
diff --git a/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/impl/FastjsonParser.java b/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/impl/FastjsonParser.java
@@ -25,7 +25,9 @@
 /**
  * JsonParser implement by Fastjson
  *
+ * @deprecated use {@link org.apache.seata.common.json.impl.FastjsonJsonSerializer} in json-common module instead.
  */
+@Deprecated
 @LoadLevel(name = FastjsonParser.NAME)
 public class FastjsonParser implements JsonParser {
 
diff --git a/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/impl/JacksonJsonParser.java b/saga/seata-saga-statelang/src/main/java/org/apache/seata/saga/statelang/parser/impl/JacksonJsonParser.java
@@ -32,7 +32,9 @@
 /**
  * JsonParser implement by Jackson
  *
+ * @deprecated use {@link org.apache.seata.common.json.impl.JacksonJsonSerializer} in json-common module instead.
  */
+@Deprecated
 @LoadLevel(name = JacksonJsonParser.NAME)
 public class JacksonJsonParser implements JsonParser {
 
diff --git a/tcc/src/main/java/org/apache/seata/rm/tcc/json/FastJsonParser.java b/tcc/src/main/java/org/apache/seata/rm/tcc/json/FastJsonParser.java
@@ -21,6 +21,10 @@
 import org.apache.seata.common.loader.LoadLevel;
 import org.apache.seata.integration.tx.api.json.JsonParser;
 
+/**
+ * @deprecated use {@link org.apache.seata.common.json.impl.FastjsonJsonSerializer} in json-common module instead.
+ */
+@Deprecated
 @LoadLevel(name = Constants.FASTJSON_JSON_PARSER_NAME)
 public class FastJsonParser implements JsonParser {
 
diff --git a/tcc/src/main/java/org/apache/seata/rm/tcc/json/GsonJsonParser.java b/tcc/src/main/java/org/apache/seata/rm/tcc/json/GsonJsonParser.java
@@ -24,6 +24,10 @@
 
 import java.lang.reflect.Modifier;
 
+/**
+ * @deprecated use {@link org.apache.seata.common.json.impl.GsonJsonSerializer} in json-common module instead.
+ */
+@Deprecated
 @LoadLevel(name = Constants.GSON_JSON_PARSER_NAME)
 public class GsonJsonParser implements JsonParser {
 
diff --git a/tcc/src/main/java/org/apache/seata/rm/tcc/json/JacksonJsonParser.java b/tcc/src/main/java/org/apache/seata/rm/tcc/json/JacksonJsonParser.java
@@ -27,6 +27,10 @@
 
 import java.io.IOException;
 
+/**
+ * @deprecated use {@link org.apache.seata.common.json.impl.JacksonJsonSerializer} in json-common module instead.
+ */
+@Deprecated
 @LoadLevel(name = Constants.JACKSON_JSON_PARSER_NAME)
 public class JacksonJsonParser implements JsonParser {
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@`
`19`	`19`	`/**`
`20`	`20`	`* Json Parser`
`21`	`21`	`*`
	`22`	`+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializer} in json-common module instead.`
`22`	`23`	`*/`
	`24`	`+@Deprecated`
`23`	`25`	`public interface JsonParser {`
`24`	`26`
`25`	`27`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,9 @@`
`25`	`25`	`/**`
`26`	`26`	`* JsonParserFactory`
`27`	`27`	`*`
	`28`	`+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializerFactory} in json-common module instead.`
`28`	`29`	`*/`
	`30`	`+@Deprecated`
`29`	`31`	`public class JsonParserFactory {`
`30`	`32`
`31`	`33`	`private JsonParserFactory() {}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@`
`32`	`32`	`/**`
`33`	`33`	`* JsonParser implement by Jackson`
`34`	`34`	`*`
	`35`	`+ * @deprecated use {@link org.apache.seata.common.json.impl.JacksonJsonSerializer} in json-common module instead.`
`35`	`36`	`*/`
	`37`	`+@Deprecated`
`36`	`38`	`@LoadLevel(name = JacksonJsonParser.NAME)`
`37`	`39`	`public class JacksonJsonParser implements JsonParser {`
`38`	`40`