From cdf6f17b9e8f6a7ce38f17e8362d0085385b11eb Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 11 Jul 2013 10:28:58 +0200 Subject: [PATCH] 412729 - SPDYClient needs a Promise-based connect() method. Implemented the new method, modified the blocking method (with a better signature) to call the new method. --- .../eclipse/jetty/spdy/client/SPDYClient.java | 74 ++++++++++++++++--- .../server/proxy/ProxySPDYToHTTPLoadTest.java | 2 +- .../server/proxy/ProxySPDYToSPDYLoadTest.java | 3 +- 3 files changed, 64 insertions(+), 15 deletions(-) diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java index c4360a2c121..c866449dbb5 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYClient.java @@ -19,7 +19,6 @@ package org.eclipse.jetty.spdy.client; import java.io.IOException; -import java.net.InetSocketAddress; import java.net.SocketAddress; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; @@ -46,12 +45,29 @@ import org.eclipse.jetty.spdy.api.Session; import org.eclipse.jetty.spdy.api.SessionFrameListener; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FuturePromise; +import org.eclipse.jetty.util.Promise; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.Scheduler; +/** + * A {@link SPDYClient} allows applications to connect to one or more SPDY servers, + * obtaining {@link Session} objects that can be used to send/receive SPDY frames. + *

+ * {@link SPDYClient} instances are created through a {@link Factory}: + * 

+ * SPDYClient.Factory factory = new SPDYClient.Factory();
+ * SPDYClient client = factory.newSPDYClient(SPDY.V3);
+ *
+ * and then used to connect to the server: + * 
+ * FuturePromise<Session> promise = new FuturePromise<>();
+ * client.connect("server.com", null, promise);
+ * Session session = promise.get();
+ *
+ */ public class SPDYClient { private final SPDYClientConnectionFactory connectionFactory = new SPDYClientConnectionFactory(); @@ -87,23 +103,57 @@ public class SPDYClient this.bindAddress = bindAddress; } - public Future connect(InetSocketAddress address, SessionFrameListener listener) throws IOException + /** + * Equivalent to: + * 
+     * Future<Session> promise = new FuturePromise<>();
+     * connect(address, listener, promise);
+     *
+ * + * @param address the address to connect to + * @param listener the session listener that will be notified of session events + * @return a {@link Future} that provides a {@link Session} when connected + */ + public Future connect(SocketAddress address, SessionFrameListener listener) + { + FuturePromise promise = new FuturePromise<>(); + connect(address, listener, promise); + return promise; + } + + /** + * Connects to the given {@code address}, binding the given {@code listener} to session events, + * and notified the given {@code promise} of the connect result. + *

+ * If the connect operation is successful, the {@code promise} will be invoked with the {@link Session} + * object that applications can use to perform SPDY requests. + * + * @param address the address to connect to + * @param listener the session listener that will be notified of session events + * @param promise the promise notified of connection success/failure + */ + public void connect(SocketAddress address, SessionFrameListener listener, Promise promise) { if (!factory.isStarted()) throw new IllegalStateException(Factory.class.getSimpleName() + " is not started"); - SocketChannel channel = SocketChannel.open(); - if (bindAddress != null) - channel.bind(bindAddress); - channel.socket().setTcpNoDelay(true); - channel.configureBlocking(false); + try + { + SocketChannel channel = SocketChannel.open(); + if (bindAddress != null) + channel.bind(bindAddress); + channel.socket().setTcpNoDelay(true); + channel.configureBlocking(false); - SessionPromise result = new SessionPromise(channel, this, listener); + SessionPromise result = new SessionPromise(channel, this, listener); - channel.connect(address); - factory.selector.connect(channel, result); - - return result; + channel.connect(address); + factory.selector.connect(channel, result); + } + catch (IOException x) + { + promise.failed(x); + } } public long getIdleTimeout() diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java index 678a8fec12d..bd5ecadb6f4 100644 --- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java +++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPLoadTest.java @@ -213,7 +213,7 @@ public class ProxySPDYToHTTPLoadTest sendSingleClientRequest(proxyAddress, client, serverIdentificationString, serverHost); } } - catch (InterruptedException | ExecutionException | TimeoutException | IOException e) + catch (InterruptedException | ExecutionException | TimeoutException e) { e.printStackTrace(); fail(); diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java index dfb7f38a29c..4992c7ab81c 100644 --- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java +++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYLoadTest.java @@ -19,7 +19,6 @@ package org.eclipse.jetty.spdy.server.proxy; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Arrays; @@ -209,7 +208,7 @@ public class ProxySPDYToSPDYLoadTest sendSingleClientRequest(proxyAddress, client, serverIdentificationString, serverHost); } } - catch (InterruptedException | ExecutionException | TimeoutException | IOException e) + catch (InterruptedException | ExecutionException | TimeoutException e) { fail(); e.printStackTrace();