Make Java runfiles library compilable with JDK 8

fmeum · copybara-github · commit 0bc0ff524414 · 2022-11-28T04:47:09.000-08:00
The `FileReader(String,Charset)` constructor is not available in Java 8. Fixes bazelbuild#16849 Work towards bazelbuild#16124 Closes bazelbuild#16851. PiperOrigin-RevId: 491310720 Change-Id: I26f7bce346038d10285b0a1ee7b29216ba151010
diff --git a/tools/java/runfiles/Runfiles.java b/tools/java/runfiles/Runfiles.java
@@ -17,7 +17,6 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.ref.SoftReference;
@@ -410,7 +409,9 @@ private static Map<Preloaded.RepoMappingKey, String> loadRepositoryMapping(Strin
       return Collections.emptyMap();
     }
 
-    try (BufferedReader r = new BufferedReader(new FileReader(path, StandardCharsets.UTF_8))) {
+    try (BufferedReader r =
+        new BufferedReader(
+            new InputStreamReader(new FileInputStream(path), StandardCharsets.UTF_8))) {
       return Collections.unmodifiableMap(
           r.lines()
               .filter(line -> !line.isEmpty())
