all: Apply code cleanup fixes

4 files changed, 15 insertions, 11 deletions

diff --git a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java b/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java
index e65e4316..3d48017f 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/autofuzz/Meta.java
@@ -51,11 +51,13 @@ import net.jodah.typetools.TypeResolver;
 import net.jodah.typetools.TypeResolver.Unknown;
 
 public class Meta {
-  static WeakHashMap<Class<?>, List<Class<?>>> implementingClassesCache = new WeakHashMap<>();
-  static WeakHashMap<Class<?>, List<Class<?>>> nestedBuilderClassesCache = new WeakHashMap<>();
-  static WeakHashMap<Class<?>, List<Method>> originalObjectCreationMethodsCache =
+  static final WeakHashMap<Class<?>, List<Class<?>>> implementingClassesCache = new WeakHashMap<>();
+  static final WeakHashMap<Class<?>, List<Class<?>>> nestedBuilderClassesCache =
+      new WeakHashMap<>();
+  static final WeakHashMap<Class<?>, List<Method>> originalObjectCreationMethodsCache =
+      new WeakHashMap<>();
+  static final WeakHashMap<Class<?>, List<Method>> cascadingBuilderMethodsCache =
       new WeakHashMap<>();
-  static WeakHashMap<Class<?>, List<Method>> cascadingBuilderMethodsCache = new WeakHashMap<>();
 
   public static Object autofuzz(FuzzedDataProvider data, Method method) {
     return autofuzz(data, method, null);
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/utils/ManifestUtils.kt b/agent/src/main/java/com/code_intelligence/jazzer/utils/ManifestUtils.kt
index 25d0ade9..e7165e55 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/utils/ManifestUtils.kt
+++ b/agent/src/main/java/com/code_intelligence/jazzer/utils/ManifestUtils.kt
@@ -18,7 +18,7 @@ import java.util.jar.Manifest
 
 object ManifestUtils {
 
-    const val FUZZ_TARGET_CLASS = "Jazzer-Fuzz-Target-Class"
+    private const val FUZZ_TARGET_CLASS = "Jazzer-Fuzz-Target-Class"
     const val HOOK_CLASSES = "Jazzer-Hook-Classes"
 
     fun combineManifestValues(attribute: String): List<String> {
diff --git a/bazel/tools/java/com/code_intelligence/jazzer/tools/JarStripper.java b/bazel/tools/java/com/code_intelligence/jazzer/tools/JarStripper.java
index 0bbb1b09..2a567c68 100644
--- a/bazel/tools/java/com/code_intelligence/jazzer/tools/JarStripper.java
+++ b/bazel/tools/java/com/code_intelligence/jazzer/tools/JarStripper.java
@@ -29,6 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class JarStripper {
   private static final Map<String, String> ZIP_FS_PROPERTIES = new HashMap<>();
@@ -77,11 +78,12 @@ public class JarStripper {
     try (FileSystem zipFs = FileSystems.newFileSystem(outUri, ZIP_FS_PROPERTIES)) {
       for (String pathToDelete : pathsToDelete) {
         // Visit files before the directory they are contained in by sorting in reverse order.
-        Iterable<Path> subpaths = Files.walk(zipFs.getPath(pathToDelete))
-                                      .sorted(Comparator.reverseOrder())
-                                      .collect(Collectors.toList());
-        for (Path subpath : subpaths) {
-          Files.delete(subpath);
+        try (Stream<Path> walk = Files.walk(zipFs.getPath(pathToDelete))) {
+          Iterable<Path> subpaths =
+              walk.sorted(Comparator.reverseOrder()).collect(Collectors.toList());
+          for (Path subpath : subpaths) {
+            Files.delete(subpath);
+          }
         }
       }
     } catch (IOException e) {
diff --git a/driver/src/main/java/com/code_intelligence/jazzer/driver/Opt.java b/driver/src/main/java/com/code_intelligence/jazzer/driver/Opt.java
index 417bfd5e..377a85df 100644
--- a/driver/src/main/java/com/code_intelligence/jazzer/driver/Opt.java
+++ b/driver/src/main/java/com/code_intelligence/jazzer/driver/Opt.java
@@ -71,7 +71,7 @@ public final class Opt {
 
   // Default to false if hooks is false to mimic the original behavior of the native fuzz target
   // runner, but still support hooks = false && dedup = true.
-  public static boolean dedup = boolSetting("dedup", hooks);
+  public static final boolean dedup = boolSetting("dedup", hooks);
 
   static {
     if (!targetClass.isEmpty() && !autofuzz.isEmpty()) {