Merge remote-tracking branch 'origin/master'

joshmg · joshmg · commit 7f0467444dae · 2019-07-30T11:23:45.000-04:00
diff --git a/src/main/java/com/softwareverde/database/transaction/DatabaseCallable.java b/src/main/java/com/softwareverde/database/transaction/DatabaseCallable.java
@@ -0,0 +1,8 @@
+package com.softwareverde.database.transaction;
+
+import com.softwareverde.database.DatabaseConnection;
+import com.softwareverde.database.DatabaseException;
+
+public interface DatabaseCallable<ReturnType, ConnectionType> {
+    ReturnType call(final DatabaseConnection<ConnectionType> databaseConnection) throws DatabaseException;
+}
diff --git a/src/main/java/com/softwareverde/database/transaction/DatabaseTransaction.java b/src/main/java/com/softwareverde/database/transaction/DatabaseTransaction.java
@@ -2,6 +2,7 @@
 
 import com.softwareverde.database.DatabaseException;
 
-public interface DatabaseTransaction<T> {
-    void execute(final DatabaseRunnable<T> databaseRunnable) throws DatabaseException;
+public interface DatabaseTransaction<ConnectionType> {
+    void execute(final DatabaseRunnable<ConnectionType> databaseRunnable) throws DatabaseException;
+    <ReturnType> ReturnType call(final DatabaseCallable<ReturnType, ConnectionType> databaseCallable) throws DatabaseException;
 }
diff --git a/src/main/java/com/softwareverde/database/transaction/JdbcDatabaseTransaction.java b/src/main/java/com/softwareverde/database/transaction/JdbcDatabaseTransaction.java
@@ -5,6 +5,7 @@
 import com.softwareverde.database.DatabaseException;
 
 import java.sql.Connection;
+import java.sql.SQLException;
 
 public class JdbcDatabaseTransaction implements DatabaseTransaction<Connection> {
     protected final DatabaseConnectionFactory<Connection> _databaseConnectionFactory;
@@ -27,7 +28,27 @@ public void execute(final DatabaseRunnable<Connection> databaseConnectedRunnable
                 connection.rollback();
                 throw exception;
             }
+        }
+        catch (final Exception exception) {
+            throw new DatabaseException("Unable to complete query.", exception);
+        }
+    }
+
+    @Override
+    public <T> T call(final DatabaseCallable<T, Connection> databaseConnectedCallable) throws DatabaseException {
+        try (final DatabaseConnection<Connection> databaseConnection = _databaseConnectionFactory.newConnection()) {
+            final Connection connection = databaseConnection.getRawConnection();
 
+            try {
+                connection.setAutoCommit(false);
+                final T returnValue = databaseConnectedCallable.call(databaseConnection);
+                connection.commit();
+                return returnValue;
+            }
+            catch (final SQLException exception) {
+                connection.rollback();
+                throw exception;
+            }
         }
         catch (final Exception exception) {
             throw new DatabaseException("Unable to complete query.", exception);

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import com.softwareverde.database.DatabaseException;`
`4`	`4`
`5`		`-public interface DatabaseTransaction<T> {`
`6`		`- void execute(final DatabaseRunnable<T> databaseRunnable) throws DatabaseException;`
	`5`	`+public interface DatabaseTransaction<ConnectionType> {`
	`6`	`+ void execute(final DatabaseRunnable<ConnectionType> databaseRunnable) throws DatabaseException;`
	`7`	`+ <ReturnType> ReturnType call(final DatabaseCallable<ReturnType, ConnectionType> databaseCallable) throws DatabaseException;`
`7`	`8`	`}`