Move checkResponse() and checkMaybeThrow() to DHttpClientRequest and map error

Author: rbygrave

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

@@ -199,19 +199,6 @@ public long avgMicros() {
     }
   }
 
-  @Override
-  public void checkResponse(HttpResponse<?> response) {
-    if (response.statusCode() >= 300) {
-      throw new HttpException(response, this);
-    }
-  }
-
-  void checkMaybeThrow(HttpResponse<byte[]> response) {
-    if (response.statusCode() >= 300) {
-      throw new HttpException(this, response);
-    }
-  }
-
   @SuppressWarnings("unchecked")
   public BodyContent readErrorContent(boolean responseAsBytes, HttpResponse<?> httpResponse) {
     if (responseAsBytes) {

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

@@ -456,11 +456,27 @@ public HttpClientResponse TRACE() {
     return this;
   }
 
+  private RuntimeException mapException(HttpException e) {
+    return errorMapper == null ? e : errorMapper.apply(e);
+  }
+
+  private void checkResponse(HttpResponse<?> response) {
+    if (response.statusCode() >= 300) {
+      throw mapException(new HttpException(response, context));
+    }
+  }
+
+  private void checkMaybeThrow(HttpResponse<byte[]> response) {
+    if (response.statusCode() >= 300) {
+      throw mapException(new HttpException(context, response));
+    }
+  }
+
   private void readResponseContent() {
     final HttpResponse<byte[]> response = sendWith(HttpResponse.BodyHandlers.ofByteArray());
     encodedResponseBody = context.readContent(response);
     context.afterResponse(this);
-    context.checkMaybeThrow(response);
+    checkMaybeThrow(response);
   }
 
   @Override
@@ -542,7 +558,7 @@ public <T> Stream<T> stream(Type type) {
   private <T> Stream<T> stream(BodyReader<T> bodyReader) {
     final HttpResponse<Stream<String>> res = handler(HttpResponse.BodyHandlers.ofLines());
     this.httpResponse = res;
-    context.checkResponse(res);
+    checkResponse(res);
     return res.body().map(bodyReader::readBody);
   }
 
@@ -626,7 +642,7 @@ protected <E> HttpResponse<Stream<E>> asyncStream(Class<E> type, HttpResponse<St
     responseTimeNanos = System.nanoTime() - startAsyncNanos;
     httpResponse = response;
     context.afterResponse(this);
-    context.checkResponse(response);
+    checkResponse(response);
     final BodyReader<E> bodyReader = context.beanReader(type);
     return new HttpWrapperResponse<>(response.body().map(bodyReader::readBody), httpResponse);
   }
@@ -635,7 +651,7 @@ protected <E> HttpResponse<Stream<E>> asyncStream(Type type, HttpResponse<Stream
     responseTimeNanos = System.nanoTime() - startAsyncNanos;
     httpResponse = response;
     context.afterResponse(this);
-    context.checkResponse(response);
+    checkResponse(response);
     final BodyReader<E> bodyReader = context.beanReader(type);
     return new HttpWrapperResponse<>(response.body().map(bodyReader::readBody), httpResponse);
   }
@@ -645,7 +661,7 @@ private void afterAsyncEncoded(HttpResponse<byte[]> response) {
     httpResponse = response;
     encodedResponseBody = context.readContent(response);
     context.afterResponse(this);
-    context.checkMaybeThrow(response);
+    checkMaybeThrow(response);
   }
 
   protected <E> HttpResponse<E> afterAsync(HttpResponse<E> response) {
@@ -680,7 +696,7 @@ public HttpResponse<String> asString() {
   public HttpResponse<String> asPlainString() {
     loggableResponseBody = true;
     final HttpResponse<String> hres = addMetrics(handler(HttpResponse.BodyHandlers.ofString()));
-    context.checkResponse(hres);
+    checkResponse(hres);
     return hres;
   }
 

http-client/src/main/java/io/avaje/http/client/SpiHttpClient.java

@@ -38,10 +38,4 @@ interface SpiHttpClient {
    */
   byte[] decodeContent(String encoding, byte[] content);
 
-  /**
-   * Check the response status code and throw HttpException if the status
-   * code is in the error range.
-   */
-  void checkResponse(HttpResponse<?> response);
-
 }