Fix nullability of some members.

Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com>
open-feature · Jul 5, 2024 · f865f18 · f865f18
1 parent 94e7ae6
commit f865f18
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/OpenFeature/Api.cs b/src/OpenFeature/Api.cs
@@ -101,15 +101,15 @@ public FeatureProvider GetProvider(string clientName)
         /// </para>
         /// </summary>
         /// <returns><see cref="ClientMetadata"/></returns>
-        public Metadata GetProviderMetadata() => this.GetProvider().GetMetadata();
+        public Metadata? GetProviderMetadata() => this.GetProvider().GetMetadata();
 
         /// <summary>
         /// Gets providers metadata assigned to the given clientName. If the clientName has no provider
         /// assigned to it the default provider will be returned
         /// </summary>
         /// <param name="clientName">Name of client</param>
         /// <returns>Metadata assigned to provider</returns>
-        public Metadata GetProviderMetadata(string clientName) => this.GetProvider(clientName).GetMetadata();
+        public Metadata? GetProviderMetadata(string clientName) => this.GetProvider(clientName).GetMetadata();
 
         /// <summary>
         /// Create a new instance of <see cref="FeatureClient"/> using the current provider
@@ -277,7 +277,7 @@ private async Task AfterInitialization(FeatureProvider provider)
             {
                 Type = ProviderEventTypes.ProviderReady,
                 Message = "Provider initialization complete",
-                ProviderName = provider.GetMetadata().Name,
+                ProviderName = provider.GetMetadata()?.Name,
             };
 
             await this._eventExecutor.EventChannel.Writer.WriteAsync(new Event { Provider = provider, EventPayload = eventPayload }).ConfigureAwait(false);
@@ -287,14 +287,13 @@ private async Task AfterInitialization(FeatureProvider provider)
         /// Update the provider state to ERROR and emit an ERROR after failed init.
         /// </summary>
         private async Task AfterError(FeatureProvider provider, Exception? ex)
-
         {
             provider.Status = typeof(ProviderFatalException) == ex?.GetType() ? ProviderStatus.Fatal : ProviderStatus.Error;
             var eventPayload = new ProviderEventPayload
             {
                 Type = ProviderEventTypes.ProviderError,
                 Message = $"Provider initialization error: {ex?.Message}",
-                ProviderName = provider.GetMetadata().Name,
+                ProviderName = provider.GetMetadata()?.Name,
             };
 
             await this._eventExecutor.EventChannel.Writer.WriteAsync(new Event { Provider = provider, EventPayload = eventPayload }).ConfigureAwait(false);

diff --git a/src/OpenFeature/EventExecutor.cs b/src/OpenFeature/EventExecutor.cs
@@ -206,7 +206,7 @@ private void EmitOnRegistration(FeatureProvider? provider, ProviderEventTypes ev
                 {
                     handler.Invoke(new ProviderEventPayload
                     {
-                        ProviderName = provider.GetMetadata().Name,
+                        ProviderName = provider.GetMetadata()?.Name,
                         Type = eventType,
                         Message = message
                     });

diff --git a/src/OpenFeature/FeatureProvider.cs b/src/OpenFeature/FeatureProvider.cs
@@ -38,7 +38,7 @@ public abstract class FeatureProvider
         /// Metadata describing the provider.
         /// </summary>
         /// <returns><see cref="Metadata"/></returns>
-        public abstract Metadata GetMetadata();
+        public abstract Metadata? GetMetadata();
 
         /// <summary>
         /// Resolves a boolean feature flag

diff --git a/src/OpenFeature/ProviderRepository.cs b/src/OpenFeature/ProviderRepository.cs
@@ -221,7 +221,7 @@ private async Task SafeShutdownProviderAsync(FeatureProvider? targetProvider)
             }
             catch (Exception ex)
             {
-                this.ErrorShuttingDownProvider(targetProvider.GetMetadata().Name, ex);
+                this.ErrorShuttingDownProvider(targetProvider.GetMetadata()?.Name, ex);
             }
         }
 

diff --git a/test/OpenFeature.Tests/OpenFeatureTests.cs b/test/OpenFeature.Tests/OpenFeatureTests.cs
@@ -103,8 +103,8 @@ public async Task OpenFeature_Should_Not_Change_Named_Providers_When_Setting_Def
             var defaultClient = openFeature.GetProviderMetadata();
             var namedClient = openFeature.GetProviderMetadata(TestProvider.DefaultName);
 
-            defaultClient.Name.Should().Be(NoOpProvider.NoOpProviderName);
-            namedClient.Name.Should().Be(TestProvider.DefaultName);
+            defaultClient?.Name.Should().Be(NoOpProvider.NoOpProviderName);
+            namedClient?.Name.Should().Be(TestProvider.DefaultName);
         }
 
         [Fact]
@@ -117,7 +117,7 @@ public async Task OpenFeature_Should_Set_Default_Provide_When_No_Name_Provided()
 
             var defaultClient = openFeature.GetProviderMetadata();
 
-            defaultClient.Name.Should().Be(TestProvider.DefaultName);
+            defaultClient?.Name.Should().Be(TestProvider.DefaultName);
         }
 
         [Fact]
@@ -130,7 +130,7 @@ public async Task OpenFeature_Should_Assign_Provider_To_Existing_Client()
             await openFeature.SetProviderAsync(name, new TestProvider());
             await openFeature.SetProviderAsync(name, new NoOpFeatureProvider());
 
-            openFeature.GetProviderMetadata(name).Name.Should().Be(NoOpProvider.NoOpProviderName);
+            openFeature.GetProviderMetadata(name)?.Name.Should().Be(NoOpProvider.NoOpProviderName);
         }
 
         [Fact]
@@ -187,7 +187,7 @@ public async Task OpenFeature_Should_Get_Metadata()
             var metadata = openFeature.GetProviderMetadata();
 
             metadata.Should().NotBeNull();
-            metadata.Name.Should().Be(NoOpProvider.NoOpProviderName);
+            metadata?.Name.Should().Be(NoOpProvider.NoOpProviderName);
         }
 
         [Theory]