make FeatureProviderStateManager a true wrapper, without implementing FeatureProvider

Signed-off-by: christian.lutnik <[email protected]>

Author: chrfwow

src/main/java/dev/openfeature/sdk/EventProvider.java

@@ -108,8 +108,8 @@ public boolean equals(Object obj) {
         if (obj == null) {
             return false;
         }
-        if (obj instanceof StatefulFeatureProvider) {
-            return this == ((StatefulFeatureProvider) obj).getDelegate();
+        if (obj instanceof FeatureProviderStateManager) {
+            return this == ((FeatureProviderStateManager) obj).getProvider();
         }
         return this == obj;
     }

src/main/java/dev/openfeature/sdk/StatefulFeatureProvider.java renamed to src/main/java/dev/openfeature/sdk/FeatureProviderStateManager.java

@@ -1,11 +1,12 @@
 package dev.openfeature.sdk;
 
 import dev.openfeature.sdk.exceptions.OpenFeatureError;
+import lombok.Getter;
 import lombok.experimental.Delegate;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-class StatefulFeatureProvider implements FeatureProvider, EventProviderListener {
+class FeatureProviderStateManager implements EventProviderListener {
 
     private interface ExcludeFromDelegate {
         void initialize(EvaluationContext evaluationContext) throws Exception;
@@ -18,16 +19,16 @@ private interface ExcludeFromDelegate {
     @Delegate(excludes = ExcludeFromDelegate.class)
     private final FeatureProvider delegate;
     private final AtomicBoolean isInitialized = new AtomicBoolean();
+    @Getter
     private ProviderState state = ProviderState.NOT_READY;
 
-    public StatefulFeatureProvider(FeatureProvider delegate) {
+    public FeatureProviderStateManager(FeatureProvider delegate) {
         this.delegate = delegate;
         if (delegate instanceof EventProvider) {
             ((EventProvider) delegate).setEventProviderListener(this);
         }
     }
 
-    @Override
     public void initialize(EvaluationContext evaluationContext) throws Exception {
         if (isInitialized.getAndSet(true)) {
             return;
@@ -50,34 +51,12 @@ public void initialize(EvaluationContext evaluationContext) throws Exception {
         }
     }
 
-    @Override
     public void shutdown() {
         delegate.shutdown();
         state = ProviderState.NOT_READY;
         isInitialized.set(false);
     }
 
-    @Override
-    public ProviderState getState() {
-        return state;
-    }
-
-    @Override
-    public int hashCode() {
-        return delegate.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof StatefulFeatureProvider) {
-            return delegate.equals(((StatefulFeatureProvider) obj).delegate);
-        }
-        return delegate.equals(obj);
-    }
-
     @Override
     public void onEmit(ProviderEvent event, ProviderEventDetails details) {
         if (ProviderEvent.PROVIDER_ERROR.equals(event)) {
@@ -93,7 +72,11 @@ public void onEmit(ProviderEvent event, ProviderEventDetails details) {
         }
     }
 
-    FeatureProvider getDelegate() {
+    FeatureProvider getProvider() {
         return delegate;
     }
+
+    public boolean hasSameProvider(FeatureProvider featureProvider){
+        return this.delegate.equals(featureProvider);
+    }
 }

src/main/java/dev/openfeature/sdk/NoOpProvider.java

@@ -66,15 +66,4 @@ public ProviderEvaluation<Value> getObjectEvaluation(String key, Value defaultVa
                 .reason(Reason.DEFAULT.toString())
                 .build();
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (obj instanceof StatefulFeatureProvider) {
-            return ((StatefulFeatureProvider) obj).getDelegate() == this;
-        }
-        return obj == this;
-    }
 }

src/main/java/dev/openfeature/sdk/OpenFeatureAPI.java

@@ -65,7 +65,7 @@ public Metadata getProviderMetadata(String domain) {
     }
 
     /**
-     * A factory function for creating new, OpenFeature clients.
+     * A factory function for creating new, OpenFeature client.
      * Clients can contain their own state (e.g. logger, hook, context).
      * Multiple clients can be used to segment feature flag configuration.
      * All un-named or unbound clients use the default provider.
@@ -77,7 +77,7 @@ public Client getClient() {
     }
 
     /**
-     * A factory function for creating new domainless OpenFeature clients.
+     * A factory function for creating new domainless OpenFeature client.
      * Clients can contain their own state (e.g. logger, hook, context).
      * Multiple clients can be used to segment feature flag configuration.
      * If there is already a provider bound to this domain, this provider will be used.
@@ -91,7 +91,7 @@ public Client getClient(String domain) {
     }
 
     /**
-     * A factory function for creating new domainless OpenFeature clients.
+     * A factory function for creating new domainless OpenFeature client.
      * Clients can contain their own state (e.g. logger, hook, context).
      * Multiple clients can be used to segment feature flag configuration.
      * If there is already a provider bound to this domain, this provider will be used.
@@ -103,17 +103,7 @@ public Client getClient(String domain) {
      */
     public Client getClient(String domain, String version) {
         return new OpenFeatureClient(
-                new ProviderAccessor() {
-                    @Override
-                    public FeatureProvider getProvider() {
-                        return providerRepository.getProvider(domain);
-                    }
-
-                    @Override
-                    public ProviderState getProviderState() {
-                        return providerRepository.getProviderState(domain);
-                    }
-                },
+                () -> providerRepository.getFeatureProviderStateManager(domain),
                 this,
                 domain,
                 version

src/main/java/dev/openfeature/sdk/OpenFeatureClient.java

@@ -63,7 +63,7 @@ public OpenFeatureClient(
 
     @Override
     public ProviderState getProviderState() {
-        return providerAccessor.getProviderState();
+        return providerAccessor.getProviderStateManager().getState();
     }
 
     /**
@@ -122,8 +122,9 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(FlagValueType type, String key
 
         try {
             // openfeatureApi.getProvider() must be called once to maintain a consistent reference
-            provider = providerAccessor.getProvider();
-            ProviderState state = providerAccessor.getProviderState();
+            FeatureProviderStateManager stateManager = providerAccessor.getProviderStateManager();
+            provider = stateManager.getProvider();
+            ProviderState state = stateManager.getState();
             if (ProviderState.NOT_READY.equals(state)) {
                 throw new ProviderNotReadyError("provider not yet initialized");
             }

src/main/java/dev/openfeature/sdk/ProviderAccessor.java

@@ -3,8 +3,7 @@
 /**
  * Provides access to the future provider for the domain of the client.
  */
-public interface ProviderAccessor {
-    FeatureProvider getProvider();
-
-    ProviderState getProviderState();
+@FunctionalInterface
+interface ProviderAccessor {
+    FeatureProviderStateManager getProviderStateManager();
 }