#12 - ENH: Support multiple RequestListeners

Author: rbygrave

client/src/main/java/io/avaje/http/client/DHttpClientContextBuilder.java

@@ -20,8 +20,6 @@ class DHttpClientContextBuilder implements HttpClientContext.Builder {
 
   private BodyAdapter bodyAdapter;
 
-  private RequestListener requestListener;
-
   private CookieHandler cookieHandler = new CookieManager();
 
   private HttpClient.Redirect redirect = HttpClient.Redirect.NORMAL;
@@ -32,6 +30,7 @@ class DHttpClientContextBuilder implements HttpClientContext.Builder {
   private AuthTokenProvider authTokenProvider;
 
   private final List<RequestIntercept> interceptors = new ArrayList<>();
+  private final List<RequestListener> listeners = new ArrayList<>();
 
   DHttpClientContextBuilder() {
   }
@@ -62,7 +61,7 @@ public HttpClientContext.Builder withBodyAdapter(BodyAdapter adapter) {
 
   @Override
   public HttpClientContext.Builder withRequestListener(RequestListener requestListener) {
-    this.requestListener = requestListener;
+    this.listeners.add(requestListener);
     return this;
   }
 
@@ -109,7 +108,17 @@ public HttpClientContext build() {
     if (client == null) {
       client = defaultClient();
     }
-    return new DHttpClientContext(client, baseUrl, requestTimeout, bodyAdapter, requestListener, authTokenProvider, buildIntercept());
+    return new DHttpClientContext(client, baseUrl, requestTimeout, bodyAdapter, buildListener(), authTokenProvider, buildIntercept());
+  }
+
+  private RequestListener buildListener() {
+    if (listeners.isEmpty()) {
+      return null;
+    } else if (listeners.size() == 1) {
+      return listeners.get(0);
+    } else {
+      return new DRequestListeners(listeners);
+    }
   }
 
   private RequestIntercept buildIntercept() {

client/src/main/java/io/avaje/http/client/DRequestListeners.java

@@ -0,0 +1,19 @@
+package io.avaje.http.client;
+
+import java.util.List;
+
+class DRequestListeners implements RequestListener {
+
+  private final RequestListener[] listeners;
+
+  DRequestListeners(List<RequestListener> reqListeners) {
+    this.listeners = reqListeners.toArray(new RequestListener[0]);
+  }
+
+  @Override
+  public void response(Event event) {
+    for (RequestListener listener : listeners) {
+      listener.response(event);
+    }
+  }
+}

client/src/main/java/io/avaje/http/client/HttpClientContext.java

@@ -160,14 +160,17 @@ interface Builder {
     Builder withBodyAdapter(BodyAdapter adapter);
 
     /**
-     * Add a request listener. Note that {@link RequestLogger} is an
+     * Add a request listener. Multiple listeners may be added, when
+     * do so they will process events in the order they were added.
+     * <p>
+     * Note that {@link RequestLogger} is an
      * implementation for debug logging request/response headers and
      * content.
      */
     Builder withRequestListener(RequestListener requestListener);
 
     /**
-     * Add a request interceptor.
+     * Add a request interceptor. Multiple interceptors may be added.
      */
     Builder withRequestIntercept(RequestIntercept requestIntercept);
 

client/src/test/java/io/avaje/http/client/DRequestInterceptorsTest.java

@@ -10,7 +10,7 @@
 
 class DRequestInterceptorsTest {
 
-  private StringBuilder buffer = new StringBuilder();
+  private final StringBuilder buffer = new StringBuilder();
 
   @Test
   void intercept_reverse_after() {

client/src/test/java/io/avaje/http/client/DRequestListenersTest.java

@@ -0,0 +1,29 @@
+package io.avaje.http.client;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class DRequestListenersTest {
+
+  private final StringBuilder buffer = new StringBuilder();
+
+  @Test
+  void response() {
+
+    DRequestListeners listeners = new DRequestListeners(listeners());
+
+    listeners.response(Mockito.mock(RequestListener.Event.class));
+
+    assertThat(buffer.toString()).isEqualTo("one|two|");
+  }
+
+  private List<RequestListener> listeners() {
+    return Arrays.asList(event -> buffer.append("one|"), event -> buffer.append("two|"));
+  }
+
+}