#4 - When @Form is on the method then non-path parameters default to form parameters

Author: rbygrave

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

@@ -7,8 +7,8 @@ class MethodParam {
 
   private final ElementReader elementParam;
 
-  MethodParam(VariableElement param, ProcessingContext ctx) {
-    this.elementParam = new ElementReader(param, ctx, ParamType.QUERYPARAM);
+  MethodParam(VariableElement param, ProcessingContext ctx, ParamType defaultParamType) {
+    this.elementParam = new ElementReader(param, ctx, defaultParamType);
   }
 
   void buildCtxGet(Append writer, Set<String> pathParams) {

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

@@ -1,6 +1,7 @@
 package io.dinject.javalin.generator;
 
 import io.dinject.controller.Delete;
+import io.dinject.controller.Form;
 import io.dinject.controller.Get;
 import io.dinject.controller.Patch;
 import io.dinject.controller.Post;
@@ -27,6 +28,8 @@ class MethodReader {
   private WebMethod webMethod;
   private String webMethodPath;
 
+  private boolean formMarker;
+
   /**
    * Holds enum Roles that are required for the method.
    */
@@ -39,6 +42,8 @@ class MethodReader {
     this.element = element;
     this.isVoid = element.getReturnType().toString().equals("void");
     this.methodRoles = Util.findRoles(element);
+
+    readMethodAnnotation();
   }
 
   void read() {
@@ -49,17 +54,19 @@ void read() {
       }
     }
 
+    // non-path parameters default to form or query parameters based on the
+    // existence of @Form annotation on the method
+    ParamType defaultParamType = (formMarker) ? ParamType.FORMPARAM : ParamType.QUERYPARAM;
+
     for (VariableElement p : element.getParameters()) {
-      MethodParam param = new MethodParam(p, ctx);
+      MethodParam param = new MethodParam(p, ctx, defaultParamType);
       params.add(param);
       param.addImports(bean);
     }
   }
 
   void addRoute(Append writer) {
 
-    readMethodAnnotation();
-
     if (webMethod != null) {
 
       String fullPath = Util.combinePath(beanPath, webMethodPath);
@@ -122,6 +129,11 @@ private boolean isReturnJson() {
 
   private boolean readMethodAnnotation() {
 
+    Form form = element.getAnnotation(Form.class);
+    if (form != null) {
+      this.formMarker = true;
+    }
+
     Get get = element.getAnnotation(Get.class);
     if (get != null) {
       return setWebMethod(WebMethod.GET, get.value());