Feedback and cleanups

Author: javiercn

src/Components/Components/src/Infrastructure/ComponentStatePersistenceManager.cs

@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Components.Infrastructure;
 /// </summary>
 public class ComponentStatePersistenceManager
 {
-    private readonly List<RegistrationContext> _registeredCallbacks = new();
+    private readonly List<PersistComponentStateRegistration> _registeredCallbacks = new();
     private readonly ILogger<ComponentStatePersistenceManager> _logger;
 
     private bool _stateIsPersisted;
@@ -106,7 +106,7 @@ private void InferRenderModes(Renderer renderer)
             if (registration.Callback.Target is IComponent component)
             {
                 var componentRenderMode = renderer.GetComponentRenderMode(component);
-                _registeredCallbacks[i] = new RegistrationContext(registration.Callback, componentRenderMode);
+                _registeredCallbacks[i] = new PersistComponentStateRegistration(registration.Callback, componentRenderMode);
                 continue;
             }
 

src/Components/Components/src/PersistComponentStateRegistration.cs

@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+internal readonly struct PersistComponentStateRegistration(
+    Func<Task> callback,
+    IComponentRenderMode? renderMode)
+{
+    public Func<Task> Callback { get; } = callback;
+
+    public IComponentRenderMode? RenderMode { get; } = renderMode;
+}

src/Components/Components/src/PersistentComponentState.cs

@@ -15,11 +15,11 @@ public class PersistentComponentState
     private IDictionary<string, byte[]>? _existingState;
     private readonly IDictionary<string, byte[]> _currentState;
 
-    private readonly List<RegistrationContext> _registeredCallbacks;
+    private readonly List<PersistComponentStateRegistration> _registeredCallbacks;
 
     internal PersistentComponentState(
         IDictionary<string , byte[]> currentState,
-        List<RegistrationContext> pauseCallbacks)
+        List<PersistComponentStateRegistration> pauseCallbacks)
     {
         _currentState = currentState;
         _registeredCallbacks = pauseCallbacks;
@@ -56,7 +56,7 @@ public PersistingComponentStateSubscription RegisterOnPersisting(Func<Task> call
     {
         ArgumentNullException.ThrowIfNull(callback);
 
-        var persistenceCallback = new RegistrationContext(callback, renderMode);
+        var persistenceCallback = new PersistComponentStateRegistration(callback, renderMode);
 
         _registeredCallbacks.Add(persistenceCallback);
 

src/Components/Components/src/PersistingComponentStateSubscription.cs

@@ -11,10 +11,10 @@ namespace Microsoft.AspNetCore.Components;
 /// </summary>
 public readonly struct PersistingComponentStateSubscription : IDisposable
 {
-    private readonly List<RegistrationContext>? _callbacks;
-    private readonly RegistrationContext? _callback;
+    private readonly List<PersistComponentStateRegistration>? _callbacks;
+    private readonly PersistComponentStateRegistration? _callback;
 
-    internal PersistingComponentStateSubscription(List<RegistrationContext> callbacks, RegistrationContext callback)
+    internal PersistingComponentStateSubscription(List<PersistComponentStateRegistration> callbacks, PersistComponentStateRegistration callback)
     {
         _callbacks = callbacks;
         _callback = callback;

src/Components/Components/src/RegistrationContext.cs

@@ -310,7 +310,6 @@ IEnumerator IEnumerable.GetEnumerator()
         }
     }
 
-
     private class TestRenderMode : IComponentRenderMode
     {
 

src/Components/Components/test/Lifetime/ComponentApplicationLifetimeTest.cs

@@ -11,7 +11,7 @@ public class ComponentApplicationStateTest
     public void InitializeExistingState_SetupsState()
     {
         // Arrange
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<RegistrationContext>());
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
         var existingState = new Dictionary<string, byte[]>
         {
             ["MyState"] = JsonSerializer.SerializeToUtf8Bytes(new byte[] { 1, 2, 3, 4 })
@@ -29,7 +29,7 @@ public void InitializeExistingState_SetupsState()
     public void InitializeExistingState_ThrowsIfAlreadyInitialized()
     {
         // Arrange
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<RegistrationContext>());
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
         var existingState = new Dictionary<string, byte[]>
         {
             ["MyState"] = new byte[] { 1, 2, 3, 4 }
@@ -45,7 +45,7 @@ public void InitializeExistingState_ThrowsIfAlreadyInitialized()
     public void TryRetrieveState_ReturnsStateWhenItExists()
     {
         // Arrange
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<RegistrationContext>());
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
         var existingState = new Dictionary<string, byte[]>
         {
             ["MyState"] = JsonSerializer.SerializeToUtf8Bytes(new byte[] { 1, 2, 3, 4 })
@@ -65,7 +65,7 @@ public void PersistState_SavesDataToTheStoreAsync()
     {
         // Arrange
         var currentState = new Dictionary<string, byte[]>();
-        var applicationState = new PersistentComponentState(currentState, new List<RegistrationContext>())
+        var applicationState = new PersistentComponentState(currentState, new List<PersistComponentStateRegistration>())
         {
             PersistingState = true
         };
@@ -84,7 +84,7 @@ public void PersistState_ThrowsForDuplicateKeys()
     {
         // Arrange
         var currentState = new Dictionary<string, byte[]>();
-        var applicationState = new PersistentComponentState(currentState, new List<RegistrationContext>())
+        var applicationState = new PersistentComponentState(currentState, new List<PersistComponentStateRegistration>())
         {
             PersistingState = true
         };
@@ -101,7 +101,7 @@ public void PersistAsJson_SerializesTheDataToJsonAsync()
     {
         // Arrange
         var currentState = new Dictionary<string, byte[]>();
-        var applicationState = new PersistentComponentState(currentState, new List<RegistrationContext>())
+        var applicationState = new PersistentComponentState(currentState, new List<PersistComponentStateRegistration>())
         {
             PersistingState = true
         };
@@ -120,7 +120,7 @@ public void PersistAsJson_NullValueAsync()
     {
         // Arrange    
         var currentState = new Dictionary<string, byte[]>();
-        var applicationState = new PersistentComponentState(currentState, new List<RegistrationContext>())
+        var applicationState = new PersistentComponentState(currentState, new List<PersistComponentStateRegistration>())
         {
             PersistingState = true
         };
@@ -140,7 +140,7 @@ public void TryRetrieveFromJson_DeserializesTheDataFromJson()
         var myState = new byte[] { 1, 2, 3, 4 };
         var serialized = JsonSerializer.SerializeToUtf8Bytes(myState);
         var existingState = new Dictionary<string, byte[]>() { ["MyState"] = serialized };
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<RegistrationContext>());
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
 
         applicationState.InitializeExistingState(existingState);
 
@@ -158,7 +158,7 @@ public void TryRetrieveFromJson_NullValue()
         // Arrange
         var serialized = JsonSerializer.SerializeToUtf8Bytes<byte[]>(null);
         var existingState = new Dictionary<string, byte[]>() { ["MyState"] = serialized };
-        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<RegistrationContext>());
+        var applicationState = new PersistentComponentState(new Dictionary<string, byte[]>(), new List<PersistComponentStateRegistration>());
 
         applicationState.InitializeExistingState(existingState);