#65 - [client api] Bug with @Form @post with path parameter included as formParam()

Author: rbygrave

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

@@ -81,7 +81,7 @@ void write() {
     writeHeaders();
     writePaths(segments);
     writeQueryParams(pathSegments);
-    writeFormParams();
+    writeFormParams(pathSegments);
     writeBody();
 
     WebMethod webMethod = method.getWebMethod();
@@ -174,20 +174,29 @@ private void writeHeaders() {
     }
   }
 
-  private void writeFormParams() {
+  private void writeFormParams(PathSegments segments) {
     for (MethodParam param : method.getParams()) {
+      final String varName = param.getName();
       ParamType paramType = param.getParamType();
-      if (paramType == ParamType.FORMPARAM) {
-        if (isMap(param)) {
-          writer.append("      .formParam(%s)", param.getName()).eol();
-        } else {
-          writer.append("      .formParam(\"%s\", %s)", param.getParamName(), param.getName()).eol();
-        }
-      } else if (paramType == ParamType.FORM) {
-        TypeElement formBeanType = ctx.getTypeElement(param.getRawType());
-        BeanParamReader form = new BeanParamReader(ctx, formBeanType, param.getName(), param.getShortType(), ParamType.FORMPARAM);
-        form.writeFormParams(writer);
+      PathSegments.Segment segment = segments.segment(varName);
+      if (segment == null) {
+        // not a path or matrix parameter
+        writeFormParam(param, paramType);
+      }
+    }
+  }
+
+  private void writeFormParam(MethodParam param, ParamType paramType) {
+    if (paramType == ParamType.FORMPARAM) {
+      if (isMap(param)) {
+        writer.append("      .formParam(%s)", param.getName()).eol();
+      } else {
+        writer.append("      .formParam(\"%s\", %s)", param.getParamName(), param.getName()).eol();
       }
+    } else if (paramType == ParamType.FORM) {
+      TypeElement formBeanType = ctx.getTypeElement(param.getRawType());
+      BeanParamReader form = new BeanParamReader(ctx, formBeanType, param.getName(), param.getShortType(), ParamType.FORMPARAM);
+      form.writeFormParams(writer);
     }
   }
 

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

@@ -1,6 +1,7 @@
 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.client.HttpCall;
@@ -131,4 +132,8 @@ public interface JunkApi {
 
   @Post("/{id}/foo/{name}")
   HttpResponse<Path> reqBodyResHand2(HttpResponse.BodyHandler<Path> handler, HttpRequest.BodyPublisher body, String id, String name, String other);
+
+  @Form
+  @Post("foo/{email}")
+  void postFormWithPath(String email, String name, String other);
 }