fix beanparam import

Author: SentryMan

http-api/src/main/java/io/avaje/http/api/context/ServerContext.java

@@ -19,7 +19,7 @@ public ServerContext(Object request, Object response) {
    * @return The request
    */
   @SuppressWarnings("unchecked")
-  <T> T request() {
+  public <T> T request() {
     return (T) request;
   }
 
@@ -29,7 +29,7 @@ <T> T request() {
    * @return The request
    */
   @SuppressWarnings("unchecked")
-  <T> T response() {
+  public <T> T response() {
     return (T) response;
   }
 }

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

@@ -14,6 +14,7 @@ public class BeanParamReader {
   private final Map<String, FieldReader> fieldMap = new LinkedHashMap<>();
   private final List<ExecutableElement> constructors = new ArrayList<>();
   private final Map<String, ExecutableElement> methodMap = new LinkedHashMap<>();
+  private final Set<String> imports = new HashSet<>();
 
   public BeanParamReader(TypeElement beanType, String beanVarName, String beanShortType, ParamType defaultParamType) {
     this.beanType = beanType;
@@ -23,6 +24,10 @@ public BeanParamReader(TypeElement beanType, String beanVarName, String beanShor
     read();
   }
 
+  public Collection<String> imports() {
+    return imports;
+  }
+
   private void read() {
     for (Element enclosedElement : beanType.getEnclosedElements()) {
       switch (enclosedElement.getKind()) {
@@ -45,6 +50,8 @@ private void readField(Element enclosedElement) {
     }
     FieldReader field = new FieldReader(enclosedElement, defaultParamType);
     fieldMap.put(field.varName(), field);
+
+    imports.addAll(UType.parse(field.element.element().asType()).importTypes());
   }
 
   private void readMethod(ExecutableElement enclosedElement) {

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

@@ -38,6 +38,7 @@ 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);
@@ -74,6 +75,10 @@ public class ElementReader {
       paramType = ParamType.CONTEXT;
       useValidation = false;
     }
+    if (ParamType.FORM == paramType || ParamType.BEANPARAM == paramType) {
+      this.formBeanReader = getFormBeanReader(rawType, rawType, defaultType);
+      this.imports.addAll(formBeanReader.imports());
+    }
   }
 
   TypeHandler initTypeHandler() {
@@ -289,21 +294,9 @@ void setValue(Append writer) {
   }
 
   private boolean setValue(Append writer, PathSegments segments, String shortType) {
-//    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);
+
+    if ((ParamType.FORM == paramType) || (ParamType.BEANPARAM == paramType)) {
+      formBeanReader.write(writer);
       return false;
     }
     if (impliedParamType) {
@@ -366,10 +359,10 @@ private boolean setValue(Append writer, PathSegments segments, String shortType)
     return true;
   }
 
-  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);
+  private BeanParamReader getFormBeanReader(
+      String shortType, String varName, ParamType defaultParamType) {
+    final TypeElement formBeanType = typeElement(rawType);
+    return new BeanParamReader(formBeanType, varName, shortType, defaultParamType);
   }
 
   public ParamType paramType() {