Merge "Use Session.getHooks() in InputFilter(s)" into ub-jack

5 files changed, 7 insertions, 46 deletions

diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java
index 79eba960..388ab7ff 100644
--- a/jack/src/com/android/jack/Jack.java
+++ b/jack/src/com/android/jack/Jack.java
@@ -686,7 +686,7 @@ public abstract class Jack {
     Config config = ThreadConfig.getConfig();
 
     try {
-      session.setInputFilter(config.get(Options.INPUT_FILTER).create(options, hooks));
+      session.setInputFilter(config.get(Options.INPUT_FILTER).create(options));
     } catch (RuntimeException e) {
       Throwable cause = e.getCause();
       if (cause instanceof JackAbortException) {
diff --git a/jack/src/com/android/jack/Options.java b/jack/src/com/android/jack/Options.java
index 26f8fb0c..fdbf0084 100644
--- a/jack/src/com/android/jack/Options.java
+++ b/jack/src/com/android/jack/Options.java
@@ -130,7 +130,7 @@ public class Options {
   @Nonnull
   public static final ReflectFactoryPropertyId<InputFilter> INPUT_FILTER = ReflectFactoryPropertyId
       .create("jack.input.filter", "Inputs filter", InputFilter.class)
-      .addDefaultValue("no-filter").addArgType(Options.class).addArgType(RunnableHooks.class);
+      .addDefaultValue("no-filter").addArgType(Options.class);
 
   @Nonnull
   public static final JavaVersionPropertyId JAVA_SOURCE_VERSION = JavaVersionPropertyId
diff --git a/jack/src/com/android/jack/incremental/CommonFilter.java b/jack/src/com/android/jack/incremental/CommonFilter.java
index a94f71b2..71b59e16 100644
--- a/jack/src/com/android/jack/incremental/CommonFilter.java
+++ b/jack/src/com/android/jack/incremental/CommonFilter.java
@@ -31,7 +31,6 @@ import com.android.jack.library.OutputJackLibrary;
 import com.android.jack.reporting.Reportable;
 import com.android.jack.reporting.ReportableException;
 import com.android.jack.reporting.Reporter.Severity;
-import com.android.sched.util.RunnableHooks;
 import com.android.sched.util.config.Config;
 import com.android.sched.util.config.ThreadConfig;
 import com.android.sched.util.file.AbstractStreamFile;
@@ -49,7 +48,6 @@ import com.android.sched.util.file.NotFileException;
 import com.android.sched.util.file.NotFileOrDirectoryException;
 import com.android.sched.util.file.WrongPermissionException;
 import com.android.sched.util.log.LoggerFactory;
-import com.android.sched.vfs.CachedDirectFS;
 import com.android.sched.vfs.Container;
 import com.android.sched.vfs.PrefixedFS;
 import com.android.sched.vfs.ReadZipFS;
@@ -58,14 +56,12 @@ import com.android.sched.vfs.VPath;
 import com.android.sched.vfs.ZipUtils;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.ZipException;
 
@@ -132,11 +128,7 @@ public abstract class CommonFilter {
   @Nonnull
   private static final Logger logger = LoggerFactory.getLogger();
 
-  @Nonnull
-  private final RunnableHooks hooks;
-
-  public CommonFilter(@Nonnull RunnableHooks hooks) {
-    this.hooks = hooks;
+  public CommonFilter() {
   }
 
   @Nonnull
@@ -234,34 +226,6 @@ public abstract class CommonFilter {
     return libraries;
   }
 
-  @Nonnull
-  protected VFS wrapAsVDir(@Nonnull final File dirOrZip)
-      throws IOException {
-    final VFS vfs;
-    if (dirOrZip.isDirectory()) {
-      vfs = new CachedDirectFS(new Directory(dirOrZip.getPath(), hooks, Existence.MUST_EXIST,
-          Permission.READ, ChangePermission.NOCHANGE), Permission.READ);
-    } else { // zip
-      vfs = new ReadZipFS(new InputZipFile(dirOrZip.getPath(), hooks, Existence.MUST_EXIST,
-          ChangePermission.NOCHANGE));
-    }
-
-    if (hooks != null) {
-      hooks.addHook(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            vfs.close();
-          } catch (IOException e) {
-            logger.log(Level.FINE, "Failed to close vfs for '" + dirOrZip + "'.", e);
-          }
-        }
-      });
-    }
-
-    return vfs;
-  }
-
   private List<InputLibrary> getDefaultLibraries() {
     URL location = Jack.class.getProtectionDomain().getCodeSource().getLocation();
     JSession session = Jack.getSession();
@@ -270,7 +234,8 @@ public abstract class CommonFilter {
       try {
         File jackJar = new File(location.toURI().getPath());
         for (String prefix: Jack.JACK_DEFAULT_LIB_PATH) {
-          VFS jackVfs = new PrefixedFS(new ReadZipFS(new InputZipFile(jackJar.getPath(), hooks,
+          VFS jackVfs = new PrefixedFS(new ReadZipFS(new InputZipFile(jackJar.getPath(),
+              session.getHooks(),
               Existence.MUST_EXIST,
               ChangePermission.NOCHANGE)), new VPath(prefix, ZipUtils.ZIP_SEPARATOR));
           libraries.add(JackLibraryFactory.getInputLibrary(jackVfs));
diff --git a/jack/src/com/android/jack/incremental/IncrementalInputFilter.java b/jack/src/com/android/jack/incremental/IncrementalInputFilter.java
index 5c3632f2..faee61d3 100644
--- a/jack/src/com/android/jack/incremental/IncrementalInputFilter.java
+++ b/jack/src/com/android/jack/incremental/IncrementalInputFilter.java
@@ -40,7 +40,6 @@ import com.android.jack.library.LibraryWritingException;
 import com.android.jack.library.NotJackLibraryException;
 import com.android.jack.library.OutputJackLibrary;
 import com.android.jack.reporting.Reporter.Severity;
-import com.android.sched.util.RunnableHooks;
 import com.android.sched.util.codec.ImplementationName;
 import com.android.sched.util.config.Config;
 import com.android.sched.util.config.HasKeyId;
@@ -153,8 +152,7 @@ public class IncrementalInputFilter extends CommonFilter implements InputFilter
   @Nonnull
   private final File incrementalFolder;
 
-  public IncrementalInputFilter(@Nonnull Options options, @Nonnull RunnableHooks hooks) {
-    super(hooks);
+  public IncrementalInputFilter(@Nonnull Options options) {
     Config config = ThreadConfig.getConfig();
     incrementalFolder = new File(config.get(Options.LIBRARY_OUTPUT_DIR).getPath());
 
diff --git a/jack/src/com/android/jack/incremental/NoInputFilter.java b/jack/src/com/android/jack/incremental/NoInputFilter.java
index 61a08b42..2dad78db 100644
--- a/jack/src/com/android/jack/incremental/NoInputFilter.java
+++ b/jack/src/com/android/jack/incremental/NoInputFilter.java
@@ -24,7 +24,6 @@ import com.android.jack.analysis.dependency.type.TypeDependencies;
 import com.android.jack.ir.ast.JSession;
 import com.android.jack.library.InputLibrary;
 import com.android.jack.library.OutputJackLibrary;
-import com.android.sched.util.RunnableHooks;
 import com.android.sched.util.codec.ImplementationName;
 import com.android.sched.util.config.ThreadConfig;
 
@@ -51,8 +50,7 @@ public class NoInputFilter extends CommonFilter implements InputFilter {
   @Nonnull
   private final List<? extends InputLibrary> librariesOnClasspathFromCommandLine;
 
-  public NoInputFilter(@Nonnull Options options, @Nonnull RunnableHooks hooks) {
-    super(hooks);
+  public NoInputFilter(@Nonnull Options options) {
     this.options = options;
     this.fileNamesToCompile = getJavaFileNamesSpecifiedOnCommandLine(options);
     JSession session = Jack.getSession();