Flip HttpClient.Metrics to extend HttpClientContext.Metrics instead of the other way around

Author: rbygrave

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

@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.ParameterizedType;
-import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -24,7 +23,7 @@ final class DHttpClientContext implements HttpClientContext, SpiHttpClient {
   static final String AUTHORIZATION = "Authorization";
   private static final String BEARER = "Bearer ";
 
-  private final HttpClient httpClient;
+  private final java.net.http.HttpClient httpClient;
   private final String baseUrl;
   private final Duration requestTimeout;
   private final BodyAdapter bodyAdapter;
@@ -41,7 +40,7 @@ final class DHttpClientContext implements HttpClientContext, SpiHttpClient {
   private final LongAdder metricResMicros = new LongAdder();
   private final LongAccumulator metricResMaxMicros = new LongAccumulator(Math::max, 0);
 
-  DHttpClientContext(HttpClient httpClient, String baseUrl, Duration requestTimeout, BodyAdapter bodyAdapter, RetryHandler retryHandler, RequestListener requestListener, AuthTokenProvider authTokenProvider, RequestIntercept intercept) {
+  DHttpClientContext(java.net.http.HttpClient httpClient, String baseUrl, Duration requestTimeout, BodyAdapter bodyAdapter, RetryHandler retryHandler, RequestListener requestListener, AuthTokenProvider authTokenProvider, RequestIntercept intercept) {
     this.httpClient = httpClient;
     this.baseUrl = baseUrl;
     this.requestTimeout = requestTimeout;
@@ -106,17 +105,17 @@ public UrlBuilder url() {
   }
 
   @Override
-  public HttpClient httpClient() {
+  public java.net.http.HttpClient httpClient() {
     return httpClient;
   }
 
   @Override
-  public Metrics metrics() {
+  public HttpClient.Metrics metrics() {
     return metrics(false);
   }
 
   @Override
-  public Metrics metrics(boolean reset) {
+  public HttpClient.Metrics metrics(boolean reset) {
     if (reset) {
       return new DMetrics(metricResTotal.sumThenReset(), metricResError.sumThenReset(), metricResBytes.sumThenReset(), metricResMicros.sumThenReset(), metricResMaxMicros.getThenReset());
     } else {
@@ -128,7 +127,7 @@ void metricsString(int stringBody) {
     metricResBytes.add(stringBody);
   }
 
-  static final class DMetrics implements Metrics {
+  static final class DMetrics implements HttpClient.Metrics {
 
     private final long totalCount;
     private final long errorCount;

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

@@ -78,14 +78,14 @@ static Builder builder() {
    * <p>
    * These metrics are collected for all requests sent via this context.
    */
-  HttpClientContext.Metrics metrics();
+  HttpClient.Metrics metrics();
 
   /**
    * Return the current metrics with the option of resetting the underlying counters.
    * <p>
    * These metrics are collected for all requests sent via this context.
    */
-  HttpClientContext.Metrics metrics(boolean reset);
+  HttpClient.Metrics metrics(boolean reset);
 
   /**
    * Builds the HttpClient.
@@ -331,36 +331,7 @@ interface State {
   /**
    * Statistic metrics collected to provide an overview of activity of this client.
    */
-  interface Metrics {
+  interface Metrics extends HttpClientContext.Metrics {
 
-    /**
-     * Return the total number of responses.
-     */
-    long totalCount();
-
-    /**
-     * Return the total number of error responses (status code >= 300).
-     */
-    long errorCount();
-
-    /**
-     * Return the total response bytes (excludes streaming responses).
-     */
-    long responseBytes();
-
-    /**
-     * Return the total response time in microseconds.
-     */
-    long totalMicros();
-
-    /**
-     * Return the max response time in microseconds (since the last reset).
-     */
-    long maxMicros();
-
-    /**
-     * Return the average response time in microseconds.
-     */
-    long avgMicros();
   }
 }

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

@@ -275,7 +275,35 @@ interface State extends io.avaje.http.client.HttpClient.Builder.State {
   /**
    * Statistic metrics collected to provide an overview of activity of this client.
    */
-  interface Metrics extends io.avaje.http.client.HttpClient.Metrics {
+  interface Metrics {
+    /**
+     * Return the total number of responses.
+     */
+    long totalCount();
+
+    /**
+     * Return the total number of error responses (status code >= 300).
+     */
+    long errorCount();
+
+    /**
+     * Return the total response bytes (excludes streaming responses).
+     */
+    long responseBytes();
 
+    /**
+     * Return the total response time in microseconds.
+     */
+    long totalMicros();
+
+    /**
+     * Return the max response time in microseconds (since the last reset).
+     */
+    long maxMicros();
+
+    /**
+     * Return the average response time in microseconds.
+     */
+    long avgMicros();
   }
 }

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

@@ -1,6 +1,5 @@
 package io.avaje.http.client;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.example.webserver.ErrorResponse;
 import org.example.webserver.HelloDto;
@@ -23,7 +22,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static java.net.http.HttpClient.Version.*;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;