rename Lealone.run(String[], Runnable) to Lealone.main(String[], Runn…

…able)
lealone · Dec 22, 2022 · f6cbc6f · f6cbc6f
1 parent 2b38519
commit f6cbc6f
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/lealone-main/src/main/java/org/lealone/main/Lealone.java b/lealone-main/src/main/java/org/lealone/main/Lealone.java
@@ -43,20 +43,11 @@ public static void main(String[] args) {
         new Lealone().start(args);
     }
 
-    public static void embed(String[] args) {
-        run(args, true, null);
-    }
-
-    // 外部调用者如果在独立的线程中启动Lealone，可以传递一个CountDownLatch等待Lealone启动就绪
-    public static void run(String[] args, boolean embedded, CountDownLatch latch) {
-        new Lealone().run(embedded, latch);
-    }
-
-    public static void run(String[] args, Runnable runnable) {
+    public static void main(String[] args, Runnable runnable) {
         // 在一个新线程中启动 Lealone
         CountDownLatch latch = new CountDownLatch(1);
         new Thread(() -> {
-            Lealone.run(args, false, latch);
+            new Lealone().start(args, latch);
         }).start();
         try {
             latch.await();
@@ -66,6 +57,15 @@ public static void run(String[] args, Runnable runnable) {
         }
     }
 
+    public static void embed(String[] args) {
+        run(args, true, null);
+    }
+
+    // 外部调用者如果在独立的线程中启动Lealone，可以传递一个CountDownLatch等待Lealone启动就绪
+    public static void run(String[] args, boolean embedded, CountDownLatch latch) {
+        new Lealone().run(embedded, latch);
+    }
+
     public static void runScript(String url, String... sqlScripts) {
         try (Connection conn = DriverManager.getConnection(url);
                 Statement stmt = conn.createStatement()) {
@@ -84,6 +84,10 @@ public static void runScript(String url, String... sqlScripts) {
     private String port;
 
     public void start(String[] args) {
+        start(args, null);
+    }
+
+    public void start(String[] args, CountDownLatch latch) {
         for (int i = 0; args != null && i < args.length; i++) {
             String arg = args[i].trim();
             if (arg.isEmpty())
@@ -106,7 +110,7 @@ public void start(String[] args) {
                 continue;
             }
         }
-        run(false, null);
+        run(false, latch);
     }
 
     private void showUsage() {