refactor: improve code quality (#706)

* chore(tests): use 'using' declaration for CancellationTokenSource in test files

Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com>

* chore(EventExecutor): make _defaultClientName readonly

Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com>

* chore(InMemoryProvider): simplify flag initialization logic in constructor and UpdateFlagsAsync method

Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com>

* chore(EventExecutor): streamline event handler removal logic
chore(LoggingHook): refine number value handling in logging

Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com>

---------

Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com>

Author: askpt

src/OpenFeature/EventExecutor.cs

@@ -15,7 +15,7 @@ internal sealed partial class EventExecutor : IAsyncDisposable
     private readonly List<FeatureProvider> _activeSubscriptions = [];
 
     /// placeholder for anonymous clients
-    private static Guid _defaultClientName = Guid.NewGuid();
+    private static readonly Guid _defaultClientName = Guid.NewGuid();
 
     private readonly Dictionary<ProviderEventTypes, List<EventHandlerDelegate>> _apiHandlers = [];
     private readonly Dictionary<string, Dictionary<ProviderEventTypes, List<EventHandlerDelegate>>> _clientHandlers = [];
@@ -93,12 +93,10 @@ internal void RemoveClientHandler(string client, ProviderEventTypes type, EventH
 
         lock (this._lockObj)
         {
-            if (this._clientHandlers.TryGetValue(clientName, out var clientEventHandlers))
+            if (this._clientHandlers.TryGetValue(clientName, out var clientEventHandlers)
+                    && clientEventHandlers.TryGetValue(type, out var eventHandlers))
             {
-                if (clientEventHandlers.TryGetValue(type, out var eventHandlers))
-                {
-                    eventHandlers.Remove(handler);
-                }
+                eventHandlers.Remove(handler);
             }
         }
     }

src/OpenFeature/Hooks/LoggingHook.cs

@@ -153,11 +153,11 @@ public override string ToString()
             if (value.IsBoolean)
                 return value.AsBoolean.ToString();
 
-            if (value.IsNumber)
+            if (value.IsNumber && value.AsDouble != null)
             {
                 // Value.AsDouble will attempt to cast other numbers to double
                 // There is an implicit conversation for int/long to double
-                if (value.AsDouble != null) return value.AsDouble.ToString();
+                return value.AsDouble.ToString();
             }
 
             if (value.IsDateTime)

src/OpenFeature/Providers/Memory/InMemoryProvider.cs

@@ -26,14 +26,7 @@ public override Metadata GetMetadata()
     /// <param name="flags">dictionary of Flags</param>
     public InMemoryProvider(IDictionary<string, Flag>? flags = null)
     {
-        if (flags == null)
-        {
-            this._flags = new Dictionary<string, Flag>();
-        }
-        else
-        {
-            this._flags = new Dictionary<string, Flag>(flags); // shallow copy
-        }
+        this._flags = flags == null ? [] : new Dictionary<string, Flag>(flags); // shallow copy
     }
 
     /// <summary>
@@ -43,14 +36,8 @@ public InMemoryProvider(IDictionary<string, Flag>? flags = null)
     public async Task UpdateFlagsAsync(IDictionary<string, Flag>? flags = null)
     {
         var changed = this._flags.Keys.ToList();
-        if (flags == null)
-        {
-            this._flags = new Dictionary<string, Flag>();
-        }
-        else
-        {
-            this._flags = new Dictionary<string, Flag>(flags); // shallow copy
-        }
+        this._flags = flags == null ? [] : new Dictionary<string, Flag>(flags); // shallow copy
+
         changed.AddRange(this._flags.Keys.ToList());
         var @event = new ProviderEventPayload
         {

test/OpenFeature.Providers.MultiProvider.Tests/MultiProviderEventTests.cs

@@ -319,7 +319,7 @@ private static async Task EmitEventToProvider(FeatureProvider provider, Provider
     private static async Task<List<ProviderEventPayload>> ReadEvents(Channel<object> channel, int expectedCount = 1, int timeoutMs = 1000)
     {
         var events = new List<ProviderEventPayload>();
-        var cts = new CancellationTokenSource(timeoutMs);
+        using var cts = new CancellationTokenSource(timeoutMs);
 
         try
         {

test/OpenFeature.Providers.MultiProvider.Tests/ProviderExtensionsTests.cs

@@ -220,7 +220,8 @@ public async Task EvaluateAsync_WithCancellationToken_PassesToProvider()
         const string resolvedValue = "resolved";
         var expectedDetails = new ResolutionDetails<string>(TestFlagKey, resolvedValue, ErrorType.None, Reason.Static, TestVariant);
         var providerContext = new StrategyPerProviderContext<string>(this._mockProvider, TestProviderName, ProviderStatus.Ready, TestFlagKey);
-        var customCancellationToken = new CancellationTokenSource().Token;
+        using var cts = new CancellationTokenSource();
+        var customCancellationToken = cts.Token;
 
         this._mockProvider.ResolveStringValueAsync(TestFlagKey, defaultValue, this._evaluationContext, customCancellationToken)
             .Returns(expectedDetails);
@@ -283,7 +284,7 @@ public async Task EvaluateAsync_WhenOperationCancelled_ReturnsErrorResult()
     {
         // Arrange
         const bool defaultValue = false;
-        var cancellationTokenSource = new CancellationTokenSource();
+        using var cancellationTokenSource = new CancellationTokenSource();
         var providerContext = new StrategyPerProviderContext<bool>(this._mockProvider, TestProviderName, ProviderStatus.Ready, TestFlagKey);
 
         this._mockProvider.ResolveBooleanValueAsync(TestFlagKey, defaultValue, this._evaluationContext, cancellationTokenSource.Token)

test/OpenFeature.Tests/OpenFeatureClientTests.cs

@@ -470,7 +470,7 @@ public async Task Cancellation_Token_Added_Is_Passed_To_Provider()
         var defaultString = fixture.Create<string>();
         var cancelledReason = "cancelled";
 
-        var cts = new CancellationTokenSource();
+        using var cts = new CancellationTokenSource();
 
 
         var featureProviderMock = Substitute.For<FeatureProvider>();

test/OpenFeature.Tests/OpenFeatureHookTests.cs

@@ -673,7 +673,7 @@ public async Task Successful_Resolution_Should_Pass_Cancellation_Token()
     {
         var featureProvider = Substitute.For<FeatureProvider>();
         var hook = Substitute.For<Hook>();
-        var cts = new CancellationTokenSource();
+        using var cts = new CancellationTokenSource();
 
         featureProvider.GetMetadata().Returns(new Metadata(null));
         featureProvider.GetProviderHooks().Returns(ImmutableList<Hook>.Empty);
@@ -701,7 +701,7 @@ public async Task Failed_Resolution_Should_Pass_Cancellation_Token()
         var hook = Substitute.For<Hook>();
         var flagOptions = new FlagEvaluationOptions(hook);
         var exceptionToThrow = new GeneralException("Fake Exception");
-        var cts = new CancellationTokenSource();
+        using var cts = new CancellationTokenSource();
 
         featureProvider.GetMetadata()
             .Returns(new Metadata(null));