Move memoized runtime classpath to a package private utility class.

openrewrite · Apr 25, 2024 · 8988375 · 8988375
1 parent 559b956
commit 8988375
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java
@@ -57,16 +57,8 @@ public interface JavaParser extends Parser {
      */
     String SKIP_SOURCE_SET_TYPE_GENERATION = "org.openrewrite.java.skipSourceSetTypeGeneration";
 
-    List<Path> runtimeClasspath = new ArrayList<>();
     static List<Path> runtimeClasspath() {
-        if(runtimeClasspath.isEmpty()) {
-            runtimeClasspath.addAll(new ClassGraph()
-                    .disableNestedJarScanning()
-                    .getClasspathURIs().stream()
-                    .filter(uri -> "file".equals(uri.getScheme()))
-                    .map(Paths::get).collect(toList()));
-        }
-        return runtimeClasspath;
+        return RuntimeClasspathCache.getRuntimeClasspath();
     }
 
     /**
@@ -456,3 +448,22 @@ static Path resolveSourcePathFromSourceText(Path prefix, String sourceCode) {
         return prefix.resolve(Paths.get(pkg + className));
     }
 }
+
+class RuntimeClasspathCache {
+    private RuntimeClasspathCache() {
+    }
+
+    @Nullable
+    private static List<Path> runtimeClasspath = null;
+
+    static List<Path> getRuntimeClasspath() {
+        if (runtimeClasspath == null) {
+            runtimeClasspath = new ClassGraph()
+                    .disableNestedJarScanning()
+                    .getClasspathURIs().stream()
+                    .filter(uri -> "file".equals(uri.getScheme()))
+                    .map(Paths::get).collect(toList());
+        }
+        return runtimeClasspath;
+    }
+}