cli: update and check annotation processor

Author: jknack

modules/jooby-bom/pom.xml

@@ -18,33 +18,24 @@
   <properties>
   <jooby.version>2.0.7-SNAPSHOT</jooby.version>
   <HikariCP.version>3.3.1</HikariCP.version>
-  <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
-  <archetype-packaging.version>2.2</archetype-packaging.version>
+  <archetype-packaging.version>3.1.2</archetype-packaging.version>
   <asm.version>7.2-beta</asm.version>
   <auto-service.version>1.0-rc6</auto-service.version>
-  <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
-  <capsule-maven-plugin.version>1.0.4</capsule-maven-plugin.version>
   <checkstyle.version>8.19</checkstyle.version>
-  <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
   <commons-io.version>2.6</commons-io.version>
   <compile-testing.version>0.18</compile-testing.version>
   <config.version>1.3.4</config.version>
-  <coveralls-maven-plugin.version>3.1.0</coveralls-maven-plugin.version>
-  <depencency-check-maven.version>2.1.1</depencency-check-maven.version>
-  <docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
-  <dokka-maven-plugin.version>0.9.13</dokka-maven-plugin.version>
-  <duplicate-finder-maven-plugin.version>1.2.1</duplicate-finder-maven-plugin.version>
   <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-  <flyway.version>5.2.4</flyway.version>
+  <flyway.version>6.0.1</flyway.version>
   <freemarker.version>2.3.29</freemarker.version>
   <gradle-core.version>2.6</gradle-core.version>
   <gradle-plugins.version>0.9-rc-1</gradle-plugins.version>
   <gradle-tooling-api.version>2.6</gradle-tooling-api.version>
-  <guava.version>28.0-jre</guava.version>
+  <guava.version>28.1-jre</guava.version>
   <guice.version>4.2.2</guice.version>
   <h2.version>1.4.199</h2.version>
   <handlebars.version>4.1.2</handlebars.version>
-  <hibernate.version>5.4.3.Final</hibernate.version>
+  <hibernate.version>5.4.4.Final</hibernate.version>
   <jackson-databind.version>2.9.9.2</jackson-databind.version>
   <jackson.version>2.9.9</jackson.version>
   <jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
@@ -60,53 +51,50 @@
   <jsr305.version>3.0.2</jsr305.version>
   <junit.version>5.5.1</junit.version>
   <kotlin.version>1.3.50</kotlin.version>
-  <kotlinx-coroutines-core.version>1.2.2</kotlinx-coroutines-core.version>
+  <kotlinx-coroutines-core.version>1.3.0</kotlinx-coroutines-core.version>
   <license-maven-plugin.version>3.0</license-maven-plugin.version>
   <log4j.version>2.12.1</log4j.version>
   <log4jdbc.version>1.2</log4jdbc.version>
   <logback-classic.version>1.2.3</logback-classic.version>
   <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
-  <maven-archetype-plugin.version>2.2</maven-archetype-plugin.version>
-  <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
-  <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
-  <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+  <maven-archetype-plugin.version>3.1.2</maven-archetype-plugin.version>
+  <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
+  <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+  <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
   <maven-core.version>3.6.1</maven-core.version>
   <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-  <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
   <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
   <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-  <maven-jar-plugin.version>2.5</maven-jar-plugin.version>
-  <maven-java-formatter-plugin.version>0.4</maven-java-formatter-plugin.version>
-  <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+  <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
+  <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
   <maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
   <maven-plugin-api.version>3.6.1</maven-plugin-api.version>
   <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
   <maven-project.version>2.2.1</maven-project.version>
-  <maven-release-plugin.version>2.5.1</maven-release-plugin.version>
   <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-  <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
-  <maven-site-plugin.version>3.4</maven-site-plugin.version>
-  <maven-source-plugin.version>2.4</maven-source-plugin.version>
+  <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
+  <maven-site-plugin.version>3.8.2</maven-site-plugin.version>
+  <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
   <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
   <mockito.version>3.0.0</mockito.version>
   <mojo-executor.version>2.3.0</mojo-executor.version>
   <mysql-connector-java.version>8.0.17</mysql-connector-java.version>
   <netty.version>4.1.39.Final</netty.version>
-  <nexus-staging-maven-plugin.version>1.6.5</nexus-staging-maven-plugin.version>
+  <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
   <okhttp.version>4.1.0</okhttp.version>
-  <pebble.version>3.0.10</pebble.version>
+  <pebble.version>3.1.0</pebble.version>
   <plexus-utils.version>3.2.1</plexus-utils.version>
   <reactor.version>3.2.11.RELEASE</reactor.version>
-  <rest-assured.version>4.0.0</rest-assured.version>
+  <rest-assured.version>4.1.0</rest-assured.version>
   <rocker.version>1.2.1</rocker.version>
-  <rxjava.version>2.2.11</rxjava.version>
-  <slf4j.version>1.7.27</slf4j.version>
+  <rxjava.version>2.2.12</rxjava.version>
+  <slf4j.version>1.7.28</slf4j.version>
   <spring.version>5.1.9.RELEASE</spring.version>
-  <stork-maven-plugin.version>2.7.0</stork-maven-plugin.version>
+  <stork-maven-plugin.version>3.0.0</stork-maven-plugin.version>
   <truth.version>1.0</truth.version>
   <unbescape.version>1.1.6.RELEASE</unbescape.version>
-  <undertow.version>2.0.25.Final</undertow.version>
-  <versions-maven-plugin.version>2.1</versions-maven-plugin.version>
+  <undertow.version>2.0.26.Final</undertow.version>
+  <versions-maven-plugin.version>2.7</versions-maven-plugin.version>
   <weld.version>3.1.2.Final</weld.version>
 </properties>
 
@@ -207,6 +195,21 @@
       <artifactId>jooby-banner</artifactId>
       <version>${jooby.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.jooby</groupId>
+      <artifactId>jooby-cli</artifactId>
+      <version>${jooby.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.jooby</groupId>
+      <artifactId>jooby-apt</artifactId>
+      <version>${jooby.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.jooby</groupId>
+      <artifactId>jooby-maven-plugin</artifactId>
+      <version>${jooby-maven-plugin.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.jooby</groupId>
       <artifactId>jooby-gradle-plugin</artifactId>

modules/jooby-cli/pom.xml

@@ -111,7 +111,7 @@
       <plugin>
         <groupId>com.fizzed</groupId>
         <artifactId>stork-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${stork-maven-plugin.version}</version>
         <executions>
           <execution>
             <id>stork-launcher</id>
@@ -123,7 +123,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>${maven-assembly-plugin.version}</version>
         <executions>
           <execution>
             <id>make-assembly</id>

modules/jooby-cli/src/main/resources/cli/IntegrationTest.java.hbs

@@ -17,7 +17,7 @@ public class IntegrationTest {
   static OkHttpClient client = new OkHttpClient();
 
   @Test
-  public void welcome(int serverPort) throws IOException {
+  public void shouldSayHi(int serverPort) throws IOException {
     Request req = new Request.Builder()
         .url("http://localhost:" + serverPort)
         .build();

modules/jooby-cli/src/main/resources/cli/IntegrationTest.kt.hbs

@@ -4,11 +4,8 @@ import io.jooby.JoobyTest
 import io.jooby.StatusCode
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.Response
 import org.junit.jupiter.api.Test
 
-import java.io.IOException
-
 import org.junit.jupiter.api.Assertions.assertEquals
 
 @JoobyTest(App::class)
@@ -19,7 +16,7 @@ class IntegrationTest {
   }
 
   @Test
-  fun welcome(serverPort: Int) {
+  fun shouldSayHi(serverPort: Int) {
     val req = Request.Builder()
         .url("http://localhost:$serverPort")
         .build()

modules/jooby-cli/src/main/resources/cli/pom.xml.hbs

@@ -101,7 +101,7 @@
     {{else}}
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.2</version>
+        <version>3.8.1</version>
       {{#if apt}}
         <configuration>
           <annotationProcessorPaths>
@@ -117,7 +117,7 @@
     {{/if}}
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
+        <version>3.0.0-M3</version>
       </plugin>
       <!-- jooby:run -->
       <plugin>

modules/jooby-test/src/main/java/io/jooby/JoobyExtension.java

@@ -16,8 +16,10 @@
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.extension.TestInstancePostProcessor;
 
+import javax.inject.Named;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.lang.reflect.Parameter;
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -109,32 +111,40 @@ private ExtensionContext.Store getStore(ExtensionContext context) {
   private Supplier<Object> joobyParameter(ExtensionContext context,
       ParameterContext parameterContext) {
     Parameter parameter = parameterContext.getParameter();
-    return injectionPoint(context, parameter.getType(), parameter.getName());
+    return injectionPoint(context, parameter.getType(), () -> parameterName(parameter));
+  }
+
+  private String parameterName(Parameter parameter) {
+    if (!parameter.isNamePresent()) {
+      throw new IllegalStateException("Parameter injection requires parameter names to be present "
+          + "at runtime. Make sure compiler has the -parameters option");
+    }
+    return parameter.getName();
   }
 
   private Supplier<Object> injectionPoint(ExtensionContext context,
-      Class type, String name) {
-    if (name.equals("serverPath") && type == String.class) {
+      Class type, Supplier<String> name) {
+    if (Jooby.class.isAssignableFrom(type)) {
+      return () -> application(context);
+    }
+    if (Environment.class.isAssignableFrom(type)) {
+      return () -> application(context).getEnvironment();
+    }
+    if (Config.class.isAssignableFrom(type)) {
+      return () -> application(context).getEnvironment().getConfig();
+    }
+    if (type == String.class && name.get().equals("serverPath")) {
       return () -> {
         Jooby app = application(context);
         return "http://localhost:" + app.getServerOptions().getPort() + app.getContextPath();
       };
     }
-    if (name.equals("serverPort") && type == int.class) {
+    if (type == int.class && name.get().equals("serverPort")) {
       return () -> {
         Jooby app = application(context);
         return app.getServerOptions().getPort();
       };
     }
-    if (Jooby.class.isAssignableFrom(type)) {
-      return () -> application(context);
-    }
-    if (Environment.class.isAssignableFrom(type)) {
-      return () -> application(context).getEnvironment();
-    }
-    if (Config.class.isAssignableFrom(type)) {
-      return () -> application(context).getEnvironment().getConfig();
-    }
     return null;
   }
 
@@ -157,10 +167,14 @@ private int port(int port, int fallback) {
 
   @Override public void postProcessTestInstance(Object instance, ExtensionContext context)
       throws Exception {
-    for (Field field : instance.getClass().getFields()) {
-      Supplier<Object> injectionPoint = injectionPoint(context, field.getType(), field.getName());
-      if (injectionPoint != null) {
-        field.set(instance, injectionPoint.get());
+    for (Field field : instance.getClass().getDeclaredFields()) {
+      if (!Modifier.isStatic(field.getModifiers())) {
+        Supplier<Object> injectionPoint = injectionPoint(context, field.getType(),
+            () -> field.getName());
+        if (injectionPoint != null) {
+          field.setAccessible(true);
+          field.set(instance, injectionPoint.get());
+        }
       }
     }
   }

pom.xml

@@ -96,47 +96,35 @@
     <gradle-tooling-api.version>2.6</gradle-tooling-api.version>
 
     <!-- Maven plugins -->
-    <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
-    <archetype-packaging.version>2.2</archetype-packaging.version>
-    <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
-    <capsule-maven-plugin.version>1.0.4</capsule-maven-plugin.version>
-    <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
-    <coveralls-maven-plugin.version>3.1.0</coveralls-maven-plugin.version>
-    <depencency-check-maven.version>2.1.1</depencency-check-maven.version>
-    <docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
-    <dokka-maven-plugin.version>0.9.13</dokka-maven-plugin.version>
-    <duplicate-finder-maven-plugin.version>1.2.1</duplicate-finder-maven-plugin.version>
-    <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
     <jacoco-maven-plugin.version>${jacoco.version}</jacoco-maven-plugin.version>
     <license-maven-plugin.version>3.0</license-maven-plugin.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
-    <maven-archetype-plugin.version>2.2</maven-archetype-plugin.version>
-    <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
-    <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
-    <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+    <maven-archetype-plugin.version>3.1.2</maven-archetype-plugin.version>
+    <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
+    <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
     <maven-core.version>3.6.1</maven-core.version>
     <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-    <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
     <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
     <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-    <maven-jar-plugin.version>2.5</maven-jar-plugin.version>
-    <maven-java-formatter-plugin.version>0.4</maven-java-formatter-plugin.version>
-    <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+    <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
+    <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
+    <archetype-packaging.version>3.1.2</archetype-packaging.version>
     <maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
     <maven-plugin-api.version>3.6.1</maven-plugin-api.version>
     <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
     <maven-project.version>2.2.1</maven-project.version>
-    <maven-release-plugin.version>2.5.1</maven-release-plugin.version>
     <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-    <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
-    <maven-site-plugin.version>3.4</maven-site-plugin.version>
-    <maven-source-plugin.version>2.4</maven-source-plugin.version>
+    <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
+    <maven-site-plugin.version>3.8.2</maven-site-plugin.version>
+    <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
     <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
     <mojo-executor.version>2.3.0</mojo-executor.version>
-    <nexus-staging-maven-plugin.version>1.6.5</nexus-staging-maven-plugin.version>
+    <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
     <plexus-utils.version>3.2.1</plexus-utils.version>
-    <stork-maven-plugin.version>2.7.0</stork-maven-plugin.version>
-    <versions-maven-plugin.version>2.1</versions-maven-plugin.version>
+    <stork-maven-plugin.version>3.0.0</stork-maven-plugin.version>
+    <versions-maven-plugin.version>2.7</versions-maven-plugin.version>
+    <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 
     <!-- Jooby  -->
     <jooby.version>${project.version}</jooby.version>