wip

8 files changed, 6 insertions, 12 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/queue/JdbcQueueService.java b/src/main/java/io/trygvis/queue/JdbcQueueService.java
index a366838..ef0b5bb 100644
--- a/src/main/java/io/trygvis/queue/JdbcQueueService.java
+++ b/src/main/java/io/trygvis/queue/JdbcQueueService.java
@@ -1,7 +1,5 @@
 package io.trygvis.queue;
 
-import io.trygvis.async.SqlEffectExecutor;
-
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
diff --git a/src/main/java/io/trygvis/queue/QueueExecutor.java b/src/main/java/io/trygvis/queue/QueueExecutor.java
index 3739532..468059d 100644
--- a/src/main/java/io/trygvis/queue/QueueExecutor.java
+++ b/src/main/java/io/trygvis/queue/QueueExecutor.java
@@ -1,8 +1,6 @@
 package io.trygvis.queue;
 
 import io.trygvis.async.QueueStats;
-import io.trygvis.async.SqlEffect;
-import io.trygvis.async.SqlEffectExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/trygvis/queue/QueueSystem.java b/src/main/java/io/trygvis/queue/QueueSystem.java
index 6710bf4..5954526 100644
--- a/src/main/java/io/trygvis/queue/QueueSystem.java
+++ b/src/main/java/io/trygvis/queue/QueueSystem.java
@@ -1,8 +1,6 @@
 package io.trygvis.queue;
 
 import io.trygvis.async.JdbcAsyncService;
-import io.trygvis.async.SqlEffect;
-import io.trygvis.async.SqlEffectExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/trygvis/async/SqlEffect.java b/src/main/java/io/trygvis/queue/SqlEffect.java
index d0c4e9b..7864bcd 100644
--- a/src/main/java/io/trygvis/async/SqlEffect.java
+++ b/src/main/java/io/trygvis/queue/SqlEffect.java
@@ -1,4 +1,4 @@
-package io.trygvis.async;
+package io.trygvis.queue;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/main/java/io/trygvis/async/SqlEffectExecutor.java b/src/main/java/io/trygvis/queue/SqlEffectExecutor.java
index 3da2cd3..92802da 100644
--- a/src/main/java/io/trygvis/async/SqlEffectExecutor.java
+++ b/src/main/java/io/trygvis/queue/SqlEffectExecutor.java
@@ -1,10 +1,8 @@
-package io.trygvis.async;
+package io.trygvis.queue;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 
 public class SqlEffectExecutor {
 
diff --git a/src/main/java/io/trygvis/spring/DefaultConfig.java b/src/main/java/io/trygvis/spring/DefaultConfig.java
index 3ba28de..6890d58 100644
--- a/src/main/java/io/trygvis/spring/DefaultConfig.java
+++ b/src/main/java/io/trygvis/spring/DefaultConfig.java
@@ -1,7 +1,7 @@
 package io.trygvis.spring;
 
 import io.trygvis.async.AsyncService;
-import io.trygvis.async.SqlEffectExecutor;
+import io.trygvis.queue.SqlEffectExecutor;
 import io.trygvis.queue.QueueService;
 import io.trygvis.queue.QueueSystem;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/io/trygvis/spring/SpringJdbcAsyncService.java b/src/main/java/io/trygvis/spring/SpringJdbcAsyncService.java
index a1c9cda..12dc71e 100644
--- a/src/main/java/io/trygvis/spring/SpringJdbcAsyncService.java
+++ b/src/main/java/io/trygvis/spring/SpringJdbcAsyncService.java
@@ -3,7 +3,7 @@ package io.trygvis.spring;
 import io.trygvis.async.AsyncService;
 import io.trygvis.async.JdbcAsyncService;
 import io.trygvis.async.QueueController;
-import io.trygvis.async.SqlEffect;
+import io.trygvis.queue.SqlEffect;
 import io.trygvis.queue.JdbcQueueService;
 import io.trygvis.queue.Queue;
 import io.trygvis.queue.QueueExecutor;