Changed DriverManager to BasicDataSource

Added Maven Shade Plugin to package dependencies with jar

Signed-off-by: Joshua Gager <jlgager@outlook.com>

Author: jlgager24

pom.xml

@@ -18,13 +18,37 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <!-- Run shade goal on package phase -->
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Main-Class>com.jgcomptech.tools.demo.Main</Main-Class>
+                                        <Build-Number>123</Build-Number>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.5</version>
+            <version>RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
@@ -34,12 +58,12 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>
-            <version>4.3.0</version>
+            <version>RELEASE</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>4.3.0</version>
+            <version>RELEASE</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -49,13 +73,19 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.16.1</version>
+            <version>RELEASE</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.194</version>
+            <version>RELEASE</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-dbcp2 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>RELEASE</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/com/jgcomptech/tools/databasetools/Database.java

@@ -5,23 +5,30 @@
 import com.jgcomptech.tools.dialogs.MessageBox;
 import com.jgcomptech.tools.dialogs.MessageBoxButtons;
 import com.jgcomptech.tools.dialogs.MessageBoxIcon;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
+import org.apache.commons.dbcp2.datasources.SharedPoolDataSource;
 
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
 import java.sql.*;
 import java.util.ArrayList;
 
 /**
  * Database object that allows communication with a SQL database
  */
 public class Database implements AutoCloseable {
-    private java.sql.Connection conn = null;
-    private String connString = "";
+    private java.sql.Connection conn;
+    private String connString;
     final private String username;
     final private String password;
     final private String dbName;
     final private DatabaseType dbType;
-    private Info info = null;
-    private Connection connection = null;
-    private Tasks tasks = null;
+    private String dbDriver;
+    private Info info;
+    private Connection connection;
+    private Tasks tasks;
 
     /**
      * Creates a database object with the specified parameters
@@ -36,9 +43,11 @@ public Database(String dbFilePath, String username, String password, DatabaseTyp
 
             case H2:
                 connString = "jdbc:h2:" + dbFilePath;
+                dbDriver = "org.h2.Driver";
                 break;
             case SQLite:
                 connString = "jdbc:sqlite:" + dbFilePath;
+                dbDriver = "org.sqlite.JDBC";
                 break;
         }
 
@@ -97,16 +106,21 @@ public class Connection {
          * @param showStatusAlert Specifies if message box should be shown
          * @throws SQLException if error occurs
          */
-        public void connect(boolean showStatusAlert) throws SQLException{
-            try {
-                conn = DriverManager.getConnection(connString, username, password);
+        public void connect(boolean showStatusAlert) throws SQLException {
+            try(final BasicDataSource ds = new BasicDataSource()) {
+                ds.setDriverClassName(dbDriver);
+                ds.setUrl(connString);
+                ds.setUsername(username);
+                ds.setPassword(password);
+
+                conn = ds.getConnection();
 
                 if(showStatusAlert) MessageBox.show("Connection to database has been established.", "Database Alert",
                         "Database Alert", MessageBoxIcon.INFORMATION);
             } catch (SQLException e) {
                 if(showStatusAlert) {
                     if(e.getMessage().contains("Database may be already in use")) {
-                        DialogResult result = MessageBox.show("\"" + dbName + "\" is currently in use!\nPlease Close any open connections!",
+                        final DialogResult result = MessageBox.show("\"" + dbName + "\" is currently in use!\nPlease Close any open connections!",
                                 "Error!", "Database Error", MessageBoxButtons.RetryCancel, MessageBoxIcon.ERROR);
                         if(result.equals(DialogResult.RETRY)) connect(showStatusAlert);
                         if(result.equals(DialogResult.CANCEL)) throw e;
@@ -196,7 +210,7 @@ public boolean TableExists(String tableName) throws SQLException {
          */
         public ArrayList getTablesList() throws SQLException {
 
-            ArrayList<String> listOfTables = new ArrayList<String>();
+            ArrayList<String> listOfTables = new ArrayList<>();
 
             DatabaseMetaData md = conn.getMetaData();
 

src/main/java/com/jgcomptech/tools/demo/Main.java

@@ -19,7 +19,7 @@ private static void Print(KeyPair keyPair) {
     public static void main(String[] args) {
         Print("------------------------------------");
         Print("------Java Ultimate Tools v1.2------");
-        Print("-------Created by J&G CompTech-------");
+        Print("-------Created by J&G CompTech------");
         Print("------------------------------------");
         Print("Loading Computer Info Please Wait...");
         ComputerInfo compinfo = new ComputerInfo();