From afc6b9e5c0644287cd0c5a510491e6477e0f6218 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 4 Nov 2015 15:00:39 +0100 Subject: [PATCH] Fixed compilation issues. --- .../eclipse/jetty/client/HttpClientTest.java | 150 ++++++------------ 1 file changed, 46 insertions(+), 104 deletions(-) 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 592d7d65cae..6117b1be605 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 @@ -47,6 +47,7 @@ import java.util.concurrent.Exchanger; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; @@ -63,6 +64,7 @@ import org.eclipse.jetty.client.api.Destination; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Result; +import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP; import org.eclipse.jetty.client.http.HttpConnectionOverHTTP; import org.eclipse.jetty.client.http.HttpDestinationOverHTTP; import org.eclipse.jetty.client.util.BufferingResponseListener; @@ -75,6 +77,7 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpHeaderValue; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpVersion; +import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.toolchain.test.TestingDir; import org.eclipse.jetty.toolchain.test.annotation.Slow; @@ -367,16 +370,12 @@ public class HttpClientTest extends AbstractHttpClientServerTest final byte[] content = {0, 1, 2, 3}; ContentResponse response = client.POST(scheme + "://localhost:" + connector.getLocalPort()) - .onRequestContent(new Request.ContentListener() + .onRequestContent((request, buffer) -> { - @Override - public void onContent(Request request, ByteBuffer buffer) - { - byte[] bytes = new byte[buffer.remaining()]; - buffer.get(bytes); - if (!Arrays.equals(content, bytes)) - request.abort(new Exception()); - } + byte[] bytes = new byte[buffer.remaining()]; + buffer.get(bytes); + if (!Arrays.equals(content, bytes)) + request.abort(new Exception()); }) .content(new BytesContentProvider(content)) .timeout(5, TimeUnit.SECONDS) @@ -401,16 +400,12 @@ public class HttpClientTest extends AbstractHttpClientServerTest final AtomicInteger progress = new AtomicInteger(); ContentResponse response = client.POST(scheme + "://localhost:" + connector.getLocalPort()) - .onRequestContent(new Request.ContentListener() + .onRequestContent((request, buffer) -> { - @Override - public void onContent(Request request, ByteBuffer buffer) - { - byte[] bytes = new byte[buffer.remaining()]; - Assert.assertEquals(1, bytes.length); - buffer.get(bytes); - Assert.assertEquals(bytes[0], progress.getAndIncrement()); - } + byte[] bytes = new byte[buffer.remaining()]; + Assert.assertEquals(1, bytes.length); + buffer.get(bytes); + Assert.assertEquals(bytes[0], progress.getAndIncrement()); }) .content(new BytesContentProvider(new byte[]{0}, new byte[]{1}, new byte[]{2}, new byte[]{3}, new byte[]{4})) .timeout(5, TimeUnit.SECONDS) @@ -432,19 +427,15 @@ public class HttpClientTest extends AbstractHttpClientServerTest final CountDownLatch successLatch = new CountDownLatch(2); client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) - .onRequestBegin(new Request.BeginListener() + .onRequestBegin(request -> { - @Override - public void onBegin(Request request) + try { - try - { - latch.await(); - } - catch (InterruptedException x) - { - x.printStackTrace(); - } + latch.await(); + } + catch (InterruptedException x) + { + x.printStackTrace(); } }) .send(new Response.Listener.Adapter() @@ -459,14 +450,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) - .onRequestQueued(new Request.QueuedListener() - { - @Override - public void onQueued(Request request) - { - latch.countDown(); - } - }) + .onRequestQueued(request -> latch.countDown()) .send(new Response.Listener.Adapter() { @Override @@ -514,27 +498,16 @@ public class HttpClientTest extends AbstractHttpClientServerTest latch.countDown(); } }) - .onResponseFailure(new Response.FailureListener() - { - @Override - public void onFailure(Response response, Throwable failure) - { - latch.countDown(); - } - }) + .onResponseFailure((response, failure) -> latch.countDown()) .send(null); client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) .path("/two") - .onResponseSuccess(new Response.SuccessListener() + .onResponseSuccess(response -> { - @Override - public void onSuccess(Response response) - { - Assert.assertEquals(200, response.getStatus()); - latch.countDown(); - } + Assert.assertEquals(200, response.getStatus()); + latch.countDown(); }) .send(null); @@ -564,14 +537,10 @@ public class HttpClientTest extends AbstractHttpClientServerTest client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) .file(file) - .onRequestSuccess(new Request.SuccessListener() + .onRequestSuccess(request -> { - @Override - public void onSuccess(Request request) - { - requestTime.set(System.nanoTime()); - latch.countDown(); - } + requestTime.set(System.nanoTime()); + latch.countDown(); }) .send(new Response.Listener.Adapter() { @@ -674,14 +643,10 @@ public class HttpClientTest extends AbstractHttpClientServerTest final int port = connector.getLocalPort(); client.newRequest(host, port) .scheme(scheme) - .onRequestBegin(new Request.BeginListener() + .onRequestBegin(request -> { - @Override - public void onBegin(Request request) - { - HttpDestinationOverHTTP destination = (HttpDestinationOverHTTP)client.getDestination(scheme, host, port); - destination.getConnectionPool().getActiveConnections().peek().close(); - } + HttpDestinationOverHTTP destination = (HttpDestinationOverHTTP)client.getDestination(scheme, host, port); + destination.getConnectionPool().getActiveConnections().peek().close(); }) .send(new Response.Listener.Adapter() { @@ -773,14 +738,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) - .onResponseHeader(new Response.HeaderListener() - { - @Override - public boolean onHeader(Response response, HttpField field) - { - return !field.getName().equals(headerName); - } - }) + .onResponseHeader((response1, field) -> !field.getName().equals(headerName)) .timeout(5, TimeUnit.SECONDS) .send(); @@ -864,16 +822,12 @@ public class HttpClientTest extends AbstractHttpClientServerTest final CountDownLatch latch = new CountDownLatch(1); client.newRequest("idontexist", 80) - .send(new Response.CompleteListener() + .send(result -> { - @Override - public void onComplete(Result result) - { - Assert.assertTrue(result.isFailed()); - Throwable failure = result.getFailure(); - Assert.assertTrue(failure instanceof UnknownHostException); - latch.countDown(); - } + Assert.assertTrue(result.isFailed()); + Throwable failure = result.getFailure(); + Assert.assertTrue(failure instanceof UnknownHostException); + latch.countDown(); }); Assert.assertTrue(latch.await(10, TimeUnit.SECONDS)); } @@ -1323,14 +1277,10 @@ public class HttpClientTest extends AbstractHttpClientServerTest final CountDownLatch completeLatch = new CountDownLatch(1); client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) - .send(new Response.CompleteListener() + .send(result -> { - @Override - public void onComplete(Result result) - { - if (result.isFailed()) - completeLatch.countDown(); - } + if (result.isFailed()) + completeLatch.countDown(); }); Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); @@ -1519,23 +1469,15 @@ public class HttpClientTest extends AbstractHttpClientServerTest final CountDownLatch latch = new CountDownLatch(2); client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) - .onRequestBegin(new Request.BeginListener() + .onRequestBegin(request -> { - @Override - public void onBegin(Request request) - { - Assert.assertTrue(open.get()); - latch.countDown(); - } + Assert.assertTrue(open.get()); + latch.countDown(); }) - .send(new Response.CompleteListener() + .send(result -> { - @Override - public void onComplete(Result result) - { - if (result.isSucceeded()) - latch.countDown(); - } + if (result.isSucceeded()) + latch.countDown(); }); Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));