apt: Add parameter nullability support

Author: jknack

modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java

@@ -186,6 +186,8 @@ private void processArguments(ClassWriter classWriter, MethodVisitor visitor) th
     }
   }
 
+
+
   private void processReturnType(MethodVisitor visitor) throws Exception {
     TypeKind kind = executable.getReturnType().getKind();
     if (kind == TypeKind.VOID) {

modules/jooby-apt/src/main/java/io/jooby/internal/apt/ParamDefinition.java

@@ -160,35 +160,37 @@ private Class[] builtinTypes() {
   }
 
   public Method getMethod() throws NoSuchMethodException {
-    if (is(String.class)) {
-      return Value.class.getDeclaredMethod("value");
-    }
-    if (is(int.class)) {
-      return Value.class.getDeclaredMethod("intValue");
-    }
-    if (is(byte.class)) {
-      return Value.class.getDeclaredMethod("byteValue");
-    }
-    if (is(long.class)) {
-      return Value.class.getDeclaredMethod("longValue");
-    }
-    if (is(float.class)) {
-      return Value.class.getDeclaredMethod("floatValue");
-    }
-    if (is(double.class)) {
-      return Value.class.getDeclaredMethod("doubleValue");
-    }
-    if (is(boolean.class)) {
-      return Value.class.getDeclaredMethod("booleanValue");
-    }
-    if (is(Optional.class, String.class)) {
-      return Value.class.getDeclaredMethod("toOptional");
-    }
-    if (is(List.class, String.class)) {
-      return Value.class.getDeclaredMethod("toList");
-    }
-    if (is(Set.class, String.class)) {
-      return Value.class.getDeclaredMethod("toSet");
+    if (!isNullable()) {
+      if (is(String.class)) {
+        return Value.class.getDeclaredMethod("value");
+      }
+      if (is(int.class)) {
+        return Value.class.getDeclaredMethod("intValue");
+      }
+      if (is(byte.class)) {
+        return Value.class.getDeclaredMethod("byteValue");
+      }
+      if (is(long.class)) {
+        return Value.class.getDeclaredMethod("longValue");
+      }
+      if (is(float.class)) {
+        return Value.class.getDeclaredMethod("floatValue");
+      }
+      if (is(double.class)) {
+        return Value.class.getDeclaredMethod("doubleValue");
+      }
+      if (is(boolean.class)) {
+        return Value.class.getDeclaredMethod("booleanValue");
+      }
+      if (is(Optional.class, String.class)) {
+        return Value.class.getDeclaredMethod("toOptional");
+      }
+      if (is(List.class, String.class)) {
+        return Value.class.getDeclaredMethod("toList");
+      }
+      if (is(Set.class, String.class)) {
+        return Value.class.getDeclaredMethod("toSet");
+      }
     }
     // toOptional(Class)
     if (isOptional()) {

modules/jooby-apt/src/main/java/io/jooby/internal/apt/asm/RouteAttributesWriter.java

@@ -1,3 +1,8 @@
+/**
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
 package io.jooby.internal.apt.asm;
 
 import io.jooby.Route;

modules/jooby-apt/src/test/java/output/ASMPrinter.java

@@ -22,6 +22,11 @@ public void mvcExtension() throws Exception {
     ASMifier.main(new String[] {MvcExtension.class.getName() });
   }
 
+  @Test
+  public void mvcDispatch() throws Exception {
+    ASMifier.main(new String[] {MvcDispatch.class.getName() });
+  }
+
   @Test
   public void myController() throws Exception {
     ASMifier.main(new String[] {MyControllerHandler.class.getName() });

modules/jooby-apt/src/test/java/output/MvcDispatch.java

@@ -0,0 +1,15 @@
+package output;
+
+import io.jooby.Jooby;
+
+public class MvcDispatch implements Runnable {
+  private Jooby application;
+
+  public MvcDispatch(Jooby application) {
+    this.application = application;
+  }
+
+  @Override public void run() {
+    application.get("/", ctx -> "xx");
+  }
+}

modules/jooby-apt/src/test/java/output/MvcExtension.java

@@ -17,14 +17,6 @@ public MvcExtension(Provider c) {
   }
 
   @Override public void install(@Nonnull Jooby application) throws Exception {
-    Route route = application.get("/", ctx -> "..");
-    route.attribute("str", "string");
-    route.attribute("annotation", newMap());
-  }
-
-  private static Map<String, Object> newMap() {
-    Map<String, Object> map = new HashMap<>();
-    map.put("LinkAnnotation", "v");
-    return map;
+    application.dispatch(new MvcDispatch(application));
   }
 }

modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java

@@ -319,11 +319,8 @@ public void body() throws Exception {
           assertEquals(map, handler.apply(ctx));
         })
         .compile("POST", "/p/bodyStringParam", handler -> {
-          Body body = mock(Body.class);
-          when(body.value()).thenReturn("...");
-
           Context ctx = mockContext("POST", "/p/bodyStringParam");
-          when(ctx.body()).thenReturn(body);
+          when(ctx.body(String.class)).thenReturn("...");
 
           assertEquals("...", handler.apply(ctx));
         })