Changeset 34885

Timestamp:

2021-02-16T14:19:04+13:00 (3 years ago)

Author:

davidb

Message:

Updated to have default values from 'port' and 'database' options. Prints out the connection URL formed

Location:

gs2-extensions/tipple-bridge/trunk/src

Files:

• README.txt (modified) (1 diff)
• build.gradle (modified) (2 diffs)
• src/main/java/sqlCli.java (modified) (3 diffs)

gs2-extensions/tipple-bridge/trunk/src/README.txt

@@ -1 +1 @@
 Tipple-bridge is a Gradle based project revolving connecting the databases
-of Tipple and Greenstone. 
+of Tipple and Greenstone.
+
+To compile:
+
+  ./gradlew compileJava
+
+To produce a self-contained jar file:
+
+  ./gradlew jar
+
+
+

gs2-extensions/tipple-bridge/trunk/src/build.gradle

@@ -14 +14 @@
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
+
     implementation 'org.mariadb.jdbc:mariadb-java-client:2.1.2'
-    implementation 'info.picocli:picocli:4.6.1'
+    // implementation 'info.picocli:picocli:4.6.1'
+
+    // https://mvnrepository.com/artifact/info.picocli/picocli
+    compile group: 'info.picocli', name: 'picocli', version: '4.6.1'
+
     // https://mvnrepository.com/artifact/mysql/mysql-connector-java
     compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.23'
+
     // https://mvnrepository.com/artifact/com.google.code.gson/gson
     compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
@@ -23 +29 @@
 }
 
+jar {
+    manifest {
+        attributes "Main-Class": "sqlCli"
+    }
+
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+}

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

@@ -40 +40 @@
     String password;
 
-    @Option(names = {"--port"},  description = "Port number")
+    @Option(names = {"--port"},  description="Port number", defaultValue="3306")
     int portNo;
 
-    @Option(names = {"--dbname"}, description = "Name of the db")
+    @Option(names = {"--dbname"}, description="Name of the database", defaultValue="tippleTest")
     String dbName;
 
@@ -86 +86 @@
             Class.forName("com.mysql.cj.jdbc.Driver");
             //opening the connection
-            System.out.println("Connecting to database: ");
+            System.out.println("Connecting to database:");
+        System.out.println("  " + dbUrl);
+        
             conn = DriverManager.getConnection(dbUrl, user, pass);
-            //conn = DriverManager.getConnection(dbUrl, user, pass);
 
             //create and execute query
@@ -108 +109 @@
 
             Gson myGSon = new Gson();
-           file.write("[");
+        file.write("[");
 
             //does nothing, assuming the try catch picks up the error first,