Merge remote-tracking branch 'refs/remotes/upstream/master' into feat/support_springboot3.x

Author: wardseptember

pom.xml

@@ -96,6 +96,7 @@
         <maven.ignore.testfailure>false</maven.ignore.testfailure>
         <maven.surefire.version>3.0.0-M7</maven.surefire.version>
         <maven.javadoc.version>3.0.1</maven.javadoc.version>
+        <central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
         <exec.maven.version>3.1.0</exec.maven.version>
         <file.encoding>UTF-8</file.encoding>
     </properties>
@@ -335,9 +336,14 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>${maven.deploy.version}</version>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>${central-publishing-maven-plugin.version}</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>central-repo</publishingServerId>
+                            <autoPublish>true</autoPublish>
+                        </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -397,14 +403,27 @@
         </profile>
     </profiles>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-        </snapshotRepository>
+    <repositories>
+        <repository>
+            <id>maven-central</id>
+            <url>https://repo.maven.apache.org/maven2/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
         <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <name>Central Portal Snapshots</name>
+            <id>central-portal-snapshots</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
-    </distributionManagement>
+    </repositories>
 </project>

trpc-code-generator/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>trpc-code-generator</artifactId>
     <packaging>jar</packaging>
+    <name>trpc-code-generator</name>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

trpc-container/trpc-container-default/src/test/java/com/tencent/trpc/container/config/yaml/PluginConfigParserHelperTest.java

@@ -86,7 +86,7 @@ private void checkRegistry(PluginConfig config) {
         List<Map<String, Object>> services = (List<Map<String, Object>>) config.getProperties()
                 .get(ConfigConstants.SERVICE);
         Assert.assertEquals(services.get(0).get("namespace"), "java-sdk-test-service1");
-        Assert.assertEquals(services.get(0).get("token"), "5e43887a00c4465085fb89eaa0e414b4");
+        Assert.assertEquals(services.get(0).get("token"), "xxxx");
         Assert.assertEquals(services.get(0).get("instance_id"),
                 "feda4ceffed0b7b08cf5ec665dcd320e50434549");
         Assert.assertEquals(services.get(0).get("name"), "trpc.TestApp.TestServer.Greeter");

trpc-container/trpc-container-default/src/test/java/com/tencent/trpc/container/config/yaml/YamlApplicationConfigParserTest.java

@@ -47,6 +47,7 @@ public void after() {
 
     @Test
     public void parse() {
+        ConfigManager.stopTest();
         ConfigManager applicationConfig =
                 new YamlApplicationConfigParser().parseFromClassPath("trpc_java_parse_test.yaml");
         assert applicationConfig != null;
@@ -225,9 +226,9 @@ public void checkServerConfig(ConfigManager applicationConfig) {
         assertEquals(serviceConfig.getFilters().get(1), "filter2");
         assertEquals(serviceConfig.getWorkerPool(), "woker_pool_provider_test2");
         assertEquals(serviceConfig.getRegistries().get("polaris").get("token"),
-                "5e43887a00c4465085fb89eaa0e414b4");
+                "xxxx");
         assertEquals(serviceConfig.getRegistries().get("polaris2").get("token"),
-                "5e43887a00c4465085fb89eaa0e414b3");
+                "xxxx");
         ProviderConfig providerConfig = serviceConfig.getProviderConfigs().get(0);
         assertEquals(providerConfig.getRefClazz(), "com.tencent.trpc.container.demo.GreeterServiceImp");
         assertEquals(serviceConfig.getWorkerPool(), "woker_pool_provider_test2");
@@ -259,6 +260,7 @@ public void checkServerConfig(ConfigManager applicationConfig) {
 
     @Test
     public void testServerIpParse() {
+        ConfigManager.stopTest();
         ConfigManager applicationConfig = new YamlApplicationConfigParser()
                 .parseFromClassPath("trpc_java_ip_parse_test.yaml");
         applicationConfig.setDefault();
@@ -271,13 +273,15 @@ public void testServerIpParse() {
 
     @Test
     public void testParseMap() {
+        ConfigManager.stopTest();
         String path = YamlParser.class.getClassLoader().getResource("trpc_java.yaml").getPath();
         Map<String, Object> map = new YamlApplicationConfigParser().parseMap(path);
         Assert.assertNotEquals(map.size(), 0);
     }
 
     @Test
     public void testParseMap_confPath() {
+        ConfigManager.stopTest();
         TRpcSystemProperties.setProperties(TRpcSystemProperties.CONFIG_PATH, "");
         Map<String, Object> map1 = new YamlApplicationConfigParser().parseMap("");
         Assert.assertNotNull(map1);
@@ -314,7 +318,7 @@ public void testParseImpls() {
 
     @Test
     public void testEx() {
-
+        ConfigManager.stopTest();
         try {
             new YamlApplicationConfigParser().parseMap("abc");
             TRpcSystemProperties.setProperties(TRpcSystemProperties.CONFIG_PATH, "abc");

trpc-container/trpc-container-default/src/test/resources/listener_default.yaml

@@ -67,7 +67,7 @@ server:
       registrys:
         polaris2:
           namespace: java-sdk-test-service2
-          token: 5e43887a00c4465085fb89eaa0e414b3
+          token: xxxx
           instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
           name: trpc.TestApp.TestServer.Greeter3
 
@@ -173,7 +173,7 @@ plugins:
       register_self: true
       service:
         - namespace: java-sdk-test-service2
-          token: 5e43887a00c4465085fb89eaa0e414b4
+          token: xxxx
           instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
           name: trpc.TestApp.TestServer.Greeter
   selector:

trpc-container/trpc-container-default/src/test/resources/trpc_java_config.yaml

@@ -41,7 +41,7 @@ plugins:
       register_self: false
       service:
         - namespace: java-sdk-test-service1
-          token: 5e43887a00c4465085fb89eaa0e414b4
+          token: xxxx
           instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
           name: trpc.TestApp.TestServer.Greeter
 

trpc-container/trpc-container-default/src/test/resources/trpc_java_parse_test.yaml

@@ -67,7 +67,7 @@ server:
       registrys:
         polaris2:
           namespace: java-sdk-test-service2
-          token: 5e43887a00c4465085fb89eaa0e414b3
+          token: xxxx
           instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
           name: trpc.TestApp.TestServer.Greeter3
 
@@ -173,7 +173,7 @@ plugins:
       register_self: true
       service:
         - namespace: java-sdk-test-service2
-          token: 5e43887a00c4465085fb89eaa0e414b4
+          token: xxxx
           instance_id: feda4ceffed0b7b08cf5ec665dcd320e50434549
           name: trpc.TestApp.TestServer.Greeter
   selector:

trpc-core/src/main/java/com/tencent/trpc/core/common/Constants.java

@@ -74,9 +74,13 @@ public class Constants {
      */
     public static final String DEFAULT_BOSS_THREADS = "1";
     /**
-     * Default business thread count cpus * 2
+     * Default business core thread count 50
      */
-    public static final int DEFAULT_BIZ_THREADS = CPUS * 2;
+    public static final int DEFAULT_CORE_THREADS = 50;
+    /**
+     * Default business max thread count 200
+     */
+    public static final int DEFAULT_MAX_THREADS = 200;
     /**
      * Default coroutine pool core count
      */

trpc-core/src/main/java/com/tencent/trpc/core/worker/WorkerPoolManager.java

@@ -63,11 +63,11 @@ public class WorkerPoolManager {
 
     static {
         DEF_PROVIDER_WORKER_POOL_CONFIG = newThreadWorkerPoolConfig(DEF_PROVIDER_WORKER_POOL_NAME,
-                Constants.DEFAULT_BIZ_THREADS, Boolean.FALSE);
+                Constants.DEFAULT_CORE_THREADS, Constants.DEFAULT_MAX_THREADS, Boolean.FALSE);
         DEF_CONSUMER_WORKER_POOL_CONFIG = newThreadWorkerPoolConfig(DEF_CONSUMER_WORKER_POOL_NAME,
-                Constants.DEFAULT_BIZ_THREADS, Boolean.FALSE);
+                Constants.DEFAULT_CORE_THREADS, Constants.DEFAULT_MAX_THREADS, Boolean.FALSE);
         DEF_NAMING_WORKER_POOL_CONFIG = newThreadWorkerPoolConfig(DEF_NAMING_WORKER_POOL_NAME,
-                Constants.DEFAULT_BIZ_THREADS, Boolean.FALSE);
+                Constants.DEFAULT_CORE_THREADS, Constants.DEFAULT_MAX_THREADS, Boolean.FALSE);
         shareScheduler = new ScheduledThreadPoolExecutor(Math.min(Constants.CPUS, 4),
                 // Parameters can be considered for startup parameter configuration
                 new NamedThreadFactory("trpc_share_scheduler"));
@@ -122,6 +122,11 @@ public static PluginConfig newThreadWorkerPoolConfig(String name, int thread, bo
         return ThreadWorkerPool.newThreadWorkerPoolConfig(name, thread, useFiber);
     }
 
+    public static PluginConfig newThreadWorkerPoolConfig(String name, int corePoolSize,
+            int maxPoolSize, boolean useFiber) {
+        return ThreadWorkerPool.newThreadWorkerPoolConfig(name, corePoolSize, maxPoolSize, useFiber);
+    }
+
     /**
      * Close shared thread pool, graceful shutdown.
      */

trpc-core/src/main/java/com/tencent/trpc/core/worker/support/thread/ThreadWorkerPool.java

@@ -74,10 +74,15 @@ public class ThreadWorkerPool extends AbstractWorkerPool
     private UncaughtExceptionHandler uncaughtExceptionHandler;
 
     public static PluginConfig newThreadWorkerPoolConfig(String name, int corePoolSize, boolean useFiber) {
+        return newThreadWorkerPoolConfig(name, corePoolSize, corePoolSize, useFiber);
+    }
+
+    public static PluginConfig newThreadWorkerPoolConfig(String name,
+            int corePoolSize, int maxPoolSize, boolean useFiber) {
         ThreadPoolConfig poolConfig = new ThreadPoolConfig();
         poolConfig.setUseFiber(useFiber);
         poolConfig.setCorePoolSize(corePoolSize);
-        poolConfig.setMaximumPoolSize(corePoolSize);
+        poolConfig.setMaximumPoolSize(maxPoolSize);
         poolConfig.setShareSchedule(Boolean.TRUE);
         return new PluginConfig(name, WorkerPool.class, ThreadWorkerPool.class, poolConfig.toMap());
     }