Update ElementReader.java

Author: SentryMan

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

@@ -38,7 +38,6 @@ public class ElementReader {
   private boolean isParamCollection;
   private boolean isParamMap;
   private final Set<String> imports = new HashSet<>();
-  private BeanParamReader formBeanReader;
 
   ElementReader(Element element, ParamType defaultType, boolean formMarker) {
     this(element, null, Util.typeDef(element.asType()), defaultType, formMarker);
@@ -76,8 +75,8 @@ public class ElementReader {
       useValidation = false;
     }
     if (ParamType.FORM == paramType || ParamType.BEANPARAM == paramType) {
-      this.formBeanReader = getFormBeanReader(rawType, rawType, paramType);
-      this.imports.addAll(formBeanReader.imports());
+      this.imports.addAll(
+          new BeanParamReader(typeElement(rawType), varName, shortType, paramType).imports());
     }
   }
 
@@ -294,9 +293,21 @@ void setValue(Append writer) {
   }
 
   private boolean setValue(Append writer, PathSegments segments, String shortType) {
-
-    if ((ParamType.FORM == paramType) || (ParamType.BEANPARAM == paramType)) {
-      formBeanReader.write(writer);
+//    if (formMarker && impliedParamType && typeHandler == null) {
+//      if (ParamType.FORM != paramType) {
+//        throw new IllegalStateException("Don't get here?");
+//      }
+////      // @Form on method and this type is a "bean" so treat is as a form bean
+////      writeForm(writer, shortType, varName, ParamType.FORMPARAM);
+////      paramType = ParamType.FORM;
+////      return false;
+//    }
+    if (ParamType.FORM == paramType) {
+      writeForm(writer, shortType, varName, ParamType.FORMPARAM);
+      return false;
+    }
+    if (ParamType.BEANPARAM == paramType) {
+      writeForm(writer, shortType, varName, ParamType.QUERYPARAM);
       return false;
     }
     if (impliedParamType) {
@@ -359,10 +370,10 @@ private boolean setValue(Append writer, PathSegments segments, String shortType)
     return true;
   }
 
-  private BeanParamReader getFormBeanReader(
-      String shortType, String varName, ParamType defaultParamType) {
-    final TypeElement formBeanType = typeElement(rawType);
-    return new BeanParamReader(formBeanType, varName, shortType, defaultParamType);
+  private void writeForm(Append writer, String shortType, String varName, ParamType defaultParamType) {
+    TypeElement formBeanType = typeElement(rawType);
+    BeanParamReader form = new BeanParamReader(formBeanType, varName, shortType, defaultParamType);
+    form.write(writer);
   }
 
   public ParamType paramType() {