#66 - [client api] Support use of @BeanParam

Author: rbygrave

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java

@@ -81,9 +81,13 @@ void write() {
     writeHeaders();
     writePaths(segments);
     writeQueryParams(pathSegments);
+    writeBeanParams(pathSegments);
     writeFormParams(pathSegments);
     writeBody();
+    writeEnd();
+  }
 
+  private void writeEnd() {
     WebMethod webMethod = method.getWebMethod();
     writer.append("      .%s()", webMethod.name()).eol();
     if (returnType == UType.VOID) {
@@ -174,6 +178,19 @@ private void writeHeaders() {
     }
   }
 
+  private void writeBeanParams(PathSegments segments) {
+    for (MethodParam param : method.getParams()) {
+      final String varName = param.getName();
+      ParamType paramType = param.getParamType();
+      PathSegments.Segment segment = segments.segment(varName);
+      if (segment == null && paramType == ParamType.BEANPARAM) {
+        TypeElement formBeanType = ctx.getTypeElement(param.getRawType());
+        BeanParamReader form = new BeanParamReader(ctx, formBeanType, param.getName(), param.getShortType(), ParamType.QUERYPARAM);
+        form.writeFormParams(writer);
+      }
+    }
+  }
+
   private void writeFormParams(PathSegments segments) {
     for (MethodParam param : method.getParams()) {
       final String varName = param.getName();

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

@@ -0,0 +1,23 @@
+package org.example;
+
+import io.avaje.http.api.Header;
+import io.avaje.http.api.QueryParam;
+
+public class CommonParams {
+
+  public Long firstRow;
+  public Long maxRows;
+  public String sortBy;
+  @QueryParam("X-Xtr")
+  private String extra;
+  @Header
+  public String filter;
+
+  public Long firstRow() {
+    return firstRow;
+  }
+
+  public String getExtra() {
+    return extra;
+  }
+}

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

@@ -1,16 +1,14 @@
 package org.example;
 
-import io.avaje.http.api.Client;
-import io.avaje.http.api.Form;
-import io.avaje.http.api.Get;
-import io.avaje.http.api.Post;
+import io.avaje.http.api.*;
 import io.avaje.http.client.HttpCall;
 
 import java.io.InputStream;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
@@ -136,4 +134,11 @@ public interface JunkApi {
   @Form
   @Post("foo/{email}")
   void postFormWithPath(String email, String name, String other);
+
+  @Post("withBeanParam/{id}")
+  void postWithBeanParam(UUID id, @BeanParam CommonParams commonParams);
+
+  @Form @Post("withFormParam/{id}")
+  void postWithFormParam(UUID id, MyForm theForm, @BeanParam CommonParams commonParams);
+
 }

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

@@ -0,0 +1,19 @@
+package org.example;
+
+import io.avaje.http.api.Header;
+
+import java.time.LocalDate;
+
+public class MyForm {
+
+  public String name;
+  public String email;
+  public LocalDate started;
+
+  @Header("MFoo")
+  public String fooHead;
+
+  public String email() {
+    return email;
+  }
+}