[incubator-inlong] branch master updated: [INLONG-2294]Rename the variable BROKER_VERSION to SERVER_VERSION (#2295)

[aloyszhang]

This is an automated email from the ASF dual-hosted git repository.

aloyszhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new bc58c9e  [INLONG-2294]Rename the variable BROKER_VERSION to 
SERVER_VERSION (#2295)
bc58c9e is described below

commit bc58c9ee0d58f52cf4ebe562d09795160f9900c1
Author: gosonzhang <4675...@qq.com>
AuthorDate: Mon Jan 24 14:29:29 2022 +0800

    [INLONG-2294]Rename the variable BROKER_VERSION to SERVER_VERSION (#2295)
---
 .../main/java/org/apache/inlong/tubemq/server/broker/TubeBroker.java  | 4 ++--
 .../tubemq/server/master/web/action/screen/config/BrokerList.java     | 2 +-
 .../org/apache/inlong/tubemq/server/tools/cli/CliAbstractBase.java    | 2 +-
 inlong-tubemq/tubemq-server/src/saveServerVersion.cmd                 | 2 +-
 inlong-tubemq/tubemq-server/src/saveServerVersion.sh                  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/TubeBroker.java
 
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/TubeBroker.java
index 1f57fac..ad8b319 100644
--- 
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/TubeBroker.java
+++ 
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/TubeBroker.java
@@ -256,7 +256,7 @@ public class TubeBroker implements Stoppable {
         isOnline = true;
         logger.info(new StringBuilder(512)
                 .append("Start tube server successfully, broker version=")
-                .append(TubeServerVersion.BROKER_VERSION).toString());
+                .append(TubeServerVersion.SERVER_VERSION).toString());
     }
 
     public synchronized void reloadConfig() {
@@ -311,7 +311,7 @@ public class TubeBroker implements Stoppable {
         return new 
StringBuilder(512).append(tubeConfig.getBrokerId()).append(":")
                 .append(tubeConfig.getHostName()).append(":")
                 .append(tubeConfig.getPort()).append(":")
-                .append(TubeServerVersion.BROKER_VERSION).toString();
+                .append(TubeServerVersion.SERVER_VERSION).toString();
     }
 
     private void procConfigFromHeartBeat(StringBuilder sBuilder,
diff --git 
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/action/screen/config/BrokerList.java
 
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/action/screen/config/BrokerList.java
index 624618e..87dcafd 100644
--- 
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/action/screen/config/BrokerList.java
+++ 
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/master/web/action/screen/config/BrokerList.java
@@ -98,7 +98,7 @@ public class BrokerList implements Action {
                 brokerVO.setPartitionCount(totalPartitionNum);
                 brokerVO.setReadable(true);
                 brokerVO.setWritable(true);
-                brokerVO.setVersion(TubeServerVersion.BROKER_VERSION);
+                brokerVO.setVersion(TubeServerVersion.SERVER_VERSION);
                 brokerVO.setStatus(1);
                 brokerVO.setLastOpTime(new Date());
                 brokerVOList.add(brokerVO);
diff --git 
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/cli/CliAbstractBase.java
 
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/cli/CliAbstractBase.java
index aab466a..0160ec6 100644
--- 
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/cli/CliAbstractBase.java
+++ 
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/tools/cli/CliAbstractBase.java
@@ -53,7 +53,7 @@ public abstract class CliAbstractBase {
      *
      */
     public void version() {
-        System.out.println("TubeMQ " + TubeServerVersion.BROKER_VERSION);
+        System.out.println("TubeMQ " + TubeServerVersion.SERVER_VERSION);
         System.exit(0);
     }
 
diff --git a/inlong-tubemq/tubemq-server/src/saveServerVersion.cmd 
b/inlong-tubemq/tubemq-server/src/saveServerVersion.cmd
index 6eb47f8..b015a4c 100644
--- a/inlong-tubemq/tubemq-server/src/saveServerVersion.cmd
+++ b/inlong-tubemq/tubemq-server/src/saveServerVersion.cmd
@@ -30,6 +30,6 @@ echo  */>> %tubeServerVersion%
 echo package org.apache.inlong.tubemq.server.common;>> %tubeServerVersion%
 echo,>> %tubeServerVersion%
 echo public class TubeServerVersion {>> %tubeServerVersion%
-echo     public static final String BROKER_VERSION = "%version%";>> 
%tubeServerVersion%
+echo     public static final String SERVER_VERSION = "%version%";>> 
%tubeServerVersion%
 echo } >> %tubeServerVersion%
 
diff --git a/inlong-tubemq/tubemq-server/src/saveServerVersion.sh 
b/inlong-tubemq/tubemq-server/src/saveServerVersion.sh
index 58cb86a..7250e69 100755
--- a/inlong-tubemq/tubemq-server/src/saveServerVersion.sh
+++ b/inlong-tubemq/tubemq-server/src/saveServerVersion.sh
@@ -30,7 +30,7 @@ cat 
>"$outputDirectory/org/apache/inlong/tubemq/server/common/TubeServerVersion.
 package org.apache.inlong.tubemq.server.common;
 
 public class TubeServerVersion {
-    public static final String BROKER_VERSION = "$version";
+    public static final String SERVER_VERSION = "$version";
 }
 EOF