[ISSUE apache#5069] rename nameSrv to nameSrv in ProxyConfig

xdkxlk · Sep 16, 2022 · 9eb8978 · 9eb8978
1 parent 285bc08
commit 9eb8978
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java b/proxy/src/main/java/org/apache/rocketmq/proxy/ProxyStartup.java
@@ -151,7 +151,7 @@ private static Options buildCommandlineOptions() {
 
     private static void setConfigFromCommandLineArgument(CommandLineArgument commandLineArgument) {
         if (StringUtils.isNotBlank(commandLineArgument.getNamesrvAddr())) {
-            ConfigurationManager.getProxyConfig().setNameSrvAddr(commandLineArgument.getNamesrvAddr());
+            ConfigurationManager.getProxyConfig().setNamesrvAddr(commandLineArgument.getNamesrvAddr());
         }
         if (StringUtils.isNotBlank(commandLineArgument.getBrokerConfigPath())) {
             ConfigurationManager.getProxyConfig().setBrokerConfigPath(commandLineArgument.getBrokerConfigPath());
@@ -204,9 +204,9 @@ private static GrpcMessagingApplication createServiceProcessor(MessagingProcesso
     private static BrokerController createBrokerController() {
         ProxyConfig config = ConfigurationManager.getProxyConfig();
         List<String> brokerStartupArgList = Lists.newArrayList("-c", config.getBrokerConfigPath());
-        if (StringUtils.isNotBlank(config.getNameSrvAddr())) {
+        if (StringUtils.isNotBlank(config.getNamesrvAddr())) {
             brokerStartupArgList.add("-n");
-            brokerStartupArgList.add(config.getNameSrvAddr());
+            brokerStartupArgList.add(config.getNamesrvAddr());
         }
         String[] brokerStartupArgs = brokerStartupArgList.toArray(new String[0]);
         return BrokerStartup.createBrokerController(brokerStartupArgs);

diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java
@@ -45,9 +45,9 @@ public class ProxyConfig implements ConfigFile {
     private long printJstackInMillis = Duration.ofSeconds(60).toMillis();
     private long printThreadPoolStatusInMillis = Duration.ofSeconds(3).toMillis();
 
-    private String nameSrvAddr = System.getProperty(MixAll.NAMESRV_ADDR_PROPERTY, System.getenv(MixAll.NAMESRV_ADDR_ENV));
-    private String nameSrvDomain = "";
-    private String nameSrvDomainSubgroup = "";
+    private String namesrvAddr = System.getProperty(MixAll.NAMESRV_ADDR_PROPERTY, System.getenv(MixAll.NAMESRV_ADDR_ENV));
+    private String namesrvDomain = "";
+    private String namesrvDomainSubgroup = "";
     /**
      * gRPC
      */
@@ -235,28 +235,28 @@ public void setPrintThreadPoolStatusInMillis(long printThreadPoolStatusInMillis)
         this.printThreadPoolStatusInMillis = printThreadPoolStatusInMillis;
     }
 
-    public String getNameSrvAddr() {
-        return nameSrvAddr;
+    public String getNamesrvAddr() {
+        return namesrvAddr;
     }
 
-    public void setNameSrvAddr(String nameSrvAddr) {
-        this.nameSrvAddr = nameSrvAddr;
+    public void setNamesrvAddr(String namesrvAddr) {
+        this.namesrvAddr = namesrvAddr;
     }
 
-    public String getNameSrvDomain() {
-        return nameSrvDomain;
+    public String getNamesrvDomain() {
+        return namesrvDomain;
     }
 
-    public void setNameSrvDomain(String nameSrvDomain) {
-        this.nameSrvDomain = nameSrvDomain;
+    public void setNamesrvDomain(String namesrvDomain) {
+        this.namesrvDomain = namesrvDomain;
     }
 
-    public String getNameSrvDomainSubgroup() {
-        return nameSrvDomainSubgroup;
+    public String getNamesrvDomainSubgroup() {
+        return namesrvDomainSubgroup;
     }
 
-    public void setNameSrvDomainSubgroup(String nameSrvDomainSubgroup) {
-        this.nameSrvDomainSubgroup = nameSrvDomainSubgroup;
+    public void setNamesrvDomainSubgroup(String namesrvDomainSubgroup) {
+        this.namesrvDomainSubgroup = namesrvDomainSubgroup;
     }
 
     public String getProxyMode() {

diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/service/mqclient/MQClientAPIFactory.java b/proxy/src/main/java/org/apache/rocketmq/proxy/service/mqclient/MQClientAPIFactory.java
@@ -54,11 +54,11 @@ public MQClientAPIFactory(String namePrefix, int clientNum,
     protected void init() {
         System.setProperty(ClientConfig.SEND_MESSAGE_WITH_VIP_CHANNEL_PROPERTY, "false");
         ProxyConfig proxyConfig = ConfigurationManager.getProxyConfig();
-        if (StringUtils.isEmpty(proxyConfig.getNameSrvDomain())) {
-            System.setProperty(MixAll.NAMESRV_ADDR_PROPERTY, proxyConfig.getNameSrvAddr());
+        if (StringUtils.isEmpty(proxyConfig.getNamesrvDomain())) {
+            System.setProperty(MixAll.NAMESRV_ADDR_PROPERTY, proxyConfig.getNamesrvAddr());
         } else {
-            System.setProperty("rocketmq.namesrv.domain", proxyConfig.getNameSrvDomain());
-            System.setProperty("rocketmq.namesrv.domain.subgroup", proxyConfig.getNameSrvDomainSubgroup());
+            System.setProperty("rocketmq.namesrv.domain", proxyConfig.getNamesrvDomain());
+            System.setProperty("rocketmq.namesrv.domain.subgroup", proxyConfig.getNamesrvDomainSubgroup());
         }
     }
 

diff --git a/proxy/src/test/java/org/apache/rocketmq/proxy/ProxyStartupTest.java b/proxy/src/test/java/org/apache/rocketmq/proxy/ProxyStartupTest.java
@@ -85,7 +85,7 @@ public void testParseAndInitCommandLineArgument() throws Exception {
         ProxyConfig config = ConfigurationManager.getProxyConfig();
         assertEquals(brokerConfigPath, config.getBrokerConfigPath());
         assertEquals(proxyMode, config.getProxyMode());
-        assertEquals(namesrvAddr, config.getNameSrvAddr());
+        assertEquals(namesrvAddr, config.getNamesrvAddr());
     }
 
     @Test
@@ -96,7 +96,7 @@ public void testLoadNameSrvAddrByProperty() throws Exception {
         ProxyStartup.initLogAndConfiguration(commandLineArgument);
 
         ProxyConfig config = ConfigurationManager.getProxyConfig();
-        assertEquals(namesrvAddr, config.getNameSrvAddr());
+        assertEquals(namesrvAddr, config.getNamesrvAddr());
     }
 
     @Test
@@ -115,7 +115,7 @@ public void testLoadNameSrvAddrByConfigFile() throws Exception {
         ProxyStartup.initLogAndConfiguration(commandLineArgument);
 
         ProxyConfig config = ConfigurationManager.getProxyConfig();
-        assertEquals(namesrvAddr, config.getNameSrvAddr());
+        assertEquals(namesrvAddr, config.getNamesrvAddr());
     }
 
     @Test
@@ -135,6 +135,6 @@ public void testLoadNameSrvAddrByCommandLine() throws Exception {
         ProxyStartup.initLogAndConfiguration(commandLineArgument);
 
         ProxyConfig config = ConfigurationManager.getProxyConfig();
-        assertEquals(namesrvAddr, config.getNameSrvAddr());
+        assertEquals(namesrvAddr, config.getNamesrvAddr());
     }
 }
diff --git a/proxy/src/test/java/org/apache/rocketmq/proxy/service/message/LocalMessageServiceTest.java b/proxy/src/test/java/org/apache/rocketmq/proxy/service/message/LocalMessageServiceTest.java
@@ -114,7 +114,7 @@ public class LocalMessageServiceTest extends InitConfigAndLoggerTest {
     @Before
     public void setUp() throws Throwable {
         super.before();
-        ConfigurationManager.getProxyConfig().setNameSrvAddr("1.1.1.1");
+        ConfigurationManager.getProxyConfig().setNamesrvAddr("1.1.1.1");
         channelManager = new ChannelManager();
         Mockito.when(brokerControllerMock.getSendMessageProcessor()).thenReturn(sendMessageProcessorMock);
         Mockito.when(brokerControllerMock.getPopMessageProcessor()).thenReturn(popMessageProcessorMock);

diff --git a/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java b/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java
@@ -152,7 +152,7 @@ public void setUp() throws Exception {
 
         ConfigurationManager.initEnv();
         ConfigurationManager.intConfig();
-        ConfigurationManager.getProxyConfig().setNameSrvAddr(nsAddr);
+        ConfigurationManager.getProxyConfig().setNamesrvAddr(nsAddr);
         // Set LongPollingReserveTimeInMillis to 500ms to reserve more time for IT
         ConfigurationManager.getProxyConfig().setLongPollingReserveTimeInMillis(500);
         ConfigurationManager.getProxyConfig().setRocketMQClusterName(brokerController1.getBrokerConfig().getBrokerClusterName());