#62 - ENH: [Client generator] Add Map<String,?> option for header() queryParam() and formParam()

Author: rbygrave

http-generator-client/pom.xml

@@ -9,7 +9,7 @@
     <relativePath>..</relativePath>
   </parent>
 
-  <artifactId>avaje-http-generator-client</artifactId>
+  <artifactId>avaje-http-client-generator</artifactId>
 
   <properties>
     <java.version>11</java.version>

tests/test-client/pom.xml

@@ -14,6 +14,11 @@
   <artifactId>test-client</artifactId>
   <version>1</version>
 
+  <properties>
+    <jex.version>1.6</jex.version>
+    <avaje-inject.version>6.0</avaje-inject.version>
+  </properties>
+
   <dependencies>
 
     <dependency>
@@ -28,18 +33,18 @@
       <version>1.8</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.12.3</version>
-    </dependency>
-
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
       <version>1.7-SNAPSHOT</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.12.3</version>
+    </dependency>
+
     <dependency>
       <groupId>com.squareup.retrofit2</groupId>
       <artifactId>retrofit</artifactId>
@@ -58,6 +63,16 @@
       <version>2.9.0</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-jex</artifactId>
+      <version>${jex.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-inject</artifactId>
+      <version>${avaje-inject.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -92,9 +107,19 @@
           <annotationProcessorPaths>
             <path>
               <groupId>io.avaje</groupId>
-              <artifactId>avaje-http-generator-client</artifactId>
+              <artifactId>avaje-http-client-generator</artifactId>
               <version>1.7-SNAPSHOT</version>
             </path>
+            <path>
+              <groupId>io.avaje</groupId>
+              <artifactId>avaje-http-jex-generator</artifactId>
+              <version>1.7-SNAPSHOT</version>
+            </path>
+            <path>
+              <groupId>io.avaje</groupId>
+              <artifactId>avaje-inject-generator</artifactId>
+              <version>${avaje-inject.version}</version>
+            </path>
           </annotationProcessorPaths>
         </configuration>
       </plugin>

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

@@ -0,0 +1,24 @@
+package org.example;
+
+import io.avaje.http.api.Get;
+import io.avaje.http.api.Path;
+import io.avaje.http.api.Produces;
+
+import java.time.LocalDate;
+
+@Path("/common")
+public interface CommonApi {
+
+  @Produces("text/plain")
+  @Get("plain")
+  String hello();
+
+  @Produces("text/plain")
+  @Get("name/{name}")
+  String name(String name);
+
+  @Produces("text/plain")
+  @Get("{id}/{name}")
+  String p2(long id, String name, LocalDate after, Boolean more);
+
+}

tests/test-client/src/main/java/org/example/client/package-info.java

@@ -0,0 +1,5 @@
+@Client.Import(types = CommonApi.class)
+package org.example.client;
+
+import io.avaje.http.api.Client;
+import org.example.CommonApi;

tests/test-client/src/main/java/org/example/server/CommonController.java

@@ -0,0 +1,25 @@
+package org.example.server;
+
+import io.avaje.http.api.Controller;
+import org.example.CommonApi;
+
+import java.time.LocalDate;
+
+@Controller
+public class CommonController implements CommonApi {
+
+  @Override
+  public String hello() {
+    return "hello world";
+  }
+
+  @Override
+  public String name(String name) {
+    return "name[" + name + "]";
+  }
+
+  @Override
+  public String p2(long id, String name, LocalDate after, Boolean more) {
+    return "p2[" + id + ";" + name + "; after:" + after + " more:" + more + "]";
+  }
+}

tests/test-client/src/main/java/org/example/server/Main.java

@@ -0,0 +1,28 @@
+package org.example.server;
+
+import io.avaje.inject.ApplicationScope;
+import io.avaje.inject.BeanScope;
+import io.avaje.jex.Jex;
+import io.avaje.jex.Routing;
+
+import java.util.List;
+
+public class Main {
+
+  public static void main(String[] args) {
+    start(8090);
+  }
+
+  public static Jex.Server start(int port) {
+    return start(port, ApplicationScope.scope());
+  }
+
+  public static Jex.Server start(int port, BeanScope context) {
+
+    final List<Routing.Service> services = context.list(Routing.Service.class);
+
+    final Jex jex = Jex.create();
+    jex.routing().addAll(services);
+    return jex.port(port).start();
+  }
+}

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

@@ -0,0 +1,59 @@
+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.example.server.Main;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDate;
+import java.util.Random;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CommonApiTest {
+
+  static CommonApi client;
+
+  @BeforeAll
+  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))
+      .build();
+
+    client = clientContext.create(CommonApi.class);
+  }
+
+  @Test
+  void hello() {
+    assertThat(client.hello()).isEqualTo("hello world");
+  }
+
+  @Test
+  void name() {
+    assertThat(client.name("foo")).isEqualTo("name[foo]");
+    assertThat(client.name("bar")).isEqualTo("name[bar]");
+  }
+
+  @Test
+  void p2() {
+    final LocalDate date = LocalDate.of(2021, 6, 24);
+    final String result = client.p2(42, "foo", date, false);
+    assertThat(result).isEqualTo("p2[42;foo; after:2021-06-24 more:false]");
+
+    final String result2 = client.p2(44, "bar", null, true);
+    assertThat(result2).isEqualTo("p2[44;bar; after:null more:true]");
+  }
+}

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

@@ -7,6 +7,7 @@
 import io.avaje.http.client.JacksonBodyAdapter;
 import io.avaje.http.client.RequestLogger;
 import org.example.httpclient.GitHubUsers$HttpClient;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -15,6 +16,7 @@
 
 public class SimpleTest {
 
+  @Disabled
   @Test
   void listRepos() {