Added JdbcDatabaseProperties interface. Updated dependencies.

joshmg · joshmg · commit 8a672680a284 · 2021-01-28T14:15:42.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'com.softwareverde'
-version '3.2.5'
+version '3.3.0'
 
 apply plugin: 'java'
 apply plugin: 'java-library'
@@ -9,7 +9,7 @@ sourceCompatibility = 1.8
 task makeJar(type: Jar) {
     manifest {
         attributes  'Implementation-Title': 'Java Database Wrapper',
-                    'Implementation-Version': version
+                    'Implementation-Version': archiveVersion
     }
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'com.github.softwareverde', name: 'java-util', version: 'v2.1.0'
+    implementation group: 'com.github.softwareverde', name: 'java-util', version: 'v2.7.0'
 
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     testImplementation group: 'com.h2database', name: 'h2', version: '1.4.192'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Jul 29 10:43:26 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/com/softwareverde/database/jdbc/JdbcDatabaseConnection.java b/src/main/java/com/softwareverde/database/jdbc/JdbcDatabaseConnection.java
@@ -9,7 +9,11 @@
 import com.softwareverde.database.row.RowFactory;
 import com.softwareverde.util.Util;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/main/java/com/softwareverde/database/jdbc/JdbcDatabaseProperties.java b/src/main/java/com/softwareverde/database/jdbc/JdbcDatabaseProperties.java
@@ -0,0 +1,9 @@
+package com.softwareverde.database.jdbc;
+
+import com.softwareverde.database.properties.DatabaseProperties;
+
+import java.util.Properties;
+
+public interface JdbcDatabaseProperties extends DatabaseProperties {
+    Properties getConnectionProperties();
+}
diff --git a/src/main/java/com/softwareverde/database/query/BatchedInsertQuery.java b/src/main/java/com/softwareverde/database/query/BatchedInsertQuery.java
@@ -4,7 +4,6 @@
 
 import java.util.HashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class BatchedInsertQuery extends Query {
diff --git a/src/main/java/com/softwareverde/database/util/DatabaseUtil.java b/src/main/java/com/softwareverde/database/util/DatabaseUtil.java
@@ -2,10 +2,7 @@
 
 import com.softwareverde.constable.list.List;
 import com.softwareverde.constable.list.immutable.ImmutableListBuilder;
-import com.softwareverde.database.row.Row;
-import com.softwareverde.util.Util;
 
-import java.util.Collection;
 import java.util.Map;
 
 public class DatabaseUtil {
diff --git a/src/test/java/com/softwareverde/database/memory/mysql/MysqlMemoryDatabaseConnection.java b/src/test/java/com/softwareverde/database/memory/mysql/MysqlMemoryDatabaseConnection.java
@@ -6,7 +6,11 @@
 import com.softwareverde.database.query.parameter.TypedParameter;
 import com.softwareverde.database.row.Row;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
