#8 - Have @Form on method imply a bean is a "form bean" (not require @Form on method param)

Author: rbygrave

src/main/java/io/dinject/javalin/generator/BeanParamReader.java

@@ -84,7 +84,7 @@ static class FieldReader {
     private String setterMethod;
 
     FieldReader(ProcessingContext ctx, Element enclosedElement, ParamType defaultParamType) {
-      this.element = new ElementReader(enclosedElement, ctx, defaultParamType);
+      this.element = new ElementReader(enclosedElement, ctx, defaultParamType, false);
     }
 
     String getVarName() {

src/main/java/io/dinject/javalin/generator/ElementReader.java

@@ -18,17 +18,19 @@ class ElementReader {
   private final TypeHandler typeHandler;
   private final String varName;
   private final String snakeName;
+  private final boolean formMarker;
 
   private String paramName;
   private ParamType paramType;
   private boolean impliedParamType;
   private String paramDefault;
   private String docComment;
 
-  ElementReader(Element element, ProcessingContext ctx, ParamType defaultType) {
+  ElementReader(Element element, ProcessingContext ctx, ParamType defaultType, boolean formMarker) {
     this.ctx = ctx;
     this.rawType = element.asType().toString();
     this.typeHandler = TypeMap.get(rawType);
+    this.formMarker = formMarker;
 
     this.varName = element.getSimpleName().toString();
     this.snakeName = Util.snakeCase(varName);
@@ -157,6 +159,12 @@ void setValue(Append writer) {
 
   private boolean setValue(Append writer, PathSegments segments, String shortType) {
 
+    if (formMarker && impliedParamType && typeHandler == null) {
+      // @Form on method and this type is a "bean" so treat is as a form bean
+      writeForm(writer, shortType, varName, ParamType.FORMPARAM);
+      return false;
+    }
+
     if (ParamType.FORM == paramType) {
       writeForm(writer, shortType, varName, ParamType.FORMPARAM);
       return false;

src/main/java/io/dinject/javalin/generator/MethodParam.java

@@ -6,8 +6,8 @@ class MethodParam {
 
   private final ElementReader elementParam;
 
-  MethodParam(VariableElement param, ProcessingContext ctx, ParamType defaultParamType) {
-    this.elementParam = new ElementReader(param, ctx, defaultParamType);
+  MethodParam(VariableElement param, ProcessingContext ctx, ParamType defaultParamType, boolean formMarker) {
+    this.elementParam = new ElementReader(param, ctx, defaultParamType, formMarker);
   }
 
   void buildCtxGet(Append writer, PathSegments segments) {

src/main/java/io/dinject/javalin/generator/MethodReader.java

@@ -58,7 +58,7 @@ void read() {
     ParamType defaultParamType = (formMarker) ? ParamType.FORMPARAM : ParamType.QUERYPARAM;
 
     for (VariableElement p : element.getParameters()) {
-      MethodParam param = new MethodParam(p, ctx, defaultParamType);
+      MethodParam param = new MethodParam(p, ctx, defaultParamType, formMarker);
       params.add(param);
       param.addImports(bean);
     }