Have SimpleAHCTransferListener receive an UriComponents

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/SimpleAsyncHttpClient.java

@@ -18,6 +18,7 @@
 import org.asynchttpclient.resumable.ResumableIOExceptionFilter;
 import org.asynchttpclient.simple.HeaderMap;
 import org.asynchttpclient.simple.SimpleAHCTransferListener;
+import org.asynchttpclient.uri.UriComponents;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -283,7 +284,7 @@ private Future<Response> execute(RequestBuilder rb, BodyConsumer bodyConsumer, T
 
         Request request = rb.build();
         ProgressAsyncHandler<Response> handler = new BodyConsumerAsyncHandler(bodyConsumer, throwableHandler, errorDocumentBehaviour,
-                request.getUrl(), listener);
+                request.getURI(), listener);
 
         if (resumeEnabled && request.getMethod().equals("GET") && bodyConsumer != null && bodyConsumer instanceof ResumableBodyConsumer) {
             ResumableBodyConsumer fileBodyConsumer = (ResumableBodyConsumer) bodyConsumer;
@@ -735,7 +736,7 @@ private final static class BodyConsumerAsyncHandler extends AsyncCompletionHandl
         private final BodyConsumer bodyConsumer;
         private final ThrowableHandler exceptionHandler;
         private final ErrorDocumentBehaviour errorDocumentBehaviour;
-        private final String url;
+        private final UriComponents uri;
         private final SimpleAHCTransferListener listener;
 
         private boolean accumulateBody = false;
@@ -744,11 +745,11 @@ private final static class BodyConsumerAsyncHandler extends AsyncCompletionHandl
         private long total = -1;
 
         public BodyConsumerAsyncHandler(BodyConsumer bodyConsumer, ThrowableHandler exceptionHandler,
-                ErrorDocumentBehaviour errorDocumentBehaviour, String url, SimpleAHCTransferListener listener) {
+                ErrorDocumentBehaviour errorDocumentBehaviour, UriComponents uri, SimpleAHCTransferListener listener) {
             this.bodyConsumer = bodyConsumer;
             this.exceptionHandler = exceptionHandler;
             this.errorDocumentBehaviour = errorDocumentBehaviour;
-            this.url = url;
+            this.uri = uri;
             this.listener = listener;
         }
 
@@ -846,13 +847,13 @@ private void calculateTotal(HttpResponseHeaders headers) {
 
         @Override
         public STATE onContentWriteProgress(long amount, long current, long total) {
-            fireSent(url, amount, current, total);
+            fireSent(uri, amount, current, total);
             return super.onContentWriteProgress(amount, current, total);
         }
 
         private void fireStatus(HttpResponseStatus status) {
             if (listener != null) {
-                listener.onStatus(url, status.getStatusCode(), status.getStatusText());
+                listener.onStatus(uri, status.getStatusCode(), status.getStatusText());
             }
         }
 
@@ -862,27 +863,26 @@ private void fireReceived(HttpResponseBodyPart content) {
             amount += remaining;
 
             if (listener != null) {
-                listener.onBytesReceived(url, amount, remaining, total);
+                listener.onBytesReceived(uri, amount, remaining, total);
             }
         }
 
         private void fireHeaders(HttpResponseHeaders headers) {
             if (listener != null) {
-                listener.onHeaders(url, new HeaderMap(headers.getHeaders()));
+                listener.onHeaders(uri, new HeaderMap(headers.getHeaders()));
             }
         }
 
-        private void fireSent(String url, long amount, long current, long total) {
+        private void fireSent(UriComponents uri, long amount, long current, long total) {
             if (listener != null) {
-                listener.onBytesSent(url, amount, current, total);
+                listener.onBytesSent(uri, amount, current, total);
             }
         }
 
         private void fireCompleted(Response response) {
             if (listener != null) {
-                listener.onCompleted(url, response.getStatusCode(), response.getStatusText());
+                listener.onCompleted(uri, response.getStatusCode(), response.getStatusText());
             }
         }
     }
-
 }

api/src/main/java/org/asynchttpclient/simple/SimpleAHCTransferListener.java

@@ -14,6 +14,7 @@
  */
 
 import org.asynchttpclient.SimpleAsyncHttpClient;
+import org.asynchttpclient.uri.UriComponents;
 
 /**
  * A simple transfer listener for use with the {@link SimpleAsyncHttpClient}.
@@ -29,51 +30,51 @@ public interface SimpleAHCTransferListener {
     /**
      * This method is called after the connection status is received.
      *
-     * @param url        the url for the connection.
+     * @param uri        the uri
      * @param statusCode the received status code.
      * @param statusText the received status text.
      */
-    void onStatus(String url, int statusCode, String statusText);
+    void onStatus(UriComponents uri, int statusCode, String statusText);
 
     /**
      * This method is called after the response headers are received.
      *
-     * @param url     the url for the connection.
+     * @param uri     the uri
      * @param headers the received headers, never {@code null}.
      */
-    void onHeaders(String url, HeaderMap headers);
+    void onHeaders(UriComponents uri, HeaderMap headers);
 
     /**
      * This method is called when bytes of the responses body are received.
      *
-     * @param url     the url for the connection.
+     * @param uri     the uri
      * @param amount  the number of transferred bytes so far.
      * @param current the number of transferred bytes since the last call to this
      *                method.
      * @param total   the total number of bytes to be transferred. This is taken
      *                from the Content-Length-header and may be unspecified (-1).
      */
-    void onBytesReceived(String url, long amount, long current, long total);
+    void onBytesReceived(UriComponents uri, long amount, long current, long total);
 
     /**
      * This method is called when bytes are sent.
      *
-     * @param url     the url for the connection.
+     * @param uri     the uri
      * @param amount  the number of transferred bytes so far.
      * @param current the number of transferred bytes since the last call to this
      *                method.
      * @param total   the total number of bytes to be transferred. This is taken
      *                from the Content-Length-header and may be unspecified (-1).
      */
-    void onBytesSent(String url, long amount, long current, long total);
+    void onBytesSent(UriComponents uri, long amount, long current, long total);
 
     /**
      * This method is called when the request is completed.
      *
-     * @param url        the url for the connection.
+     * @param uri        the uri
      * @param statusCode the received status code.
      * @param statusText the received status text.
      */
-    void onCompleted(String url, int statusCode, String statusText);
+    void onCompleted(UriComponents uri, int statusCode, String statusText);
 }
 

api/src/test/java/org/asynchttpclient/async/SimpleAsyncHttpClientTest.java

@@ -27,6 +27,7 @@
 import org.asynchttpclient.multipart.ByteArrayPart;
 import org.asynchttpclient.simple.HeaderMap;
 import org.asynchttpclient.simple.SimpleAHCTransferListener;
+import org.asynchttpclient.uri.UriComponents;
 import org.asynchttpclient.util.StandardCharsets;
 import org.testng.annotations.Test;
 
@@ -176,19 +177,19 @@ public void testSimpleTransferListener() throws Exception {
 
         SimpleAHCTransferListener listener = new SimpleAHCTransferListener() {
 
-            public void onStatus(String url, int statusCode, String statusText) {
+            public void onStatus(UriComponents uri, int statusCode, String statusText) {
                 try {
                     assertEquals(statusCode, 200);
-                    assertEquals(url, getTargetUrl());
+                    assertEquals(uri.toUrl(), getTargetUrl());
                 } catch (Error e) {
                     errors.add(e);
                     throw e;
                 }
             }
 
-            public void onHeaders(String url, HeaderMap headers) {
+            public void onHeaders(UriComponents uri, HeaderMap headers) {
                 try {
-                    assertEquals(url, getTargetUrl());
+                    assertEquals(uri.toUrl(), getTargetUrl());
                     assertNotNull(headers);
                     assertTrue(!headers.isEmpty());
                     assertEquals(headers.getFirstValue("X-Custom"), "custom");
@@ -198,19 +199,19 @@ public void onHeaders(String url, HeaderMap headers) {
                 }
             }
 
-            public void onCompleted(String url, int statusCode, String statusText) {
+            public void onCompleted(UriComponents uri, int statusCode, String statusText) {
                 try {
                     assertEquals(statusCode, 200);
-                    assertEquals(url, getTargetUrl());
+                    assertEquals(uri.toUrl(), getTargetUrl());
                 } catch (Error e) {
                     errors.add(e);
                     throw e;
                 }
             }
 
-            public void onBytesSent(String url, long amount, long current, long total) {
+            public void onBytesSent(UriComponents uri, long amount, long current, long total) {
                 try {
-                    assertEquals(url, getTargetUrl());
+                    assertEquals(uri.toUrl(), getTargetUrl());
                     // FIXME Netty bug, see https://github.com/netty/netty/issues/1855
 //                    assertEquals(total, MY_MESSAGE.getBytes().length);
                 } catch (Error e) {
@@ -219,9 +220,9 @@ public void onBytesSent(String url, long amount, long current, long total) {
                 }
             }
 
-            public void onBytesReceived(String url, long amount, long current, long total) {
+            public void onBytesReceived(UriComponents uri, long amount, long current, long total) {
                 try {
-                    assertEquals(url, getTargetUrl());
+                    assertEquals(uri.toUrl(), getTargetUrl());
                     assertEquals(total, -1);
                 } catch (Error e) {
                     errors.add(e);