Fix Unable to create injector
Bug: Issue 7180
Change-Id: Ibdb19aca14fb08ddb494f658fc3a6814dd42f5da
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java
index 4c92dd2..7e2a4c1 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java
@@ -19,18 +19,18 @@
import com.google.gerrit.server.events.ProjectEvent;
import com.google.inject.Inject;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ScheduledExecutorService;
/**
* Listen to Events and store them into the EventStore
*/
class EventHandler implements EventListener {
private final EventStore store;
- private final ScheduledThreadPoolExecutor pool;
+ private final ScheduledExecutorService pool;
@Inject
EventHandler(EventStore store,
- @EventPool ScheduledThreadPoolExecutor pool) {
+ @EventPool ScheduledExecutorService pool) {
this.store = store;
this.pool = pool;
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java
index 25aeef4..1c3f536 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
/**
- * Annotation applied to a ScheduledThreadPoolExecutor.
+ * Annotation applied to a ScheduledExecutorService.
*/
@Retention(RUNTIME)
@BindingAnnotation
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
index bc1c79b..7224b38 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
@@ -50,7 +50,7 @@
import java.util.List;
import java.util.Map.Entry;
import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@Singleton
@@ -67,7 +67,7 @@
private final int connectTime;
private boolean online = true;
private boolean copyLocal;
- private final ScheduledThreadPoolExecutor pool;
+ private final ScheduledExecutorService pool;
private final PermissionBackend permissionBackend;
private ScheduledFuture<?> checkConnTask;
private Path localPath;
@@ -77,7 +77,7 @@
EventsLogConfig cfg,
@EventsDb SQLClient eventsDb,
@LocalEventsDb SQLClient localEventsDb,
- @EventPool ScheduledThreadPoolExecutor pool,
+ @EventPool ScheduledExecutorService pool,
PermissionBackend permissionBackend) {
this.maxAge = cfg.getMaxAge();
this.maxTries = cfg.getMaxTries();
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java
index 68f1ea4..2a82b5a 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java
@@ -28,7 +28,7 @@
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ScheduledExecutorService;
@RunWith(MockitoJUnitRunner.class)
public class EventHandlerTest {
@@ -38,7 +38,7 @@
@Before
public void setUp() {
- ScheduledThreadPoolExecutor poolMock = new PoolMock();
+ ScheduledExecutorService poolMock = new PoolMock();
eventHandler = new EventHandler(storeMock, poolMock);
}
@@ -56,7 +56,7 @@
verifyZeroInteractions(storeMock);
}
- class PoolMock extends ScheduledThreadPoolExecutor {
+ class PoolMock extends ScheduledExecutorService {
PoolMock() {
super(1);
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
index e506e26..f429e39 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
@@ -57,7 +57,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@RunWith(MockitoJUnitRunner.class)
@@ -83,7 +83,7 @@
private SQLClient eventsDb;
private SQLClient localEventsDb;
private SQLStore store;
- private ScheduledThreadPoolExecutor poolMock;
+ private ScheduledExecutorService poolMock;
private Statement stat;
@@ -415,7 +415,7 @@
}
}
- class PoolMock extends ScheduledThreadPoolExecutor {
+ class PoolMock extends ScheduledExecutorService {
PoolMock() {
super(1);
}
