8290316: Ensure that all directory streams are closed in java.base

Reviewed-by: chegar

src/java.base/share/classes/java/time/chrono/HijrahChronology.java

@@ -86,6 +86,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Stream;
 
 import sun.util.logging.PlatformLogger;
 
@@ -1035,9 +1036,8 @@ public final class HijrahChronology extends AbstractChronology implements Serial
         AccessController.doPrivileged(
             (PrivilegedAction<Void>)() -> {
                 if (Files.isDirectory(CONF_PATH)) {
-                    try {
+                    try (Stream<Path> stream = Files.list(CONF_PATH)) {
-                        Files.list(CONF_PATH)
+                        stream.map(p -> p.getFileName().toString())
-                            .map(p -> p.getFileName().toString())
                             .filter(fn -> fn.matches("hijrah-config-[^\\.]+\\.properties"))
                             .map(fn -> fn.replaceAll("(hijrah-config-|\\.properties)", ""))
                             .forEach(idtype -> {

src/java.base/share/classes/jdk/internal/jrtfs/ExplodedImage.java

@@ -38,6 +38,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import jdk.internal.jimage.ImageReader.Node;
 
@@ -254,10 +255,11 @@ class ExplodedImage extends SystemImage {
                     String moduleName = module.getFileName().toString();
                     // make sure "/modules/<moduleName>" is created
                     findModulesNode(MODULES + moduleName);
-                    Files.walk(module).filter(Files::isDirectory).forEach((p) -> {
+                    try (Stream<Path> contentsStream = Files.walk(module)) {
+                        contentsStream.filter(Files::isDirectory).forEach((p) -> {
                             p = module.relativize(p);
                             String pkgName = slashesToDots(p.toString());
-                        // skip META-INFO and empty strings
+                            // skip META-INF and empty strings
                             if (!pkgName.isEmpty() && !pkgName.startsWith("META-INF")) {
                                 List<String> moduleNames = packageToModules.get(pkgName);
                                 if (moduleNames == null) {
@@ -270,6 +272,7 @@ class ExplodedImage extends SystemImage {
                     }
                 }
             }
+        }
         // create "/modules" directory
         // "nodes" map contains only /modules/<foo> nodes only so far and so add all as children of /modules
         PathNode modulesDir = new PathNode("/modules", new ArrayList<>(nodes.values()));

src/java.base/share/classes/jdk/internal/module/ModuleHashes.java

@@ -41,6 +41,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 /**
  * The result of hashing the contents of a number of module artifacts.
@@ -114,9 +115,9 @@ public final class ModuleHashes {
         } catch (NoSuchAlgorithmException e) {
             throw new IllegalArgumentException(e);
         }
-        try {
         byte[] buf = new byte[32*1024];
-            reader.list().sorted().forEach(rn -> {
+        try (Stream<String> stream = reader.list()) {
+            stream.sorted().forEach(rn -> {
                 md.update(rn.getBytes(StandardCharsets.UTF_8));
                 try (InputStream in = reader.open(rn).orElseThrow()) {
                     int n;

src/java.base/share/classes/jdk/internal/module/ModulePatcher.java

@@ -131,14 +131,15 @@ public final class ModulePatcher {
 
                     // exploded directory without following sym links
                     Path top = file;
-                    Files.find(top, Integer.MAX_VALUE,
+                    try (Stream<Path> stream = Files.find(top, Integer.MAX_VALUE,
-                               ((path, attrs) -> attrs.isRegularFile()))
+                            ((path, attrs) -> attrs.isRegularFile()))) {
-                            .filter(path -> (!isAutomatic
+                        stream.filter(path -> (!isAutomatic
                                       || path.toString().endsWith(".class"))
                                       && !isHidden(path))
                             .map(path -> toPackageName(top, path))
                             .filter(Checks::isPackageName)
                             .forEach(packages::add);
+                    }
 
                 }
             }

src/java.base/share/classes/jdk/internal/module/ModulePath.java

@@ -58,6 +58,7 @@ import java.util.jar.Manifest;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
@@ -663,10 +664,9 @@ public class ModulePath implements ModuleFinder {
 
     private Set<String> explodedPackages(Path dir) {
         String separator = dir.getFileSystem().getSeparator();
-        try {
+        try (Stream<Path> stream = Files.find(dir, Integer.MAX_VALUE,
-            return Files.find(dir, Integer.MAX_VALUE,
+                (path, attrs) -> attrs.isRegularFile() && !isHidden(path))) {
-                    ((path, attrs) -> attrs.isRegularFile() && !isHidden(path)))
+            return stream.map(dir::relativize)
-                    .map(path -> dir.relativize(path))
                 .map(path -> toPackageName(path, separator))
                 .flatMap(Optional::stream)
                 .collect(Collectors.toSet());