From e901f26d58b44377ed3bb88eed955cade6f335cc Mon Sep 17 00:00:00 2001 From: Wang Xiao Date: Fri, 8 Aug 2025 14:36:58 +0800 Subject: [PATCH 1/3] feat: add ServiceConfig field to ProtocolConfig --- .../trpc/core/common/config/ProtocolConfig.java | 12 ++++++++++++ .../trpc/core/common/config/ServiceConfig.java | 1 + 2 files changed, 13 insertions(+) diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ProtocolConfig.java b/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ProtocolConfig.java index b74ed0215..9d318f5ca 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ProtocolConfig.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ProtocolConfig.java @@ -48,6 +48,8 @@ public class ProtocolConfig extends BaseProtocolConfig implements Cloneable { protected volatile boolean setDefault = false; protected volatile boolean inited = false; + protected ServiceConfig serviceConfig; + public static ProtocolConfig newInstance() { return new ProtocolConfig(); } @@ -244,4 +246,14 @@ public boolean isInited() { return inited; } + public ServiceConfig getServiceConfig() { + return serviceConfig; + } + + public void setServiceConfig(ServiceConfig serviceConfig) { + checkFiledModifyPrivilege(); + Preconditions.checkArgument(serviceConfig != null, "serviceConfig cannot be null"); + this.serviceConfig = serviceConfig; + } + } \ No newline at end of file diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ServiceConfig.java b/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ServiceConfig.java index 9d2444401..68a2a6ed5 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ServiceConfig.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ServiceConfig.java @@ -402,6 +402,7 @@ protected ProtocolConfig buildProtocolConfig() { tempProtocolConfig.setReusePort(this.getReusePort()); tempProtocolConfig.setSign(this.getSign()); tempProtocolConfig.setDefault(); + tempProtocolConfig.setServiceConfig(this); return tempProtocolConfig; } From b9beda50d95ca1e60a80e33fe304eaf101ba6b3b Mon Sep 17 00:00:00 2001 From: Wang Xiao Date: Fri, 8 Aug 2025 15:00:20 +0800 Subject: [PATCH 2/3] feat: add ServiceConfig field to ProtocolConfig --- .../tencent/trpc/core/common/config/ProtocolConfigTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/trpc-core/src/test/java/com/tencent/trpc/core/common/config/ProtocolConfigTest.java b/trpc-core/src/test/java/com/tencent/trpc/core/common/config/ProtocolConfigTest.java index 7f4f56e59..78613313d 100644 --- a/trpc-core/src/test/java/com/tencent/trpc/core/common/config/ProtocolConfigTest.java +++ b/trpc-core/src/test/java/com/tencent/trpc/core/common/config/ProtocolConfigTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableMap; @@ -90,6 +91,8 @@ public void testConfig() { config.setExplicitFlushAfterFlushes(1024); config.setCompressMinBytes(10); config.setDefault(); + ServiceConfig serviceConfig = new ServiceConfig(); + config.setServiceConfig(serviceConfig); assertEquals("127.1.1.1", config.getIp()); assertEquals("", config.getName()); assertEquals(8080, config.getPort()); @@ -124,5 +127,6 @@ public void testConfig() { assertFalse(config.useEpoll()); assertEquals(10, config.getCompressMinBytes()); assertTrue(config.isSetDefault()); + assertSame(serviceConfig, config.getServiceConfig()); } } \ No newline at end of file From ae9983d66370fb3a0693df77001dc5fea5f6503c Mon Sep 17 00:00:00 2001 From: Wang Xiao Date: Fri, 8 Aug 2025 15:15:53 +0800 Subject: [PATCH 3/3] feat: add ServiceConfig field to ProtocolConfig --- .../java/com/tencent/trpc/core/common/config/ProtocolConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ProtocolConfig.java b/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ProtocolConfig.java index 9d318f5ca..f8cd2c732 100644 --- a/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ProtocolConfig.java +++ b/trpc-core/src/main/java/com/tencent/trpc/core/common/config/ProtocolConfig.java @@ -252,7 +252,6 @@ public ServiceConfig getServiceConfig() { public void setServiceConfig(ServiceConfig serviceConfig) { checkFiledModifyPrivilege(); - Preconditions.checkArgument(serviceConfig != null, "serviceConfig cannot be null"); this.serviceConfig = serviceConfig; }