Reduce locking and concurrency issues

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

Author: chrfwow

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

@@ -8,6 +8,7 @@
 import dev.openfeature.sdk.internal.AutoCloseableLock;
 import dev.openfeature.sdk.internal.AutoCloseableReentrantReadWriteLock;
 import dev.openfeature.sdk.internal.ObjectUtils;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -162,29 +163,32 @@ public EvaluationContext getEvaluationContext() {
         return this.evaluationContext.get();
     }
 
+    @SuppressFBWarnings(
+            value = {"REC_CATCH_EXCEPTION"},
+            justification =
+                    "We don't want to allow any exception to reach the user. Instead, we return an evaluation result with the appropriate error code.")
     private <T> FlagEvaluationDetails<T> evaluateFlag(
             FlagValueType type, String key, T defaultValue, EvaluationContext ctx, FlagEvaluationOptions options) {
-        FlagEvaluationOptions flagOptions = ObjectUtils.defaultIfNull(
+        var flagOptions = ObjectUtils.defaultIfNull(
                 options, () -> FlagEvaluationOptions.builder().build());
-        Map<String, Object> hints = Collections.unmodifiableMap(flagOptions.getHookHints());
+        var hints = Collections.unmodifiableMap(flagOptions.getHookHints());
 
         FlagEvaluationDetails<T> details = null;
         List<Hook> mergedHooks = null;
         HookContext<T> afterHookContext = null;
-        FeatureProvider provider;
 
         try {
-            FeatureProviderStateManager stateManager = openfeatureApi.getFeatureProviderStateManager(this.domain);
+            var stateManager = openfeatureApi.getFeatureProviderStateManager(this.domain);
             // provider must be accessed once to maintain a consistent reference
-            provider = stateManager.getProvider();
-            ProviderState state = stateManager.getState();
+            var provider = stateManager.getProvider();
+            var state = stateManager.getState();
 
             try (AutoCloseableLock ignored = this.hooksLock.readLockAutoCloseable()) {
                 mergedHooks = ObjectUtils.merge(
                         provider.getProviderHooks(), flagOptions.getHooks(), clientHooks, openfeatureApi.getHooks());
             }
 
-            EvaluationContext mergedCtx = hookSupport.beforeHooks(
+            var mergedCtx = hookSupport.beforeHooks(
                     type,
                     HookContext.from(
                             key,
@@ -207,12 +211,12 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(
                 throw new FatalError("Provider is in an irrecoverable error state");
             }
 
-            ProviderEvaluation<T> providerEval =
+            var providerEval =
                     (ProviderEvaluation<T>) createProviderEvaluation(type, key, defaultValue, provider, mergedCtx);
 
             details = FlagEvaluationDetails.from(providerEval, key);
             if (details.getErrorCode() != null) {
-                OpenFeatureError error =
+                var error =
                         ExceptionUtils.instantiateErrorByErrorCode(details.getErrorCode(), details.getErrorMessage());
                 enrichDetailsWithErrorDefaults(defaultValue, details);
                 hookSupport.errorHooks(type, afterHookContext, error, mergedHooks, hints);