3 files changed, 2 insertions, 64 deletions
diff --git a/src/main/java/io/trygvis/async/QueueController.java b/src/main/java/io/trygvis/async/QueueController.java
index 863d6a5..8aed91f 100644
--- a/src/main/java/io/trygvis/async/QueueController.java
+++ b/src/main/java/io/trygvis/async/QueueController.java
@@ -3,6 +3,8 @@ package io.trygvis.async;
 import io.trygvis.queue.QueueExecutor;
 import io.trygvis.queue.QueueService;
 import io.trygvis.queue.QueueSystem;
+import io.trygvis.queue.SqlEffect;
+import io.trygvis.queue.SqlEffectExecutor;
 import io.trygvis.queue.Task;
 import io.trygvis.queue.TaskEffect;
 import org.slf4j.Logger;
diff --git a/src/main/java/io/trygvis/async/SqlEffect.java b/src/main/java/io/trygvis/async/SqlEffect.java
deleted file mode 100644
index d0c4e9b..0000000
--- a/src/main/java/io/trygvis/async/SqlEffect.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.trygvis.async;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-public interface SqlEffect<A> {
-    A doInConnection(Connection c) throws SQLException;
-
-    interface Void {
-        void doInConnection(Connection c) throws SQLException;
-    }
-}
diff --git a/src/main/java/io/trygvis/async/SqlEffectExecutor.java b/src/main/java/io/trygvis/async/SqlEffectExecutor.java
deleted file mode 100644
index 3da2cd3..0000000
--- a/src/main/java/io/trygvis/async/SqlEffectExecutor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.trygvis.async;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-public class SqlEffectExecutor {
-
-    private final DataSource dataSource;
-
-    public SqlEffectExecutor(DataSource dataSource) {
-        this.dataSource = dataSource;
-    }
-
-    public <A> A transaction(SqlEffect<A> effect) throws SQLException {
-//        int pid;
-
-        try (Connection c = dataSource.getConnection()) {
-//            pid = getPid(c);
-//            System.out.println("pid = " + pid);
-
-            boolean ok = false;
-            try {
-                A a = effect.doInConnection(c);
-                c.commit();
-                ok = true;
-                return a;
-            } finally {
-//                System.out.println("Closing, pid = " + pid);
-                if (!ok) {
-                    try {
-                        c.rollback();
-                    } catch (SQLException e) {
-                        // ignore
-                    }
-                }
-            }
-        }
-    }
-
-    public void transaction(final SqlEffect.Void effect) throws SQLException {
-        transaction(new SqlEffect<Object>() {
-            @Override
-            public Object doInConnection(Connection c) throws SQLException {
-                effect.doInConnection(c);
-                return null;
-            }
-        });
-    }
-}