Merge pull request #134 from avaje/feature/update-client-generation

#133 - [http-client] Disable more client tests that hit github api

Author: rbygrave

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

@@ -31,7 +31,7 @@ void init() {
     log.log(DEBUG, "providers for {0}", providerMap.keySet());
   }
 
-  void addProvider(HttpApiProvider apiProvider) {
+  void addProvider(HttpApiProvider<?> apiProvider) {
     providerMap.put(apiProvider.type(), apiProvider);
   }
 
@@ -41,7 +41,7 @@ private <T> HttpApiProvider<T> lookup(Class<T> type) {
   }
 
   @SuppressWarnings("unchecked")
-  <T> T provideFor(Class<T> type, HttpClientContext clientContext) {
+  <T> T provideFor(Class<T> type, HttpClient clientContext) {
     final HttpApiProvider<T> apiProvider = lookup(type);
     if (apiProvider == null) {
       throw new IllegalArgumentException("No registered HttpApiProvider for type: " + type);
@@ -52,7 +52,7 @@ <T> T provideFor(Class<T> type, HttpClientContext clientContext) {
   /**
    * Return the client implementation via service loading.
    */
-  static <T> T provide(Class<T> type, HttpClientContext clientContext) {
+  static <T> T provide(Class<T> type, HttpClient clientContext) {
     return INSTANCE.provideFor(type, clientContext);
   }
 

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

@@ -12,7 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DHttpApiTest {
+class DHttpApiTest {
 
   @Disabled
   @Test
@@ -31,22 +31,22 @@ void test_github_listRepos() {
     assertThat(repos).isNotEmpty();
   }
 
+  @Disabled
   @Test
   void jsonb_github_listRepos() {
 
-    Jsonb jsonb = Jsonb.newBuilder()
+    Jsonb jsonb = Jsonb.builder()
       .add(Repo.class, RepoJsonAdapter::new)
-      //.adapter(new JacksonAdapter())
       .build();
 
-    final HttpClientContext clientContext = HttpClientContext.builder()
+    final HttpClient client = HttpClient.builder()
       .baseUrl("https://api.github.com")
       .bodyAdapter(new JsonbBodyAdapter(jsonb))
       .build();
 
     DHttpApi httpApi = new DHttpApi();
     httpApi.addProvider(new Simple$HttpClient.Provider());
-    final Simple simple = httpApi.provideFor(Simple.class, clientContext);
+    final Simple simple = httpApi.provideFor(Simple.class, client);
 
     final List<Repo> repos = simple.listRepos("rbygrave", "junk");
     assertThat(repos).isNotEmpty();

tests/test-client-generation/src/test/java/org/example/GitHubServiceTest.java

@@ -12,7 +12,7 @@
 import java.io.IOException;
 import java.util.List;
 
-public class GitHubServiceTest {
+class GitHubServiceTest {
 
   @Disabled
   @Test
@@ -37,9 +37,6 @@ public void onFailure(Call<List<Repo>> call, Throwable throwable) {
         System.out.println("onFailure: " + throwable);
       }
     });
-//    final Response<List<Repo>> res = call.execute();
-//    final List<Repo> body = res.body();
-//    System.out.println("done count: "+body.size());
 
     final Call<String> call2 = service.list2("octocat");
     final Response<String> res2 = call2.execute();

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

@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.avaje.http.client.HttpApiProvider;
 import io.avaje.http.client.HttpClient;
-import io.avaje.http.client.HttpClientContext;
 import io.avaje.http.client.JacksonBodyAdapter;
 import org.example.httpclient.GitHubUsersHttpClient;
 import org.junit.jupiter.api.Disabled;
@@ -14,22 +13,21 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleTest {
+class SimpleTest {
 
   @Disabled
   @Test
   void listRepos() {
-
     final ObjectMapper objectMapper = new ObjectMapper()
       .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
-    final HttpClientContext clientContext =
-      HttpClientContext.builder()
+    final HttpClient client =
+      HttpClient.builder()
         .baseUrl("https://api.github.com")
         .bodyAdapter(new JacksonBodyAdapter(objectMapper))
         .build();
 
-    GitHubUsers simple = clientContext.create(GitHubUsers.class);
+    GitHubUsers simple = client.create(GitHubUsers.class);
 
     final List<Repo> repos = simple.listRepos("rbygrave");
     System.out.println("got repos - " + repos.size());

tests/test-client/src/test/java/example/github/GithubTest.java

@@ -2,36 +2,39 @@
 
 import com.google.gson.Gson;
 import io.avaje.http.client.BodyAdapter;
-import io.avaje.http.client.HttpClientContext;
+import io.avaje.http.client.HttpClient;
 import io.avaje.http.client.JacksonBodyAdapter;
 import io.avaje.http.client.gson.GsonBodyAdapter;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class GithubTest {
+class GithubTest {
 
+  @Disabled
   @Test
   void test_with_jackson() {
     assertListRepos(jacksonBodyAdapter());
   }
 
+  @Disabled
   @Test
   void test_with_gson() {
     assertListRepos(gsonBodyAdapter());
   }
 
   private void assertListRepos(BodyAdapter bodyAdapter) {
-    final HttpClientContext clientContext = HttpClientContext.builder()
+    final HttpClient client = HttpClient.builder()
       .baseUrl("https://api.github.com")
       .bodyAdapter(bodyAdapter)
 //      .requestLogging(false)
 //      .requestListener(new RequestLogger())
       .build();
 
-    final Simple simple = clientContext.create(Simple.class);
+    final Simple simple = client.create(Simple.class);
 
     final List<Repo> repos = simple.listRepos("rbygrave", "junk");
     assertThat(repos).isNotEmpty();