Merge remote-tracking branch 'upstream/2.x' into 2.x

Author: franklx

.gitignore

@@ -33,3 +33,4 @@ versions
 out
 node
 node_modules
+build

docs/asciidoc/usage/usage.adoc

@@ -28,7 +28,7 @@ Kotlin build also requires it via https://kotlinlang.org/docs/reference/kapt.htm
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin.version}</version>
+        <version>{mavenCompilerPluginVersion}</version>
         <configuration>
           <annotationProcessorPaths>
             <path>
@@ -51,7 +51,7 @@ Kotlin build also requires it via https://kotlinlang.org/docs/reference/kapt.htm
       <plugin>
         <artifactId>kotlin-maven-plugin</artifactId>
         <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
+        <version>{kotlinVersion}</version>
         <configuration>
           <args>
             <arg>-java-parameters</arg>
@@ -101,7 +101,7 @@ Kotlin build also requires it via https://kotlinlang.org/docs/reference/kapt.htm
                 <annotationProcessorPath>
                   <groupId>io.jooby</groupId>
                   <artifactId>jooby-apt</artifactId>
-                  <version>${jooby.version}</version>
+                  <version>{joobyVersion}</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>
             </configuration>
@@ -130,20 +130,20 @@ Java build needs an annotationProcessor statement using `jooby-apt`.
 Kotlin builds needs a https://kotlinlang.org/docs/reference/kapt.html#using-in-gradle[kapt] dependency and statement using `jooby-apt`.
 
 .Java
-[source, groovy, role="primary"]
+[source, groovy, role="primary", subs="verbatim,attributes"]
 ----
 dependencies {
   annotationProcessor "io.jooby:jooby-apt:{joobyVersion}"
 }
 ----
 
 .Kotlin
-[source, groovy, role="secondary"]
+[source, groovy, role="secondary", subs="verbatim,attributes"]
 ----
 buildscript {
   ...
   dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{kotlinVersion}"
   }
 }
 
@@ -207,7 +207,7 @@ done using `parameters` compiler option.
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin.version}</version>
+        <version>{mavenCompilerPluginVersion}</version>
         <configuration>
         ...
           <compilerArgs>
@@ -227,7 +227,7 @@ done using `parameters` compiler option.
       <plugin>
           <artifactId>kotlin-maven-plugin</artifactId>
           <groupId>org.jetbrains.kotlin</groupId>
-          <version>${kotlin.version}</version>
+          <version>{kotlinVersion}</version>
           <configuration>
             ...
             <args>

docs/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>2.6.1-SNAPSHOT</version>
+    <version>2.6.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
-      <version>1.12.1</version>
+      <version>1.12.2</version>
     </dependency>
 
   </dependencies>

jooby/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>2.6.1-SNAPSHOT</version>
+    <version>2.6.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

jooby/src/main/java/io/jooby/DefaultContext.java

@@ -396,7 +396,7 @@ public interface DefaultContext extends Context {
           return result;
         }
       }
-      return decoder(contentType).decode(this, type);
+      return (T) decoder(contentType).decode(this, type);
     } catch (Exception x) {
       throw SneakyThrows.propagate(x);
     }

jooby/src/main/java/io/jooby/MessageDecoder.java

@@ -21,20 +21,17 @@ public interface MessageDecoder {
   /**
    * Resolve parsing as {@link StatusCode#UNSUPPORTED_MEDIA_TYPE}.
    */
-  MessageDecoder UNSUPPORTED_MEDIA_TYPE = new MessageDecoder() {
-    @Override public <T> T decode(Context ctx, Type type) {
-      throw new UnsupportedMediaType(ctx.header("Content-Type").valueOrNull());
-    }
+  MessageDecoder UNSUPPORTED_MEDIA_TYPE = (ctx, type) -> {
+    throw new UnsupportedMediaType(ctx.header("Content-Type").valueOrNull());
   };
 
   /**
    * Parse HTTP body into the given type.
    *
    * @param ctx Web context.
    * @param type Target/expected type.
-   * @param <T> Dynamic binding of the target type.
    * @return An instance of the target type.
    * @throws Exception Is something goes wrong.
    */
-  @Nonnull <T> T decode(@Nonnull Context ctx, @Nonnull Type type) throws Exception;
+  @Nonnull Object decode(@Nonnull Context ctx, @Nonnull Type type) throws Exception;
 }

modules/jooby-apt/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>2.6.1-SNAPSHOT</version>
+    <version>2.6.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

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

@@ -46,6 +46,7 @@
 import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
 import static org.objectweb.asm.Opcodes.INVOKESTATIC;
 import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+import static org.objectweb.asm.Opcodes.POP;
 import static org.objectweb.asm.Type.getMethodDescriptor;
 import static org.objectweb.asm.Type.getType;
 
@@ -184,6 +185,8 @@ private void apply(ClassWriter writer, String moduleInternalName, String lambdaN
     /** Arguments. */
     processArguments(writer, apply, moduleInternalName, registry);
 
+    setDefaultResponseType(apply);
+
     /** Invoke. */
     apply.visitMethodInsn(INVOKEVIRTUAL, owner.getInternalName(), methodName, methodDescriptor,
         false);
@@ -227,6 +230,20 @@ private void processArguments(ClassWriter classWriter, MethodVisitor visitor,
     }
   }
 
+  private void setDefaultResponseType(MethodVisitor visitor) throws Exception {
+    TypeKind kind = executable.getReturnType().getKind();
+    if (kind == TypeKind.VOID && getHttpMethod().equalsIgnoreCase(Router.DELETE)) {
+      visitor.visitVarInsn(ALOAD, 1);
+      visitor
+          .visitFieldInsn(GETSTATIC, STATUS_CODE.getInternalName(), "NO_CONTENT",
+              STATUS_CODE.getDescriptor());
+      Method setResponseCode = Context.class.getDeclaredMethod("setResponseCode", StatusCode.class);
+      visitor.visitMethodInsn(INVOKEINTERFACE, CTX.getInternalName(), setResponseCode.getName(),
+          getMethodDescriptor(setResponseCode), true);
+      visitor.visitInsn(POP);
+    }
+  }
+
   private void processReturnType(MethodVisitor visitor) throws Exception {
     TypeKind kind = executable.getReturnType().getKind();
     if (kind == TypeKind.VOID) {
@@ -242,15 +259,14 @@ private void processReturnType(MethodVisitor visitor) throws Exception {
       visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
 
       visitor.visitVarInsn(ALOAD, 1);
-      visitor
-          .visitFieldInsn(GETSTATIC, STATUS_CODE.getInternalName(), "NO_CONTENT",
-              STATUS_CODE.getDescriptor());
+      visitor.visitVarInsn(ALOAD, 1);
+      Method getResponseCode = Context.class.getDeclaredMethod("getResponseCode");
+      visitor.visitMethodInsn(INVOKEINTERFACE, CTX.getInternalName(), getResponseCode.getName(),
+          getMethodDescriptor(getResponseCode), true);
       Method sendStatusCode = Context.class.getDeclaredMethod("send", StatusCode.class);
       visitor.visitMethodInsn(INVOKEINTERFACE, CTX.getInternalName(), sendStatusCode.getName(),
           getMethodDescriptor(sendStatusCode), true);
-
     } else {
-
       Method wrapper = Primitives.wrapper(kind);
       if (wrapper == null) {
         TypeDefinition returnType = getReturnType();

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

@@ -13,7 +13,8 @@ public class MvcExtension implements MvcFactory {
   private static void install(Jooby application, Provider<MyController> provider) throws Exception {
     application.get("/mypath", ctx -> {
       MyController myController = provider.get();
-      return myController.controllerMethod();
+      myController.controllerMethod();
+      return ctx;
     }).attribute("RequireRole", Controller1527.Role.USER);
   }
 

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

@@ -1,5 +1,6 @@
 package output;
 
+import io.jooby.Context;
 import io.jooby.annotations.GET;
 import io.jooby.annotations.Path;
 import io.jooby.annotations.PathParam;
@@ -9,8 +10,7 @@
 
 public class MyController {
 
-  @GET("/mypath")
-  public String controllerMethod() {
-    return "/mypath";
+  @GET("/default")
+  public void controllerMethod() {
   }
 }