Fix classloader usage across assets processor

jknack · jknack · commit d32bc65e222e · 2018-05-18T14:45:17.000-03:00
diff --git a/modules/jooby-assets-autoprefixer/src/main/java/org/jooby/assets/AutoPrefixer.java b/modules/jooby-assets-autoprefixer/src/main/java/org/jooby/assets/AutoPrefixer.java
@@ -289,8 +289,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     return engine(V8Engine.class)
         .execute("auto-prefixer.js", source, options(), filename);
   }
diff --git a/modules/jooby-assets-babel/src/main/java/org/jooby/assets/Babel.java b/modules/jooby-assets-babel/src/main/java/org/jooby/assets/Babel.java
@@ -264,8 +264,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     return engine(V8Engine.class)
         .execute("babel.js", source, options(), filename);
   }
diff --git a/modules/jooby-assets-clean-css/src/main/java/org/jooby/assets/CleanCss.java b/modules/jooby-assets-clean-css/src/main/java/org/jooby/assets/CleanCss.java
@@ -257,8 +257,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     return engine(V8Engine.class)
         .execute("clean-css.js", source, options(), filename);
   }
diff --git a/modules/jooby-assets-closure-compiler/src/main/java/org/jooby/assets/ClosureCompiler.java b/modules/jooby-assets-closure-compiler/src/main/java/org/jooby/assets/ClosureCompiler.java
@@ -280,8 +280,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     final CompilerOptions copts = new CompilerOptions();
     copts.setCodingConvention(new ClosureCodingConvention());
     copts.setOutputCharset(StandardCharsets.UTF_8);
diff --git a/modules/jooby-assets-csslint/src/main/java/org/jooby/assets/Csslint.java b/modules/jooby-assets-csslint/src/main/java/org/jooby/assets/Csslint.java
@@ -206,6 +206,7 @@
 import org.jooby.MediaType;
 
 import com.typesafe.config.Config;
+
 /**
  * <h1>csslint</h1>
  * <p>
@@ -238,8 +239,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     return engine(V8Engine.class)
         .execute("csslint.js", source, options(), filename);
   }
diff --git a/modules/jooby-assets-jscs/src/main/java/org/jooby/assets/Jscs.java b/modules/jooby-assets-jscs/src/main/java/org/jooby/assets/Jscs.java
@@ -252,17 +252,14 @@
  */
 public class Jscs extends AssetProcessor {
 
-  public Jscs() {
-  }
-
   @Override
   public boolean matches(final MediaType type) {
     return MediaType.js.matches(type);
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     return engine(V8Engine.class, "global")
         .execute("jscs.js", source, options(), filename);
   }
diff --git a/modules/jooby-assets-jshint/src/main/java/org/jooby/assets/Jshint.java b/modules/jooby-assets-jshint/src/main/java/org/jooby/assets/Jshint.java
@@ -284,8 +284,8 @@ public boolean matches(final MediaType type) {
 
   @SuppressWarnings("unchecked")
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     Map<String, Object> options = new LinkedHashMap<>(options());
     Map<String, Object> predef = (Map<String, Object>) options.remove("predef");
     options.remove("excludes");
diff --git a/modules/jooby-assets-less/src/main/java/org/jooby/assets/Less.java b/modules/jooby-assets-less/src/main/java/org/jooby/assets/Less.java
@@ -264,10 +264,10 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
-    return engine(V8Engine.class)
-        .execute("less.js", source, options(), filename);
-  }
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
+      return engine(V8Engine.class)
+          .execute("less.js", source, options(), filename);
+    }
 
-}
+  }
diff --git a/modules/jooby-assets-less4j/src/main/java/org/jooby/assets/Less.java b/modules/jooby-assets-less4j/src/main/java/org/jooby/assets/Less.java
@@ -203,14 +203,6 @@
  */
 package org.jooby.assets;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.jooby.MediaType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.sommeri.less4j.Less4jException;
 import com.github.sommeri.less4j.LessCompiler;
 import com.github.sommeri.less4j.LessCompiler.CompilationResult;
@@ -219,6 +211,13 @@
 import com.github.sommeri.less4j.LessSource;
 import com.github.sommeri.less4j.core.ThreadUnsafeLessCompiler;
 import com.typesafe.config.Config;
+import org.jooby.MediaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <h1>less4j</h1>
@@ -285,8 +284,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     String path = filename;
     try {
       LessCompiler compiler = new ThreadUnsafeLessCompiler();
diff --git a/modules/jooby-assets-ng-annotate/src/main/java/org/jooby/assets/NgAnnotate.java b/modules/jooby-assets-ng-annotate/src/main/java/org/jooby/assets/NgAnnotate.java
@@ -256,8 +256,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     return engine(V8Engine.class)
         .execute("ng-annotate.js", source, options(), filename);
   }
diff --git a/modules/jooby-assets-requirejs/src/main/java/org/jooby/assets/Rjs.java b/modules/jooby-assets-requirejs/src/main/java/org/jooby/assets/Rjs.java
@@ -259,8 +259,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     String path = filename.startsWith("/") ? filename.substring(1) : filename;
     return engine(V8Engine.class)
         .execute("r.js", source, options(), path);
diff --git a/modules/jooby-assets-rollup/src/main/java/org/jooby/assets/Rollup.java b/modules/jooby-assets-rollup/src/main/java/org/jooby/assets/Rollup.java
@@ -340,8 +340,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     V8Engine engine = engine(V8Engine.class, "window");
     V8 v8 = engine.v8;
 
diff --git a/modules/jooby-assets-sass/src/main/java/org/jooby/assets/Sass.java b/modules/jooby-assets-sass/src/main/java/org/jooby/assets/Sass.java
@@ -280,7 +280,7 @@
  * @since 0.11.0
  */
 public class Sass extends AssetProcessor {
-  
+
   static class SassImporter implements Importer {
 
     private String ext;
@@ -330,45 +330,24 @@ private String nameWithExtension(final String name) {
   }
 
   static final Pattern LOCATION = Pattern.compile("\"(.+?)\":\\s+(\\d+)");
-  
+
   private static final Function<String, URI> FS = it -> {
     File file = new File(it);
     return file.exists() ? file.toURI() : null;
   };
-  
+
   /**
    * Function that wraps a ClassLoader in a function that takes a filename and returns a URI.
    */
   private static final Function<ClassLoader, Function<String, URI>> CP = classLoader -> filename -> {
-    URL resource;
-    if(classLoader == null) {
-      resource = Sass.class.getResource(filename);
-    } else {
-      // strip the first backslash to support relative paths, similar to the behavior of Class.getResource(name)
-      if(filename.startsWith("/")) {
-        filename = filename.substring(1);
-      }
-      resource = classLoader.getResource(filename);
+    // strip the first backslash to support relative paths, similar to the behavior of Class.getResource(name)
+    if (filename.startsWith("/")) {
+      filename = filename.substring(1);
     }
+    URL resource = classLoader.getResource(filename);
     return resource == null ? null : Try.apply(resource::toURI).get();
   };
-  
-  private static Function<String, URI> createClasspathFunction(ClassLoader classLoader) {
-    return filename -> {
-      // strip the first backslash to support relative paths, similar to the behavior of Class.getResource(name)
-      if(filename.startsWith("/")) {
-        filename = filename.substring(1);
-      }
-      URL resource;
-      if(classLoader == null) {
-        resource = Sass.class.getResource(filename);
-      } else {
-        resource = classLoader.getResource(filename);
-      }
-      return resource == null ? null : Try.apply(resource::toURI).get();
-    };
-  }
-  
+
   public Sass() {
     set("syntax", "scss");
     set("style", "nested");
@@ -384,19 +363,14 @@ public Sass() {
   public boolean matches(final MediaType type) {
     return MediaType.css.matches(type);
   }
-  
-  @Override
-  public String process(String filename, String source, Config conf) throws Exception {
-    return process(filename, source, conf, null);
-  }
-  
+
   @Override
-  public String process(final String filename, final String source, final Config conf, final ClassLoader loader)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     String syntax = get("syntax");
     String importer = get("importer").toString().toUpperCase();
     Function<String, URI> resolver;
-    if("FILE".equals(importer)) {
+    if ("FILE".equals(importer)) {
       resolver = FS;
     } else {
       resolver = CP.apply(loader);
diff --git a/modules/jooby-assets-sass/src/test/java/org/jooby/assets/SassTest.java b/modules/jooby-assets-sass/src/test/java/org/jooby/assets/SassTest.java
@@ -12,7 +12,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-public class JSassTest {
+public class SassTest {
 
   @Test
   public void name() throws Exception {
@@ -154,7 +154,7 @@ public void importDirectiveRelative() throws Exception {
   public void importDirectiveFromDir() throws Exception {
     Sass sass = new Sass();
     // manually create a URLClassLoader that points to the resources directory, normally handled by the AssetClassLoader class
-    Path dirPath = Paths.get(JSassTest.class.getResource("/relative/nested/bar.scss").toURI()).getParent();
+    Path dirPath = Paths.get(SassTest.class.getResource("/relative/nested/bar.scss").toURI()).getParent();
     ClassLoader classLoader = new URLClassLoader(new URL[]{dirPath.toUri().toURL()});
     String result = sass.process("/styles.scss",
         "@import 'bar';\n\n" +
diff --git a/modules/jooby-assets-uglify/src/main/java/org/jooby/assets/Uglify.java b/modules/jooby-assets-uglify/src/main/java/org/jooby/assets/Uglify.java
@@ -283,8 +283,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     return engine(V8Engine.class)
         .execute("uglify.js", source, options(), filename);
   }
diff --git a/modules/jooby-assets-yui-compressor/src/main/java/org/jooby/assets/YuiCss.java b/modules/jooby-assets-yui-compressor/src/main/java/org/jooby/assets/YuiCss.java
@@ -203,13 +203,12 @@
  */
 package org.jooby.assets;
 
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import org.jooby.MediaType;
-
 import com.typesafe.config.Config;
 import com.yahoo.platform.yui.compressor.CssCompressor;
+import org.jooby.MediaType;
+
+import java.io.StringReader;
+import java.io.StringWriter;
 
 /**
  * <h1>yui-css</h1>
@@ -247,8 +246,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     CssCompressor compressor = new CssCompressor(new StringReader(source));
     int linebreakpos = get("linebreakpos");
     StringWriter out = new StringWriter();
diff --git a/modules/jooby-assets-yui-compressor/src/main/java/org/jooby/assets/YuiJs.java b/modules/jooby-assets-yui-compressor/src/main/java/org/jooby/assets/YuiJs.java
@@ -203,18 +203,17 @@
  */
 package org.jooby.assets;
 
-import java.io.StringReader;
-import java.io.StringWriter;
-
+import com.google.common.collect.ImmutableList;
+import com.typesafe.config.Config;
+import com.yahoo.platform.yui.compressor.JavaScriptCompressor;
 import org.jooby.MediaType;
 import org.mozilla.javascript.ErrorReporter;
 import org.mozilla.javascript.EvaluatorException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableList;
-import com.typesafe.config.Config;
-import com.yahoo.platform.yui.compressor.JavaScriptCompressor;
+import java.io.StringReader;
+import java.io.StringWriter;
 
 /**
  * <h1>yui-js</h1>
@@ -271,8 +270,8 @@ public boolean matches(final MediaType type) {
   }
 
   @Override
-  public String process(final String filename, final String source, final Config conf)
-      throws Exception {
+  public String process(final String filename, final String source, final Config conf,
+      final ClassLoader loader) throws Exception {
     ErrorReporter reporter = reporter(log, filename, name());
     JavaScriptCompressor compressor = new JavaScriptCompressor(new StringReader(source), reporter);
     StringWriter out = new StringWriter();
@@ -281,7 +280,8 @@ public String process(final String filename, final String source, final Config c
     return out.toString();
   }
 
-  private static ErrorReporter reporter(final Logger log, final String filename, final String name) {
+  private static ErrorReporter reporter(final Logger log, final String filename,
+      final String name) {
     return new ErrorReporter() {
 
       @Override
diff --git a/modules/jooby-assets/src/main/java/org/jooby/assets/AssetProcessor.java b/modules/jooby-assets/src/main/java/org/jooby/assets/AssetProcessor.java
@@ -350,7 +350,9 @@ public AssetProcessor set(final Config options) {
    * @return the processed file contents
    * @throws Exception if any error occurred
    */
-  public abstract String process(String filename, String source, Config conf) throws Exception;
+  public String process(String filename, String source, Config conf) throws Exception {
+    return process(filename, source, conf, getClass().getClassLoader());
+  }
   
   /**
    * Method that processes the provided source and returns the processed contents, with access to the ClassLoader.
@@ -362,9 +364,7 @@ public AssetProcessor set(final Config options) {
    * @return the processed file contents
    * @throws Exception if any error occurred
    */
-  public String process(String filename, String source, Config conf, ClassLoader loader) throws Exception {
-    return process(filename, source, conf);
-  }
+  public abstract String process(String filename, String source, Config conf, ClassLoader loader) throws Exception;
 
   /**
    * This method is executed by the {@link AssetCompiler} at processor creation time.
diff --git a/modules/jooby-assets/src/main/java/org/jooby/assets/Props.java b/modules/jooby-assets/src/main/java/org/jooby/assets/Props.java
diff --git a/modules/jooby-assets/src/test/java/org/jooby/assets/CompressorTest.java b/modules/jooby-assets/src/test/java/org/jooby/assets/CompressorTest.java
diff --git a/modules/jooby-assets/src/test/java/org/jooby/assets/CssProcessorTest.java b/modules/jooby-assets/src/test/java/org/jooby/assets/CssProcessorTest.java
diff --git a/modules/jooby-assets/src/test/java/org/jooby/assets/ProcessorTest.java b/modules/jooby-assets/src/test/java/org/jooby/assets/ProcessorTest.java

Original file line number	Diff line number	Diff line change
`@@ -289,8 +289,8 @@ public boolean matches(final MediaType type) {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`@Override`
`292`		`- public String process(final String filename, final String source, final Config conf)`
`293`		`- throws Exception {`
	`292`	`+ public String process(final String filename, final String source, final Config conf,`
	`293`	`+ final ClassLoader loader) throws Exception {`
`294`	`294`	`return engine(V8Engine.class)`
`295`	`295`	`.execute("auto-prefixer.js", source, options(), filename);`
`296`	`296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,8 +264,8 @@ public boolean matches(final MediaType type) {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`@Override`
`267`		`- public String process(final String filename, final String source, final Config conf)`
`268`		`- throws Exception {`
	`267`	`+ public String process(final String filename, final String source, final Config conf,`
	`268`	`+ final ClassLoader loader) throws Exception {`
`269`	`269`	`return engine(V8Engine.class)`
`270`	`270`	`.execute("babel.js", source, options(), filename);`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,8 +257,8 @@ public boolean matches(final MediaType type) {`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`@Override`
`260`		`- public String process(final String filename, final String source, final Config conf)`
`261`		`- throws Exception {`
	`260`	`+ public String process(final String filename, final String source, final Config conf,`
	`261`	`+ final ClassLoader loader) throws Exception {`
`262`	`262`	`return engine(V8Engine.class)`
`263`	`263`	`.execute("clean-css.js", source, options(), filename);`
`264`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,8 +256,8 @@ public boolean matches(final MediaType type) {`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`@Override`
`259`		`- public String process(final String filename, final String source, final Config conf)`
`260`		`- throws Exception {`
	`259`	`+ public String process(final String filename, final String source, final Config conf,`
	`260`	`+ final ClassLoader loader) throws Exception {`
`261`	`261`	`return engine(V8Engine.class)`
`262`	`262`	`.execute("ng-annotate.js", source, options(), filename);`
`263`	`263`	`}`