1 files changed, 6 insertions, 13 deletions
diff --git a/src/main/java/io/trygvis/spring/SpringQueueService.java b/src/main/java/io/trygvis/spring/SpringQueueService.java
index 271e9bf..2027ab5 100644
--- a/src/main/java/io/trygvis/spring/SpringQueueService.java
+++ b/src/main/java/io/trygvis/spring/SpringQueueService.java
@@ -2,9 +2,9 @@ package io.trygvis.spring;
 
 import io.trygvis.queue.JdbcQueueService;
 import io.trygvis.queue.Queue;
+import io.trygvis.queue.QueueExecutor;
 import io.trygvis.queue.QueueService;
 import io.trygvis.queue.QueueSystem;
-import io.trygvis.queue.TaskEffect;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.ConnectionCallback;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -23,21 +23,14 @@ public class SpringQueueService implements QueueService {
 
     public SpringQueueService(QueueSystem queueSystem, JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
-        this.queueService = queueSystem.queueService;
-    }
-
-    /**
-     * @see JdbcQueueService#consumeAll(io.trygvis.queue.Queue, io.trygvis.queue.QueueService.TaskExecutionRequest, io.trygvis.queue.TaskEffect)
-     */
-    public void consume(final Queue queue, TaskExecutionRequest req, final TaskEffect effect) throws SQLException {
-        queueService.consumeAll(queue, req, effect);
+        this.queueService = queueSystem.createQueueService();
     }
 
     @Transactional
-    public Queue getQueue(final String name, final int interval, final boolean autoCreate) throws SQLException {
-        return jdbcTemplate.execute(new ConnectionCallback<Queue>() {
+    public QueueExecutor getQueue(final String name, final int interval, final boolean autoCreate) throws SQLException {
+        return jdbcTemplate.execute(new ConnectionCallback<QueueExecutor>() {
             @Override
-            public Queue doInConnection(Connection c) throws SQLException, DataAccessException {
+            public QueueExecutor doInConnection(Connection c) throws SQLException, DataAccessException {
                 return queueService.lookupQueue(c, name, interval, autoCreate);
             }
         });
@@ -48,7 +41,7 @@ public class SpringQueueService implements QueueService {
         jdbcTemplate.execute(new ConnectionCallback<Object>() {
             @Override
             public Object doInConnection(Connection c) throws SQLException, DataAccessException {
-                queueService.schedule(c, queue, scheduled, arguments);
+                queueService.getQueue(queue.name).schedule(c, scheduled, arguments);
                 return null;
             }
         });