Remove dependencies on Java 7 std library.

Author: nicolasstucki

src/com/google/javascript/jscomp/AbstractCommandLineRunner.java

@@ -16,8 +16,8 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.US_ASCII;
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.US_ASCII;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.VisibleForTesting;

src/com/google/javascript/jscomp/AliasStrings.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;

src/com/google/javascript/jscomp/CallGraph.java

@@ -31,7 +31,7 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.Objects;
+import java7compat.util.Objects;
 
 /**
  * A pass the uses a {@link DefinitionProvider} to compute a call graph for an

src/com/google/javascript/jscomp/CommandLineRunner.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.base.Joiner;
@@ -45,22 +45,9 @@
 import org.kohsuke.args4j.spi.Setter;
 import org.kohsuke.args4j.spi.StringOptionHandler;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
+import java.io.*;
 import java.lang.reflect.AnnotatedElement;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Path;
-import java.nio.file.PathMatcher;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -1181,10 +1168,12 @@ private void reportError(String message) {
 
   private void processFlagFile()
             throws CmdLineException, IOException {
-    Path flagFile = Paths.get(flags.flagFile);
+    File flagFile = new File(flags.flagFile);
+
+    InputStream newInputStream = new FileInputStream(flagFile);
+    Reader reader = new InputStreamReader(newInputStream, UTF_8.newDecoder());
+    BufferedReader buffer = new BufferedReader(reader);
 
-    BufferedReader buffer =
-      java.nio.file.Files.newBufferedReader(flagFile, UTF_8);
     // Builds the tokens.
     StringBuilder builder = new StringBuilder();
     // Stores the built tokens.
@@ -1568,13 +1557,15 @@ protected CompilerOptions createOptions() {
       Instrumentation.Builder builder = Instrumentation.newBuilder();
       BufferedReader br = null;
       try {
-        br = new BufferedReader(Files.newReader(new File(flags.instrumentationFile), UTF_8));
+        InputStream newInputStream = new FileInputStream(new File(flags.instrumentationFile));
+        Reader reader = new InputStreamReader(newInputStream, UTF_8.newDecoder());
+        br = new BufferedReader(reader);
         StringBuilder sb = new StringBuilder();
         String line = br.readLine();
 
         while (line != null) {
           sb.append(line);
-          sb.append(System.lineSeparator());
+          sb.append(System.getProperty("line.separator"));
           line = br.readLine();
         }
         instrumentationPb = sb.toString();
@@ -1685,8 +1676,8 @@ private static List<String> findJsFiles(Collection<String> patterns, boolean sor
         if (matchedFile.isDirectory()) {
           matchPaths(new File(matchedFile, "**.js").toString(), allJsInputs, excludes);
         } else {
-          Path original = Paths.get(pattern);
-          String pathStringAbsolute = original.normalize().toAbsolutePath().toString();
+          URI original = new File(pattern).toURI();
+          String pathStringAbsolute = new File(original.normalize().toString()).getAbsolutePath();
           if (!excludes.contains(pathStringAbsolute)) {
             allJsInputs.put(pathStringAbsolute, original.toString());
           }
@@ -1701,50 +1692,7 @@ private static List<String> findJsFiles(Collection<String> patterns, boolean sor
 
   private static void matchPaths(String pattern, final Map<String, String> allJsInputs,
       final Set<String> excludes) throws IOException {
-    FileSystem fs = FileSystems.getDefault();
-    final boolean remove = pattern.indexOf('!') == 0;
-    if (remove) {
-      pattern = pattern.substring(1);
-    }
-
-    String separator = File.separator.equals("\\") ? "\\\\" : File.separator;
-
-    // Split the pattern into two pieces: the globbing part
-    // and the non-globbing prefix.
-    List<String> patternParts = Splitter.on(File.separator).splitToList(pattern);
-    String prefix = ".";
-    for (int i = 0; i < patternParts.size(); i++) {
-      if (patternParts.get(i).contains("*")) {
-        if (i > 0) {
-          prefix = Joiner.on(separator).join(patternParts.subList(0, i));
-          pattern = Joiner.on(separator).join(patternParts.subList(i, patternParts.size()));
-        }
-        break;
-      }
-    }
-
-    final PathMatcher matcher = fs.getPathMatcher("glob:" + prefix + separator + pattern);
-    java.nio.file.Files.walkFileTree(
-        fs.getPath(prefix), new SimpleFileVisitor<Path>() {
-          @Override
-          public FileVisitResult visitFile(Path p, BasicFileAttributes attrs) {
-            if (matcher.matches(p) || matcher.matches(p.normalize())) {
-              String pathStringAbsolute = p.normalize().toAbsolutePath().toString();
-              if (remove) {
-                excludes.add(pathStringAbsolute);
-                allJsInputs.remove(pathStringAbsolute);
-              } else if (!excludes.contains(pathStringAbsolute)) {
-                allJsInputs.put(pathStringAbsolute, p.toString());
-              }
-            }
-            return FileVisitResult.CONTINUE;
-          }
-
-          @Override
-          public FileVisitResult visitFileFailed(Path file, IOException e) {
-            return FileVisitResult.SKIP_SUBTREE;
-          }
-        });
+    throw new UnsupportedOperationException("");
   }
 
   /**

src/com/google/javascript/jscomp/Compiler.java

@@ -49,7 +49,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.nio.file.FileSystems;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -562,8 +561,9 @@ private static List<CompilerInput> getAllInputsFromModules(
    *   getRelativeTo("../foo/bar.js", "baz/bam/qux.js") --> "baz/foo/bar.js"
    */
   private static String getRelativeTo(String relative, String base) {
-    return FileSystems.getDefault().getPath(base)
-        .resolveSibling(relative)
+    return new File(base)
+        .toURI()
+        .resolve(relative)
         .normalize()
         .toString()
         .replace(File.separator, "/");

src/com/google/javascript/jscomp/DataFlowAnalysis.java

@@ -31,7 +31,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Objects;
+import java7compat.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 

src/com/google/javascript/jscomp/DefaultPassConfig.java

@@ -17,7 +17,7 @@
 package com.google.javascript.jscomp;
 
 import static com.google.javascript.jscomp.PassFactory.createEmptyPass;
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;

src/com/google/javascript/jscomp/FileInstrumentationData.java

@@ -61,7 +61,7 @@ String getInstrumentedLinesAsHexString() {
     StringBuilder builder = new StringBuilder();
 
     // Build the hex string.
-    for (byte byteEntry : instrumentedBits.toByteArray()) {
+    for (byte byteEntry : toByteArray(instrumentedBits)) {
       // Java bytes are signed, but we want the value as if it were unsigned.
       int value = UnsignedBytes.toInt(byteEntry);
       String hexString = Integer.toHexString(value);
@@ -75,6 +75,15 @@ String getInstrumentedLinesAsHexString() {
     return builder.toString();
   }
 
+  private static byte[] toByteArray(BitSet bits) {
+    byte[] bytes = new byte[(bits.length() + 7) / 8];
+    for (int i = 0; i < bits.length(); i++) {
+      if (bits.get(i)) {
+        bytes[(bytes.length - i) / (8 - 1)] |= 1 << (i % 8);
+      }
+    }
+    return bytes;
+  }
 
   /**
    * Mark given 1-based line number as instrumented. Zero, Negative numbers

src/com/google/javascript/jscomp/GlobalNamespace.java

@@ -37,7 +37,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
+import java7compat.util.Objects;
 import java.util.Set;
 
 /**

src/com/google/javascript/jscomp/GoogleJsMessageIdGenerator.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Preconditions;

src/com/google/javascript/jscomp/JsMessage.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.base.Preconditions;

src/com/google/javascript/jscomp/Linter.java

@@ -24,8 +24,6 @@
 import com.google.javascript.refactoring.SuggestedFix;
 
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,15 +43,15 @@ public static void main(String[] args) throws IOException {
 
 
   static void lint(String filename) throws IOException {
-    lint(Paths.get(filename), false);
+    lint(filename, false);
   }
 
   static void fix(String filename) throws IOException {
-    lint(Paths.get(filename), true);
+    lint(filename, true);
   }
 
-  private static void lint(Path path, boolean fix) throws IOException {
-    SourceFile file = SourceFile.fromFile(path.toString());
+  private static void lint(String filename, boolean fix) throws IOException {
+    SourceFile file = SourceFile.fromFile(filename);
     Compiler compiler = new Compiler(System.out);
     CompilerOptions options = new CompilerOptions();
     options.setLanguage(LanguageMode.ECMASCRIPT6_STRICT);

src/com/google/javascript/jscomp/NameAnalyzer.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;

src/com/google/javascript/jscomp/NewTypeInference.java

@@ -48,7 +48,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
+import java7compat.util.Objects;
 import java.util.Set;
 
 /**

src/com/google/javascript/jscomp/NodeTraversal.java

@@ -547,7 +547,7 @@ public final boolean shouldTraverse(NodeTraversal t, Node n, Node p) {
 
   /**
    * Traverses a node recursively.
-   * @deprecated Use traverseEs6 whenever possible.
+   * Use traverseEs6 whenever possible.
    */
   @Deprecated
   public static void traverse(AbstractCompiler compiler, Node root, Callback cb) {

src/com/google/javascript/jscomp/OutputCharsetEncoder.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.US_ASCII;
+import static java7compat.nio.charset.StandardCharsets.US_ASCII;
 
 import com.google.common.annotations.GwtIncompatible;
 

src/com/google/javascript/jscomp/PerformanceTracker.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.VisibleForTesting;
@@ -283,7 +283,7 @@ public void outputTracerReport(PrintStream pstr) {
           new Comparator<Entry<String, Stats>>() {
             @Override
             public int compare(Entry<String, Stats> e1, Entry<String, Stats> e2) {
-              return Long.compare(e1.getValue().runtime, e2.getValue().runtime);
+              return Long.valueOf(e1.getValue().runtime).compareTo(e2.getValue().runtime);
             }
           });
 

src/com/google/javascript/jscomp/PureFunctionIdentifier.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;

src/com/google/javascript/jscomp/ResourceLoader.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.io.CharStreams;

src/com/google/javascript/jscomp/SourceFile.java

@@ -17,7 +17,7 @@
 package com.google.javascript.jscomp;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.VisibleForTesting;
@@ -36,7 +36,7 @@
 import java.io.StringReader;
 import java.net.URL;
 import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
+import java7compat.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;

src/com/google/javascript/jscomp/TransformAMDToCJSModule.java

@@ -158,7 +158,7 @@ private void handleRequiresAndParamList(NodeTraversal t, Node defineNode,
       Iterator<Node> paramList = callback.getSecondChild().children().
           iterator();
       Iterator<Node> requires = requiresNode != null ?
-          requiresNode.children().iterator() : Collections.<Node>emptyIterator();
+          requiresNode.children().iterator() : Collections.<Node>emptyList().iterator();
       while (paramList.hasNext() || requires.hasNext()) {
         Node aliasNode = paramList.hasNext() ? paramList.next() : null;
         Node modNode = requires.hasNext() ? requires.next() : null;

src/com/google/javascript/jscomp/TypeValidator.java

@@ -46,7 +46,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
+import java7compat.util.Objects;
 
 import javax.annotation.Nullable;
 

src/com/google/javascript/jscomp/VariableMap.java

@@ -16,7 +16,7 @@
 
 package com.google.javascript.jscomp;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static java7compat.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.VisibleForTesting;