Add support for @QueryParam with default value

Author: rbygrave

pom.xml

@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.dinject</groupId>
       <artifactId>dinject-controller</artifactId>
-      <version>1.5</version>
+      <version>1.6-SNAPSHOT</version>
     </dependency>
 
     <dependency>

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

@@ -18,6 +18,8 @@
  */
 class BeanReader {
 
+  private final ProcessingContext ctx;
+
   private final TypeElement beanType;
 
   private final List<String> roles;
@@ -30,6 +32,7 @@ class BeanReader {
 
   BeanReader(TypeElement beanType, ProcessingContext ctx) {
     this.beanType = beanType;
+    this.ctx = ctx;
     this.roles = Util.findRoles(beanType);
     if (ctx.isGeneratedAvailable()) {
       importTypes.add(Constants.GENERATED);
@@ -63,7 +66,7 @@ void read() {
   private void readMethod(Element element) {
 
     ExecutableElement methodElement = (ExecutableElement) element;
-    MethodReader methodReader = new MethodReader(this, methodElement);
+    MethodReader methodReader = new MethodReader(this, methodElement, ctx);
     methodReader.read();
     methods.add(methodReader);
   }

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

@@ -1,21 +1,47 @@
 package io.dinject.javalin.generator;
 
+import io.dinject.controller.QueryParam;
+
 import javax.lang.model.element.VariableElement;
 import java.util.Set;
 
 class MethodParam {
 
   private final String rawType;
   private final TypeHandler typeHandler;
-  private final String name;
+  private final String varName;
+  private final String paramName;
   private final String snakeName;
 
+  private final String paramDefault;
+  private final String docComment;
 
-  MethodParam(VariableElement param) {
-    this.name = param.getSimpleName().toString();
-    this.snakeName = Util.snakeCase(name);
+  MethodParam(VariableElement param, ProcessingContext ctx) {
     this.rawType = param.asType().toString();
     this.typeHandler = TypeMap.get(rawType);
+    this.varName = param.getSimpleName().toString();
+    this.docComment = ctx.docComment(param);
+
+    QueryParam queryParam = param.getAnnotation(QueryParam.class);
+    if (queryParam != null) {
+      this.paramName = nameFrom(queryParam.name(), param.getSimpleName().toString());
+      this.paramDefault = queryParam.defaultValue();
+    } else {
+      this.paramName = varName;
+      this.paramDefault = "";
+    }
+    this.snakeName = Util.snakeCase(varName);
+  }
+
+  private String nameFrom(String name, String defaultName) {
+    if (name != null && !name.isEmpty()) {
+      return name;
+    }
+    return defaultName;
+  }
+
+  private boolean hasParamDefault() {
+    return paramDefault != null && !paramDefault.isEmpty();
   }
 
   private boolean isJavalinContext() {
@@ -36,7 +62,7 @@ void buildCtxGet(Append writer, Set<String> pathParams) {
       shortType = Util.shortName(rawType);
     }
 
-    writer.append("      %s %s = ", shortType, name);
+    writer.append("      %s %s = ", shortType, varName);
 
     // path parameters are expected to be not nullable
     // ... with query parameters nullable
@@ -51,9 +77,13 @@ void buildCtxGet(Append writer, Set<String> pathParams) {
     } else {
       if (typeHandler == null) {
         // assuming this is a body (POST, PATCH)
-        writer.append("ctx.bodyAsClass(%s.class)", shortType, name, shortType);
+        writer.append("ctx.bodyAsClass(%s.class)", shortType);
       } else {
-        writer.append("ctx.queryParam(\"%s\")", name);
+        if (hasParamDefault()) {
+          writer.append("ctx.queryParam(\"%s\",\"%s\")", paramName, paramDefault);
+        } else {
+          writer.append("ctx.queryParam(\"%s\")", paramName);
+        }
       }
     }
 
@@ -64,8 +94,8 @@ void buildCtxGet(Append writer, Set<String> pathParams) {
   }
 
   private String derivePathParam(Set<String> pathParams) {
-    if (pathParams.contains(name)) {
-      return name;
+    if (pathParams.contains(varName)) {
+      return varName;
     }
     if (pathParams.contains(snakeName)){
       return snakeName;
@@ -88,7 +118,7 @@ void buildParamName(Append writer) {
     if (isJavalinContext()) {
       writer.append("ctx");
     } else {
-      writer.append(name);
+      writer.append(varName);
     }
   }
 }

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

@@ -16,6 +16,7 @@
 
 class MethodReader {
 
+  private final ProcessingContext ctx;
   private final BeanReader bean;
   private final ExecutableElement element;
 
@@ -31,7 +32,8 @@ class MethodReader {
    */
   private final List<String> methodRoles;
 
-  MethodReader(BeanReader bean, ExecutableElement element) {
+  MethodReader(BeanReader bean, ExecutableElement element, ProcessingContext ctx) {
+    this.ctx = ctx;
     this.bean = bean;
     this.beanPath = bean.getPath();
     this.element = element;
@@ -48,7 +50,7 @@ void read() {
     }
 
     for (VariableElement p : element.getParameters()) {
-      MethodParam param = new MethodParam(p);
+      MethodParam param = new MethodParam(p, ctx);
       params.add(param);
       param.addImports(bean);
     }

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

@@ -43,4 +43,8 @@ void logError(Element e, String msg, Object... args) {
   JavaFileObject createWriter(String cls, Element origin) throws IOException {
     return filer.createSourceFile(cls, origin);
   }
+
+  public String docComment(Element param) {
+    return elementUtils.getDocComment(param);
+  }
 }