[rocketmq] branch develop updated: [ISSUE #5124] Revert signatures of public methods in 'org.apache.rocketmq.namesrv.NamesrvStartup'

[ji...@apache.org]

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

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 39df11994 [ISSUE #5124] Revert signatures of public methods in 'org.apache.rocketmq.namesrv.NamesrvStartup'
39df11994 is described below

commit 39df11994ca29d73453f1be106f00af6be948800
Author: caigy <cs...@163.com>
AuthorDate: Tue Sep 20 14:32:36 2022 +0800

    [ISSUE #5124] Revert signatures of public methods in 'org.apache.rocketmq.namesrv.NamesrvStartup'
---
 .../org/apache/rocketmq/namesrv/NamesrvStartup.java    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java
index d5f5d9762..fd4279002 100644
--- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java
+++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java
@@ -57,26 +57,29 @@ public class NamesrvStartup {
         controllerManagerMain();
     }
 
-    public static void main0(String[] args) {
+    public static NamesrvController main0(String[] args) {
         try {
             parseCommandlineAndConfigFile(args);
-            createAndStartNamesrvController();
+            NamesrvController controller = createAndStartNamesrvController();
+            return controller;
         } catch (Throwable e) {
             e.printStackTrace();
             System.exit(-1);
         }
 
+        return null;
     }
 
-    public static void controllerManagerMain() {
+    public static ControllerManager controllerManagerMain() {
         try {
             if (namesrvConfig.isEnableControllerInNamesrv()) {
-                createAndStartControllerManager();
+                return createAndStartControllerManager();
             }
         } catch (Throwable e) {
             e.printStackTrace();
             System.exit(-1);
         }
+        return null;
     }
 
     public static void parseCommandlineAndConfigFile(String[] args) throws Exception {
@@ -141,12 +144,14 @@ public class NamesrvStartup {
 
     }
 
-    public static void createAndStartNamesrvController() throws Exception {
+    public static NamesrvController createAndStartNamesrvController() throws Exception {
+
         NamesrvController controller = createNamesrvController();
         start(controller);
         String tip = "The Name Server boot success. serializeType=" + RemotingCommand.getSerializeTypeConfigInThisServer();
         log.info(tip);
         System.out.printf("%s%n", tip);
+        return controller;
     }
 
     public static NamesrvController createNamesrvController() {
@@ -179,12 +184,13 @@ public class NamesrvStartup {
         return controller;
     }
 
-    public static void createAndStartControllerManager() throws Exception {
+    public static ControllerManager createAndStartControllerManager() throws Exception {
         ControllerManager controllerManager = createControllerManager();
         start(controllerManager);
         String tip = "The ControllerManager boot success. serializeType=" + RemotingCommand.getSerializeTypeConfigInThisServer();
         log.info(tip);
         System.out.printf("%s%n", tip);
+        return controllerManager;
     }
 
     public static ControllerManager createControllerManager() throws Exception {