diff --git a/pom.xml b/pom.xml
index ad769a1..92c356f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,9 @@
1.6
- 1.3.29
+ 2.0.22
+ 30.1.1-jre
+ 3.12.0
0.9.12
3.9.0
4.13.2
@@ -82,10 +84,22 @@
io.dropwizard
- dropwizard-jdbi
+ dropwizard-jdbi3
${dropwizard.jdbi.version}
+
+ com.google.guava
+ guava
+ ${com.google.guava.version}
+
+
+
+ org.apache.commons
+ commons-lang3
+ ${org.apache.commons.version}
+
+
org.reflections
reflections
@@ -276,4 +290,4 @@
-
+
\ No newline at end of file
diff --git a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/JdbiUnitOfWork.java b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/JdbiUnitOfWork.java
index 99a6031..fe02e3a 100644
--- a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/JdbiUnitOfWork.java
+++ b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/JdbiUnitOfWork.java
@@ -32,4 +32,4 @@
@Retention(RUNTIME)
@Documented
public @interface JdbiUnitOfWork {
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/DefaultJdbiHandleManager.java b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/DefaultJdbiHandleManager.java
index 296f122..575efef 100644
--- a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/DefaultJdbiHandleManager.java
+++ b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/DefaultJdbiHandleManager.java
@@ -13,8 +13,8 @@
*/
package com.github.isopropylcyanide.jdbiunitofwork.core;
-import org.skife.jdbi.v2.DBI;
-import org.skife.jdbi.v2.Handle;
+import org.jdbi.v3.core.Handle;
+import org.jdbi.v3.core.Jdbi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,15 +32,15 @@
public class DefaultJdbiHandleManager implements JdbiHandleManager {
private static final Logger log = LoggerFactory.getLogger(DefaultJdbiHandleManager.class);
- private final DBI dbi;
+ private final Jdbi jdbi;
- public DefaultJdbiHandleManager(DBI dbi) {
- this.dbi = dbi;
+ public DefaultJdbiHandleManager(Jdbi jdbi) {
+ this.jdbi = jdbi;
}
@Override
public Handle get() {
- Handle handle = dbi.open();
+ Handle handle = jdbi.open();
log.debug("handle [{}] : Thread Id [{}]", handle.hashCode(), Thread.currentThread().getId());
return handle;
}
@@ -49,4 +49,4 @@ public Handle get() {
public void clear() {
log.debug("No Op");
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiHandleManager.java b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiHandleManager.java
index 61af43b..64c2f05 100644
--- a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiHandleManager.java
+++ b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiHandleManager.java
@@ -13,10 +13,10 @@
*/
package com.github.isopropylcyanide.jdbiunitofwork.core;
-import org.skife.jdbi.v2.Handle;
-
import java.util.concurrent.ThreadFactory;
+import org.jdbi.v3.core.Handle;
+
/**
* A {@link JdbiHandleManager} is used to provide the lifecycle of a {@link Handle} with respect
* to a given scope. A scope may be session based, request based or may be invoked on every run.
@@ -65,4 +65,4 @@ default ThreadFactory createThreadFactory() {
default String getConversationId() {
return String.valueOf(Thread.currentThread().getId());
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiTransactionAspect.java b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiTransactionAspect.java
index dcd4caf..94b3e5a 100644
--- a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiTransactionAspect.java
+++ b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiTransactionAspect.java
@@ -13,7 +13,7 @@
*/
package com.github.isopropylcyanide.jdbiunitofwork.core;
-import org.skife.jdbi.v2.Handle;
+import org.jdbi.v3.core.Handle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,4 +84,4 @@ public void terminateHandle() {
handle = null;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/LinkedRequestScopedJdbiHandleManager.java b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/LinkedRequestScopedJdbiHandleManager.java
index c9b1e87..7ff1b1a 100644
--- a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/LinkedRequestScopedJdbiHandleManager.java
+++ b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/LinkedRequestScopedJdbiHandleManager.java
@@ -15,8 +15,8 @@
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.commons.lang3.StringUtils;
-import org.skife.jdbi.v2.DBI;
-import org.skife.jdbi.v2.Handle;
+import org.jdbi.v3.core.Handle;
+import org.jdbi.v3.core.Jdbi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,10 +46,10 @@ public class LinkedRequestScopedJdbiHandleManager implements JdbiHandleManager {
private static final Logger log = LoggerFactory.getLogger(LinkedRequestScopedJdbiHandleManager.class);
private static final String NAME_FORMAT = "[%s]-%%d";
private final Map parentThreadHandleMap = new ConcurrentHashMap<>();
- private final DBI dbi;
+ private final Jdbi jdbi;
- public LinkedRequestScopedJdbiHandleManager(DBI dbi) {
- this.dbi = dbi;
+ public LinkedRequestScopedJdbiHandleManager(Jdbi jdbi) {
+ this.jdbi = jdbi;
}
@Override
@@ -94,8 +94,8 @@ private Handle getHandle() {
if (parentThreadHandleMap.containsKey(threadIdentity)) {
return parentThreadHandleMap.get(threadIdentity);
}
- Handle handle = dbi.open();
+ Handle handle = jdbi.open();
parentThreadHandleMap.putIfAbsent(threadIdentity, handle);
return handle;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/ManagedHandleInvocationHandler.java b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/ManagedHandleInvocationHandler.java
index 260b1b5..aeb4cb6 100644
--- a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/ManagedHandleInvocationHandler.java
+++ b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/ManagedHandleInvocationHandler.java
@@ -13,7 +13,7 @@
*/
package com.github.isopropylcyanide.jdbiunitofwork.core;
-import org.skife.jdbi.v2.Handle;
+import org.jdbi.v3.core.Handle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,4 +73,4 @@ private Object handleInvocation(Method method, Object[] args) throws IllegalAcce
public String toString() {
return "Proxy[" + underlying.getSimpleName() + "]";
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/RequestScopedJdbiHandleManager.java b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/RequestScopedJdbiHandleManager.java
index 06085af..846fb0b 100644
--- a/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/RequestScopedJdbiHandleManager.java
+++ b/src/main/java/com/github/isopropylcyanide/jdbiunitofwork/core/RequestScopedJdbiHandleManager.java
@@ -13,8 +13,8 @@
*/
package com.github.isopropylcyanide.jdbiunitofwork.core;
-import org.skife.jdbi.v2.DBI;
-import org.skife.jdbi.v2.Handle;
+import org.jdbi.v3.core.Handle;
+import org.jdbi.v3.core.Jdbi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,17 +30,17 @@
public class RequestScopedJdbiHandleManager implements JdbiHandleManager {
private static final Logger log = LoggerFactory.getLogger(RequestScopedJdbiHandleManager.class);
- private final DBI dbi;
+ private final Jdbi jdbi;
private final ThreadLocal threadLocal = new ThreadLocal<>();
- public RequestScopedJdbiHandleManager(DBI dbi) {
- this.dbi = dbi;
+ public RequestScopedJdbiHandleManager(Jdbi jdbi) {
+ this.jdbi = jdbi;
}
@Override
public Handle get() {
if (threadLocal.get() == null) {
- threadLocal.set(dbi.open());
+ threadLocal.set(jdbi.open());
}
Handle handle = threadLocal.get();
log.debug("handle [{}] : Thread Id [{}]", handle.hashCode(), Thread.currentThread().getId());
@@ -58,4 +58,4 @@ public void clear() {
log.debug("Clearing handle member for thread [{}] ", Thread.currentThread().getId());
}
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/DefaultJdbiHandleManagerTest.java b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/DefaultJdbiHandleManagerTest.java
index a2b073c..ef9477d 100644
--- a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/DefaultJdbiHandleManagerTest.java
+++ b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/DefaultJdbiHandleManagerTest.java
@@ -1,10 +1,10 @@
package com.github.isopropylcyanide.jdbiunitofwork.core;
+import org.jdbi.v3.core.Handle;
+import org.jdbi.v3.core.Jdbi;
import org.junit.Before;
import org.junit.Test;
import org.mockito.stubbing.Answer;
-import org.skife.jdbi.v2.DBI;
-import org.skife.jdbi.v2.Handle;
import static org.junit.Assert.assertNotEquals;
import static org.mockito.Mockito.mock;
@@ -15,19 +15,19 @@
public class DefaultJdbiHandleManagerTest {
- private DBI dbi;
+ private Jdbi jdbi;
private DefaultJdbiHandleManager manager;
@Before
public void setUp() {
- dbi = mock(DBI.class);
- this.manager = new DefaultJdbiHandleManager(dbi);
+ jdbi = mock(Jdbi.class);
+ this.manager = new DefaultJdbiHandleManager(jdbi);
}
@Test
public void testGetSetsTheHandlePerInvocation() throws InterruptedException {
- when(dbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
+ when(jdbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
Handle firstHandle = manager.get();
Handle secondHandle = manager.get();
assertNotEquals(firstHandle, secondHandle);
@@ -35,13 +35,13 @@ public void testGetSetsTheHandlePerInvocation() throws InterruptedException {
Thread newHandleInvokerThread = new Thread(() -> assertNotEquals(firstHandle, manager.get()));
newHandleInvokerThread.start();
newHandleInvokerThread.join();
- verify(dbi, times(3)).open();
+ verify(jdbi, times(3)).open();
}
@Test
public void testClear() {
manager.clear();
- verify(dbi, never()).open();
+ verify(jdbi, never()).open();
}
@Test(expected = UnsupportedOperationException.class)
diff --git a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiTransactionAspectTest.java b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiTransactionAspectTest.java
index 55dc8ac..cdf1f27 100644
--- a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiTransactionAspectTest.java
+++ b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/JdbiTransactionAspectTest.java
@@ -1,8 +1,8 @@
package com.github.isopropylcyanide.jdbiunitofwork.core;
+import org.jdbi.v3.core.Handle;
import org.junit.Before;
import org.junit.Test;
-import org.skife.jdbi.v2.Handle;
import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.doReturn;
diff --git a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/LinkedRequestScopedJdbiHandleManagerTest.java b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/LinkedRequestScopedJdbiHandleManagerTest.java
index da05780..49ae7d0 100644
--- a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/LinkedRequestScopedJdbiHandleManagerTest.java
+++ b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/LinkedRequestScopedJdbiHandleManagerTest.java
@@ -1,10 +1,10 @@
package com.github.isopropylcyanide.jdbiunitofwork.core;
+import org.jdbi.v3.core.Handle;
+import org.jdbi.v3.core.Jdbi;
import org.junit.Before;
import org.junit.Test;
import org.mockito.stubbing.Answer;
-import org.skife.jdbi.v2.DBI;
-import org.skife.jdbi.v2.Handle;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
@@ -21,40 +21,40 @@
public class LinkedRequestScopedJdbiHandleManagerTest {
- private DBI dbi;
+ private Jdbi jdbi;
private LinkedRequestScopedJdbiHandleManager manager;
@Before
public void setUp() {
- dbi = mock(DBI.class);
- this.manager = new LinkedRequestScopedJdbiHandleManager(dbi);
+ jdbi = mock(Jdbi.class);
+ this.manager = new LinkedRequestScopedJdbiHandleManager(jdbi);
}
@Test
public void testGetSetsSameHandleForMultipleInvocationsInSameThread() {
- when(dbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
+ when(jdbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
Handle firstHandle = manager.get();
Handle secondHandle = manager.get();
assertEquals(firstHandle, secondHandle);
- verify(dbi, times(1)).open();
+ verify(jdbi, times(1)).open();
}
@Test
public void testGetSetsNewHandleForEachThread() throws InterruptedException {
- when(dbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
+ when(jdbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
Handle handleThreadA = manager.get();
Thread newHandleInvokerThread = new Thread(() -> assertNotEquals(handleThreadA, manager.get()));
newHandleInvokerThread.start();
newHandleInvokerThread.join();
- verify(dbi, times(2)).open();
+ verify(jdbi, times(2)).open();
}
@Test
public void testGetSetsSameHandleForChildThreadsIfTheThreadFactoryIsPlaced() throws InterruptedException {
- when(dbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
+ when(jdbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
Handle parentHandle = manager.get();
ThreadFactory threadFactory = manager.createThreadFactory();
@@ -71,12 +71,12 @@ public void testGetSetsSameHandleForChildThreadsIfTheThreadFactoryIsPlaced() thr
}
service.shutdown();
endGate.await();
- verify(dbi, times(1)).open();
+ verify(jdbi, times(1)).open();
}
@Test
public void testGetSetsNewHandleForChildThreadsIfTheThreadFactoryIsNotPlaced() throws InterruptedException {
- when(dbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
+ when(jdbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
Handle parentHandle = manager.get();
final int NUM_THREADS = 5;
@@ -92,23 +92,23 @@ public void testGetSetsNewHandleForChildThreadsIfTheThreadFactoryIsNotPlaced() t
}
service.shutdown();
endGate.await();
- verify(dbi, times(NUM_THREADS + 1)).open();
+ verify(jdbi, times(NUM_THREADS + 1)).open();
}
@Test
public void testClearClosesHandleAndClearsHandle() {
Handle mockHandle = mock(Handle.class);
- when(dbi.open()).thenReturn(mockHandle);
+ when(jdbi.open()).thenReturn(mockHandle);
manager.get();
manager.clear();
- verify(dbi, times(1)).open();
+ verify(jdbi, times(1)).open();
verify(mockHandle, times(1)).close();
}
@Test
public void testClearDoesNothingWhenHandleIsNull() {
manager.clear();
- verify(dbi, never()).open();
+ verify(jdbi, never()).open();
}
}
diff --git a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/ManagedHandleInvocationHandlerTest.java b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/ManagedHandleInvocationHandlerTest.java
index 38f679b..7176082 100644
--- a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/ManagedHandleInvocationHandlerTest.java
+++ b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/ManagedHandleInvocationHandlerTest.java
@@ -1,9 +1,9 @@
package com.github.isopropylcyanide.jdbiunitofwork.core;
import com.google.common.reflect.Reflection;
+import org.jdbi.v3.core.Handle;
import org.junit.Before;
import org.junit.Test;
-import org.skife.jdbi.v2.Handle;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/RequestScopedJdbiHandleManagerTest.java b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/RequestScopedJdbiHandleManagerTest.java
index 75695f6..b36a3f1 100644
--- a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/RequestScopedJdbiHandleManagerTest.java
+++ b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/core/RequestScopedJdbiHandleManagerTest.java
@@ -1,10 +1,10 @@
package com.github.isopropylcyanide.jdbiunitofwork.core;
+import org.jdbi.v3.core.Handle;
+import org.jdbi.v3.core.Jdbi;
import org.junit.Before;
import org.junit.Test;
import org.mockito.stubbing.Answer;
-import org.skife.jdbi.v2.DBI;
-import org.skife.jdbi.v2.Handle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -16,52 +16,52 @@
public class RequestScopedJdbiHandleManagerTest {
- private DBI dbi;
+ private Jdbi jdbi;
private RequestScopedJdbiHandleManager manager;
@Before
public void setUp() {
- dbi = mock(DBI.class);
- this.manager = new RequestScopedJdbiHandleManager(dbi);
+ jdbi = mock(Jdbi.class);
+ this.manager = new RequestScopedJdbiHandleManager(jdbi);
}
@Test
public void testGetSetsSameHandleForMultipleInvocationsInSameThread() {
- when(dbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
+ when(jdbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
Handle firstHandle = manager.get();
Handle secondHandle = manager.get();
assertEquals(firstHandle, secondHandle);
- verify(dbi, times(1)).open();
+ verify(jdbi, times(1)).open();
}
@Test
public void testGetSetsNewHandleForEachThread() throws InterruptedException {
- when(dbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
+ when(jdbi.open()).thenAnswer((Answer) invocation -> mock(Handle.class));
Handle handleThreadA = manager.get();
Thread newHandleInvokerThread = new Thread(() -> assertNotEquals(handleThreadA, manager.get()));
newHandleInvokerThread.start();
newHandleInvokerThread.join();
- verify(dbi, times(2)).open();
+ verify(jdbi, times(2)).open();
}
@Test
public void testClearClosesHandleAndClearsThreadLocal() {
Handle mockHandle = mock(Handle.class);
- when(dbi.open()).thenReturn(mockHandle);
+ when(jdbi.open()).thenReturn(mockHandle);
manager.get();
manager.clear();
- verify(dbi, times(1)).open();
+ verify(jdbi, times(1)).open();
verify(mockHandle, times(1)).close();
}
@Test
public void testClearDoesNothingWhenHandleIsNull() {
manager.clear();
- verify(dbi, never()).open();
+ verify(jdbi, never()).open();
}
@Test(expected = UnsupportedOperationException.class)
diff --git a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/HttpGetRequestJdbiUnitOfWorkEventListenerTest.java b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/HttpGetRequestJdbiUnitOfWorkEventListenerTest.java
index 20f27f9..23b622a 100644
--- a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/HttpGetRequestJdbiUnitOfWorkEventListenerTest.java
+++ b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/HttpGetRequestJdbiUnitOfWorkEventListenerTest.java
@@ -2,9 +2,9 @@
import com.github.isopropylcyanide.jdbiunitofwork.core.JdbiHandleManager;
import org.glassfish.jersey.server.monitoring.RequestEvent;
+import org.jdbi.v3.core.Handle;
import org.junit.Before;
import org.junit.Test;
-import org.skife.jdbi.v2.Handle;
import static org.glassfish.jersey.server.monitoring.RequestEvent.Type.FINISHED;
import static org.glassfish.jersey.server.monitoring.RequestEvent.Type.RESOURCE_METHOD_START;
diff --git a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/JdbiUnitOfWorkApplicationEventListenerTest.java b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/JdbiUnitOfWorkApplicationEventListenerTest.java
index b0efd86..8f13f3c 100644
--- a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/JdbiUnitOfWorkApplicationEventListenerTest.java
+++ b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/JdbiUnitOfWorkApplicationEventListenerTest.java
@@ -5,13 +5,13 @@
import org.glassfish.jersey.server.monitoring.ApplicationEvent;
import org.glassfish.jersey.server.monitoring.RequestEvent;
import org.glassfish.jersey.server.monitoring.RequestEventListener;
+import org.jdbi.v3.core.Handle;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import org.skife.jdbi.v2.Handle;
import javax.ws.rs.HttpMethod;
import java.util.Set;
diff --git a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/NonHttpGetRequestJdbiUnitOfWorkEventListenerTest.java b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/NonHttpGetRequestJdbiUnitOfWorkEventListenerTest.java
index 4e42ae6..ff00f21 100644
--- a/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/NonHttpGetRequestJdbiUnitOfWorkEventListenerTest.java
+++ b/src/test/java/com/github/isopropylcyanide/jdbiunitofwork/listener/NonHttpGetRequestJdbiUnitOfWorkEventListenerTest.java
@@ -7,10 +7,10 @@
import org.glassfish.jersey.server.model.Resource;
import org.glassfish.jersey.server.model.ResourceMethod;
import org.glassfish.jersey.server.monitoring.RequestEvent;
+import org.jdbi.v3.core.Handle;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.skife.jdbi.v2.Handle;
import static org.glassfish.jersey.server.monitoring.RequestEvent.Type.FINISHED;
import static org.glassfish.jersey.server.monitoring.RequestEvent.Type.ON_EXCEPTION;