Merge pull request #209 from SentryMan/ctx2

Fix BeanParam imports

Author: rob-bygrave

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

@@ -74,6 +74,19 @@ public class ElementReader {
       paramType = ParamType.CONTEXT;
       useValidation = false;
     }
+    if (ParamType.FORM == paramType || ParamType.BEANPARAM == paramType) {
+      beanParamImports(rawType);
+    }
+  }
+
+  private void beanParamImports(String rawType) {
+    typeElement(rawType).getEnclosedElements().stream()
+        .filter(e -> e.getKind() == ElementKind.FIELD)
+        .filter(f -> !IgnorePrism.isPresent(f))
+        .map(Element::asType)
+        .map(UType::parse)
+        .flatMap(u -> u.importTypes().stream())
+        .forEach(imports::add);
   }
 
   TypeHandler initTypeHandler() {