Bump avaje-http-client to 1.9

Author: rbygrave

tests/test-client/pom.xml

@@ -30,7 +30,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>1.9-SNAPSHOT</version>
+      <version>1.9</version>
     </dependency>
 
     <dependency>

tests/test-client/src/main/java/org/example/JunkApi.java

@@ -121,6 +121,14 @@ public interface JunkApi {
   HttpCall<HttpResponse<Path>> callWithHandPath(HttpResponse.BodyHandler<Path> handler);
 
   @Post("/{id}/foo/{name}")
-  HttpResponse<Path> reqBodyResHand2(HttpResponse.BodyHandler<Path> handler, HttpRequest.BodyPublisher body, String id, String name, String other);
+  HttpResponse<Void> postWithBody(String id, String name, HttpRequest.BodyPublisher body, String other);
+
+  @Get("/{id}")
+  HttpResponse<Path> getWithHandler(String id, HttpResponse.BodyHandler<Path> myHandler, String other);
+
+  @Get("/{id}")
+  <T> HttpResponse<T> getWithGeneralHandler(String id, HttpResponse.BodyHandler<T> myHandler);
 
+  @Post("/{id}/foo/{name}")
+  HttpResponse<Path> reqBodyResHand2(HttpResponse.BodyHandler<Path> handler, HttpRequest.BodyPublisher body, String id, String name, String other);
 }

tests/test-client/src/test/java/org/example/CommonApiTest.java

@@ -24,13 +24,9 @@ static void start() {
     final int port = new Random().nextInt(1000) + 10_000;
     Main.start(port);
 
-    ObjectMapper objectMapper = new ObjectMapper()
-      .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
     final HttpClientContext clientContext = HttpClientContext.newBuilder()
-      .withBaseUrl("http://localhost:" + port)
-      .withRequestListener(new RequestLogger())
-      .withBodyAdapter(new JacksonBodyAdapter(objectMapper))
+      .baseUrl("http://localhost:" + port)
+      .bodyAdapter(new JacksonBodyAdapter())
       .build();
 
     client = clientContext.create(CommonApi.class);

tests/test-client/src/test/java/org/example/SimpleTest.java

@@ -25,9 +25,8 @@ void listRepos() {
 
     final HttpClientContext clientContext =
       HttpClientContext.newBuilder()
-        .withBaseUrl("https://api.github.com")
-        .withRequestListener(new RequestLogger())
-        .withBodyAdapter(new JacksonBodyAdapter(objectMapper))
+        .baseUrl("https://api.github.com")
+        .bodyAdapter(new JacksonBodyAdapter(objectMapper))
         .build();
 
     GitHubUsers simple = clientContext.create(GitHubUsers.class);

tests/test-helidon/pom.xml

@@ -115,7 +115,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>1.7</version>
+      <version>1.9</version>
       <scope>test</scope>
     </dependency>
 

tests/test-helidon/src/test/java/org/example/BaseWebTest.java

@@ -27,10 +27,8 @@ public static void shutdown() {
 
   public static HttpClientContext client() {
     return HttpClientContext.newBuilder()
-      .withBaseUrl(baseUrl)
-      .withRequestListener(new RequestLogger())
-      .withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
-      //.with(httpClient)
+      .baseUrl(baseUrl)
+      .bodyAdapter(new JacksonBodyAdapter())
       .build();
   }
 }

tests/test-javalin/pom.xml

@@ -108,7 +108,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>1.7</version>
+      <version>1.9</version>
       <scope>test</scope>
     </dependency>
 

tests/test-javalin/src/test/java/org/example/myapp/BaseWebTest.java

@@ -27,10 +27,8 @@ public static void shutdown() {
 
   public static HttpClientContext client() {
     return HttpClientContext.newBuilder()
-      .withBaseUrl(baseUrl)
-      .withRequestListener(new RequestLogger())
-      .withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
-      //.with(httpClient)
+      .baseUrl(baseUrl)
+      .bodyAdapter(new JacksonBodyAdapter())
       .build();
   }
 }

tests/test-javalin/src/test/java/org/example/myapp/HelloControllerTest.java

@@ -1,12 +1,6 @@
 package org.example.myapp;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.avaje.http.client.BodyReader;
-import io.avaje.http.client.BodyWriter;
-import io.avaje.http.client.HttpClientContext;
-import io.avaje.http.client.HttpException;
-import io.avaje.http.client.JacksonBodyAdapter;
-import io.avaje.http.client.RequestLogger;
+import io.avaje.http.client.*;
 import io.restassured.common.mapper.TypeRef;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
@@ -35,10 +29,9 @@ class HelloControllerTest extends BaseWebTest {
       .build();
 
     this.clientContext = HttpClientContext.newBuilder()
-      .withBaseUrl(baseUrl)
-      .withRequestListener(new RequestLogger())
-      .withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
-      .with(httpClient)
+      .baseUrl(baseUrl)
+      .bodyAdapter(new JacksonBodyAdapter())
+      .client(httpClient)
       .build();
   }
 

tests/test-jex/pom.xml

@@ -95,7 +95,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>1.7</version>
+      <version>1.9</version>
       <scope>test</scope>
     </dependency>
 

tests/test-jex/src/test/java/org/example/web/BaseWebTest.java

@@ -30,10 +30,9 @@ public static void shutdown() {
 
   public static HttpClientContext client() {
     return HttpClientContext.newBuilder()
-      .withBaseUrl(baseUrl)
-      .withRequestTimeout(Duration.ofMinutes(2))
-      .withRequestListener(new RequestLogger())
-      .withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
+      .baseUrl(baseUrl)
+      .requestTimeout(Duration.ofMinutes(2))
+      .bodyAdapter(new JacksonBodyAdapter())
       .build();
   }
 }

tests/test-spark/pom.xml

@@ -93,7 +93,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>1.7</version>
+      <version>1.9</version>
       <scope>test</scope>
     </dependency>