API - Refactor rename ResponseListener to RequestListener #6

Author: rbygrave

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

@@ -15,14 +15,14 @@ class DHttpClientContext implements HttpClientContext {
   private final String baseUrl;
   private final Duration requestTimeout;
   private final BodyAdapter bodyAdapter;
-  private final ResponseListener responseListener;
+  private final RequestListener requestListener;
 
-  DHttpClientContext(HttpClient httpClient, String baseUrl, Duration requestTimeout, BodyAdapter bodyAdapter, ResponseListener responseListener) {
+  DHttpClientContext(HttpClient httpClient, String baseUrl, Duration requestTimeout, BodyAdapter bodyAdapter, RequestListener requestListener) {
     this.httpClient = httpClient;
     this.baseUrl = baseUrl;
     this.requestTimeout = requestTimeout;
     this.bodyAdapter = bodyAdapter;
-    this.responseListener = responseListener;
+    this.requestListener = requestListener;
   }
 
   @Override
@@ -128,14 +128,14 @@ <T> List<T> readList(Class<T> cls, BodyContent content) {
 
 
   void afterResponse(DHttpClientRequest request) {
-    if (responseListener != null) {
-      responseListener.response(request.listenerEvent());
+    if (requestListener != null) {
+      requestListener.response(request.listenerEvent());
     }
   }
 
   void afterResponseHandler(DHttpClientRequest request) {
-    if (responseListener != null) {
-      responseListener.response(request.listenerEvent());
+    if (requestListener != null) {
+      requestListener.response(request.listenerEvent());
     }
   }
 }

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

@@ -18,7 +18,7 @@ class DHttpClientContextBuilder implements HttpClientContext.Builder {
 
   private BodyAdapter bodyAdapter;
 
-  private ResponseListener responseListener;
+  private RequestListener requestListener;
 
   private CookieHandler cookieHandler = new CookieManager();
 
@@ -55,8 +55,8 @@ public HttpClientContext.Builder withBodyAdapter(BodyAdapter adapter) {
   }
 
   @Override
-  public HttpClientContext.Builder withResponseListener(ResponseListener responseListener) {
-    this.responseListener = responseListener;
+  public HttpClientContext.Builder withRequestListener(RequestListener requestListener) {
+    this.requestListener = requestListener;
     return this;
   }
 
@@ -89,7 +89,7 @@ public HttpClientContext build() {
     if (client == null) {
       client = defaultClient();
     }
-    return new DHttpClientContext(client, baseUrl, requestTimeout, bodyAdapter, responseListener);
+    return new DHttpClientContext(client, baseUrl, requestTimeout, bodyAdapter, requestListener);
   }
 
   private HttpClient defaultClient() {

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

@@ -354,11 +354,11 @@ protected HttpRequest.Builder newRequest(String method, String url, HttpRequest.
       .method(method, body);
   }
 
-  ResponseListener.Event listenerEvent() {
+  RequestListener.Event listenerEvent() {
     return new ListenerEvent();
   }
 
-  private class ListenerEvent implements ResponseListener.Event {
+  private class ListenerEvent implements RequestListener.Event {
 
     @Override
     public long responseTimeNanos() {

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

@@ -151,11 +151,11 @@ interface Builder {
     Builder withBodyAdapter(BodyAdapter adapter);
 
     /**
-     * Add a response listener. Note that {@link RequestLogger} is an
+     * Add a request listener. Note that {@link RequestLogger} is an
      * implementation for debug logging request/response headers and
      * content.
      */
-    Builder withResponseListener(ResponseListener requestListener);
+    Builder withRequestListener(RequestListener requestListener);
 
     /**
      * Specify a cookie handler to use on the HttpClient. This would override the default cookie handler.

client/src/main/java/io/avaje/http/client/ResponseListener.java renamed to client/src/main/java/io/avaje/http/client/RequestListener.java

@@ -7,10 +7,10 @@
 /**
  * Listen to responses.
  * <p>
- * {@link RequestLogger} is an implementation for debug logging the
- * requests and responses.
+ * {@link RequestLogger} is an implementation for debug logging
+ * the requests and responses.
  */
-public interface ResponseListener {
+public interface RequestListener {
 
   /**
    * Handle the response.

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

@@ -13,7 +13,7 @@
 /**
  * Logs request and response details for debug logging purposes.
  */
-public class RequestLogger implements ResponseListener {
+public class RequestLogger implements RequestListener {
 
   private static final Logger log = LoggerFactory.getLogger(RequestLogger.class);
 

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

@@ -26,7 +26,7 @@ public static void shutdown() {
   public static HttpClientContext client() {
     return HttpClientContext.newBuilder()
       .withBaseUrl(baseUrl)
-      .withResponseListener(new RequestLogger())
+      .withRequestListener(new RequestLogger())
       .withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
 //      .withBodyAdapter(new GsonBodyAdapter(new Gson()))
       .build();