Csla.State namespace nullable aware

Fixes #1233
MarimerLLC · Oct 23, 2024 · 6c84c52 · 6c84c52
1 parent a042511
commit 6c84c52
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/Source/Csla.AspNetCore/Blazor/State/StateController.cs b/Source/Csla.AspNetCore/Blazor/State/StateController.cs
@@ -47,8 +47,7 @@ public virtual StateResult Get(long lastTouched)
       }
       else
       {
-        var message = (SessionMessage)applicationContext.CreateInstanceDI(typeof(SessionMessage));
-        message.Session = session;
+        var message = applicationContext.CreateInstanceDI< SessionMessage>(session);
         if (FlowUserIdentityToWebAssembly)
         {
           message.Principal = applicationContext.Principal;

diff --git a/Source/Csla/State/Session.cs b/Source/Csla/State/Session.cs
@@ -38,7 +38,13 @@ public class Session : MobileDictionary<string, object?>, INotifyPropertyChanged
     /// Raise PropertyChanged event.
     /// </summary>
     /// <param name="propertyName"></param>
-    protected virtual void OnPropertyChanged(string propertyName) 
-      => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    /// <exception cref="ArgumentNullException"><paramref name="propertyName"/> is <see langword="null"/>.</exception>
+    protected virtual void OnPropertyChanged(string propertyName)
+    {
+      if (propertyName is null)
+        throw new ArgumentNullException(nameof(propertyName));
+
+      PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
   }
 }
diff --git a/Source/Csla/State/SessionMessage.cs b/Source/Csla/State/SessionMessage.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System.Security.Claims;
+using Csla.Serialization.Mobile;
 
 namespace Csla.State;
 
@@ -25,20 +26,38 @@ public class SessionMessage : CommandBase<SessionMessage>
   /// </summary>
   public Session Session
   {
-    get => ReadProperty(SessionProperty);
-    set => LoadProperty(SessionProperty, value);
+    get => ReadProperty(SessionProperty)!;
+    set => LoadProperty(SessionProperty, value ?? throw new ArgumentNullException(nameof(Session)));
   }
 
   /// <summary>
   /// User principal data
   /// </summary>
-  public static readonly PropertyInfo<ClaimsPrincipal> PrincipalProperty = RegisterProperty<ClaimsPrincipal>(nameof(Principal));
+  public static readonly PropertyInfo<ClaimsPrincipal?> PrincipalProperty = RegisterProperty<ClaimsPrincipal?>(nameof(Principal));
   /// <summary>
   /// User principal data
   /// </summary>
-  public ClaimsPrincipal Principal
+  public ClaimsPrincipal? Principal
   {
     get => ReadProperty(PrincipalProperty);
     set => LoadProperty(PrincipalProperty, value);
   }
-}
+
+  /// <summary>
+  /// Initializes a new instance of <see cref="SessionMessage"/>.
+  /// </summary>
+  /// <param name="session"></param>
+  /// <exception cref="ArgumentNullException"><paramref name="session"/> is <see langword="null"/>.</exception>
+  public SessionMessage(Session session)
+  {
+    Session = session ?? throw new ArgumentNullException(nameof(session));
+  }
+
+  /// <summary>
+  /// Initializes a new instance of <see cref="SessionMessage"/>.
+  /// </summary>
+  [Obsolete(MobileFormatter.DefaultCtorObsoleteMessage, error: true)]
+  public SessionMessage()
+  {
+  }
+}
diff --git a/Source/Csla/State/StateResult.cs b/Source/Csla/State/StateResult.cs
@@ -20,6 +20,6 @@ public class StateResult
     /// <summary>
     /// Gets or sets the serialized session data.
     /// </summary>
-    public byte[] SessionData { get; set; }
+    public byte[]? SessionData { get; set; }
   }
 }