From 3820d7413c2bfed42ee78dd6b63840189ab0e21c Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 27 May 2019 16:11:25 +0100 Subject: [PATCH] Rename rendezvous handler to endpoint. --- .../bramble/api/plugin/duplex/DuplexPlugin.java | 8 ++++---- .../{RendezvousHandler.java => RendezvousEndpoint.java} | 2 +- .../bramble/plugin/bluetooth/BluetoothPlugin.java | 4 ++-- .../org/briarproject/bramble/plugin/tcp/TcpPlugin.java | 4 ++-- .../org/briarproject/bramble/plugin/tor/TorPlugin.java | 4 ++-- .../briarproject/bramble/plugin/modem/ModemPlugin.java | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) rename bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/{RendezvousHandler.java => RendezvousEndpoint.java} (93%) diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java index 31a07c258..38ba819de 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java @@ -7,7 +7,7 @@ import org.briarproject.bramble.api.plugin.ConnectionHandler; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; -import org.briarproject.bramble.api.rendezvous.RendezvousHandler; +import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; import javax.annotation.Nullable; @@ -50,10 +50,10 @@ public interface DuplexPlugin extends Plugin { boolean supportsRendezvous(); /** - * Creates and returns a handler that uses the given key material to - * rendezvous with a pending contact and the given connection handler to + * Creates and returns an endpoint that uses the given key material to + * rendezvous with a pending contact, and the given connection handler to * handle incoming connections. */ - RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + RendezvousEndpoint createRendezvousEndpoint(KeyMaterialSource k, ConnectionHandler incoming); } diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousHandler.java b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousEndpoint.java similarity index 93% rename from bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousHandler.java rename to bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousEndpoint.java index a48e2d619..b44f84988 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousHandler.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousEndpoint.java @@ -8,7 +8,7 @@ import java.io.IOException; * An interface for making and accepting rendezvous connections with a pending * contact over a given transport. */ -public interface RendezvousHandler { +public interface RendezvousEndpoint { /** * Returns a set of transport properties for connecting to the pending diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java index 482f8d160..58d06c52e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java @@ -23,7 +23,7 @@ import org.briarproject.bramble.api.plugin.event.DisableBluetoothEvent; import org.briarproject.bramble.api.plugin.event.EnableBluetoothEvent; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; -import org.briarproject.bramble.api.rendezvous.RendezvousHandler; +import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; @@ -398,7 +398,7 @@ abstract class BluetoothPlugin implements DuplexPlugin, EventListener { } @Override - public RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + public RendezvousEndpoint createRendezvousEndpoint(KeyMaterialSource k, ConnectionHandler incoming) { throw new UnsupportedOperationException(); } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java index 6881637eb..3529c5838 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java @@ -13,7 +13,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; -import org.briarproject.bramble.api.rendezvous.RendezvousHandler; +import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; import org.briarproject.bramble.util.IoUtils; import java.io.IOException; @@ -309,7 +309,7 @@ abstract class TcpPlugin implements DuplexPlugin { } @Override - public RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + public RendezvousEndpoint createRendezvousEndpoint(KeyMaterialSource k, ConnectionHandler incoming) { throw new UnsupportedOperationException(); } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index 462e11b5d..ec523b950 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -26,7 +26,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; -import org.briarproject.bramble.api.rendezvous.RendezvousHandler; +import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; import org.briarproject.bramble.api.settings.Settings; import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent; import org.briarproject.bramble.api.system.Clock; @@ -613,7 +613,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { } @Override - public RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + public RendezvousEndpoint createRendezvousEndpoint(KeyMaterialSource k, ConnectionHandler incoming) { throw new UnsupportedOperationException(); } diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java index 3c3c18eaf..21bef9284 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java @@ -14,7 +14,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.rendezvous.KeyMaterialSource; -import org.briarproject.bramble.api.rendezvous.RendezvousHandler; +import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint; import java.io.IOException; import java.io.InputStream; @@ -192,7 +192,7 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback { } @Override - public RendezvousHandler createRendezvousHandler(KeyMaterialSource k, + public RendezvousEndpoint createRendezvousEndpoint(KeyMaterialSource k, ConnectionHandler incoming) { throw new UnsupportedOperationException(); }