Refactoring + java 9

Author: adrienlauer

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 
 language: java
 
-jdk: oraclejdk8
+jdk: oraclejdk9
 
 cache:
   directories: "$HOME/.m2/repository"

CHANGELOG.md

@@ -1,6 +1,8 @@
-# Version 2.7.1 (2017-12-15)
+# Version 2.7.1 (2018-05-16)
 
-* [new] In watch goal, trigger a LiveReload (without app refresh) when a resource change. 
+* [new] In watch goal, trigger a LiveReload (without app refresh) when a resource changes.
+* [chg] Java 9 compatibility: avoid using JDK internal classes for hot-reloading.
+* [fix] More reliable check for Cygwin environment. 
 
 # Version 2.7.0 (2017-11-31)
 

pom.xml

@@ -24,7 +24,7 @@
 
     <properties>
         <maven.version>3.3</maven.version>
-        <plexus-component.version>1.6</plexus-component.version>
+        <plexus-component.version>1.7.1</plexus-component.version>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
 
@@ -140,12 +140,12 @@
             <dependency>
                 <groupId>org.fusesource.jansi</groupId>
                 <artifactId>jansi</artifactId>
-                <version>1.16</version>
+                <version>1.17.1</version>
             </dependency>
             <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
-                <version>2.14.5</version>
+                <version>2.14.6</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>

src/license/THIRD-PARTY.properties

@@ -13,11 +13,11 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Sat Dec 09 19:25:38 CET 2017
+#Mon May 14 16:12:41 CEST 2018
 classworlds--classworlds--1.1-alpha-2=
-dom4j--dom4j--1.6.1=
+org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=
 jdom--jdom--1.0=
 org.codehaus.plexus--plexus-component-api--1.0-alpha-16=
-org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=
 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-6=
 oro--oro--2.0.8=
+dom4j--dom4j--1.6.1=

src/main/java/org/seedstack/maven/AbstractExecutableMojo.java

@@ -19,133 +19,56 @@
 import java.util.Collection;
 import java.util.List;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
 
 /**
  * Provides a common base for mojos that run SeedStack applications.
  */
 public abstract class AbstractExecutableMojo extends AbstractSeedStackMojo {
-    @Parameter(defaultValue = "${project}", required = true, readonly = true)
-    private MavenProject project;
-    @Parameter(defaultValue = "${session}", required = true, readonly = true)
-    private MavenSession mavenSession;
-    @Component
-    private BuildPluginManager buildPluginManager;
-    @Parameter(defaultValue = "${project.build.outputDirectory}", required = true)
-    private File classesDirectory;
-    @Parameter(defaultValue = "${project.build.testOutputDirectory}", required = true)
-    private File testClassesDirectory;
-    @Parameter(property = "args")
-    private String args;
     private final IsolatedThreadGroup isolatedThreadGroup = new IsolatedThreadGroup("seed-app");
-    private final Object monitor = new Object();
 
     @SuppressFBWarnings(value = {"UW_UNCOND_WAIT", "WA_NOT_IN_LOOP"}, justification = "Cannot know when the "
             + "application is started")
-    protected void execute(Runnable runnable, boolean testMode) throws MojoExecutionException, MojoFailureException {
+    protected void execute(Runnable runnable, boolean testMode) throws MojoExecutionException {
         File[] classPathFiles = getClassPathFiles(testMode);
 
         // Set the system property for proper detection of classpath
         System.setProperty("java.class.path", buildCpProperty(classPathFiles));
 
         // Start the launcher thread
-        ClassLoader classLoader = buildClassLoader(classPathFiles);
+        ClassLoader classLoader;
+        try {
+            classLoader = buildClassLoader(classPathFiles);
+        } catch (MalformedURLException e) {
+            throw new MojoExecutionException("Unable to build the classloader", e);
+        }
 
         // Create an isolated thread
         Thread bootstrapThread = new Thread(isolatedThreadGroup, runnable, "main");
         bootstrapThread.setContextClassLoader(classLoader);
         bootstrapThread.start();
 
         // Wait for the application to launch
-        synchronized (monitor) {
-            try {
-                monitor.wait();
-            } catch (InterruptedException e) {
-                throw new MojoExecutionException("Interrupted while waiting for Seed");
-            }
-        }
+        getContext().waitForStartup();
 
         // Check for any uncaught exception
         synchronized (isolatedThreadGroup) {
             if (isolatedThreadGroup.uncaughtException != null) {
-                throw new MojoExecutionException("An exception occurred while executing Seed",
+                throw new MojoExecutionException("An exception occurred while executing SeedStack application",
                         isolatedThreadGroup.uncaughtException);
             }
         }
     }
 
-    MavenSession getMavenSession() {
-        return mavenSession;
-    }
-
-    BuildPluginManager getBuildPluginManager() {
-        return buildPluginManager;
-    }
-
-    MavenProject getProject() {
-        return project;
-    }
-
-    File getClassesDirectory() {
-        return classesDirectory;
-    }
-
-    File getTestClassesDirectory() {
-        return testClassesDirectory;
-    }
-
-    Object getMonitor() {
-        return monitor;
-    }
-
-    String[] getArgs() throws MojoExecutionException {
-        try {
-            return CommandLineUtils.translateCommandline(args);
-        } catch (Exception e) {
-            throw new MojoExecutionException("Failed to parse arguments", e);
-        }
-    }
-
-    URLClassLoader getClassLoader(final URL[] classPathUrls) {
+    URLClassLoader createClassLoader(final URL[] classPathUrls) {
         return AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() {
             public URLClassLoader run() {
                 return new URLClassLoader(classPathUrls);
             }
         });
     }
 
-    private ClassLoader buildClassLoader(File[] classPathFiles) throws MojoExecutionException {
-        URL[] classPathUrls = new URL[classPathFiles.length];
-        for (int i = 0; i < classPathFiles.length; i++) {
-            try {
-                classPathUrls[i] = classPathFiles[i].toURI().toURL();
-            } catch (MalformedURLException e) {
-                throw new MojoExecutionException("Unable to create URL from " + classPathFiles[i]);
-            }
-        }
-        return getClassLoader(classPathUrls);
-    }
-
-    private String buildCpProperty(File[] classPathFiles) {
-        StringBuilder stringBuilder = new StringBuilder();
-        for (int i = 0; i < classPathFiles.length; i++) {
-            File classPathFile = classPathFiles[i];
-            stringBuilder.append(classPathFile);
-            if (i < classPathFiles.length - 1) {
-                stringBuilder.append(File.pathSeparator);
-            }
-        }
-        return stringBuilder.toString();
-    }
-
     void waitForShutdown() {
         boolean found = true;
 
@@ -180,34 +103,32 @@ private Thread[] getGroupThreads(final ThreadGroup group) {
         return java.util.Arrays.copyOf(threads, n);
     }
 
-    private File[] getClassPathFiles(boolean testMode) throws MojoExecutionException {
+    private File[] getClassPathFiles(boolean testMode) {
         List<File> files = new ArrayList<>();
 
-        try {
-            if (testMode) {
-                // Project test resources
-                addResources(this.testClassesDirectory, this.project.getTestResources(), files);
+        if (testMode) {
+            // Project test resources
+            addResources(getContext().getTestClassesDirectory(),
+                    getContext().getMavenProject().getTestResources(),
+                    files);
 
-                // Project test classes
-                files.add(this.testClassesDirectory);
-            }
+            // Project test classes
+            files.add(getContext().getTestClassesDirectory());
+        }
 
-            // Project resources
-            addResources(this.classesDirectory, this.project.getResources(), files);
+        // Project resources
+        addResources(getContext().getClassesDirectory(), getContext().getMavenProject().getResources(), files);
 
-            // Project classes
-            files.add(this.classesDirectory);
+        // Project classes
+        files.add(getContext().getClassesDirectory());
 
-            // Project dependencies (scope is dependent upon the @Mojo annotation and the already executed phase)
-            addArtifacts(this.project.getArtifacts(), files);
-        } catch (MalformedURLException e) {
-            throw new MojoExecutionException("Unable to build classpath", e);
-        }
+        // Project dependencies (scope is dependent upon the @Mojo annotation and the already executed phase)
+        addArtifacts(getContext().getMavenProject().getArtifacts(), files);
 
-        return files.toArray(new File[files.size()]);
+        return files.toArray(new File[0]);
     }
 
-    private void addArtifacts(Collection<Artifact> artifacts, List<File> files) throws MalformedURLException {
+    private void addArtifacts(Collection<Artifact> artifacts, List<File> files) {
         for (Artifact artifact : artifacts) {
             File file = artifact.getFile();
             if (file.getName().endsWith(".jar")) {
@@ -217,7 +138,7 @@ private void addArtifacts(Collection<Artifact> artifacts, List<File> files) thro
     }
 
     private void addResources(File classesDirectory, List<Resource> resources,
-            List<File> files) throws MalformedURLException {
+            List<File> files) {
         for (Resource resource : resources) {
             File directory = new File(resource.getDirectory());
             files.add(directory);
@@ -246,6 +167,26 @@ private void removeDuplicatesFromOutputDirectory(File outputDirectory, File orig
         }
     }
 
+    private ClassLoader buildClassLoader(File[] classPathFiles) throws MalformedURLException {
+        URL[] classPathUrls = new URL[classPathFiles.length];
+        for (int i = 0; i < classPathFiles.length; i++) {
+            classPathUrls[i] = classPathFiles[i].toURI().toURL();
+        }
+        return createClassLoader(classPathUrls);
+    }
+
+    private String buildCpProperty(File[] classPathFiles) {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < classPathFiles.length; i++) {
+            File classPathFile = classPathFiles[i];
+            stringBuilder.append(classPathFile);
+            if (i < classPathFiles.length - 1) {
+                stringBuilder.append(File.pathSeparator);
+            }
+        }
+        return stringBuilder.toString();
+    }
+
     private class IsolatedThreadGroup extends ThreadGroup {
         private Throwable uncaughtException;
 

src/main/java/org/seedstack/maven/AbstractSeedStackMojo.java

@@ -8,7 +8,14 @@
 
 package org.seedstack.maven;
 
+import java.io.File;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.BuildPluginManager;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.fusesource.jansi.AnsiConsole;
 
 abstract class AbstractSeedStackMojo extends AbstractMojo {
@@ -21,4 +28,37 @@ public void run() {
         }, "uninstall-ansi"));
         AnsiConsole.systemInstall();
     }
+
+    @Parameter(defaultValue = "${project}", required = true, readonly = true)
+    private MavenProject mavenProject;
+    @Parameter(defaultValue = "${session}", required = true, readonly = true)
+    private MavenSession mavenSession;
+    @Parameter(defaultValue = "${project.build.outputDirectory}", required = true)
+    private File classesDirectory;
+    @Parameter(defaultValue = "${project.build.testOutputDirectory}", required = true)
+    private File testClassesDirectory;
+    @Parameter(property = "args")
+    private String args;
+    @Component
+    private BuildPluginManager buildPluginManager;
+    private Context context;
+
+    public synchronized Context getContext() {
+        if (context == null) {
+            try {
+                context = new Context(
+                        CommandLineUtils.translateCommandline(this.args),
+                        getLog(),
+                        classesDirectory,
+                        testClassesDirectory,
+                        mavenProject,
+                        mavenSession,
+                        buildPluginManager
+                );
+            } catch (Exception e) {
+                throw new RuntimeException("Unable to create execution context", e);
+            }
+        }
+        return context;
+    }
 }

src/main/java/org/seedstack/maven/ConfigMojo.java

@@ -14,7 +14,7 @@
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.seedstack.maven.runnables.ToolLauncherRunnable;
+import org.seedstack.maven.runnables.ToolRunnable;
 
 /**
  * Defines the config goal. This goal runs the config Seed tool which displays all configuration options for the
@@ -26,7 +26,7 @@
 public class ConfigMojo extends AbstractExecutableMojo {
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
-        execute(new ToolLauncherRunnable("config", getArgs(), getMonitor(), getLog()), false);
+        execute(new ToolRunnable("config", getContext()), false);
         waitForShutdown();
     }
 }