Wrap scheduler in an interface.

bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutMonitorImpl.java

@@ -3,7 +3,7 @@ package org.briarproject.bramble.io;
 import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.Scheduler;
+import org.briarproject.bramble.api.system.TaskScheduler;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 
 import javax.annotation.concurrent.GuardedBy;
@@ -30,7 +29,7 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 
 	private static final long CHECK_INTERVAL_MS = SECONDS.toMillis(10);
 
-	private final ScheduledExecutorService scheduler;
+	private final TaskScheduler scheduler;
 	private final Executor ioExecutor;
 	private final Clock clock;
 	private final Object lock = new Object();
@@ -41,7 +40,7 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 	private Future<?> task = null;
 
 	@Inject
-	TimeoutMonitorImpl(@Scheduler ScheduledExecutorService scheduler,
+	TimeoutMonitorImpl(TaskScheduler scheduler,
 			@IoExecutor Executor ioExecutor, Clock clock) {
 		this.scheduler = scheduler;
 		this.ioExecutor = ioExecutor;
@@ -74,7 +73,7 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 		if (toCancel != null) toCancel.cancel(false);
 	}
 
-	@Scheduler
+	// Scheduler
 	private void checkTimeouts() {
 		ioExecutor.execute(() -> {
 			List<TimeoutInputStream> snapshot;

bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java

@@ -26,7 +26,7 @@ import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.Scheduler;
+import org.briarproject.bramble.api.system.TaskScheduler;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -36,7 +36,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
@@ -58,7 +57,7 @@ class PollerImpl implements Poller, EventListener {
 	private static final Logger LOG = getLogger(PollerImpl.class.getName());
 
 	private final Executor ioExecutor;
-	private final ScheduledExecutorService scheduler;
+	private final TaskScheduler scheduler;
 	private final ConnectionManager connectionManager;
 	private final ConnectionRegistry connectionRegistry;
 	private final PluginManager pluginManager;
@@ -71,11 +70,13 @@ class PollerImpl implements Poller, EventListener {
 
 	@Inject
 	PollerImpl(@IoExecutor Executor ioExecutor,
-			@Scheduler ScheduledExecutorService scheduler,
+			TaskScheduler scheduler,
 			ConnectionManager connectionManager,
-			ConnectionRegistry connectionRegistry, PluginManager pluginManager,
+			ConnectionRegistry connectionRegistry,
+			PluginManager pluginManager,
 			TransportPropertyManager transportPropertyManager,
-			SecureRandom random, Clock clock) {
+			SecureRandom random,
+			Clock clock) {
 		this.ioExecutor = ioExecutor;
 		this.scheduler = scheduler;
 		this.connectionManager = connectionManager;

bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java

@@ -41,7 +41,7 @@ import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedE
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousPollEvent;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.Scheduler;
+import org.briarproject.bramble.api.system.TaskScheduler;
 
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
@@ -52,7 +52,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 
@@ -80,7 +79,7 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 	private static final Logger LOG =
 			getLogger(RendezvousPollerImpl.class.getName());
 
-	private final ScheduledExecutorService scheduler;
+	private final TaskScheduler scheduler;
 	private final DatabaseComponent db;
 	private final IdentityManager identityManager;
 	private final TransportCrypto transportCrypto;
@@ -105,7 +104,7 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 
 	@Inject
 	RendezvousPollerImpl(@IoExecutor Executor ioExecutor,
-			@Scheduler ScheduledExecutorService scheduler,
+			TaskScheduler scheduler,
 			DatabaseComponent db,
 			IdentityManager identityManager,
 			TransportCrypto transportCrypto,
@@ -205,7 +204,7 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 		return plugin.createRendezvousEndpoint(k, cs.alice, h);
 	}
 
-	@Scheduler
+	// Scheduler
 	private void poll() {
 		worker.execute(() -> {
 			removeExpiredPendingContacts();

bramble-core/src/main/java/org/briarproject/bramble/system/SystemModule.java

@@ -2,7 +2,7 @@ package org.briarproject.bramble.system;
 
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.Scheduler;
+import org.briarproject.bramble.api.system.TaskScheduler;
 
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ScheduledExecutorService;
@@ -19,17 +19,16 @@ public class SystemModule {
 
 	public static class EagerSingletons {
 		@Inject
-		@Scheduler
-		ScheduledExecutorService scheduledExecutorService;
+		TaskScheduler scheduler;
 	}
 
-	private final ScheduledExecutorService scheduler;
+	private final ScheduledExecutorService scheduledExecutorService;
 
 	public SystemModule() {
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ScheduledThreadPoolExecutor.DiscardPolicy();
-		scheduler = new ScheduledThreadPoolExecutor(1, policy);
+		scheduledExecutorService = new ScheduledThreadPoolExecutor(1, policy);
 	}
 
 	@Provides
@@ -39,10 +38,8 @@ public class SystemModule {
 
 	@Provides
 	@Singleton
-	@Scheduler
-	ScheduledExecutorService provideScheduledExecutorService(
-			LifecycleManager lifecycleManager) {
-		lifecycleManager.registerForShutdown(scheduler);
-		return scheduler;
+	TaskScheduler provideTaskScheduler(LifecycleManager lifecycleManager) {
+		lifecycleManager.registerForShutdown(scheduledExecutorService);
+		return new TaskSchedulerImpl(scheduledExecutorService);
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java

@@ -0,0 +1,43 @@
+package org.briarproject.bramble.system;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.TaskScheduler;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.concurrent.ThreadSafe;
+
+/**
+ * A {@link TaskScheduler} that delegates all calls to a
+ * {@link ScheduledExecutorService}.
+ */
+@ThreadSafe
+@NotNullByDefault
+class TaskSchedulerImpl implements TaskScheduler {
+
+	private final ScheduledExecutorService delegate;
+
+	TaskSchedulerImpl(ScheduledExecutorService delegate) {
+		this.delegate = delegate;
+	}
+
+	@Override
+	public ScheduledFuture<?> schedule(Runnable task, long delay,
+			TimeUnit unit) {
+		return delegate.schedule(task, delay, unit);
+	}
+
+	@Override
+	public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long delay,
+			long interval, TimeUnit unit) {
+		return delegate.scheduleAtFixedRate(task, delay, interval, unit);
+	}
+
+	@Override
+	public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, long delay,
+			long interval, TimeUnit unit) {
+		return delegate.scheduleWithFixedDelay(task, delay, interval, unit);
+	}
+}

bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerFactoryImpl.java

@@ -6,10 +6,9 @@ import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.Scheduler;
+import org.briarproject.bramble.api.system.TaskScheduler;
 
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
@@ -22,14 +21,15 @@ class TransportKeyManagerFactoryImpl implements
 	private final DatabaseComponent db;
 	private final TransportCrypto transportCrypto;
 	private final Executor dbExecutor;
-	private final ScheduledExecutorService scheduler;
+	private final TaskScheduler scheduler;
 	private final Clock clock;
 
 	@Inject
 	TransportKeyManagerFactoryImpl(DatabaseComponent db,
 			TransportCrypto transportCrypto,
 			@DatabaseExecutor Executor dbExecutor,
-			@Scheduler ScheduledExecutorService scheduler, Clock clock) {
+			TaskScheduler scheduler,
+			Clock clock) {
 		this.db = db;
 		this.transportCrypto = transportCrypto;
 		this.dbExecutor = dbExecutor;

bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java

@@ -11,7 +11,7 @@ import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.Scheduler;
+import org.briarproject.bramble.api.system.TaskScheduler;
 import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.api.transport.StreamContext;
 import org.briarproject.bramble.api.transport.TransportKeySet;
@@ -24,7 +24,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
@@ -53,7 +52,7 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 	private final DatabaseComponent db;
 	private final TransportCrypto transportCrypto;
 	private final Executor dbExecutor;
-	private final ScheduledExecutorService scheduler;
+	private final TaskScheduler scheduler;
 	private final Clock clock;
 	private final TransportId transportId;
 	private final long timePeriodLength;
@@ -72,9 +71,12 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 			pendingContactOutContexts = new HashMap<>();
 
 	TransportKeyManagerImpl(DatabaseComponent db,
-			TransportCrypto transportCrypto, Executor dbExecutor,
-			@Scheduler ScheduledExecutorService scheduler, Clock clock,
-			TransportId transportId, long maxLatency) {
+			TransportCrypto transportCrypto,
+			Executor dbExecutor,
+			TaskScheduler scheduler,
+			Clock clock,
+			TransportId transportId,
+			long maxLatency) {
 		this.db = db;
 		this.transportCrypto = transportCrypto;
 		this.dbExecutor = dbExecutor;

bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java

@@ -19,6 +19,7 @@ import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.TaskScheduler;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.ImmediateExecutor;
 import org.briarproject.bramble.test.RunAction;
@@ -30,7 +31,6 @@ import org.junit.Test;
 import java.security.SecureRandom;
 import java.util.List;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 
 import static java.util.Arrays.asList;
@@ -45,8 +45,7 @@ import static org.briarproject.bramble.test.TestUtils.getTransportId;
 
 public class PollerImplTest extends BrambleMockTestCase {
 
-	private final ScheduledExecutorService scheduler =
-			context.mock(ScheduledExecutorService.class);
+	private final TaskScheduler scheduler = context.mock(TaskScheduler.class);
 	private final ConnectionManager connectionManager =
 			context.mock(ConnectionManager.class);
 	private final ConnectionRegistry connectionRegistry =
@@ -56,7 +55,8 @@ public class PollerImplTest extends BrambleMockTestCase {
 	private final TransportPropertyManager transportPropertyManager =
 			context.mock(TransportPropertyManager.class);
 	private final Clock clock = context.mock(Clock.class);
-	private final ScheduledFuture future = context.mock(ScheduledFuture.class);
+	private final ScheduledFuture<?> future =
+			context.mock(ScheduledFuture.class);
 	private final SecureRandom random;
 
 	private final Executor ioExecutor = new ImmediateExecutor();

bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java

@@ -26,6 +26,7 @@ import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedE
 import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousPollEvent;
 import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.TaskScheduler;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.CaptureArgumentAction;
 import org.briarproject.bramble.test.DbExpectations;
@@ -37,7 +38,6 @@ import org.junit.Test;
 
 import java.util.Random;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static java.util.Collections.emptyList;
@@ -60,8 +60,7 @@ import static org.briarproject.bramble.test.TestUtils.getTransportProperties;
 
 public class RendezvousPollerImplTest extends BrambleMockTestCase {
 
-	private final ScheduledExecutorService scheduler =
-			context.mock(ScheduledExecutorService.class);
+	private final TaskScheduler scheduler = context.mock(TaskScheduler.class);
 	private final DatabaseComponent db = context.mock(DatabaseComponent.class);
 	private final IdentityManager identityManager =
 			context.mock(IdentityManager.class);

bramble-core/src/test/java/org/briarproject/bramble/transport/TransportKeyManagerImplTest.java

@@ -8,6 +8,7 @@ import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.TaskScheduler;
 import org.briarproject.bramble.api.transport.IncomingKeys;
 import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.api.transport.OutgoingKeys;
@@ -29,7 +30,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -55,8 +55,7 @@ public class TransportKeyManagerImplTest extends BrambleMockTestCase {
 	private final TransportCrypto transportCrypto =
 			context.mock(TransportCrypto.class);
 	private final Executor dbExecutor = context.mock(Executor.class);
-	private final ScheduledExecutorService scheduler =
-			context.mock(ScheduledExecutorService.class);
+	private final TaskScheduler scheduler = context.mock(TaskScheduler.class);
 	private final Clock clock = context.mock(Clock.class);
 
 	private final TransportId transportId = getTransportId();