From a1789c8f7cfeb95840fae125438f55664f0c3e66 Mon Sep 17 00:00:00 2001 From: Thomas Becker Date: Wed, 17 Jul 2013 18:09:00 +0200 Subject: 412840 remove Future in SPDYClient.connect() and return Session instead in blocking version --- .../java/org/eclipse/jetty/spdy/client/SPDYClient.java | 8 ++++---- .../jetty/spdy/server/proxy/SPDYProxyEngine.java | 2 +- .../jetty/spdy/server/http/AbstractHTTPSPDYTest.java | 3 +-- .../spdy/server/proxy/ProxySPDYToHTTPLoadTest.java | 2 +- .../jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java | 18 +++++++++--------- .../spdy/server/proxy/ProxySPDYToSPDYLoadTest.java | 2 +- .../jetty/spdy/server/proxy/ProxySPDYToSPDYTest.java | 14 +++++++------- .../org/eclipse/jetty/spdy/server/AbstractTest.java | 3 +-- .../org/eclipse/jetty/spdy/server/IdleTimeoutTest.java | 6 +++--- .../org/eclipse/jetty/spdy/server/SettingsTest.java | 2 +- 10 files changed, 29 insertions(+), 31 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 364db9cad6..9b062d8e92 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 @@ -27,8 +27,8 @@ import java.util.Collections; import java.util.List; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; -import java.util.concurrent.Future; import javax.net.ssl.SSLEngine; import org.eclipse.jetty.io.ByteBufferPool; @@ -112,13 +112,13 @@ public class SPDYClient * * @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 + * @return a {@link Session} when connected */ - public Future connect(SocketAddress address, SessionFrameListener listener) + public Session connect(SocketAddress address, SessionFrameListener listener) throws ExecutionException, InterruptedException { FuturePromise promise = new FuturePromise<>(); connect(address, listener, promise); - return promise; + return promise.get(); } /** diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java index 5fe79092b4..51a8d31a75 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java @@ -178,7 +178,7 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener if (session == null) { SPDYClient client = factory.newSPDYClient(version); - session = client.connect(address, sessionListener).get(getConnectTimeout(), TimeUnit.MILLISECONDS); + session = client.connect(address, sessionListener); LOG.debug("Proxy session connected to {}", address); Session existing = serverSessions.putIfAbsent(host, session); if (existing != null) diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java index fab4631bdd..66b140ae1b 100644 --- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java +++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/AbstractHTTPSPDYTest.java @@ -22,7 +22,6 @@ import java.net.InetSocketAddress; import java.util.Arrays; import java.util.Collection; import java.util.concurrent.Executor; -import java.util.concurrent.TimeUnit; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConfiguration; @@ -122,7 +121,7 @@ public abstract class AbstractHTTPSPDYTest clientFactory = newSPDYClientFactory(threadPool); clientFactory.start(); } - return clientFactory.newSPDYClient(version).connect(socketAddress, listener).get(5, TimeUnit.SECONDS); + return clientFactory.newSPDYClient(version).connect(socketAddress, listener); } protected SPDYClient.Factory newSPDYClientFactory(Executor threadPool) 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 6c2e210950..080f9aeeac 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 @@ -231,7 +231,7 @@ public class ProxySPDYToHTTPLoadTest { try { - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(15, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); for (int i = 0; i < requestsPerClient; i++) { sendSingleClientRequest(proxyAddress, client, serverIdentificationString, serverHost); diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java index 556c148658..f6eeffb1df 100644 --- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java +++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java @@ -169,7 +169,7 @@ public class ProxySPDYToHTTPTest InetSocketAddress proxyAddress = startProxy(startServer(new TestServerHandler(header, null)), 30000, 30000); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); final CountDownLatch replyLatch = new CountDownLatch(1); @@ -202,7 +202,7 @@ public class ProxySPDYToHTTPTest InetSocketAddress proxyAddress = startProxy(startServer(new TestServerHandler(header, data)), 30000, 30000); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); final CountDownLatch replyLatch = new CountDownLatch(1); final CountDownLatch dataLatch = new CountDownLatch(1); @@ -275,7 +275,7 @@ public class ProxySPDYToHTTPTest { resetLatch.countDown(); } - }).get(5, TimeUnit.SECONDS); + }); Fields headers = SPDYTestUtils.createHeaders("localhost", proxyAddress.getPort(), version, "GET", "/"); headers.put("connection", "close"); @@ -309,7 +309,7 @@ public class ProxySPDYToHTTPTest final CountDownLatch replyLatch = new CountDownLatch(1); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); Fields headers = SPDYTestUtils.createHeaders("localhost", proxyAddress.getPort(), version, "GET", "/"); client.syn(new SynInfo(headers, true), new StreamFrameListener.Adapter() @@ -335,7 +335,7 @@ public class ProxySPDYToHTTPTest InetSocketAddress proxyAddress = startProxy(startServer(new TestServerHandler(header, null)), 30000, 30000); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); final CountDownLatch replyLatch = new CountDownLatch(1); final CountDownLatch dataLatch = new CountDownLatch(1); @@ -383,7 +383,7 @@ public class ProxySPDYToHTTPTest InetSocketAddress proxyAddress = startProxy(startServer(new TestServerHandler(header, null)), 30000, 30000); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); final CountDownLatch replyLatch = new CountDownLatch(1); final CountDownLatch dataLatch = new CountDownLatch(1); @@ -439,7 +439,7 @@ public class ProxySPDYToHTTPTest { goAwayLatch.countDown(); } - }).get(5, TimeUnit.SECONDS); + }); Fields headers = SPDYTestUtils.createHeaders("localhost", proxyAddress.getPort(), version, "POST", "/"); ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(true); @@ -470,7 +470,7 @@ public class ProxySPDYToHTTPTest } }), 30000, timeout); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); final CountDownLatch replyLatch = new CountDownLatch(1); @@ -510,7 +510,7 @@ public class ProxySPDYToHTTPTest { pingLatch.countDown(); } - }).get(5, TimeUnit.SECONDS); + }); client.ping(new PingInfo(5, TimeUnit.SECONDS)); 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 4992c7ab81..9ec5cc52c9 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 @@ -202,7 +202,7 @@ public class ProxySPDYToSPDYLoadTest { try { - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); for (int i = 0; i < requestsPerClient; i++) { sendSingleClientRequest(proxyAddress, client, serverIdentificationString, serverHost); diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYTest.java index 064f556f95..f2266e70ca 100644 --- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYTest.java +++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToSPDYTest.java @@ -169,7 +169,7 @@ public class ProxySPDYToSPDYTest })); proxyConnector.addConnectionFactory(proxyConnector.getConnectionFactory("spdy/" + version)); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); final CountDownLatch replyLatch = new CountDownLatch(1); Fields headers = SPDYTestUtils.createHeaders("localhost", proxyAddress.getPort(), version, "GET", "/"); @@ -215,7 +215,7 @@ public class ProxySPDYToSPDYTest { resetLatch.countDown(); } - }).get(5, TimeUnit.SECONDS); + }); Fields headers = SPDYTestUtils.createHeaders("localhost", proxyAddress.getPort(), version, "GET", "/"); headers.put(header, "bar"); @@ -247,7 +247,7 @@ public class ProxySPDYToSPDYTest })); proxyConnector.addConnectionFactory(proxyConnector.getConnectionFactory("spdy/" + version)); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); final CountDownLatch replyLatch = new CountDownLatch(1); final CountDownLatch dataLatch = new CountDownLatch(1); @@ -318,7 +318,7 @@ public class ProxySPDYToSPDYTest final CountDownLatch pushSynLatch = new CountDownLatch(1); final CountDownLatch pushDataLatch = new CountDownLatch(1); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); Fields headers = new Fields(); headers.put(HTTPSPDYHeader.HOST.name(version), "localhost:" + proxyAddress.getPort()); @@ -417,7 +417,7 @@ public class ProxySPDYToSPDYTest final CountDownLatch pushSynLatch = new CountDownLatch(3); final CountDownLatch pushDataLatch = new CountDownLatch(3); - Session client = factory.newSPDYClient(version).connect(proxyAddress, null).get(5, TimeUnit.SECONDS); + Session client = factory.newSPDYClient(version).connect(proxyAddress, null); Fields headers = new Fields(); headers.put(HTTPSPDYHeader.HOST.name(version), "localhost:" + proxyAddress.getPort()); @@ -516,7 +516,7 @@ public class ProxySPDYToSPDYTest { pingLatch.countDown(); } - }).get(5, TimeUnit.SECONDS); + }); client.ping(new PingInfo(5, TimeUnit.SECONDS)); @@ -552,7 +552,7 @@ public class ProxySPDYToSPDYTest { resetLatch.countDown(); } - }).get(5, TimeUnit.SECONDS); + }); Fields headers = new Fields(); headers.put(HTTPSPDYHeader.HOST.name(version), "localhost:" + proxyAddress.getPort()); diff --git a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/AbstractTest.java b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/AbstractTest.java index cdbe2ba6c2..829ceb9f8d 100644 --- a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/AbstractTest.java +++ b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/AbstractTest.java @@ -21,7 +21,6 @@ package org.eclipse.jetty.spdy.server; import java.net.InetSocketAddress; import java.util.concurrent.Executor; -import java.util.concurrent.TimeUnit; import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.Server; @@ -114,7 +113,7 @@ public abstract class AbstractTest clientFactory.start(); } - return clientFactory.newSPDYClient(version).connect(socketAddress, listener).get(5, TimeUnit.SECONDS); + return clientFactory.newSPDYClient(version).connect(socketAddress, listener); } protected SPDYClient.Factory newSPDYClientFactory(Executor threadPool) diff --git a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/IdleTimeoutTest.java b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/IdleTimeoutTest.java index 708e6dc9be..0291fd3415 100644 --- a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/IdleTimeoutTest.java +++ b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/IdleTimeoutTest.java @@ -173,7 +173,7 @@ public class IdleTimeoutTest extends AbstractTest clientFactory.start(); SPDYClient client = clientFactory.newSPDYClient(SPDY.V2); client.setIdleTimeout(idleTimeout); - Session session = client.connect(address, null).get(5, TimeUnit.SECONDS); + Session session = client.connect(address, null); session.syn(new SynInfo(new Fields(), true), null); @@ -199,7 +199,7 @@ public class IdleTimeoutTest extends AbstractTest clientFactory.start(); SPDYClient client = clientFactory.newSPDYClient(SPDY.V2); client.setIdleTimeout(idleTimeout); - Session session = client.connect(address, null).get(5, TimeUnit.SECONDS); + Session session = client.connect(address, null); session.syn(new SynInfo(new Fields(), true), null); @@ -232,7 +232,7 @@ public class IdleTimeoutTest extends AbstractTest clientFactory.start(); SPDYClient client = clientFactory.newSPDYClient(SPDY.V2); client.setIdleTimeout(idleTimeout); - Session session = client.connect(address, null).get(5, TimeUnit.SECONDS); + Session session = client.connect(address, null); final CountDownLatch replyLatch = new CountDownLatch(1); session.syn(new SynInfo(new Fields(), true), new StreamFrameListener.Adapter() diff --git a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SettingsTest.java b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SettingsTest.java index 3f7963b074..692109a9e9 100644 --- a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SettingsTest.java +++ b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SettingsTest.java @@ -159,7 +159,7 @@ public class SettingsTest extends AbstractTest Session sessionV2 = startClient(address, null); sessionV2.settings(settingsInfo); - Session sessionV3 = clientFactory.newSPDYClient(SPDY.V3).connect(address, null).get(5, TimeUnit.SECONDS); + Session sessionV3 = clientFactory.newSPDYClient(SPDY.V3).connect(address, null); sessionV3.settings(settingsInfo); Assert.assertTrue(settingsLatch.await(5, TimeUnit.SECONDS)); -- cgit v1.2.3