Rollback of commit 2300f8a3e88d720f7eae90a80456142363850c5c.

*** Reason for rollback ***

bazelbuild/bazel#2123 is fixed

*** Original change description ***

Fix JavaLibraryBuildRequest for java 7

Bazel still supports java 7. This cl fixes a java 8-only construct introduced by commit 3c5e55ff8e058b624ce26e803ff00434c70d4b91.
Liam, feel free to fix it to your liking afterwards.

--
PiperOrigin-RevId: 144511670
MOS_MIGRATED_REVID=144511670

1 files changed, 1 insertions, 4 deletions

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
index ad473dd365..df09cf055b 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
@@ -27,7 +27,6 @@ import com.google.devtools.build.buildjar.javac.plugins.processing.AnnotationPro
 import java.io.File;
 import java.io.IOError;
 import java.io.IOException;
-import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -310,9 +309,7 @@ public final class JavaLibraryBuildRequest {
       try {
         Path path = Paths.get(file);
         if (Files.isDirectory(path)) {
-          try (DirectoryStream<Path> directoryContents = Files.newDirectoryStream(path)) {
-            jars.addAll(directoryContents);
-          }
+          Files.list(path).forEach(jars::add);
         } else {
           jars.add(path);
         }