minor refactoring of use of autocloseablelock in try with resources

Signed-off-by: jarebudev <[email protected]>

Author: jarebudev

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

@@ -1,7 +1,6 @@
 package dev.openfeature.sdk;
 
 import dev.openfeature.sdk.exceptions.OpenFeatureError;
-import dev.openfeature.sdk.internal.AutoCloseableLock;
 import dev.openfeature.sdk.internal.AutoCloseableReentrantReadWriteLock;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -115,7 +114,8 @@ public Client getClient(String domain, String version) {
      * @return api instance
      */
     public OpenFeatureAPI setEvaluationContext(EvaluationContext evaluationContext) {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             this.evaluationContext = evaluationContext;
         }
         return this;
@@ -127,7 +127,8 @@ public OpenFeatureAPI setEvaluationContext(EvaluationContext evaluationContext)
      * @return evaluation context
      */
     public EvaluationContext getEvaluationContext() {
-        try (AutoCloseableLock __ = lock.readLockAutoCloseable()) {
+        var autoCloseableLock = lock.readLockAutoCloseable();
+        try (autoCloseableLock) {
             return this.evaluationContext;
         }
     }
@@ -136,7 +137,8 @@ public EvaluationContext getEvaluationContext() {
      * Return the transaction context propagator.
      */
     public TransactionContextPropagator getTransactionContextPropagator() {
-        try (AutoCloseableLock __ = lock.readLockAutoCloseable()) {
+        var autoCloseableLock = lock.readLockAutoCloseable();
+        try (autoCloseableLock) {
             return this.transactionContextPropagator;
         }
     }
@@ -150,7 +152,8 @@ public void setTransactionContextPropagator(TransactionContextPropagator transac
         if (transactionContextPropagator == null) {
             throw new IllegalArgumentException("Transaction context propagator cannot be null");
         }
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             this.transactionContextPropagator = transactionContextPropagator;
         }
     }
@@ -176,7 +179,8 @@ public void setTransactionContext(EvaluationContext evaluationContext) {
      * Set the default provider.
      */
     public void setProvider(FeatureProvider provider) {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             providerRepository.setProvider(
                     provider,
                     this::attachEventProvider,
@@ -194,7 +198,8 @@ public void setProvider(FeatureProvider provider) {
      * @param provider The provider to set.
      */
     public void setProvider(String domain, FeatureProvider provider) {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             providerRepository.setProvider(
                     domain,
                     provider,
@@ -210,7 +215,8 @@ public void setProvider(String domain, FeatureProvider provider) {
      * Set the default provider and wait for initialization to finish.
      */
     public void setProviderAndWait(FeatureProvider provider) throws OpenFeatureError {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             providerRepository.setProvider(
                     provider,
                     this::attachEventProvider,
@@ -228,7 +234,8 @@ public void setProviderAndWait(FeatureProvider provider) throws OpenFeatureError
      * @param provider The provider to set.
      */
     public void setProviderAndWait(String domain, FeatureProvider provider) throws OpenFeatureError {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             providerRepository.setProvider(
                     domain,
                     provider,
@@ -297,7 +304,8 @@ public FeatureProvider getProvider(String domain) {
      * @param hooks The hook to add.
      */
     public void addHooks(Hook... hooks) {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             this.apiHooks.addAll(Arrays.asList(hooks));
         }
     }
@@ -308,7 +316,8 @@ public void addHooks(Hook... hooks) {
      * @return A list of {@link Hook}s.
      */
     public List<Hook> getHooks() {
-        try (AutoCloseableLock __ = lock.readLockAutoCloseable()) {
+        var autoCloseableLock = lock.readLockAutoCloseable();
+        try (autoCloseableLock) {
             return this.apiHooks;
         }
     }
@@ -317,7 +326,8 @@ public List<Hook> getHooks() {
      * Removes all hooks.
      */
     public void clearHooks() {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             this.apiHooks.clear();
         }
     }
@@ -329,7 +339,8 @@ public void clearHooks() {
      * Once shut down is complete, API is reset and ready to use again.
      */
     public void shutdown() {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             providerRepository.shutdown();
             eventSupport.shutdown();
 
@@ -375,7 +386,8 @@ public OpenFeatureAPI onProviderError(Consumer<EventDetails> handler) {
      */
     @Override
     public OpenFeatureAPI on(ProviderEvent event, Consumer<EventDetails> handler) {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             this.eventSupport.addGlobalHandler(event, handler);
             return this;
         }
@@ -391,13 +403,15 @@ public OpenFeatureAPI removeHandler(ProviderEvent event, Consumer<EventDetails>
     }
 
     void removeHandler(String domain, ProviderEvent event, Consumer<EventDetails> handler) {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             eventSupport.removeClientHandler(domain, event, handler);
         }
     }
 
     void addHandler(String domain, ProviderEvent event, Consumer<EventDetails> handler) {
-        try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
+        var autoCloseableLock = lock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             // if the provider is in the state associated with event, run immediately
             if (Optional.ofNullable(this.providerRepository.getProviderState(domain))
                     .orElse(ProviderState.READY)
@@ -421,7 +435,8 @@ FeatureProviderStateManager getFeatureProviderStateManager(String domain) {
      * @param details  the event details
      */
     private void runHandlersForProvider(FeatureProvider provider, ProviderEvent event, ProviderEventDetails details) {
-        try (AutoCloseableLock __ = lock.readLockAutoCloseable()) {
+        var autoCloseableLock = lock.readLockAutoCloseable();
+        try (autoCloseableLock) {
 
             List<String> domainsForProvider = providerRepository.getDomainsForProvider(provider);
 

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

@@ -5,7 +5,6 @@
 import dev.openfeature.sdk.exceptions.GeneralError;
 import dev.openfeature.sdk.exceptions.OpenFeatureError;
 import dev.openfeature.sdk.exceptions.ProviderNotReadyError;
-import dev.openfeature.sdk.internal.AutoCloseableLock;
 import dev.openfeature.sdk.internal.AutoCloseableReentrantReadWriteLock;
 import dev.openfeature.sdk.internal.ObjectUtils;
 import java.util.ArrayList;
@@ -125,7 +124,8 @@ public void track(String trackingEventName, EvaluationContext context, TrackingE
      */
     @Override
     public OpenFeatureClient addHooks(Hook... hooks) {
-        try (AutoCloseableLock __ = this.hooksLock.writeLockAutoCloseable()) {
+        var autoCloseableLock = this.hooksLock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             this.clientHooks.addAll(Arrays.asList(hooks));
         }
         return this;
@@ -136,7 +136,8 @@ public OpenFeatureClient addHooks(Hook... hooks) {
      */
     @Override
     public List<Hook> getHooks() {
-        try (AutoCloseableLock __ = this.hooksLock.readLockAutoCloseable()) {
+        var autoCloseableLock = this.hooksLock.readLockAutoCloseable();
+        try (autoCloseableLock) {
             return this.clientHooks;
         }
     }
@@ -146,7 +147,8 @@ public List<Hook> getHooks() {
      */
     @Override
     public OpenFeatureClient setEvaluationContext(EvaluationContext evaluationContext) {
-        try (AutoCloseableLock __ = contextLock.writeLockAutoCloseable()) {
+        var autoCloseableLock = contextLock.writeLockAutoCloseable();
+        try (autoCloseableLock) {
             this.evaluationContext = evaluationContext;
         }
         return this;
@@ -157,7 +159,8 @@ public OpenFeatureClient setEvaluationContext(EvaluationContext evaluationContex
      */
     @Override
     public EvaluationContext getEvaluationContext() {
-        try (AutoCloseableLock __ = contextLock.readLockAutoCloseable()) {
+        var autoCloseableLock = contextLock.readLockAutoCloseable();
+        try (autoCloseableLock) {
             return this.evaluationContext;
         }
     }