Revert "ref(core): Have ScopesStorageFactory implement IScopesStorageFactory"

This reverts commit a0d77eb.

Author: adinauer

sentry/api/sentry.api

@@ -1061,7 +1061,7 @@ public abstract interface class io/sentry/IScopesStorage {
 }
 
 public abstract interface class io/sentry/IScopesStorageFactory {
-	public abstract fun create (Lio/sentry/util/LoadClass;Lio/sentry/ILogger;)Lio/sentry/IScopesStorage;
+	public abstract fun create ()Lio/sentry/IScopesStorage;
 }
 
 public abstract interface class io/sentry/ISentryClient {
@@ -2632,9 +2632,9 @@ public final class io/sentry/ScopesAdapter : io/sentry/IScopes {
 	public fun withScope (Lio/sentry/ScopeCallback;)V
 }
 
-public final class io/sentry/ScopesStorageFactory : io/sentry/IScopesStorageFactory {
+public final class io/sentry/ScopesStorageFactory {
 	public fun <init> ()V
-	public fun create (Lio/sentry/util/LoadClass;Lio/sentry/ILogger;)Lio/sentry/IScopesStorage;
+	public static fun create (Lio/sentry/util/LoadClass;Lio/sentry/ILogger;)Lio/sentry/IScopesStorage;
 }
 
 public final class io/sentry/ScreenshotStrategyType : java/lang/Enum {

sentry/src/main/java/io/sentry/IScopesStorageFactory.java

@@ -1,12 +1,11 @@
 package io.sentry;
 
-import io.sentry.util.LoadClass;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /** Factory for creating custom {@link IScopesStorage} implementations. */
 @ApiStatus.Experimental
 public interface IScopesStorageFactory {
   @NotNull
-  IScopesStorage create(final @NotNull LoadClass loadClass, final @NotNull ILogger logger);
+  IScopesStorage create();
 }

sentry/src/main/java/io/sentry/ScopesStorageFactory.java

@@ -8,13 +8,12 @@
 import org.jetbrains.annotations.Nullable;
 
 @ApiStatus.Internal
-public final class ScopesStorageFactory implements IScopesStorageFactory {
+public final class ScopesStorageFactory {
 
   private static final String OTEL_SCOPES_STORAGE =
       "io.sentry.opentelemetry.OtelContextScopesStorage";
 
-  @Override
-  public @NotNull IScopesStorage create(
+  public static @NotNull IScopesStorage create(
       final @NotNull LoadClass loadClass, final @NotNull ILogger logger) {
     final @NotNull IScopesStorage storage = createInternal(loadClass, logger);
     storage.init();

sentry/src/main/java/io/sentry/Sentry.java

@@ -439,15 +439,13 @@ private static void initFatalLogger(final @NotNull SentryOptions options) {
 
   private static void initScopesStorage(SentryOptions options) {
     getScopesStorage().close();
-    final @NotNull LoadClass loadClass = new LoadClass();
-    final @NotNull ILogger logger = NoOpLogger.getInstance();
     if (options.getScopesStorageFactory() != null) {
-      scopesStorage = options.getScopesStorageFactory().create(loadClass, logger);
+      scopesStorage = options.getScopesStorageFactory().create();
       scopesStorage.init();
     } else if (SentryOpenTelemetryMode.OFF == options.getOpenTelemetryMode()) {
       scopesStorage = new DefaultScopesStorage();
     } else {
-      scopesStorage = new ScopesStorageFactory().create(loadClass, logger);
+      scopesStorage = ScopesStorageFactory.create(new LoadClass(), NoOpLogger.getInstance());
     }
   }
 

sentry/src/test/java/io/sentry/SentryOptionsTest.kt

@@ -974,15 +974,15 @@ class SentryOptionsTest {
   @Test
   fun `scopesStorageFactory can be set and retrieved`() {
     val options = SentryOptions()
-    val factory = IScopesStorageFactory { _, _ -> DefaultScopesStorage() }
+    val factory = IScopesStorageFactory { DefaultScopesStorage() }
     options.scopesStorageFactory = factory
     assertSame(factory, options.scopesStorageFactory)
   }
 
   @Test
   fun `scopesStorageFactory can be set to null`() {
     val options = SentryOptions()
-    val factory = IScopesStorageFactory { _, _ -> DefaultScopesStorage() }
+    val factory = IScopesStorageFactory { DefaultScopesStorage() }
     options.scopesStorageFactory = factory
     options.scopesStorageFactory = null
     assertNull(options.scopesStorageFactory)

sentry/src/test/java/io/sentry/SentryTest.kt

@@ -1732,7 +1732,7 @@ class SentryTest {
 
     initForTest {
       it.dsn = dsn
-      it.scopesStorageFactory = IScopesStorageFactory { _, _ -> customStorage }
+      it.scopesStorageFactory = IScopesStorageFactory { customStorage }
     }
 
     verify(customStorage).init()
@@ -1758,7 +1758,7 @@ class SentryTest {
 
     initForTest {
       it.dsn = dsn
-      it.scopesStorageFactory = IScopesStorageFactory { _, _ ->
+      it.scopesStorageFactory = IScopesStorageFactory {
         factoryCalled.set(true)
         backingStorage
       }