Making the src extensions that trigger rebuild configurable (jooby-project#859)

sphogan · jknack · commit b88a2069b40a · 2017-10-08T11:00:20.000-03:00
* making the src extensions that trigger rebuild configurable

* add documentation and fix XML Parsing on Kotlin recompilation
diff --git a/doc/doc/maven-plugin/maven.md b/doc/doc/maven-plugin/maven.md
@@ -56,6 +56,7 @@ It's worth to mention that dynamic reload of classes is done via {{jboss-modules
     </includes>
     <excludes>
     </excludes>
+    <srcExtensions>.java,.kt,.conf,.properties</srcExtensions>
   </configuration>
 </plugin>
 ```
@@ -150,4 +151,8 @@ Make sure to enable the ```fork``` option too, otherwise ```vmArgs``` are ignore
 
 ### includes / excludes
 
-List of file patterns to listen for file changes.
+List of file patterns to listen for file changes and trigger restarting the server.
+
+### srcExtensions
+
+List of file extensions to listen for file changes and trigger re-compilation.
diff --git a/doc/gradle-jooby-run.md b/doc/gradle-jooby-run.md
@@ -62,6 +62,7 @@ joobyRun {
   includes = ['**/*.class', '**/*.conf', '**/*.properties']
   excludes = []
   logLevel = 'info'
+  srcExtensions = [".java", ".kt", ".conf", ".properties"]
 }
 
 ```
@@ -86,4 +87,8 @@ Compilation success or error messages are displayed in the console (not in the b
 
 ### includes / excludes
 
-List of file patterns to watch for file changes.
+List of file patterns to watch for file changes and trigger restarting the server.
+
+### srcExtensions
+
+List of file extensions watch for changes and trigger re-compilation.
diff --git a/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyPlugin.java b/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyPlugin.java
@@ -250,6 +250,8 @@ private void configureJoobyRun(final Project project) throws IOException {
 
           mapping.map("mainClassName", () -> project.getProperties().get("mainClassName"));
 
+          mapping.map("srcExtensions", () -> new String[] {".java", ".conf", ".properties"});
+
           mapping.map("compiler", () -> {
             File eclipseClasspath = new File(project.getProjectDir(), ".classpath");
             return eclipseClasspath.exists() ? "off" : "on";
diff --git a/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyTask.java b/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyTask.java
@@ -248,6 +248,8 @@ public class JoobyTask extends ConventionTask {
 
   private List<String> watchDirs;
 
+  private List<String> srcExtensions;
+
   private String mainClassName;
 
   private String compiler;
@@ -284,10 +286,8 @@ public void run() throws Exception {
           .toArray(new Path[0]);
       // don't start watcher if continuous is ON
       new Watcher((k, path) -> {
-        if (path.toString().endsWith(".java")) {
-          runTask(project, path, "classes");
-        } else if (path.toString().endsWith(".conf")
-            || path.toString().endsWith(".properties")) {
+        if (getSrcExtensions().stream()
+                .anyMatch(ext -> path.toString().endsWith(ext))) {
           runTask(project, path, "classes");
         }
       }, watchDirs).start();
@@ -409,11 +409,20 @@ public void setWatchDirs(final List<String> watchDirs) {
     this.watchDirs = watchDirs;
   }
 
+  public List<String> getSrcExtensions() {
+    return srcExtensions;
+  }
+
+  public void setSrcExtensions(final List<String> srcExtensions) {
+    this.srcExtensions = srcExtensions;
+  }
+
   public String getCompiler() {
     return compiler;
   }
 
   public void setCompiler(final String compiler) {
     this.compiler = compiler;
   }
+
 }
diff --git a/modules/jooby-maven-plugin/src/main/java/org/jooby/JoobyMojo.java b/modules/jooby-maven-plugin/src/main/java/org/jooby/JoobyMojo.java
@@ -224,19 +224,25 @@
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 @Mojo(name = "run", threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST)
 @Execute(phase = LifecyclePhase.TEST_COMPILE)
 public class JoobyMojo extends AbstractMojo {
+  private static final Object LOCK = new Object();
+
+  private static final List<String> XML_PROPS = Arrays.asList(
+      "javax.xml.parsers.DocumentBuilderFactory",
+      "javax.xml.parsers.SAXParserFactory",
+      "javax.xml.stream.XMLInputFactory",
+      "javax.xml.stream.XMLEventFactory",
+      "javax.xml.transform.TransformerFactory",
+      "javax.xml.stream.XMLOutputFactory",
+      "javax.xml.datatype.DatatypeFactory",
+      "org.xml.sax.driver");
+
 
   private static class ShutdownHook extends Thread {
     private Log log;
@@ -291,6 +297,9 @@ public void run() {
   @Parameter(property = "jooby.excludes")
   private List<String> excludes;
 
+  @Parameter(property = "jooby.srcExtensions", defaultValue = ".java,.kt,.conf,.properties")
+  private List<String> srcExtensions;
+
   @Parameter(property = "application.debug", defaultValue = "true")
   private String debug;
 
@@ -388,7 +397,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
       getLog().debug("cmd: " + cmd.debug());
     }
 
-    Watcher watcher = setupCompiler(mavenProject, compiler, goal -> {
+    Watcher watcher = setupCompiler(mavenProject, compiler, srcExtensions, goal -> {
       maven.execute(DefaultMavenExecutionRequest.copy(session.getRequest())
           .setGoals(Arrays.asList(goal)));
     });
@@ -455,7 +464,7 @@ private Set<File> refcp(final Set<File> files) {
 
   @SuppressWarnings("unchecked")
   private static Watcher setupCompiler(final MavenProject project, final String compiler,
-      final Consumer<String> task) throws MojoFailureException {
+      final List<String> srcExtensions, final Consumer<String> task) throws MojoFailureException {
     File eclipseClasspath = new File(project.getBasedir(), ".classpath");
     if ("off".equalsIgnoreCase(compiler) || eclipseClasspath.exists()) {
       return null;
@@ -472,11 +481,9 @@ private static Watcher setupCompiler(final MavenProject project, final String co
         ClassLoader currentloader = Thread.currentThread().getContextClassLoader();
         try {
           Thread.currentThread().setContextClassLoader(backloader);
-          if (path.toString().endsWith(".java")) {
-            task.accept("compile");
-          } else if (path.toString().endsWith(".conf")
-              || path.toString().endsWith(".properties")) {
-            task.accept("compile");
+          if (srcExtensions.stream()
+              .anyMatch(ext -> path.toString().endsWith(ext))) {
+            runCompile(task);
           }
         } finally {
           Thread.currentThread().setContextClassLoader(currentloader);
@@ -487,6 +494,19 @@ private static Watcher setupCompiler(final MavenProject project, final String co
     }
   }
 
+  private static void runCompile(Consumer<String> task) {
+    synchronized (LOCK) {
+      Map<String, String> xml = new HashMap<>();
+      XML_PROPS.forEach(p -> xml.put(p, (String) System.getProperties().remove(p)));
+      task.accept("compile");
+      xml.forEach((k, v) -> {
+        if (v != null) {
+          System.setProperty(k, v);
+        }
+      });
+    }
+  }
+
   private void setLogback() {
     // logback
     File[] logbackFiles = {localFile("conf", "logback-test.xml"),
