ref(core): Inject the cache LazyDirectory via the constructor (JAVA-613)

Have the composition roots (EnvelopeCache.create and AndroidEnvelopeCache)
build the LazyDirectory and pass it into CacheStrategy, so the cache no
longer constructs its own directory collaborator from a path string. The
public String constructor is kept and delegates, preserving binary
compatibility.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: runningcode

sentry-android-core/src/main/java/io/sentry/android/core/cache/AndroidEnvelopeCache.java

@@ -48,7 +48,8 @@ public AndroidEnvelopeCache(final @NotNull SentryAndroidOptions options) {
       final @NotNull ICurrentDateProvider currentDateProvider) {
     super(
         options,
-        Objects.requireNonNull(options.getCacheDirPath(), "cacheDirPath must not be null"),
+        new LazyDirectory(
+            Objects.requireNonNull(options.getCacheDirPath(), "cacheDirPath must not be null")),
         options.getMaxCacheItems());
     this.currentDateProvider = currentDateProvider;
   }

sentry/api/sentry.api

@@ -4836,6 +4836,7 @@ public class io/sentry/cache/EnvelopeCache : io/sentry/cache/IEnvelopeCache {
 	protected static final field UTF_8 Ljava/nio/charset/Charset;
 	protected final field cacheLock Lio/sentry/util/AutoClosableReentrantLock;
 	protected final field sessionLock Lio/sentry/util/AutoClosableReentrantLock;
+	public fun <init> (Lio/sentry/SentryOptions;Lio/sentry/util/LazyDirectory;I)V
 	public fun <init> (Lio/sentry/SentryOptions;Ljava/lang/String;I)V
 	public static fun create (Lio/sentry/SentryOptions;)Lio/sentry/cache/IEnvelopeCache;
 	public fun discard (Lio/sentry/SentryEnvelope;)V

sentry/src/main/java/io/sentry/cache/CacheStrategy.java

@@ -45,13 +45,10 @@ abstract class CacheStrategy {
 
   CacheStrategy(
       final @NotNull SentryOptions options,
-      final @NotNull String directoryPath,
+      final @NotNull LazyDirectory directory,
       final int maxSize) {
-    Objects.requireNonNull(directoryPath, "Directory is required.");
     this.options = Objects.requireNonNull(options, "SentryOptions is required.");
-
-    this.directory = new LazyDirectory(directoryPath);
-
+    this.directory = Objects.requireNonNull(directory, "Directory is required.");
     this.maxSize = maxSize;
   }
 

sentry/src/main/java/io/sentry/cache/EnvelopeCache.java

@@ -26,6 +26,7 @@
 import io.sentry.transport.NoOpEnvelopeCache;
 import io.sentry.util.AutoClosableReentrantLock;
 import io.sentry.util.HintUtils;
+import io.sentry.util.LazyDirectory;
 import io.sentry.util.Objects;
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -83,15 +84,22 @@ public class EnvelopeCache extends CacheStrategy implements IEnvelopeCache {
       options.getLogger().log(WARNING, "cacheDirPath is null, returning NoOpEnvelopeCache");
       return NoOpEnvelopeCache.getInstance();
     } else {
-      return new EnvelopeCache(options, cacheDirPath, maxCacheItems);
+      return new EnvelopeCache(options, new LazyDirectory(cacheDirPath), maxCacheItems);
     }
   }
 
   public EnvelopeCache(
       final @NotNull SentryOptions options,
       final @NotNull String cacheDirPath,
       final int maxCacheItems) {
-    super(options, cacheDirPath, maxCacheItems);
+    this(options, new LazyDirectory(cacheDirPath), maxCacheItems);
+  }
+
+  public EnvelopeCache(
+      final @NotNull SentryOptions options,
+      final @NotNull LazyDirectory directory,
+      final int maxCacheItems) {
+    super(options, directory, maxCacheItems);
     previousSessionLatch = new CountDownLatch(1);
   }
 

sentry/src/test/java/io/sentry/cache/CacheStrategyTest.kt

@@ -9,6 +9,7 @@ import io.sentry.Session
 import io.sentry.clientreport.ClientReportTestHelper.Companion.assertClientReport
 import io.sentry.clientreport.DiscardReason
 import io.sentry.clientreport.DiscardedEvent
+import io.sentry.util.LazyDirectory
 import java.io.ByteArrayInputStream
 import java.io.File
 import java.io.InputStreamReader
@@ -130,7 +131,7 @@ class CacheStrategyTest {
   }
 
   private class CustomCache(options: SentryOptions, path: String, maxSize: Int) :
-    CacheStrategy(options, path, maxSize)
+    CacheStrategy(options, LazyDirectory(path), maxSize)
 
   private fun createTempFilesSortByOldestToNewest(): Array<File> {
     val f1 = Files.createTempFile(fixture.dir.toPath(), "f1", ".json").toFile()