Merge remote-tracking branch 'origin/master'

joshmg · joshmg · commit 8dad6029ed32 · 2019-07-29T14:34:55.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'com.softwareverde'
-version '4.0.0'
+version '3.0.0'
 
 apply plugin: 'java'
 
diff --git a/src/main/java/com/softwareverde/database/transaction/JdbcDatabaseTransaction.java b/src/main/java/com/softwareverde/database/transaction/JdbcDatabaseTransaction.java
@@ -1,32 +1,31 @@
 package com.softwareverde.database.transaction;
 
-import com.softwareverde.database.Database;
 import com.softwareverde.database.DatabaseConnection;
+import com.softwareverde.database.DatabaseConnectionFactory;
 import com.softwareverde.database.DatabaseException;
 
 import java.sql.Connection;
-import java.sql.SQLException;
 
 public class JdbcDatabaseTransaction implements DatabaseTransaction<Connection> {
-    protected final Database<Connection> _database;
+    protected final DatabaseConnectionFactory<Connection> _databaseConnectionFactory;
 
-    public JdbcDatabaseTransaction(final Database<Connection> database) {
-        _database = database;
+    public JdbcDatabaseTransaction(final DatabaseConnectionFactory<Connection> databaseConnectionFactory) {
+        _databaseConnectionFactory = databaseConnectionFactory;
     }
 
     @Override
     public void execute(final DatabaseRunnable<Connection> databaseConnectedRunnable) throws DatabaseException {
-        try (final DatabaseConnection<Connection> databaseConnection = _database.newConnection()) {
+        try (final DatabaseConnection<Connection> databaseConnection = _databaseConnectionFactory.newConnection()) {
             final Connection connection = databaseConnection.getRawConnection(); // Should be closed for us by DatabaseConnection.close()
 
             try {
                 connection.setAutoCommit(false);
                 databaseConnectedRunnable.run(databaseConnection);
                 connection.commit();
             }
-            catch (final SQLException sqlException) {
+            catch (final Exception exception) {
                 connection.rollback();
-                throw sqlException;
+                throw exception;
             }
 
         }
