Merge pull request #205 from avaje/feature/client-url

[http client] Expose UrlBuilder url() method on client

Author: rbygrave

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

@@ -65,6 +65,11 @@ static Builder builder() {
    */
   HttpClientRequest request();
 
+  /**
+   * Return a UrlBuilder to use to build an URL taking into account the base URL.
+   */
+  UrlBuilder url();
+
   /**
    * Deprecated - migrate to {@link #bodyAdapter()}.
    * <p>

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

@@ -8,12 +8,6 @@
  */
 interface SpiHttpClient {
 
-  /**
-   * Return a UrlBuilder to use to build an URL taking into
-   * account the base URL.
-   */
-  UrlBuilder url();
-
   /**
    * Return the underlying http client.
    */

http-client/src/test/java/io/avaje/http/client/DHttpClientContextTest.java

@@ -3,7 +3,6 @@
 import org.example.github.BasicClientInterface;
 import org.junit.jupiter.api.Test;
 
-import java.net.http.HttpClient;
 import java.nio.charset.StandardCharsets;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -40,49 +39,49 @@ void gzip_contentDecode() {
   @Test
   void build_basic() {
 
-    final HttpClientContext context =
-      HttpClientContext.builder()
+    final HttpClient client =
+      HttpClient.builder()
       .baseUrl("http://localhost")
       .build();
 
-    SpiHttpClient spi = (SpiHttpClient)context;
+    SpiHttpClient spi = (SpiHttpClient)client;
     // has default client created
     assertThat(spi.httpClient()).isNotNull();
-    assertThat(spi.httpClient().version()).isEqualTo(HttpClient.Version.HTTP_2);
+    assertThat(spi.httpClient().version()).isEqualTo(java.net.http.HttpClient.Version.HTTP_2);
     assertThat(spi.httpClient().cookieHandler()).isPresent();
 
     // has expected url building
-    assertThat(spi.url().build()).isEqualTo("http://localhost");
-    assertThat(spi.url().path("hello").build()).isEqualTo("http://localhost/hello");
-    assertThat(spi.url().queryParam("hello","there").build()).isEqualTo("http://localhost?hello=there");
+    assertThat(client.url().build()).isEqualTo("http://localhost");
+    assertThat(client.url().path("hello").build()).isEqualTo("http://localhost/hello");
+    assertThat(client.url().queryParam("hello","there").build()).isEqualTo("http://localhost?hello=there");
   }
 
   @Test
   void build_noCookieHandler() {
 
-    final HttpClientContext context =
-      HttpClientContext.builder()
+    final HttpClient client =
+      HttpClient.builder()
         .baseUrl("http://localhost")
         .cookieHandler(null)
-        .redirect(HttpClient.Redirect.ALWAYS)
+        .redirect(java.net.http.HttpClient.Redirect.ALWAYS)
         .build();
 
-    SpiHttpClient spi = (SpiHttpClient)context;
+    SpiHttpClient spi = (SpiHttpClient)client;
     // has default client created
     assertThat(spi.httpClient()).isNotNull();
-    assertThat(spi.httpClient().version()).isEqualTo(HttpClient.Version.HTTP_2);
+    assertThat(spi.httpClient().version()).isEqualTo(java.net.http.HttpClient.Version.HTTP_2);
     assertThat(spi.httpClient().cookieHandler()).isEmpty();
 
     // has expected url building
-    assertThat(spi.url().build()).isEqualTo("http://localhost");
-    assertThat(spi.url().path("hello").build()).isEqualTo("http://localhost/hello");
-    assertThat(spi.url().queryParam("hello","there").build()).isEqualTo("http://localhost?hello=there");
+    assertThat(client.url().build()).isEqualTo("http://localhost");
+    assertThat(client.url().path("hello").build()).isEqualTo("http://localhost/hello");
+    assertThat(client.url().queryParam("hello","there").build()).isEqualTo("http://localhost?hello=there");
   }
 
   @Test
   void build_missingBaseUrl() {
     try {
-      HttpClientContext.builder().build();
+      HttpClient.builder().build();
     } catch (NullPointerException e) {
       assertThat(e.getMessage()).contains("baseUrl is not specified");
     }