Pass a connection handler to plugins when polling.

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java

@@ -3,7 +3,7 @@ package org.briarproject.bramble.plugin.bluetooth;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 
 import java.io.IOException;
@@ -19,6 +19,7 @@ import javax.microedition.io.StreamConnection;
 import javax.microedition.io.StreamConnectionNotifier;
 
 import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.StringUtils.isValidMac;
 
@@ -27,14 +28,14 @@ import static org.briarproject.bramble.util.StringUtils.isValidMac;
 class JavaBluetoothPlugin extends BluetoothPlugin<StreamConnectionNotifier> {
 
 	private static final Logger LOG =
-			Logger.getLogger(JavaBluetoothPlugin.class.getName());
+			getLogger(JavaBluetoothPlugin.class.getName());
 
 	// Non-null if the plugin started successfully
 	private volatile LocalDevice localDevice = null;
 
 	JavaBluetoothPlugin(BluetoothConnectionLimiter connectionManager,
 			Executor ioExecutor, SecureRandom secureRandom,
-			Backoff backoff, DuplexPluginCallback callback, int maxLatency) {
+			Backoff backoff, PluginCallback callback, int maxLatency) {
 		super(connectionManager, ioExecutor, secureRandom, backoff, callback,
 				maxLatency);
 	}

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java

@@ -4,9 +4,9 @@ import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
+import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 
 import java.security.SecureRandom;
@@ -50,7 +50,7 @@ public class JavaBluetoothPluginFactory implements DuplexPluginFactory {
 	}
 
 	@Override
-	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
+	public DuplexPlugin createPlugin(PluginCallback callback) {
 		BluetoothConnectionLimiter connectionLimiter =
 				new BluetoothConnectionLimiterImpl();
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,

bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java

@@ -1,29 +1,31 @@
 package org.briarproject.bramble.plugin.modem;
 
-import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.plugin.ConnectionHandler;
+import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.util.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Map;
+import java.util.Collection;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -33,11 +35,11 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 			new TransportId("org.briarproject.bramble.modem");
 
 	private static final Logger LOG =
-			Logger.getLogger(ModemPlugin.class.getName());
+			getLogger(ModemPlugin.class.getName());
 
 	private final ModemFactory modemFactory;
 	private final SerialPortList serialPortList;
-	private final DuplexPluginCallback callback;
+	private final PluginCallback callback;
 	private final int maxLatency;
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
@@ -45,7 +47,7 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 	private volatile Modem modem = null;
 
 	ModemPlugin(ModemFactory modemFactory, SerialPortList serialPortList,
-			DuplexPluginCallback callback, int maxLatency) {
+			PluginCallback callback, int maxLatency) {
 		this.modemFactory = modemFactory;
 		this.serialPortList = serialPortList;
 		this.callback = callback;
@@ -116,7 +118,8 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 	}
 
 	@Override
-	public void poll(Map<ContactId, TransportProperties> contacts) {
+	public void poll(Collection<Pair<TransportProperties, ConnectionHandler>>
+			properties) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -144,13 +147,13 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 		if (!running) return null;
 		// Get the ISO 3166 code for the caller's country
 		String fromIso = callback.getLocalProperties().get("iso3166");
-		if (StringUtils.isNullOrEmpty(fromIso)) return null;
+		if (isNullOrEmpty(fromIso)) return null;
 		// Get the ISO 3166 code for the callee's country
 		String toIso = p.get("iso3166");
-		if (StringUtils.isNullOrEmpty(toIso)) return null;
+		if (isNullOrEmpty(toIso)) return null;
 		// Get the callee's phone number
 		String number = p.get("number");
-		if (StringUtils.isNullOrEmpty(number)) return null;
+		if (isNullOrEmpty(number)) return null;
 		// Convert the number into direct dialling form
 		number = CountryCodes.translate(number, fromIso, toIso);
 		if (number == null) return null;
@@ -184,7 +187,7 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
 	@Override
 	public void incomingCallConnected() {
 		LOG.info("Incoming call connected");
-		callback.incomingConnectionCreated(new ModemTransportConnection());
+		callback.handleConnection(new ModemTransportConnection());
 	}
 
 	private class ModemTransportConnection

bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPluginFactory.java

@@ -1,9 +1,9 @@
 package org.briarproject.bramble.plugin.modem;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.reliability.ReliabilityLayerFactory;
 import org.briarproject.bramble.util.StringUtils;
@@ -38,7 +38,7 @@ public class ModemPluginFactory implements DuplexPluginFactory {
 	}
 
 	@Override
-	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
+	public DuplexPlugin createPlugin(PluginCallback callback) {
 		// This plugin is not enabled by default
 		String enabled = callback.getSettings().get("enabled");
 		if (StringUtils.isNullOrEmpty(enabled)) return null;

bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/JavaTorPlugin.java

@@ -4,7 +4,7 @@ import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
@@ -25,7 +25,7 @@ abstract class JavaTorPlugin extends TorPlugin {
 			Clock clock, ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
 			BatteryManager batteryManager, Backoff backoff,
-			DuplexPluginCallback callback, String architecture, int maxLatency,
+			PluginCallback callback, String architecture, int maxLatency,
 			int maxIdleTime, File torDirectory) {
 		super(ioExecutor, networkManager, locationUtils, torSocketFactory,
 				clock, resourceProvider, circumventionProvider, batteryManager,

bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPlugin.java

@@ -7,7 +7,7 @@ import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
@@ -25,7 +25,7 @@ class UnixTorPlugin extends JavaTorPlugin {
 			Clock clock, ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
 			BatteryManager batteryManager, Backoff backoff,
-			DuplexPluginCallback callback, String architecture, int maxLatency,
+			PluginCallback callback, String architecture, int maxLatency,
 			int maxIdleTime, File torDirectory) {
 		super(ioExecutor, networkManager, locationUtils, torSocketFactory,
 				clock, resourceProvider, circumventionProvider, batteryManager,
@@ -40,7 +40,7 @@ class UnixTorPlugin extends JavaTorPlugin {
 
 	private interface CLibrary extends Library {
 
-		CLibrary INSTANCE = (CLibrary) Native.loadLibrary("c", CLibrary.class);
+		CLibrary INSTANCE = Native.loadLibrary("c", CLibrary.class);
 
 		int getpid();
 	}

bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java

@@ -6,10 +6,10 @@ import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
+import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TorConstants;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
@@ -80,7 +80,7 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 	}
 
 	@Override
-	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
+	public DuplexPlugin createPlugin(PluginCallback callback) {
 		// Check that we have a Tor binary for this architecture
 		String architecture = null;
 		if (isLinux()) {

bramble-java/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java

@@ -1,10 +1,10 @@
 package org.briarproject.bramble.plugin.modem;
 
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.test.BrambleTestCase;
+import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.jmock.Expectations;
-import org.jmock.Mockery;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -12,23 +12,29 @@ import java.io.IOException;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-public class ModemPluginTest extends BrambleTestCase {
+public class ModemPluginTest extends BrambleMockTestCase {
 
 	private static final String ISO_1336 = "GB";
 	private static final String NUMBER = "0123456789";
 
+	private final ModemFactory modemFactory = context.mock(ModemFactory.class);
+	private final SerialPortList serialPortList =
+			context.mock(SerialPortList.class);
+	private final PluginCallback callback = context.mock(PluginCallback.class);
+	private final Modem modem = context.mock(Modem.class);
+
+	private ModemPlugin plugin;
+
+	@Before
+	public void setUp() {
+		plugin = new ModemPlugin(modemFactory, serialPortList, callback, 0);
+	}
+
 	@Test
 	public void testModemCreation() throws Exception {
-		Mockery context = new Mockery();
-		ModemFactory modemFactory = context.mock(ModemFactory.class);
-		SerialPortList serialPortList =
-				context.mock(SerialPortList.class);
-		ModemPlugin plugin = new ModemPlugin(modemFactory,
-				serialPortList, null, 0);
-		Modem modem = context.mock(Modem.class);
 		context.checking(new Expectations() {{
 			oneOf(serialPortList).getPortNames();
-			will(returnValue(new String[] { "foo", "bar", "baz" }));
+			will(returnValue(new String[] {"foo", "bar", "baz"}));
 			// First call to createModem() returns false
 			oneOf(modemFactory).createModem(plugin, "foo");
 			will(returnValue(modem));
@@ -45,30 +51,22 @@ public class ModemPluginTest extends BrambleTestCase {
 			oneOf(modem).start();
 			will(returnValue(true));
 		}});
+
 		plugin.start();
-		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testCreateConnection() throws Exception {
-		Mockery context = new Mockery();
-		ModemFactory modemFactory = context.mock(ModemFactory.class);
-		SerialPortList serialPortList =
-				context.mock(SerialPortList.class);
-		DuplexPluginCallback callback =
-				context.mock(DuplexPluginCallback.class);
-		ModemPlugin plugin = new ModemPlugin(modemFactory,
-				serialPortList, callback, 0);
-		Modem modem = context.mock(Modem.class);
 		TransportProperties local = new TransportProperties();
 		local.put("iso3166", ISO_1336);
 		TransportProperties remote = new TransportProperties();
 		remote.put("iso3166", ISO_1336);
 		remote.put("number", NUMBER);
+
 		context.checking(new Expectations() {{
 			// start()
 			oneOf(serialPortList).getPortNames();
-			will(returnValue(new String[] { "foo" }));
+			will(returnValue(new String[] {"foo"}));
 			oneOf(modemFactory).createModem(plugin, "foo");
 			will(returnValue(modem));
 			oneOf(modem).start();
@@ -79,32 +77,24 @@ public class ModemPluginTest extends BrambleTestCase {
 			oneOf(modem).dial(NUMBER);
 			will(returnValue(true));
 		}});
+
 		plugin.start();
 		// A connection should be returned
 		assertNotNull(plugin.createConnection(remote));
-		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testCreateConnectionWhenDialReturnsFalse() throws Exception {
-		Mockery context = new Mockery();
-		ModemFactory modemFactory = context.mock(ModemFactory.class);
-		SerialPortList serialPortList =
-				context.mock(SerialPortList.class);
-		DuplexPluginCallback callback =
-				context.mock(DuplexPluginCallback.class);
-		ModemPlugin plugin = new ModemPlugin(modemFactory,
-				serialPortList, callback, 0);
-		Modem modem = context.mock(Modem.class);
 		TransportProperties local = new TransportProperties();
 		local.put("iso3166", ISO_1336);
 		TransportProperties remote = new TransportProperties();
 		remote.put("iso3166", ISO_1336);
 		remote.put("number", NUMBER);
+
 		context.checking(new Expectations() {{
 			// start()
 			oneOf(serialPortList).getPortNames();
-			will(returnValue(new String[] { "foo" }));
+			will(returnValue(new String[] {"foo"}));
 			oneOf(modemFactory).createModem(plugin, "foo");
 			will(returnValue(modem));
 			oneOf(modem).start();
@@ -115,32 +105,24 @@ public class ModemPluginTest extends BrambleTestCase {
 			oneOf(modem).dial(NUMBER);
 			will(returnValue(false));
 		}});
+
 		plugin.start();
 		// No connection should be returned
 		assertNull(plugin.createConnection(remote));
-		context.assertIsSatisfied();
 	}
 
 	@Test
 	public void testCreateConnectionWhenDialThrowsException() throws Exception {
-		Mockery context = new Mockery();
-		ModemFactory modemFactory = context.mock(ModemFactory.class);
-		SerialPortList serialPortList =
-				context.mock(SerialPortList.class);
-		DuplexPluginCallback callback =
-				context.mock(DuplexPluginCallback.class);
-		ModemPlugin plugin = new ModemPlugin(modemFactory,
-				serialPortList, callback, 0);
-		Modem modem = context.mock(Modem.class);
 		TransportProperties local = new TransportProperties();
 		local.put("iso3166", ISO_1336);
 		TransportProperties remote = new TransportProperties();
 		remote.put("iso3166", ISO_1336);
 		remote.put("number", NUMBER);
+
 		context.checking(new Expectations() {{
 			// start()
 			oneOf(serialPortList).getPortNames();
-			will(returnValue(new String[] { "foo" }));
+			will(returnValue(new String[] {"foo"}));
 			oneOf(modemFactory).createModem(plugin, "foo");
 			will(returnValue(modem));
 			oneOf(modem).start();
@@ -152,15 +134,15 @@ public class ModemPluginTest extends BrambleTestCase {
 			will(throwException(new IOException()));
 			// resetModem()
 			oneOf(serialPortList).getPortNames();
-			will(returnValue(new String[] { "foo" }));
+			will(returnValue(new String[] {"foo"}));
 			oneOf(modemFactory).createModem(plugin, "foo");
 			will(returnValue(modem));
 			oneOf(modem).start();
 			will(returnValue(true));
 		}});
+
 		plugin.start();
 		// No connection should be returned
 		assertNull(plugin.createConnection(remote));
-		context.assertIsSatisfied();
 	}
 }

bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java

@@ -127,7 +127,7 @@ public class BridgeTest extends BrambleTestCase {
 	@Test
 	public void testBridges() throws Exception {
 		DuplexPlugin duplexPlugin =
-				factory.createPlugin(new TorPluginCallBack());
+				factory.createPlugin(new TestPluginCallback());
 		assertNotNull(duplexPlugin);
 		UnixTorPlugin plugin = (UnixTorPlugin) duplexPlugin;
 

bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/TestPluginCallback.java

@@ -1,25 +1,15 @@
 package org.briarproject.bramble.plugin.tor;
 
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.plugin.TransportConnectionReader;
+import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.settings.Settings;
 
 @NotNullByDefault
-public class TorPluginCallBack implements DuplexPluginCallback {
-
-	@Override
-	public void incomingConnectionCreated(DuplexTransportConnection d) {
-
-	}
-
-	@Override
-	public void outgoingConnectionCreated(ContactId c,
-			DuplexTransportConnection d) {
-
-	}
+public class TestPluginCallback implements PluginCallback {
 
 	@Override
 	public Settings getSettings() {
@@ -33,22 +23,29 @@ public class TorPluginCallBack implements DuplexPluginCallback {
 
 	@Override
 	public void mergeSettings(Settings s) {
-
 	}
 
 	@Override
 	public void mergeLocalProperties(TransportProperties p) {
-
 	}
 
 	@Override
 	public void transportEnabled() {
-
 	}
 
 	@Override
 	public void transportDisabled() {
-
 	}
 
+	@Override
+	public void handleConnection(DuplexTransportConnection c) {
+	}
+
+	@Override
+	public void handleReader(TransportConnectionReader r) {
+	}
+
+	@Override
+	public void handleWriter(TransportConnectionWriter w) {
+	}
 }