No effective change - tidy test-client

Author: rbygrave

pom.xml

@@ -54,8 +54,8 @@
     <module>generator-core</module>
     <module>generator-javalin</module>
     <module>generator-helidon</module>
-    <module>tests</module>
-    <module>generator-client</module>
+<!--    <module>tests</module>-->
+<!--    <module>generator-client</module>-->
   </modules>
 
 </project>

tests/test-client/pom.xml

@@ -16,15 +16,27 @@
   <dependencies>
 
     <dependency>
-      <groupId>io.dinject</groupId>
-      <artifactId>dinject-controller</artifactId>
-      <version>1.21</version>
+      <groupId>org.avaje.composite</groupId>
+      <artifactId>logback</artifactId>
+      <version>1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-client</artifactId>
+      <version>0.1</version>
     </dependency>
 
     <dependency>
-      <groupId>io.avaje.rs</groupId>
-      <artifactId>client</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.11.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.dinject</groupId>
+      <artifactId>dinject-controller</artifactId>
+      <version>1.21</version>
     </dependency>
 
     <dependency>

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

@@ -0,0 +1,26 @@
+package org.example;
+
+import io.avaje.http.client.HttpClientContext;
+import io.dinject.controller.QueryParam;
+
+import java.util.List;
+
+
+public class Simple$httpclient implements Simple {
+
+  final HttpClientContext clientContext;
+
+  public Simple$httpclient(HttpClientContext clientContext) {
+    this.clientContext = clientContext;
+  }
+
+  //@Get("users/{user}/repos")
+  @Override
+  public List<Repo> listRepos(String user, @QueryParam("foo-too") String fooToo) {
+    return clientContext.request()
+      .path("users").path(user).path("repos").param("foo-too", fooToo)
+      .get()
+      .list(Repo.class);
+  }
+
+}

tests/test-client/src/main/java/org/example/Simple$Client.java

@@ -3,31 +3,11 @@
 
 import io.dinject.controller.Get;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.http.HttpResponse;
-import java.nio.file.Path;
 import java.util.List;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
 
 public interface Simple {
 
-
   @Get("users/{user}/repos")
-  List<Repo> listRepos(String user, String other) throws IOException, InterruptedException;
-
-  @Get("users/{id}")
-  Repo getById(String id);
-  //Call<List<Repo>> listRepos(@Path("user") String user);
-
-  @Get("users/{id}")
-  HttpResponse<Repo> getById2(String id);
-
-  @Get("users/{id}")
-  void readUsing(String id, Consumer<Stream<String>> consumer);
-
-  @Get("dwn/{id}")
-  void downloadMe(String id, Consumer<InputStream> file);
+  List<Repo> listRepos(String user, String other);
 
 }

tests/test-client/src/main/java/org/example/Simple$httpclient.java

@@ -18,7 +18,7 @@ public void test() throws IOException {
     Retrofit retrofit = new Retrofit.Builder()
       .baseUrl("https://api.github.com/")
       .addConverterFactory(ScalarsConverterFactory.create())
-      //.addConverterFactory(GsonConverterFactory.create())
+      .addConverterFactory(GsonConverterFactory.create())
       .build();
 
     GitHubService service = retrofit.create(GitHubService.class);

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

@@ -0,0 +1,39 @@
+package org.example;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.avaje.http.client.HttpClientContext;
+import io.avaje.http.client.JacksonBodyAdapter;
+import io.avaje.http.client.RequestLogger;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+class SimpleTest {
+
+  @Test
+  void listRepos() {
+
+    final ObjectMapper objectMapper = new ObjectMapper()
+      .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+    final HttpClientContext clientContext =
+      HttpClientContext.newBuilder()
+        .withBaseUrl("https://api.github.com")
+        .withRequestListener(new RequestLogger())
+        .withBodyAdapter(new JacksonBodyAdapter(objectMapper))
+        .build();
+
+    Simple simple = new Simple$httpclient(clientContext);
+
+    final List<Repo> repos = simple.listRepos("octocat", "rbygrave");
+    System.out.println("done: " + repos);
+
+    final List<Repo> repos2 = simple.listRepos("octocat", "rbygrave");
+    System.out.println("done2: " + repos2);
+
+    final List<Repo> repos3 = simple.listRepos("octocat", "rbygrave");
+    System.out.println("done3: " + repos3);
+
+  }
+}

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

@@ -0,0 +1,19 @@
+<configuration scan="true" scanPeriod="10 seconds">
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>TRACE</level>
+    </filter>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT"/>
+  </root>
+
+  <logger name="io.javalin" level="INFO"/>
+  <logger name="org.example" level="DEBUG"/>
+  <logger name="io.avaje.http.client" level="DEBUG"/>
+
+</configuration>