#14 - Support bean validation

Author: rbygrave

pom.xml

@@ -31,6 +31,12 @@
       <version>1</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>2.0.1.Final</version>
+    </dependency>
+
     <dependency>
       <groupId>io.dinject</groupId>
       <artifactId>dinject-controller</artifactId>

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

@@ -19,5 +19,6 @@ class Constants {
   static final String IMPORT_PATH_TYPE_CONVERT = "import static io.dinject.controller.PathTypeConversion.*;";
 
   static final String IMPORT_CONTROLLER = "io.dinject.controller.*";
+  static final String VALIDATOR = "io.dinject.controller.Validator";
 
 }

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

@@ -13,6 +13,7 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
+import javax.validation.Valid;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
@@ -50,6 +51,8 @@ class ControllerReader {
 
   private boolean docHidden;
 
+  private final boolean includeValidator;
+
   ControllerReader(TypeElement beanType, ProcessingContext ctx) {
     this.beanType = beanType;
     this.ctx = ctx;
@@ -62,10 +65,14 @@ class ControllerReader {
     if (ctx.isOpenApiAvailable()) {
       docHidden = initDocHidden();
     }
+    includeValidator = initIncludeValidator();
     importTypes.add(Constants.SINGLETON);
     importTypes.add(Constants.API_BUILDER);
     importTypes.add(Constants.IMPORT_CONTROLLER);
     importTypes.add(beanType.getQualifiedName().toString());
+    if (includeValidator) {
+      importTypes.add(Constants.VALIDATOR);
+    }
 
     this.produces = initProduces();
   }
@@ -134,6 +141,10 @@ private boolean initDocHidden() {
     return findAnnotation(Hidden.class) != null;
   }
 
+  private boolean initIncludeValidator() {
+    return findAnnotation(Valid.class) != null;
+  }
+
   String getProduces() {
     return produces;
   }
@@ -146,6 +157,10 @@ boolean isDocHidden() {
     return docHidden;
   }
 
+  boolean isIncludeValidator() {
+    return includeValidator;
+  }
+
   void read() {
     if (!roles.isEmpty()) {
       addStaticImportType(ctx.isJavalin3() ? JAVALIN3_ROLES : JAVALIN2_ROLES);
@@ -156,7 +171,7 @@ void read() {
 
     for (Element element : beanType.getEnclosedElements()) {
       if (element.getKind() == ElementKind.METHOD) {
-        readMethod((ExecutableElement)element);
+        readMethod((ExecutableElement) element);
       }
     }
 
@@ -170,13 +185,13 @@ private void readSuper(TypeElement beanType) {
 
     TypeMirror superclass = beanType.getSuperclass();
     if (superclass.getKind() != TypeKind.NONE) {
-      DeclaredType declaredType = (DeclaredType)superclass;
+      DeclaredType declaredType = (DeclaredType) superclass;
 
       final Element superElement = ctx.asElement(superclass);
       if (!"java.lang.Object".equals(superElement.toString())) {
         for (Element element : superElement.getEnclosedElements()) {
           if (element.getKind() == ElementKind.METHOD) {
-            readMethod((ExecutableElement)element, declaredType);
+            readMethod((ExecutableElement) element, declaredType);
           }
         }
         if (superElement instanceof TypeElement) {
@@ -195,7 +210,7 @@ private void readMethod(ExecutableElement method, DeclaredType declaredType) {
     ExecutableType actualExecutable = null;
     if (declaredType != null) {
       // actual taking into account generics
-      actualExecutable = (ExecutableType)ctx.asMemberOf(declaredType, method);
+      actualExecutable = (ExecutableType) ctx.asMemberOf(declaredType, method);
     }
 
     MethodReader methodReader = new MethodReader(this, method, actualExecutable, ctx);

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

@@ -80,11 +80,22 @@ private void writeClassStart() {
     writer.append("@Singleton").eol();
     writer.append("public class ").append(shortName).append("$route implements WebRoutes {").eol().eol();
 
-    writer.append(" private final %s controller;", shortName).eol().eol();
+    writer.append(" private final %s controller;", shortName).eol();
+    if (reader.isIncludeValidator()) {
+      writer.append(" private final Validator validator;").eol();
+    }
+    writer.eol();
 
-    writer.append(" public %s$route(%s controller) {", shortName, shortName).eol();
-    writer.append("   this.controller = controller;", shortName, shortName).eol();
-    writer.append(" }", shortName, shortName).eol().eol();
+    writer.append(" public %s$route(%s controller", shortName, shortName);
+    if (reader.isIncludeValidator()) {
+      writer.append(", Validator validator");
+    }
+    writer.append(") {").eol();
+    writer.append("   this.controller = controller;").eol();
+    if (reader.isIncludeValidator()) {
+      writer.append("   this.validator = validator;").eol();
+    }
+    writer.append(" }").eol().eol();
   }
 
   private void writePackage() {

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

@@ -157,6 +157,13 @@ void buildApiDocumentation(MethodDocBuilder methodDoc) {
     }
   }
 
+  void writeValidate(Append writer) {
+    if (!isJavalinContext() && typeHandler == null) {
+      writer.append("validator.validate(%s);", varName).eol();
+      writer.append("      ");
+    }
+  }
+
   void writeCtxGet(Append writer, PathSegments segments) {
 
     if (isJavalinContext()) {

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

@@ -12,14 +12,18 @@ public class MethodParam {
     this.elementParam = new ElementReader(param, rawType, ctx, defaultParamType, formMarker);
   }
 
-  void buildCtxGet(Append writer, PathSegments segments) {
+  void writeCtxGet(Append writer, PathSegments segments) {
     elementParam.writeCtxGet(writer, segments);
   }
 
   void addImports(ControllerReader bean) {
     elementParam.addImports(bean);
   }
 
+  void writeValidate(Append writer) {
+    elementParam.writeValidate(writer);
+  }
+
   void buildParamName(Append writer) {
     elementParam.writeParamName(writer);
   }

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

@@ -148,13 +148,20 @@ void addRoute(Append writer) {
       }
 
       for (MethodParam param : params) {
-        param.buildCtxGet(writer, segments);
+        param.writeCtxGet(writer, segments);
       }
       writer.append("      ");
 
       if (!isVoid()) {
         writeContextReturn(writer);
       }
+
+      if (bean.isIncludeValidator() && webMethod != WebMethod.GET) {
+        for (MethodParam param : params) {
+          param.writeValidate(writer);
+        }
+      }
+
       writer.append("controller.");
       writer.append(element.getSimpleName().toString()).append("(");
       for (int i = 0; i < params.size(); i++) {