Remove deprecated usages and refactor library dependency folder deletion to use try-with-resources

rahlk · rahlk · commit 05d57f7927e6 · 2025-02-11T22:34:46.000-05:00
Signed-off-by: Rahul Krishna &lt;i.m.ralk@gmail.com&gt;
diff --git a/src/main/java/com/ibm/cldk/SystemDependencyGraph.java b/src/main/java/com/ibm/cldk/SystemDependencyGraph.java
@@ -251,7 +251,7 @@ public static List<Dependency> construct(
         options.setReflectionOptions(ReflectionOptions.NONE);
         IAnalysisCacheView cache = new AnalysisCacheImpl(AstIRFactory.makeDefaultFactory(),
                 options.getSSAOptions());
-        Language java = new JavaLanguage();
+
         // Build call graph
         Log.info("Building call graph.");
 
@@ -262,9 +262,9 @@ public static List<Dependency> construct(
         CallGraph callGraph;
         CallGraphBuilder<InstanceKey> builder;
         try {
-            System.setOut(new PrintStream(new NullOutputStream()));
-            System.setErr(new PrintStream(new NullOutputStream()));
-            builder = Util.makeVanillaZeroOneCFABuilder(java, options, cache, cha);
+            System.setOut(new PrintStream(NullOutputStream.INSTANCE));
+            System.setErr(new PrintStream(NullOutputStream.INSTANCE));
+            builder = Util.makeVanillaZeroOneCFABuilder(new JavaLanguage(), options, cache, cha);
             callGraph = builder.makeCallGraph(options, null);
         } finally {
             System.setOut(originalOut);
diff --git a/src/main/java/com/ibm/cldk/utils/BuildProject.java b/src/main/java/com/ibm/cldk/utils/BuildProject.java
@@ -10,10 +10,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.MessageFormat;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Stream;
 
 
 import static com.ibm.cldk.utils.ProjectDirectoryScanner.classFilesStream;
@@ -272,8 +270,14 @@ public static void cleanLibraryDependencies() {
             Log.info("Cleaning up library dependency directory: " + libDownloadPath);
             try {
                 if (libDownloadPath.toFile().getAbsoluteFile().exists()) {
-                    Files.walk(libDownloadPath).filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete);
-                    Files.delete(libDownloadPath);
+                    try (Stream<Path> paths = Files.walk(libDownloadPath)) {
+                        paths.sorted(Comparator.reverseOrder())  // Delete files first, then directories
+                            .map(Path::toFile)
+                            .forEach(file -> {
+                                if (!file.delete())
+                                    Log.warn("Failed to delete: " + file.getAbsolutePath());
+                        });
+                    }
                 }
             } catch (IOException e) {
                 Log.warn("Unable to fully delete library dependency directory: " + e.getMessage());
