From c202b6f0acfa9b21e3fdee5629f492c9dd0389fc Mon Sep 17 00:00:00 2001 From: akwizgran <akwizgran@users.sourceforge.net> Date: Wed, 5 Nov 2014 19:47:54 +0000 Subject: [PATCH] Renamed ConnectionManager to ConnectionDispatcher. Because that's what it does. --- .../api/plugins/ConnectionDispatcher.java | 18 ------------------ .../api/plugins/ConnectionManager.java | 18 ++++++++++++++++++ .../invitation/AliceConnector.java | 6 +++--- .../briarproject/invitation/BobConnector.java | 6 +++--- .../org/briarproject/invitation/Connector.java | 12 ++++++------ .../invitation/ConnectorGroup.java | 12 ++++++------ .../invitation/InvitationTaskFactoryImpl.java | 14 +++++++------- ...herImpl.java => ConnectionManagerImpl.java} | 16 ++++++++-------- .../plugins/PluginManagerImpl.java | 16 ++++++++-------- .../briarproject/plugins/PluginsModule.java | 4 ++-- .../plugins/PluginManagerImplTest.java | 6 +++--- 11 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 briar-api/src/org/briarproject/api/plugins/ConnectionDispatcher.java create mode 100644 briar-api/src/org/briarproject/api/plugins/ConnectionManager.java rename briar-core/src/org/briarproject/plugins/{ConnectionDispatcherImpl.java => ConnectionManagerImpl.java} (96%) diff --git a/briar-api/src/org/briarproject/api/plugins/ConnectionDispatcher.java b/briar-api/src/org/briarproject/api/plugins/ConnectionDispatcher.java deleted file mode 100644 index d63518a70b..0000000000 --- a/briar-api/src/org/briarproject/api/plugins/ConnectionDispatcher.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.briarproject.api.plugins; - -import org.briarproject.api.ContactId; -import org.briarproject.api.TransportId; -import org.briarproject.api.plugins.duplex.DuplexTransportConnection; - -public interface ConnectionDispatcher { - - void dispatchIncomingConnection(TransportId t, TransportConnectionReader r); - - void dispatchIncomingConnection(TransportId t, DuplexTransportConnection d); - - void dispatchOutgoingConnection(ContactId c, TransportId t, - TransportConnectionWriter w); - - void dispatchOutgoingConnection(ContactId c, TransportId t, - DuplexTransportConnection d); -} diff --git a/briar-api/src/org/briarproject/api/plugins/ConnectionManager.java b/briar-api/src/org/briarproject/api/plugins/ConnectionManager.java new file mode 100644 index 0000000000..644a3c8132 --- /dev/null +++ b/briar-api/src/org/briarproject/api/plugins/ConnectionManager.java @@ -0,0 +1,18 @@ +package org.briarproject.api.plugins; + +import org.briarproject.api.ContactId; +import org.briarproject.api.TransportId; +import org.briarproject.api.plugins.duplex.DuplexTransportConnection; + +public interface ConnectionManager { + + void manageIncomingConnection(TransportId t, TransportConnectionReader r); + + void manageIncomingConnection(TransportId t, DuplexTransportConnection d); + + void manageOutgoingConnection(ContactId c, TransportId t, + TransportConnectionWriter w); + + void manageOutgoingConnection(ContactId c, TransportId t, + DuplexTransportConnection d); +} diff --git a/briar-core/src/org/briarproject/invitation/AliceConnector.java b/briar-core/src/org/briarproject/invitation/AliceConnector.java index 378184fc6c..1b8a9d61f0 100644 --- a/briar-core/src/org/briarproject/invitation/AliceConnector.java +++ b/briar-core/src/org/briarproject/invitation/AliceConnector.java @@ -21,7 +21,7 @@ import org.briarproject.api.crypto.PseudoRandom; import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DbException; import org.briarproject.api.messaging.GroupFactory; -import org.briarproject.api.plugins.ConnectionDispatcher; +import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.plugins.duplex.DuplexTransportConnection; import org.briarproject.api.serial.Reader; @@ -45,14 +45,14 @@ class AliceConnector extends Connector { StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionDispatcher connectionDispatcher, + KeyManager keyManager, ConnectionManager connectionManager, Clock clock, boolean reuseConnection, ConnectorGroup group, DuplexPlugin plugin, LocalAuthor localAuthor, Map<TransportId, TransportProperties> localProps, PseudoRandom random) { super(crypto, db, readerFactory, writerFactory, streamReaderFactory, streamWriterFactory, authorFactory, groupFactory, - keyManager, connectionDispatcher, clock, reuseConnection, group, + keyManager, connectionManager, clock, reuseConnection, group, plugin, localAuthor, localProps, random); } diff --git a/briar-core/src/org/briarproject/invitation/BobConnector.java b/briar-core/src/org/briarproject/invitation/BobConnector.java index a89efd1762..5af921cfe3 100644 --- a/briar-core/src/org/briarproject/invitation/BobConnector.java +++ b/briar-core/src/org/briarproject/invitation/BobConnector.java @@ -21,7 +21,7 @@ import org.briarproject.api.crypto.PseudoRandom; import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DbException; import org.briarproject.api.messaging.GroupFactory; -import org.briarproject.api.plugins.ConnectionDispatcher; +import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.plugins.duplex.DuplexTransportConnection; import org.briarproject.api.serial.Reader; @@ -45,14 +45,14 @@ class BobConnector extends Connector { StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionDispatcher connectionDispatcher, + KeyManager keyManager, ConnectionManager connectionManager, Clock clock, boolean reuseConnection, ConnectorGroup group, DuplexPlugin plugin, LocalAuthor localAuthor, Map<TransportId, TransportProperties> localProps, PseudoRandom random) { super(crypto, db, readerFactory, writerFactory, streamReaderFactory, streamWriterFactory, authorFactory, groupFactory, - keyManager, connectionDispatcher, clock, reuseConnection, group, + keyManager, connectionManager, clock, reuseConnection, group, plugin, localAuthor, localProps, random); } diff --git a/briar-core/src/org/briarproject/invitation/Connector.java b/briar-core/src/org/briarproject/invitation/Connector.java index b97578fcd6..9c01446202 100644 --- a/briar-core/src/org/briarproject/invitation/Connector.java +++ b/briar-core/src/org/briarproject/invitation/Connector.java @@ -43,7 +43,7 @@ import org.briarproject.api.db.NoSuchTransportException; import org.briarproject.api.invitation.InvitationConstants; import org.briarproject.api.messaging.Group; import org.briarproject.api.messaging.GroupFactory; -import org.briarproject.api.plugins.ConnectionDispatcher; +import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.plugins.duplex.DuplexTransportConnection; import org.briarproject.api.serial.Reader; @@ -69,7 +69,7 @@ abstract class Connector extends Thread { protected final AuthorFactory authorFactory; protected final GroupFactory groupFactory; protected final KeyManager keyManager; - protected final ConnectionDispatcher connectionDispatcher; + protected final ConnectionManager connectionManager; protected final Clock clock; protected final boolean reuseConnection; protected final ConnectorGroup group; @@ -90,7 +90,7 @@ abstract class Connector extends Thread { StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionDispatcher connectionDispatcher, + KeyManager keyManager, ConnectionManager connectionManager, Clock clock, boolean reuseConnection, ConnectorGroup group, DuplexPlugin plugin, LocalAuthor localAuthor, Map<TransportId, TransportProperties> localProps, @@ -105,7 +105,7 @@ abstract class Connector extends Thread { this.authorFactory = authorFactory; this.groupFactory = groupFactory; this.keyManager = keyManager; - this.connectionDispatcher = connectionDispatcher; + this.connectionManager = connectionManager; this.clock = clock; this.reuseConnection = reuseConnection; this.group = group; @@ -323,8 +323,8 @@ abstract class Connector extends Thread { if(contactId == null) throw new IllegalStateException(); TransportId t = plugin.getId(); if(alice) - connectionDispatcher.dispatchOutgoingConnection(contactId, t, conn); - else connectionDispatcher.dispatchIncomingConnection(t, conn); + connectionManager.manageOutgoingConnection(contactId, t, conn); + else connectionManager.manageIncomingConnection(t, conn); } private static class TransportIdComparator diff --git a/briar-core/src/org/briarproject/invitation/ConnectorGroup.java b/briar-core/src/org/briarproject/invitation/ConnectorGroup.java index 4e88d55036..e3c3c6897c 100644 --- a/briar-core/src/org/briarproject/invitation/ConnectorGroup.java +++ b/briar-core/src/org/briarproject/invitation/ConnectorGroup.java @@ -27,7 +27,7 @@ import org.briarproject.api.invitation.InvitationListener; import org.briarproject.api.invitation.InvitationState; import org.briarproject.api.invitation.InvitationTask; import org.briarproject.api.messaging.GroupFactory; -import org.briarproject.api.plugins.ConnectionDispatcher; +import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.PluginManager; import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.serial.ReaderFactory; @@ -51,7 +51,7 @@ class ConnectorGroup extends Thread implements InvitationTask { private final AuthorFactory authorFactory; private final GroupFactory groupFactory; private final KeyManager keyManager; - private final ConnectionDispatcher connectionDispatcher; + private final ConnectionManager connectionManager; private final Clock clock; private final PluginManager pluginManager; private final AuthorId localAuthorId; @@ -78,7 +78,7 @@ class ConnectorGroup extends Thread implements InvitationTask { StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionDispatcher connectionDispatcher, + KeyManager keyManager, ConnectionManager connectionManager, Clock clock, PluginManager pluginManager, AuthorId localAuthorId, int localInvitationCode, int remoteInvitationCode, boolean reuseConnection) { @@ -92,7 +92,7 @@ class ConnectorGroup extends Thread implements InvitationTask { this.authorFactory = authorFactory; this.groupFactory = groupFactory; this.keyManager = keyManager; - this.connectionDispatcher = connectionDispatcher; + this.connectionManager = connectionManager; this.clock = clock; this.pluginManager = pluginManager; this.localAuthorId = localAuthorId; @@ -177,7 +177,7 @@ class ConnectorGroup extends Thread implements InvitationTask { remoteInvitationCode); return new AliceConnector(crypto, db, readerFactory, writerFactory, streamReaderFactory, streamWriterFactory, authorFactory, - groupFactory, keyManager, connectionDispatcher, clock, + groupFactory, keyManager, connectionManager, clock, reuseConnection, this, plugin, localAuthor, localProps, random); } @@ -188,7 +188,7 @@ class ConnectorGroup extends Thread implements InvitationTask { localInvitationCode); return new BobConnector(crypto, db, readerFactory, writerFactory, streamReaderFactory, streamWriterFactory, authorFactory, - groupFactory, keyManager, connectionDispatcher, clock, + groupFactory, keyManager, connectionManager, clock, reuseConnection, this, plugin, localAuthor, localProps, random); } diff --git a/briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java b/briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java index 3052fd8540..2cfae0a2fd 100644 --- a/briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java +++ b/briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java @@ -10,7 +10,7 @@ import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.invitation.InvitationTask; import org.briarproject.api.invitation.InvitationTaskFactory; import org.briarproject.api.messaging.GroupFactory; -import org.briarproject.api.plugins.ConnectionDispatcher; +import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.PluginManager; import org.briarproject.api.serial.ReaderFactory; import org.briarproject.api.serial.WriterFactory; @@ -29,7 +29,7 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory { private final AuthorFactory authorFactory; private final GroupFactory groupFactory; private final KeyManager keyManager; - private final ConnectionDispatcher connectionDispatcher; + private final ConnectionManager connectionManager; private final Clock clock; private final PluginManager pluginManager; @@ -39,7 +39,7 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory { StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionDispatcher connectionDispatcher, + KeyManager keyManager, ConnectionManager connectionManager, Clock clock, PluginManager pluginManager) { this.crypto = crypto; this.db = db; @@ -50,7 +50,7 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory { this.authorFactory = authorFactory; this.groupFactory = groupFactory; this.keyManager = keyManager; - this.connectionDispatcher = connectionDispatcher; + this.connectionManager = connectionManager; this.clock = clock; this.pluginManager = pluginManager; } @@ -58,9 +58,9 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory { public InvitationTask createTask(AuthorId localAuthorId, int localCode, int remoteCode, boolean reuseConnection) { return new ConnectorGroup(crypto, db, readerFactory, writerFactory, - streamReaderFactory, streamWriterFactory, - authorFactory, groupFactory, keyManager, connectionDispatcher, - clock, pluginManager, localAuthorId, localCode, remoteCode, + streamReaderFactory, streamWriterFactory, authorFactory, + groupFactory, keyManager, connectionManager, clock, + pluginManager, localAuthorId, localCode, remoteCode, reuseConnection); } } diff --git a/briar-core/src/org/briarproject/plugins/ConnectionDispatcherImpl.java b/briar-core/src/org/briarproject/plugins/ConnectionManagerImpl.java similarity index 96% rename from briar-core/src/org/briarproject/plugins/ConnectionDispatcherImpl.java rename to briar-core/src/org/briarproject/plugins/ConnectionManagerImpl.java index 39469cb7fb..63544f4fd1 100644 --- a/briar-core/src/org/briarproject/plugins/ConnectionDispatcherImpl.java +++ b/briar-core/src/org/briarproject/plugins/ConnectionManagerImpl.java @@ -19,7 +19,7 @@ import org.briarproject.api.db.DbException; import org.briarproject.api.lifecycle.IoExecutor; import org.briarproject.api.messaging.MessagingSession; import org.briarproject.api.messaging.MessagingSessionFactory; -import org.briarproject.api.plugins.ConnectionDispatcher; +import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.ConnectionRegistry; import org.briarproject.api.plugins.TransportConnectionReader; import org.briarproject.api.plugins.TransportConnectionWriter; @@ -31,10 +31,10 @@ import org.briarproject.api.transport.StreamWriter; import org.briarproject.api.transport.StreamWriterFactory; import org.briarproject.api.transport.TagRecogniser; -class ConnectionDispatcherImpl implements ConnectionDispatcher { +class ConnectionManagerImpl implements ConnectionManager { private static final Logger LOG = - Logger.getLogger(ConnectionDispatcherImpl.class.getName()); + Logger.getLogger(ConnectionManagerImpl.class.getName()); private final Executor ioExecutor; private final KeyManager keyManager; @@ -45,7 +45,7 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher { private final ConnectionRegistry connectionRegistry; @Inject - ConnectionDispatcherImpl(@IoExecutor Executor ioExecutor, + ConnectionManagerImpl(@IoExecutor Executor ioExecutor, KeyManager keyManager, TagRecogniser tagRecogniser, StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, @@ -60,22 +60,22 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher { this.connectionRegistry = connectionRegistry; } - public void dispatchIncomingConnection(TransportId t, + public void manageIncomingConnection(TransportId t, TransportConnectionReader r) { ioExecutor.execute(new DispatchIncomingSimplexConnection(t, r)); } - public void dispatchIncomingConnection(TransportId t, + public void manageIncomingConnection(TransportId t, DuplexTransportConnection d) { ioExecutor.execute(new DispatchIncomingDuplexConnection(t, d)); } - public void dispatchOutgoingConnection(ContactId c, TransportId t, + public void manageOutgoingConnection(ContactId c, TransportId t, TransportConnectionWriter w) { ioExecutor.execute(new DispatchOutgoingSimplexConnection(c, t, w)); } - public void dispatchOutgoingConnection(ContactId c, TransportId t, + public void manageOutgoingConnection(ContactId c, TransportId t, DuplexTransportConnection d) { ioExecutor.execute(new DispatchOutgoingDuplexConnection(c, t, d)); } diff --git a/briar-core/src/org/briarproject/plugins/PluginManagerImpl.java b/briar-core/src/org/briarproject/plugins/PluginManagerImpl.java index 0fc3ca3474..620698c4a9 100644 --- a/briar-core/src/org/briarproject/plugins/PluginManagerImpl.java +++ b/briar-core/src/org/briarproject/plugins/PluginManagerImpl.java @@ -24,7 +24,7 @@ import org.briarproject.api.TransportProperties; import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DbException; import org.briarproject.api.lifecycle.IoExecutor; -import org.briarproject.api.plugins.ConnectionDispatcher; +import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.Plugin; import org.briarproject.api.plugins.PluginCallback; import org.briarproject.api.plugins.PluginManager; @@ -55,7 +55,7 @@ class PluginManagerImpl implements PluginManager { private final Clock clock; private final DatabaseComponent db; private final Poller poller; - private final ConnectionDispatcher dispatcher; + private final ConnectionManager connectionManager; private final UiCallback uiCallback; private final Map<TransportId, Plugin> plugins; private final List<SimplexPlugin> simplexPlugins; @@ -66,14 +66,14 @@ class PluginManagerImpl implements PluginManager { SimplexPluginConfig simplexPluginConfig, DuplexPluginConfig duplexPluginConfig, Clock clock, DatabaseComponent db, Poller poller, - ConnectionDispatcher dispatcher, UiCallback uiCallback) { + ConnectionManager connectionManager, UiCallback uiCallback) { this.ioExecutor = ioExecutor; this.simplexPluginConfig = simplexPluginConfig; this.duplexPluginConfig = duplexPluginConfig; this.clock = clock; this.db = db; this.poller = poller; - this.dispatcher = dispatcher; + this.connectionManager = connectionManager; this.uiCallback = uiCallback; plugins = new ConcurrentHashMap<TransportId, Plugin>(); simplexPlugins = new CopyOnWriteArrayList<SimplexPlugin>(); @@ -378,11 +378,11 @@ class PluginManagerImpl implements PluginManager { } public void readerCreated(TransportConnectionReader r) { - dispatcher.dispatchIncomingConnection(id, r); + connectionManager.manageIncomingConnection(id, r); } public void writerCreated(ContactId c, TransportConnectionWriter w) { - dispatcher.dispatchOutgoingConnection(c, id, w); + connectionManager.manageOutgoingConnection(c, id, w); } } @@ -394,12 +394,12 @@ class PluginManagerImpl implements PluginManager { } public void incomingConnectionCreated(DuplexTransportConnection d) { - dispatcher.dispatchIncomingConnection(id, d); + connectionManager.manageIncomingConnection(id, d); } public void outgoingConnectionCreated(ContactId c, DuplexTransportConnection d) { - dispatcher.dispatchOutgoingConnection(c, id, d); + connectionManager.manageOutgoingConnection(c, id, d); } } } \ No newline at end of file diff --git a/briar-core/src/org/briarproject/plugins/PluginsModule.java b/briar-core/src/org/briarproject/plugins/PluginsModule.java index 9f52848646..cb0c330173 100644 --- a/briar-core/src/org/briarproject/plugins/PluginsModule.java +++ b/briar-core/src/org/briarproject/plugins/PluginsModule.java @@ -3,7 +3,7 @@ package org.briarproject.plugins; import javax.inject.Singleton; import org.briarproject.api.lifecycle.LifecycleManager; -import org.briarproject.api.plugins.ConnectionDispatcher; +import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.ConnectionRegistry; import org.briarproject.api.plugins.PluginManager; @@ -15,7 +15,7 @@ public class PluginsModule extends AbstractModule { @Override protected void configure() { bind(Poller.class).to(PollerImpl.class); - bind(ConnectionDispatcher.class).to(ConnectionDispatcherImpl.class); + bind(ConnectionManager.class).to(ConnectionManagerImpl.class); bind(ConnectionRegistry.class).to( ConnectionRegistryImpl.class).in(Singleton.class); } diff --git a/briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java b/briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java index ce87c9720a..02afd95902 100644 --- a/briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java +++ b/briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java @@ -7,7 +7,7 @@ import java.util.concurrent.Executors; import org.briarproject.BriarTestCase; import org.briarproject.api.TransportId; import org.briarproject.api.db.DatabaseComponent; -import org.briarproject.api.plugins.ConnectionDispatcher; +import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.plugins.duplex.DuplexPluginCallback; import org.briarproject.api.plugins.duplex.DuplexPluginConfig; @@ -36,8 +36,8 @@ public class PluginManagerImplTest extends BriarTestCase { context.mock(DuplexPluginConfig.class); final DatabaseComponent db = context.mock(DatabaseComponent.class); final Poller poller = context.mock(Poller.class); - final ConnectionDispatcher dispatcher = - context.mock(ConnectionDispatcher.class); + final ConnectionManager dispatcher = + context.mock(ConnectionManager.class); final UiCallback uiCallback = context.mock(UiCallback.class); // Two simplex plugin factories: both create plugins, one fails to start final SimplexPluginFactory simplexFactory = -- GitLab