#55 - Support client generation with @client and @Client.Import

Form beans with @Header and @QueryParam properties

Author: rbygrave

http-generator-core/src/main/java/io/avaje/http/generator/core/BeanParamReader.java

@@ -105,14 +105,28 @@ private Set<String> writeConstructorParams(Append writer) {
   public void writeFormParams(Append writer) {
     for (FieldReader field : fieldMap.values()) {
       ExecutableElement getter = findGetter(field.getVarName());
-      if (getter != null) {
-        writer.append("      .formParam(\"%s\", %s.%s)", field.getVarName(), beanVarName, getter.toString()).eol();
-      } else if (field.isPublic()) {
-        writer.append("      .formParam(\"%s\", %s.%s)", field.getVarName(), beanVarName, field.getVarName()).eol();
+      ParamType paramType = field.element.getParamType();
+      String type = propertyParamType(paramType);
+      if (type != null) {
+        String accessor = (getter != null) ? getter.toString() : field.isPublic() ? field.getVarName() : null;
+        if (accessor != null) {
+          writer.append("      .%s(\"%s\", %s.%s)", type, field.getParamName(), beanVarName, accessor).eol();
+        }
       }
     }
   }
 
+  private String propertyParamType(ParamType paramType) {
+    switch (paramType) {
+      case FORMPARAM:
+      case QUERYPARAM:
+      case HEADER:
+        return paramType.toString();
+      default:
+        return null;
+    }
+  }
+
   private ExecutableElement findGetter(String varName) {
     ExecutableElement getter = methodMap.get(varName);
     if (getter == null) {
@@ -141,6 +155,10 @@ boolean isPublic() {
       return element.getElement().getModifiers().contains(Modifier.PUBLIC);
     }
 
+    String getParamName() {
+      return element.getParamName();
+    }
+
     String getVarName() {
       return element.getVarName();
     }

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

@@ -36,6 +36,16 @@ class MyForm {
     boolean active;
     int notPublic;
 
+    @Header
+    public String bafHead;
+
+    @QueryParam("my-parm")
+    String mparam;
+
+    public String getMparam() {
+      return mparam;
+    }
+
     public String getName() {
       return name;
     }