For body(Path file) throw IllegalArgumentException

Going with the API assumption that file existence and file permission is checked in application side prior to setting as body content. In that sense it is nicer if the API does not force the user to again handle FileNotFoundException.

Author: rbygrave

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

@@ -11,7 +11,7 @@
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.time.*;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
@@ -212,9 +212,13 @@ public HttpClientRequest body(Supplier<? extends InputStream> streamSupplier) {
   }
 
   @Override
-  public HttpClientRequest body(Path file) throws FileNotFoundException {
-    this.body = HttpRequest.BodyPublishers.ofFile(file);
-    return this;
+  public HttpClientRequest body(Path file) {
+    try {
+      this.body = HttpRequest.BodyPublishers.ofFile(file);
+      return this;
+    } catch (FileNotFoundException e) {
+      throw new IllegalArgumentException("File not found " + file, e);
+    }
   }
 
   @Override

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

@@ -236,7 +236,7 @@ public interface HttpClientRequest {
    * @param file The file to send as body content
    * @return The request being built
    */
-  HttpClientRequest body(Path file) throws FileNotFoundException;
+  HttpClientRequest body(Path file);
 
   /**
    * Set the body content using http BodyPublisher.

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

@@ -25,8 +25,11 @@ void suppressLogging_listenerEvent_expect_suppressedPayloadContent() {
   void skipAuthToken_listenerEvent_expect_suppressedPayloadContent() {
 
     final DHttpClientRequest request = new DHttpClientRequest(mock(DHttpClientContext.class), Duration.ZERO);
+    assertThat(request.isSkipAuthToken()).isFalse();
 
     request.skipAuthToken();
+    assertThat(request.isSkipAuthToken()).isTrue();
+
     final RequestListener.Event event = request.listenerEvent();
 
     assertThat(event.requestBody()).isEqualTo("<suppressed request body>");

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

@@ -4,10 +4,16 @@
 import org.example.webserver.HelloDto;
 import org.junit.jupiter.api.Test;
 
+import java.io.*;
 import java.net.http.HttpResponse;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
@@ -24,6 +30,56 @@ class HelloControllerTest extends BaseWebTest {
 
   final HttpClientContext clientContext = client();
 
+  @Test
+  void asLines() {
+    final HttpResponse<Stream<String>> hres =
+      clientContext.request()
+      .path("hello").path("stream")
+      .GET()
+      .asLines();
+
+    assertThat(hres.statusCode()).isEqualTo(200);
+    final List<String> lines = hres.body().collect(Collectors.toList());
+
+    assertThat(lines).hasSize(4);
+    assertThat(lines.get(0)).contains("{\"id\":1, \"name\":\"one\"}");
+  }
+
+  @Test
+  void asInputStream() throws IOException {
+    final HttpResponse<InputStream> hres =
+      clientContext.request()
+        .path("hello").path("stream")
+        .GET()
+        .asInputStream();
+
+    assertThat(hres.statusCode()).isEqualTo(200);
+    final LineNumberReader reader = new LineNumberReader(new InputStreamReader(hres.body()));
+
+    List<String> allLines = new ArrayList<>();
+    String line;
+    while ((line = reader.readLine()) != null) {
+      allLines.add(line);
+    }
+    assertThat(allLines).hasSize(4);
+    assertThat(allLines.get(0)).contains("{\"id\":1, \"name\":\"one\"}");
+  }
+
+  @Test
+  void asFile() throws IOException {
+    final Path path = File.createTempFile("test", "dump").toPath();
+    final HttpResponse<Path> hres =
+      clientContext.request()
+        .path("hello").path("stream")
+        .GET()
+        .asFile(path);
+
+    assertThat(hres.statusCode()).isEqualTo(200);
+    assertThat(path.toFile().length()).isGreaterThan(90L);
+
+    assertTrue(path.toFile().delete());
+  }
+
   @Test
   void get_stream() {
 
@@ -160,6 +216,23 @@ void get_helloMessage() {
     assertThat(hres.statusCode()).isEqualTo(200);
   }
 
+  @Test
+  void get_notFound() {
+    UUID nullUUID = null;
+    final HttpClientRequest request = clientContext.request()
+      .path("hello").path(UUID.randomUUID()).queryParam("zone", ZoneId.of("UTC"))
+      .header("X-Zone", ZoneId.of("UTC"))
+      .header("X-Foo", nullUUID);
+
+    assertThat(request.header("X-Zone")).containsExactly("UTC");
+    assertThat(request.header("X-Foo")).isEmpty();
+
+    final HttpResponse<String> hres = request.GET().asString();
+
+    assertThat(hres.statusCode()).isEqualTo(404);
+    assertThat(hres.body()).contains("Not found");
+  }
+
   @Test
   void callString() {
     final HttpResponse<String> hres = clientContext.request()
@@ -499,12 +572,16 @@ void post_bean_returningVoid() {
   @Test
   void postForm() {
 
+    UUID nullUUID = null;
+
     final HttpResponse<Void> res = clientContext.request()
       .path("hello/saveform")
       .formParam("name", "Bazz")
       .formParam("email", "user@foo.com")
       .formParam("url", "http://foo.com")
-      .formParam("startDate", "2030-12-03")
+      .formParam("startDate", LocalDate.of(2030, 12, 03))
+      .formParam("setToNull", null)
+      .formParam("nullUid", nullUUID)
       .POST()
       .asDiscarding();
 
@@ -741,7 +818,7 @@ void callAsVoid_async() throws ExecutionException, InterruptedException {
   void callAsDiscarding() {
     final HttpResponse<Void> res =
       clientContext.request()
-        .path("hello/52")
+        .path("hello").path(52)
         .DELETE()
         .call().asDiscarding().execute();
 
@@ -751,7 +828,7 @@ void callAsDiscarding() {
   @Test
   void callAsDiscardingAsync() throws ExecutionException, InterruptedException {
     final CompletableFuture<HttpResponse<Void>> future = clientContext.request()
-      .path("hello/52")
+      .path("hello").path(52L)
       .DELETE()
       .call().asDiscarding().async();
 
@@ -761,18 +838,20 @@ void callAsDiscardingAsync() throws ExecutionException, InterruptedException {
 
   @Test
   void get_withMatrixParam() {
-
     final HttpResponse<String> httpRes = clientContext.request()
+      .requestTimeout(Duration.ofSeconds(40))
       .path("hello/withMatrix/2011")
       .matrixParam("author", "rob")
       .matrixParam("country", "nz")
+      .matrixParam("zone", ZoneId.of("UTC"))
       .path("foo")
       .queryParam("extra", "banana")
+      .matrixParam("setToNull", null)
       .GET()
       .asString();
 
     assertEquals(200, httpRes.statusCode());
-    assertEquals("yr:2011 au:rob co:nz other:foo extra:banana", httpRes.body());
+    assertEquals("yr:2011 au:rob co:nz zone:UTC other:foo extra:banana", httpRes.body());
   }
 
   public static class SimpleData {

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

@@ -0,0 +1,73 @@
+package io.avaje.http.client;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.example.webserver.HelloDto;
+import org.junit.jupiter.api.Test;
+
+import java.net.http.HttpResponse;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class RequestListenerTest extends BaseWebTest {
+
+  static class TDRequestListener implements RequestListener {
+    final boolean hasBody;
+
+    TDRequestListener(boolean hasBody) {
+      this.hasBody = hasBody;
+    }
+
+    @Override
+    public void response(Event event) {
+      if (hasBody) {
+        assertThat(event.responseBody()).isEqualTo("post");
+        assertThat(event.uri().toString()).isEqualTo("http://localhost:8887/post");
+        assertThat(event.requestBody()).isEqualTo("post-request-body");
+      } else {
+        assertThat(event.responseBody()).isEqualTo("hello world");
+        assertThat(event.uri().toString()).isEqualTo("http://localhost:8887/hello/message");
+        assertThat(event.requestBody()).isNull();
+      }
+      assertThat(event.responseTimeNanos()).isGreaterThan(1L);
+      assertThat(event.response().statusCode()).isEqualTo(200);
+      assertThat(event.request()).isEqualTo(event.response().request());
+    }
+  }
+
+  private HttpClientContext createClient(TDRequestListener tdRequestListener) {
+    return HttpClientContext.newBuilder()
+      .withBaseUrl(baseUrl)
+      .withRequestListener(new RequestLogger())
+      .withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
+      .withRequestListener(tdRequestListener)
+      .build();
+  }
+
+  @Test
+  void get_no_request_body() {
+    final TDRequestListener tdRequestListener = new TDRequestListener(false);
+    final HttpClientContext client = createClient(tdRequestListener);
+
+    final HttpResponse<String> hres = client.request()
+      .path("hello").path("message")
+      .GET().asString();
+
+    assertThat(hres.body()).contains("hello world");
+    assertThat(hres.statusCode()).isEqualTo(200);
+  }
+
+  @Test
+  void post() {
+    final TDRequestListener tdRequestListener = new TDRequestListener(true);
+    final HttpClientContext client = createClient(tdRequestListener);
+
+    final HttpResponse<String> hres = client.request()
+      .path("post")
+      .body("post-request-body")
+      .POST().asString();
+
+    assertThat(hres.body()).contains("post");
+    assertThat(hres.statusCode()).isEqualTo(200);
+  }
+
+}

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

@@ -43,6 +43,15 @@ void matrixParam() {
     assertThat(url).isEqualTo("https://foo/bar;a=one;b=two");
   }
 
+  @Test
+  void matrixParam_object() {
+    UUID uid = UUID.randomUUID();
+    final String url = foo().path("bar").matrixParam("a", uid)
+      .build();
+
+    assertThat(url).isEqualTo("https://foo/bar;a=" + uid);
+  }
+
   @Test
   void matrixParam_null() {
     final String url = foo().path("bar").matrixParam("a", null).matrixParam("b", "two")

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

@@ -3,9 +3,19 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.function.Supplier;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class VerbTest extends BaseWebTest {
 
@@ -89,6 +99,62 @@ void delete_with_body() {
     assertThat(res.body()).isEqualTo("delete body[dummy]");
   }
 
+  @Test
+  void delete_with_body_bytes() {
+
+    HttpResponse<String> res = clientContext.request()
+      .path("delete")
+      .body("dummyBytes".getBytes(StandardCharsets.UTF_8))
+      .DELETE().asString();
+
+    assertThat(res.body()).isEqualTo("delete body[dummyBytes]");
+  }
+
+  @Test
+  void delete_with_body_BodyPublishers() {
+
+    HttpResponse<String> res = clientContext.request()
+      .path("delete")
+      .body(HttpRequest.BodyPublishers.ofString("dummyBodyPublishers"))
+      .DELETE().asString();
+
+    assertThat(res.body()).isEqualTo("delete body[dummyBodyPublishers]");
+  }
+
+  @Test
+  void delete_with_body_Path() throws URISyntaxException {
+
+    final URL resource = getClass().getResource("/dummy.txt");
+    HttpResponse<String> res = clientContext.request()
+      .path("delete")
+      .body(Path.of(resource.toURI()))
+      .DELETE().asString();
+
+    assertThat(res.body()).isEqualTo("delete body[dummyFileContent]");
+  }
+
+  @Test
+  void delete_with_body_Path_NotFound_expects_IllegalArgumentException() {
+
+    final IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () ->
+      clientContext.request()
+        .path("delete")
+        .body(Path.of(URI.create("file:///file-does-not-exist.txt")))
+        .DELETE().asString());
+
+    assertThat(e.getMessage()).startsWith("File not found");
+  }
+
+  @Test
+  void delete_with_body_InputStream() {
+    HttpResponse<String> res = clientContext.request()
+        .path("delete")
+        .body(() -> getClass().getResourceAsStream("/dummy.txt"))
+        .DELETE().asString();
+
+    assertThat(res.body()).isEqualTo("delete body[dummyFileContent]");
+  }
+
   @Test
   void head() {
 
@@ -112,4 +178,14 @@ void get() {
     assertThat(res.body()).isEqualTo("get");
   }
 
+  @Test
+  void get_BodyHandler_null_expect() {
+
+    HttpResponse<String> res = clientContext.request()
+      .path("post")
+      .body((HttpRequest.BodyPublisher)null)
+      .POST().asString();
+
+    assertThat(res.body()).isEqualTo("post");
+  }
 }