Changeset 34897

Timestamp:

2021-02-18T16:01:53+13:00 (3 years ago)

Author:

su41

Message:

Changed runnable into callable so that we could handle exit codes better

File:

• gs2-extensions/tipple-bridge/trunk/src/src/main/java/sqlCli.java (modified) (7 diffs)

gs2-extensions/tipple-bridge/trunk/src/src/main/java/sqlCli.java

@@ -9 +9 @@
 import com.google.gson.Gson;
 import java.io.FileWriter;
+import java.util.concurrent.Callable;
 
 /*
@@ -25 +26 @@
  */
 @Command (name="sqlCli", description = "Arguments for database connection", mixinStandardHelpOptions = true)
-public class sqlCli implements Runnable {
+public class sqlCli implements Callable<Integer> {
     //our cli arguments
 
@@ -54 +55 @@
     String projectID;
 
-
-    /*
-    this parameter can be read in at any point on the options line.
-    but that's only because it's the only parameter at the moment.
-    If we add more parameters, will either have to put them next to each other
-    OR add in indexes
-    https://picocli.info/quick-guide.html#_options_and_parameters
-     */
-    @Parameters(description = "Name of the output JSON file. E.g. yourFileName.json")
-    String jsonOutputFile;
-
     @Option(names = {"--host"}, description = "Type of host e.g. localhost ",
             required = true, defaultValue = "localhost")
     String host;
 
-    public void run(){
+    /*
+        this parameter can be read in at any point on the options line.
+        but that's only because it's the only parameter at the moment.
+        If we add more parameters, will either have to put them next to each other
+        OR add in indexes
+        https://picocli.info/quick-guide.html#_options_and_parameters
+         */
+    @Parameters(description = "Name of the output JSON file. E.g. yourFileName.json")
+    String jsonOutputFile;
+
+    public Integer call(){
         //if it doesn't end with ...
         if(!jsonOutputFile.endsWith(".json")){
@@ -75 +75 @@
             System.out.println("The file to save the output to must be a .json file.");
             //exit code other than 0 means it's not fine.
-            System.exit(1);
-        }
-        //else we're good to go. 
-        databaseConnect(userName, password, port, dbName, projectID, jsonOutputFile, host);
+            return 1;
+        }
+        //else we're good to go.
+       // databaseConnect(userName, password, port, dbName, projectID, jsonOutputFile, host);
+        int status = databaseConnect(userName, password, port, dbName, projectID, jsonOutputFile, host);
+        return status;
     }
 
@@ -87 +89 @@
 
 
-    private static void databaseConnect(String user, String pass, int port, String dbName,
+    private static int databaseConnect(String user, String pass, int port, String dbName,
                                         String projectID, String fileName, String host){
         Connection conn;
         Statement stmt;
-
+        int returnStatus = 0;
        // String dbUrl = "jdbc:mysql://localhost:" + port +"/"+ dbName;
 
@@ -215 +217 @@
                System.out.println("    -'Database name' ");
             }
+           returnStatus = 1;
 
         }
@@ -222 +225 @@
             //print out wrong username or password instead of the stack trace?
             System.out.println("encountered error");
-
-        }
+            returnStatus = 2;
+        }
+        return returnStatus;
     }
 }