Revert "refactor: Add ConfidenceForOF proxy for safe init (#167)"

This reverts commit e177c5b.
spotify · Jun 25, 2024 · 69878a1 · 69878a1
1 parent 5e7422c
commit 69878a1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/Provider/src/main/java/com/spotify/confidence/openfeature/ConfidenceFeatureProvider.kt b/Provider/src/main/java/com/spotify/confidence/openfeature/ConfidenceFeatureProvider.kt
@@ -145,33 +145,29 @@ class ConfidenceFeatureProvider private constructor(
             throw OpenFeatureError.FlagNotFoundError(e.flag)
         }
     }
-
     companion object {
         private class ConfidenceMetadata(override var name: String? = "confidence") : ProviderMetadata
-        class ConfidenceForOpenFeature internal constructor(val confidence: Confidence)
 
         fun createConfidence(
             context: Context,
             clientSecret: String,
             initialContext: Map<String, ConfidenceValue> = mapOf(),
             region: ConfidenceRegion = ConfidenceRegion.GLOBAL,
             dispatcher: CoroutineDispatcher = Dispatchers.IO
-        ): ConfidenceForOpenFeature {
-            return ConfidenceForOpenFeature(
-                ConfidenceFactory.create(
-                    context,
-                    clientSecret,
-                    sdk = SdkMetadata("SDK_ID_KOTLIN_PROVIDER", BuildConfig.SDK_VERSION),
-                    initialContext = initialContext,
-                    region = region,
-                    dispatcher = dispatcher
-                )
+        ): Confidence {
+            return ConfidenceFactory.create(
+                context,
+                clientSecret,
+                sdk = SdkMetadata("SDK_ID_KOTLIN_PROVIDER", BuildConfig.SDK_VERSION),
+                initialContext = initialContext,
+                region = region,
+                dispatcher = dispatcher
             )
         }
 
         @Suppress("LongParameterList")
         fun create(
-            confidenceForOF: ConfidenceForOpenFeature,
+            confidence: Confidence,
             initialisationStrategy: InitialisationStrategy = InitialisationStrategy.FetchAndActivate,
             hooks: List<Hook<*>> = listOf(),
             metadata: ProviderMetadata = ConfidenceMetadata(),
@@ -183,7 +179,7 @@ class ConfidenceFeatureProvider private constructor(
                 metadata = metadata,
                 initialisationStrategy = initialisationStrategy,
                 eventHandler = eventHandler,
-                confidence = confidenceForOF.confidence,
+                confidence = confidence,
                 dispatcher = dispatcher
             )
         }

diff --git a/Provider/src/test/java/com/spotify/confidence/openfeature/ConfidenceIntegrationTests.kt b/Provider/src/test/java/com/spotify/confidence/openfeature/ConfidenceIntegrationTests.kt
@@ -45,12 +45,10 @@ class ConfidenceIntegrationTests {
         val eventsHandler = EventHandler(Dispatchers.IO).apply {
             publish(OpenFeatureEvents.ProviderStale)
         }
-        val mockConfidence = ConfidenceFeatureProvider.Companion.ConfidenceForOpenFeature(
-            ConfidenceFactory.create(mockContext, clientSecret)
-        )
+        val mockConfidence = ConfidenceFactory.create(mockContext, clientSecret)
         OpenFeatureAPI.setProvider(
             ConfidenceFeatureProvider.create(
-                confidenceForOF = mockConfidence,
+                confidence = mockConfidence,
                 initialisationStrategy = InitialisationStrategy.FetchAndActivate,
                 eventHandler = eventsHandler
             ),
@@ -89,12 +87,10 @@ class ConfidenceIntegrationTests {
         }
         val cacheFile = File(mockContext.filesDir, FLAGS_FILE_NAME)
         assertEquals(0L, cacheFile.length())
-        val mockConfidence = ConfidenceFeatureProvider.Companion.ConfidenceForOpenFeature(
-            ConfidenceFactory.create(mockContext, clientSecret)
-        )
+        val mockConfidence = ConfidenceFactory.create(mockContext, clientSecret)
         OpenFeatureAPI.setProvider(
             ConfidenceFeatureProvider.create(
-                confidenceForOF = mockConfidence,
+                confidence = mockConfidence,
                 eventHandler = eventsHandler
             ),
             ImmutableContext(