diff options
Diffstat (limited to 'jetty-client/src')
17 files changed, 47 insertions, 48 deletions
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/RedirectProtocolHandler.java b/jetty-client/src/main/java/org/eclipse/jetty/client/RedirectProtocolHandler.java index b1a21fe85b..c557457f6f 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/RedirectProtocolHandler.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/RedirectProtocolHandler.java @@ -22,7 +22,7 @@ import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Result; -public class RedirectProtocolHandler extends Response.Listener.Empty implements ProtocolHandler +public class RedirectProtocolHandler extends Response.Listener.Adapter implements ProtocolHandler { private final HttpRedirector redirector; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java index ebe117657c..176a4255be 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java @@ -503,7 +503,7 @@ public interface Request /** * An empty implementation of {@link Listener} */ - public static class Empty implements Listener + public static class Adapter implements Listener { @Override public void onQueued(Request request) diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java index 2fc140103e..6a43820739 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java @@ -202,7 +202,7 @@ public interface Response /** * An empty implementation of {@link Listener} */ - public static class Empty implements Listener + public static class Adapter implements Listener { @Override public void onBegin(Response response) diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/BufferingResponseListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/BufferingResponseListener.java index bc4860f76a..1c5c45d5d1 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/BufferingResponseListener.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/BufferingResponseListener.java @@ -35,7 +35,7 @@ import org.eclipse.jetty.http.HttpHeader; * <p>The content may be retrieved from {@link #onSuccess(Response)} or {@link #onComplete(Result)} * via {@link #getContent()} or {@link #getContentAsString()}.</p> */ -public abstract class BufferingResponseListener extends Response.Listener.Empty +public abstract class BufferingResponseListener extends Listener.Adapter { private final int maxLength; private volatile byte[] buffer = new byte[0]; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java index 6a90f7b5e8..db8753003d 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java @@ -19,7 +19,6 @@ package org.eclipse.jetty.client.util; import java.io.IOException; - import java.io.InputStream; import java.io.InterruptedIOException; import java.nio.ByteBuffer; @@ -72,7 +71,7 @@ import org.eclipse.jetty.util.log.Logger; * If the consumer is slower than the producer, then the producer will block * until the client consumes. */ -public class InputStreamResponseListener extends Response.Listener.Empty +public class InputStreamResponseListener extends Listener.Adapter { private static final Logger LOG = Log.getLogger(InputStreamResponseListener.class); private static final byte[] EOF = new byte[0]; diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java index 503ad74292..c4433abb6d 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java @@ -160,7 +160,7 @@ public class ExternalSiteTest latch.countDown(); } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onFailure(Response response, Throwable failure) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java index 0c3eafec77..a2ae974d11 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java @@ -115,7 +115,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest AuthenticationStore authenticationStore = client.getAuthenticationStore(); final AtomicReference<CountDownLatch> requests = new AtomicReference<>(new CountDownLatch(1)); - Request.Listener.Empty requestListener = new Request.Listener.Empty() + Request.Listener.Adapter requestListener = new Request.Listener.Adapter() { @Override public void onSuccess(Request request) @@ -137,7 +137,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest authenticationStore.addAuthentication(authentication); requests.set(new CountDownLatch(2)); - requestListener = new Request.Listener.Empty() + requestListener = new Request.Listener.Adapter() { @Override public void onSuccess(Request request) @@ -156,7 +156,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest client.getRequestListeners().remove(requestListener); requests.set(new CountDownLatch(1)); - requestListener = new Request.Listener.Empty() + requestListener = new Request.Listener.Adapter() { @Override public void onSuccess(Request request) @@ -196,7 +196,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest client.getAuthenticationStore().addAuthentication(new BasicAuthentication(uri, realm, "basic", "basic")); final CountDownLatch requests = new CountDownLatch(3); - Request.Listener.Empty requestListener = new Request.Listener.Empty() + Request.Listener.Adapter requestListener = new Request.Listener.Adapter() { @Override public void onSuccess(Request request) @@ -235,7 +235,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest client.getAuthenticationStore().addAuthentication(new BasicAuthentication(uri, realm, "basic", "basic")); final CountDownLatch requests = new CountDownLatch(3); - Request.Listener.Empty requestListener = new Request.Listener.Empty() + Request.Listener.Adapter requestListener = new Request.Listener.Adapter() { @Override public void onSuccess(Request request) @@ -262,7 +262,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest startBasic(new EmptyServerHandler()); final AtomicReference<CountDownLatch> requests = new AtomicReference<>(new CountDownLatch(2)); - Request.Listener.Empty requestListener = new Request.Listener.Empty() + Request.Listener.Adapter requestListener = new Request.Listener.Adapter() { @Override public void onSuccess(Request request) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientContinueTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientContinueTest.java index fd08f6f2b2..7acbb3bcb6 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientContinueTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientContinueTest.java @@ -407,7 +407,7 @@ public class HttpClientContinueTest extends AbstractHttpClientServerTest public Response.Listener getResponseListener() { final Response.Listener listener = super.getResponseListener(); - return new Response.Listener.Empty() + return new Response.Listener.Adapter() { @Override public void onBegin(Response response) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java index 1f76548f24..1ac4ae4a20 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java @@ -186,7 +186,7 @@ public class HttpClientLoadTest extends AbstractHttpClientServerTest } final CountDownLatch requestLatch = new CountDownLatch(1); - request.send(new Response.Listener.Empty() + request.send(new Response.Listener.Adapter() { private final AtomicInteger contentLength = new AtomicInteger(); diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientProxyTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientProxyTest.java index cb5f7d9b86..9f7ff33f7b 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientProxyTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientProxyTest.java @@ -129,7 +129,7 @@ public class HttpClientProxyTest extends AbstractHttpClientServerTest URI uri = URI.create(scheme + "://" + proxyHost + ":" + proxyPort); client.getAuthenticationStore().addAuthentication(new BasicAuthentication(uri, realm, user, password)); final AtomicInteger requests = new AtomicInteger(); - client.getRequestListeners().add(new Request.Listener.Empty() + client.getRequestListeners().add(new Request.Listener.Adapter() { @Override public void onSuccess(Request request) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java index 4e7d87e2ad..f9985aa3f8 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java @@ -381,7 +381,7 @@ public class HttpClientRedirectTest extends AbstractHttpClientServerTest private void testMethodRedirect(final HttpMethod requestMethod, final HttpMethod redirectMethod, int redirectCode) throws Exception { final AtomicInteger passes = new AtomicInteger(); - client.getRequestListeners().add(new org.eclipse.jetty.client.api.Request.Listener.Empty() + client.getRequestListeners().add(new org.eclipse.jetty.client.api.Request.Listener.Adapter() { @Override public void onBegin(org.eclipse.jetty.client.api.Request request) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientSynchronizationTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientSynchronizationTest.java index 2beca50108..0f717d830c 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientSynchronizationTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientSynchronizationTest.java @@ -56,7 +56,7 @@ public class HttpClientSynchronizationTest extends AbstractHttpClientServerTest synchronized (this) { - request.send(new Response.Listener.Empty() + request.send(new Response.Listener.Adapter() { @Override public void onFailure(Response response, Throwable failure) @@ -88,7 +88,7 @@ public class HttpClientSynchronizationTest extends AbstractHttpClientServerTest synchronized (this) { - request.send(new Response.Listener.Empty() + request.send(new Response.Listener.Adapter() { @Override public void onComplete(Result result) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java index 4e1bc2489a..974dad8747 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java @@ -402,7 +402,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest } } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onSuccess(Response response) @@ -422,7 +422,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest latch.countDown(); } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onSuccess(Response response) @@ -449,7 +449,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) .path("/one") - .listener(new Request.Listener.Empty() + .listener(new Request.Listener.Adapter() { @Override public void onBegin(Request request) @@ -530,7 +530,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest latch.countDown(); } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onSuccess(Response response) @@ -609,7 +609,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest }; } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onComplete(Result result) @@ -640,7 +640,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest destination.getHttpConnectionPool().getActiveConnections().peek().close(); } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onComplete(Result result) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java index 0f8afe65e2..9fcf5d0a98 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java @@ -98,7 +98,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest headersLatch.countDown(); } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onSuccess(Response response) @@ -139,7 +139,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest final CountDownLatch beginLatch = new CountDownLatch(1); final CountDownLatch failureLatch = new CountDownLatch(2); - client.newRequest(host, port).scheme(scheme).listener(new Request.Listener.Empty() + client.newRequest(host, port).scheme(scheme).listener(new Request.Listener.Adapter() { @Override public void onBegin(Request request) @@ -153,7 +153,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest { failureLatch.countDown(); } - }).send(new Response.Listener.Empty() + }).send(new Response.Listener.Adapter() { @Override public void onComplete(Result result) @@ -191,7 +191,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest final CountDownLatch successLatch = new CountDownLatch(3); client.newRequest(host, port) .scheme(scheme) - .listener(new Request.Listener.Empty() + .listener(new Request.Listener.Adapter() { @Override public void onBegin(Request request) @@ -206,7 +206,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest successLatch.countDown(); } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onSuccess(Response response) @@ -252,7 +252,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest final CountDownLatch successLatch = new CountDownLatch(3); client.newRequest(host, port) .scheme(scheme) - .listener(new Request.Listener.Empty() + .listener(new Request.Listener.Adapter() { @Override public void onBegin(Request request) @@ -280,7 +280,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest successLatch.countDown(); } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onSuccess(Response response) @@ -334,7 +334,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest failureLatch.countDown(); } }) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onComplete(Result result) @@ -377,7 +377,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest final CountDownLatch latch = new CountDownLatch(1); client.newRequest(host, port) .scheme(scheme) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onComplete(Result result) @@ -432,7 +432,7 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest client.newRequest(host, port) .scheme(scheme) .content(new ByteBufferContentProvider(buffer)) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onComplete(Result result) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpRequestAbortTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpRequestAbortTest.java index 5d1a2b1279..c131f4cb72 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpRequestAbortTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpRequestAbortTest.java @@ -59,7 +59,7 @@ public class HttpRequestAbortTest extends AbstractHttpClientServerTest { client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) - .listener(new Request.Listener.Empty() + .listener(new Request.Listener.Adapter() { @Override public void onQueued(Request request) @@ -97,7 +97,7 @@ public class HttpRequestAbortTest extends AbstractHttpClientServerTest { client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) - .listener(new Request.Listener.Empty() + .listener(new Request.Listener.Adapter() { @Override public void onBegin(Request request) @@ -137,7 +137,7 @@ public class HttpRequestAbortTest extends AbstractHttpClientServerTest { client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) - .listener(new Request.Listener.Empty() + .listener(new Request.Listener.Adapter() { @Override public void onHeaders(Request request) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java index 5fb69c0393..08de6e4503 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java @@ -47,7 +47,7 @@ public class HttpSenderTest // Request request = client.newRequest(URI.create("http://localhost/")); // final CountDownLatch headersLatch = new CountDownLatch(1); // final CountDownLatch successLatch = new CountDownLatch(1); -// request.listener(new Request.Listener.Empty() +// request.listener(new Request.Listener.Adapter() // { // @Override // public void onHeaders(Request request) @@ -108,7 +108,7 @@ public class HttpSenderTest // HttpConnection connection = new HttpConnection(client, endPoint, destination); // Request request = client.newRequest(URI.create("http://localhost/")); // final CountDownLatch failureLatch = new CountDownLatch(2); -// request.listener(new Request.Listener.Empty() +// request.listener(new Request.Listener.Adapter() // { // @Override // public void onFailure(Request request, Throwable x) @@ -116,7 +116,7 @@ public class HttpSenderTest // failureLatch.countDown(); // } // }); -// connection.send(request, new Response.Listener.Empty() +// connection.send(request, new Response.Listener.Adapter() // { // @Override // public void onComplete(Result result) @@ -137,7 +137,7 @@ public class HttpSenderTest // HttpConnection connection = new HttpConnection(client, endPoint, destination); // Request request = client.newRequest(URI.create("http://localhost/")); // final CountDownLatch failureLatch = new CountDownLatch(2); -// request.listener(new Request.Listener.Empty() +// request.listener(new Request.Listener.Adapter() // { // @Override // public void onFailure(Request request, Throwable x) @@ -145,7 +145,7 @@ public class HttpSenderTest // failureLatch.countDown(); // } // }); -// connection.send(request, new Response.Listener.Empty() +// connection.send(request, new Response.Listener.Adapter() // { // @Override // public void onComplete(Result result) @@ -175,7 +175,7 @@ public class HttpSenderTest // request.content(new ByteBufferContentProvider(ByteBuffer.wrap(content.getBytes("UTF-8")))); // final CountDownLatch headersLatch = new CountDownLatch(1); // final CountDownLatch successLatch = new CountDownLatch(1); -// request.listener(new Request.Listener.Empty() +// request.listener(new Request.Listener.Adapter() // { // @Override // public void onHeaders(Request request) @@ -210,7 +210,7 @@ public class HttpSenderTest // request.content(new ByteBufferContentProvider(ByteBuffer.wrap(content1.getBytes("UTF-8")), ByteBuffer.wrap(content2.getBytes("UTF-8")))); // final CountDownLatch headersLatch = new CountDownLatch(1); // final CountDownLatch successLatch = new CountDownLatch(1); -// request.listener(new Request.Listener.Empty() +// request.listener(new Request.Listener.Adapter() // { // @Override // public void onHeaders(Request request) @@ -252,7 +252,7 @@ public class HttpSenderTest // }); // final CountDownLatch headersLatch = new CountDownLatch(1); // final CountDownLatch successLatch = new CountDownLatch(1); -// request.listener(new Request.Listener.Empty() +// request.listener(new Request.Listener.Adapter() // { // @Override // public void onHeaders(Request request) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/api/Usage.java b/jetty-client/src/test/java/org/eclipse/jetty/client/api/Usage.java index cd7d09e098..397d5bb930 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/api/Usage.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/api/Usage.java @@ -133,7 +133,7 @@ public class Usage Response response = client.newRequest("localhost", 8080) // Add a request listener - .listener(new Request.Listener.Empty() + .listener(new Request.Listener.Adapter() { @Override public void onSuccess(Request request) @@ -319,7 +319,7 @@ public class Usage DeferredContentProvider async = new DeferredContentProvider(ByteBuffer.wrap(new byte[]{0, 1, 2})); client.newRequest("localhost", 8080) .content(async) - .send(new Response.Listener.Empty() + .send(new Response.Listener.Adapter() { @Override public void onBegin(Response response) |