Initial client add

Author: rbygrave

pom.xml

@@ -44,10 +44,12 @@
 
   <modules>
     <module>controller</module>
+    <module>client</module>
     <module>generator-core</module>
     <module>generator-javalin</module>
     <module>generator-helidon</module>
     <module>tests</module>
+    <module>generator-client</module>
   </modules>
 
 </project>

tests/pom.xml

@@ -12,6 +12,7 @@
   <modules>
     <module>test-helidon</module>
     <module>test-javalin</module>
+    <module>test-client</module>
   </modules>
 
 </project>

tests/test-client/pom.xml

@@ -15,6 +15,18 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>io.dinject</groupId>
+      <artifactId>dinject-controller</artifactId>
+      <version>1.21</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje.rs</groupId>
+      <artifactId>client</artifactId>
+      <version>0.1-SNAPSHOT</version>
+    </dependency>
+
     <dependency>
       <groupId>com.squareup.retrofit2</groupId>
       <artifactId>retrofit</artifactId>
@@ -33,11 +45,7 @@
       <version>2.9.0</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.dinject</groupId>
-      <artifactId>dinject-controller</artifactId>
-      <version>1.21</version>
-    </dependency>
+
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>

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

@@ -1,4 +1,16 @@
 package org.example;
 
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Path;
+
+import java.util.List;
+
 public interface GitHubService {
+  @GET("users/{user}/repos")
+  Call<List<Repo>> listRepos(@Path("user") String user);
+
+  @GET("users/{user}/repos")
+  Call<String> list2(@Path("user") String user);
+
 }

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

@@ -1,4 +1,6 @@
 package org.example;
 
 public class Repo {
+  public long id;
+  public String name;
 }

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

@@ -1,4 +1,60 @@
 package org.example;
 
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpConnectTimeoutException;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+import static java.net.http.HttpResponse.BodyHandlers.ofString;
+
 public class RsClient {
+
+  private final HttpClient httpClient;
+
+  private long requestTimeout = 15;
+
+  private final String baseUrl;
+
+  public RsClient(HttpClient httpClient, String baseUrl) {
+    this.httpClient = httpClient;
+    this.baseUrl = baseUrl;
+  }
+
+
+  public void get(String uri, Type type) throws IOException, InterruptedException {
+
+    final HttpRequest request = HttpRequest.newBuilder()
+      .timeout(Duration.ofSeconds(requestTimeout))
+      .uri(URI.create(baseUrl + "/" + uri))
+      .GET()
+      .build();
+
+    final HttpResponse<String> res = httpClient.send(request, ofString());
+  }
+
+  public void async(String uri, Consumer<String> target, Consumer<HttpResponse<?>> errRes) {
+
+    final HttpRequest request = HttpRequest.newBuilder()
+      .timeout(Duration.ofSeconds(requestTimeout))
+      .uri(URI.create(baseUrl + "/" + uri))
+      .GET()
+      .build();
+
+    httpClient.sendAsync(request, ofString())
+    .thenAccept(res -> {
+      final int code = res.statusCode();
+      if (code < 300) {
+        target.accept(res.body());
+      } else {
+        errRes.accept(res);
+        //throw new IOException("sf");
+        //log.info("Failed to send metrics - response code:{} body:{}", code, res.body());
+      }
+    });
+  }
 }

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

@@ -1,4 +1,57 @@
 package org.example;
 
-public class Simple$Client {
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.http.HttpClient;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+
+public class Simple$Client implements Simple {
+
+  private final RsClient client;
+
+  public Simple$Client() {
+    HttpClient httpClient = HttpClient.newBuilder()
+      .version(HttpClient.Version.HTTP_1_1)
+      .connectTimeout(Duration.ofSeconds(15))
+      .build();
+
+    this.client = new RsClient(httpClient, "https://api.github.com/");
+  }
+
+  @Override
+  public List<Repo> listRepos(String user, String other) throws IOException, InterruptedException {
+
+    String uri = String.format("users/%s/repos", user);
+    if (other != null) {
+      uri += "?other="+other;
+    }
+
+    //client.get(uri);
+    return null;
+  }
+
+  @Override
+  public Repo getById(String id) {
+    return null;
+  }
+
+  @Override
+  public HttpResponse<Repo> getById2(String id) {
+    return null;
+  }
+
+  @Override
+  public void readUsing(String id, Consumer<Stream<String>> consumer) {
+
+  }
+
+  @Override
+  public void downloadMe(String id, Consumer<InputStream> file) {
+
+  }
 }

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

@@ -1,4 +1,33 @@
 package org.example;
 
-public class Simple {
+
+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);
+
 }

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

@@ -1,7 +1,38 @@
 package org.example;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import retrofit2.Call;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
 
-class GitHubServiceTest {
+import java.io.IOException;
+import java.util.List;
 
+public class GitHubServiceTest {
+
+  @Test
+  public void test() throws IOException {
+
+    Retrofit retrofit = new Retrofit.Builder()
+      .baseUrl("https://api.github.com/")
+      .addConverterFactory(ScalarsConverterFactory.create())
+      //.addConverterFactory(GsonConverterFactory.create())
+      .build();
+
+    GitHubService service = retrofit.create(GitHubService.class);
+    final Call<List<Repo>> call = service.listRepos("octocat");
+    final Response<List<Repo>> res = call.execute();
+    final List<Repo> body = res.body();
+
+    System.out.println("done "+body);
+
+    final Call<String> call2 = service.list2("octocat");
+    final Response<String> res2 = call2.execute();
+    final String body2 = res2.body();
+
+    System.out.println("done "+body2);
+
+  }
 }

tests/test-helidon/pom.xml

@@ -10,8 +10,8 @@
 
   <parent>
     <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.1</version>
+    <artifactId>java11-oss</artifactId>
+    <version>2.1.2</version>
   </parent>
 
   <properties>

tests/test-javalin/pom.xml

@@ -10,8 +10,8 @@
 
   <parent>
     <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.1</version>
+    <artifactId>java11-oss</artifactId>
+    <version>2.1.2</version>
   </parent>
 
   <properties>
@@ -105,6 +105,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.avaje.beta.http</groupId>
+      <artifactId>http-client</artifactId>
+      <version>0.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

tests/test-javalin/src/main/java/org/example/myapp/web/HelloController.java

@@ -86,7 +86,7 @@ HelloDto post(HelloDto dto) {
    * @param foo The hello doo id
    * @param dto The hello body as json
    */
-  @Roles({ADMIN})
+//  @Roles({ADMIN})
   @Post("/savebean/:foo")
   void saveBean(String foo, HelloDto dto, Context context) {
     // save hello data ...