refactor: merge threadpool and json-common modules

bom/pom.xml

@@ -48,12 +48,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.seata</groupId>
-                <artifactId>seata-threadpool</artifactId>
+                <artifactId>seata-spi-jdk17</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.seata</groupId>
-                <artifactId>seata-threadpool-loom</artifactId>
+                <artifactId>seata-spi-jdk21</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

common/pom.xml

@@ -52,5 +52,20 @@
             <artifactId>okhttp</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

compatible/pom.xml

@@ -40,11 +40,6 @@
             <artifactId>seata-saga-engine</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.seata</groupId>
-            <artifactId>json-common-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.seata</groupId>
             <artifactId>seata-saga-engine-store</artifactId>

core/pom.xml

@@ -42,11 +42,6 @@
             <artifactId>seata-discovery-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>seata-threadpool</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>

threadpool/src/main/java/org/apache/seata/common/thread/ThreadPoolExecutorFactory.java → core/src/main/java/org/apache/seata/common/thread/ThreadPoolExecutorFactory.java

@@ -165,9 +165,8 @@ private static ThreadPoolProvider resolveThreadPoolProvider() {
             // This second warning is intentionally kept to surface the per-request fallback
             // decision so that operators can correlate the missing-provider startup message
             // with the actual thread-pool mode that is in effect.
-            LOGGER.warn(
-                    "Virtual thread pool was selected but the virtual-thread SPI provider (seata-threadpool-virtual) "
-                            + "is not present on the classpath. Falling back to platform threads.");
+            LOGGER.warn("Virtual thread pool was selected but the virtual-thread SPI provider (seata-spi-jdk21) "
+                    + "is not present on the classpath. Falling back to platform threads.");
         }
         return ThreadPoolProviderHolder.PLATFORM_THREAD_POOL_PROVIDER;
     }

discovery/seata-discovery-consul/src/main/java/org/apache/seata/discovery/registry/consul/ConsulRegistryServiceImpl.java

@@ -22,7 +22,7 @@
 import com.ecwid.consul.v1.agent.model.NewService;
 import com.ecwid.consul.v1.health.HealthServicesRequest;
 import com.ecwid.consul.v1.health.model.HealthService;
-import org.apache.seata.common.thread.ThreadPoolExecutorFactory;
+import org.apache.seata.common.thread.PlatformThreadPoolProvider;
 import org.apache.seata.common.util.NetUtil;
 import org.apache.seata.common.util.StringUtils;
 import org.apache.seata.config.Configuration;
@@ -96,13 +96,16 @@ private ConsulRegistryServiceImpl() {
         clusterAddressMap = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
         listenerMap = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
         notifiers = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
-        notifierExecutor = ThreadPoolExecutorFactory.newThreadPoolExecutor(
-                "services-consul-notifier",
-                THREAD_POOL_NUM,
-                THREAD_POOL_NUM,
-                Integer.MAX_VALUE,
-                TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<>());
+        notifierExecutor = new PlatformThreadPoolProvider()
+                .newThreadPoolExecutor(
+                        "services-consul-notifier",
+                        THREAD_POOL_NUM,
+                        THREAD_POOL_NUM,
+                        Integer.MAX_VALUE,
+                        TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<>(),
+                        true,
+                        new java.util.concurrent.ThreadPoolExecutor.AbortPolicy());
     }
 
     /**

discovery/seata-discovery-core/pom.xml

@@ -35,12 +35,6 @@
             <artifactId>seata-config-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>seata-threadpool</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryHeartBeats.java

@@ -16,14 +16,15 @@
  */
 package org.apache.seata.discovery.registry;
 
-import org.apache.seata.common.thread.ThreadPoolExecutorFactory;
+import org.apache.seata.common.thread.PlatformThreadPoolProvider;
 import org.apache.seata.config.Configuration;
 import org.apache.seata.config.ConfigurationFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -42,8 +43,8 @@ public class RegistryHeartBeats {
     private static final long DEFAULT_HEARTBEAT_PERIOD = 60 * 1000;
     private static final boolean DEFAULT_HEARTBEAT_ENABLED = Boolean.TRUE;
 
-    private static final ScheduledExecutorService HEARTBEAT_SCHEDULED =
-            ThreadPoolExecutorFactory.newScheduledThreadPoolExecutor("seata-discovery-heartbeat", 1, true);
+    private static final ScheduledExecutorService HEARTBEAT_SCHEDULED = new PlatformThreadPoolProvider()
+            .newScheduledThreadPoolExecutor("seata-discovery-heartbeat", 1, true, new ThreadPoolExecutor.AbortPolicy());
 
     public static void addHeartBeat(String registryType, InetSocketAddress serverAddress, ReRegister reRegister) {
         addHeartBeat(registryType, serverAddress, getHeartbeatPeriod(registryType), reRegister);

discovery/seata-discovery-etcd3/src/main/java/org/apache/seata/discovery/registry/etcd3/EtcdRegistryServiceImpl.java

@@ -28,7 +28,7 @@
 import io.etcd.jetcd.options.WatchOption;
 import io.etcd.jetcd.watch.WatchResponse;
 import org.apache.seata.common.exception.ShouldNeverHappenException;
-import org.apache.seata.common.thread.ThreadPoolExecutorFactory;
+import org.apache.seata.common.thread.PlatformThreadPoolProvider;
 import org.apache.seata.common.util.NetUtil;
 import org.apache.seata.common.util.StringUtils;
 import org.apache.seata.config.Configuration;
@@ -104,13 +104,16 @@ private EtcdRegistryServiceImpl() {
         clusterAddressMap = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
         listenerMap = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
         watcherMap = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
-        executorService = ThreadPoolExecutorFactory.newThreadPoolExecutor(
-                "registry-etcd3",
-                THREAD_POOL_SIZE,
-                THREAD_POOL_SIZE,
-                Integer.MAX_VALUE,
-                TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<>());
+        executorService = new PlatformThreadPoolProvider()
+                .newThreadPoolExecutor(
+                        "registry-etcd3",
+                        THREAD_POOL_SIZE,
+                        THREAD_POOL_SIZE,
+                        Integer.MAX_VALUE,
+                        TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<>(),
+                        true,
+                        new java.util.concurrent.ThreadPoolExecutor.AbortPolicy());
     }
 
     /**

discovery/seata-discovery-redis/src/main/java/org/apache/seata/discovery/registry/redis/RedisRegistryServiceImpl.java

@@ -19,7 +19,7 @@
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.apache.seata.common.ConfigurationKeys;
 import org.apache.seata.common.exception.ShouldNeverHappenException;
-import org.apache.seata.common.thread.ThreadPoolExecutorFactory;
+import org.apache.seata.common.thread.PlatformThreadPoolProvider;
 import org.apache.seata.common.util.CollectionUtils;
 import org.apache.seata.common.util.NetUtil;
 import org.apache.seata.common.util.StringUtils;
@@ -74,10 +74,19 @@ public class RedisRegistryServiceImpl implements RegistryService<RedisListener>
 
     private String transactionServiceGroup;
 
+    private static final PlatformThreadPoolProvider THREAD_POOL_PROVIDER = new PlatformThreadPoolProvider();
     private ScheduledExecutorService threadPoolExecutorForSubscribe =
-            ThreadPoolExecutorFactory.newScheduledThreadPoolExecutor("RedisRegistryService-subscribe", 1);
+            THREAD_POOL_PROVIDER.newScheduledThreadPoolExecutor(
+                    "RedisRegistryService-subscribe",
+                    1,
+                    true,
+                    new java.util.concurrent.ThreadPoolExecutor.AbortPolicy());
     private ScheduledExecutorService threadPoolExecutorForUpdateMap =
-            ThreadPoolExecutorFactory.newScheduledThreadPoolExecutor("RedisRegistryService-updateClusterAddrMap", 1);
+            THREAD_POOL_PROVIDER.newScheduledThreadPoolExecutor(
+                    "RedisRegistryService-updateClusterAddrMap",
+                    1,
+                    true,
+                    new java.util.concurrent.ThreadPoolExecutor.AbortPolicy());
 
     private RedisRegistryServiceImpl() {
         Configuration seataConfig = ConfigurationFactory.CURRENT_FILE_INSTANCE;

integration-tx-api/pom.xml

@@ -57,11 +57,6 @@
             <artifactId>seata-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>json-common-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>

integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/json/JsonParser.java

@@ -19,7 +19,7 @@
 import java.io.IOException;
 
 /**
- * @deprecated use {@link org.apache.seata.common.json.JsonSerializer} in json-common-core module instead.
+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializer} in seata-common module instead.
  */
 @Deprecated
 public interface JsonParser {

integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/json/JsonParserFactory.java

@@ -25,7 +25,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * @deprecated use {@link org.apache.seata.common.json.JsonSerializerFactory} in json-common-core module instead.
+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializerFactory} in seata-common module instead.
  */
 @Deprecated
 public class JsonParserFactory {

integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/json/JsonParserWrap.java

@@ -19,7 +19,7 @@
 import org.apache.seata.common.exception.JsonParseException;
 
 /**
- * @deprecated use {@link org.apache.seata.common.json.JsonSerializer} in json-common-core module instead.
+ * @deprecated use {@link org.apache.seata.common.json.JsonSerializer} in seata-common module instead.
  */
 @Deprecated
 public class JsonParserWrap implements JsonParser {

integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/util/JsonUtil.java

@@ -25,7 +25,7 @@
 import java.util.Objects;
 
 /**
- * @deprecated use {@link org.apache.seata.common.json.JsonUtil} in json-common-core module instead.
+ * @deprecated use {@link org.apache.seata.common.json.JsonUtil} in seata-common module instead.
  */
 @Deprecated
 public class JsonUtil {