simplify some null checks (#7659)

SimonCropp · web-flow · commit d87acf573e84 · 2025-06-10T09:11:41.000-05:00
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/AsyncWriteProxyEx.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/AsyncWriteProxyEx.cs
@@ -65,13 +65,8 @@ public sealed class SetStore
         /// <exception cref="ArgumentNullException">
         /// This exception is thrown when the specified <paramref name="store"/> is undefined.
         /// </exception>
-        public SetStore(IActorRef store)
-        {
-            if (store == null)
-                throw new ArgumentNullException(nameof(store), "SetStore requires non-null reference to store actor");
-
-            Store = store;
-        }
+        public SetStore(IActorRef store) =>
+            Store = store ?? throw new ArgumentNullException(nameof(store), "SetStore requires non-null reference to store actor");
 
         /// <summary>
         /// TBD
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ClusterShardingGuardian.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ClusterShardingGuardian.cs
@@ -95,10 +95,9 @@ public Start(
                 object handOffStopMessage)
             {
                 if (string.IsNullOrEmpty(typeName)) throw new ArgumentNullException(nameof(typeName), "ClusterSharding start requires type name to be provided");
-                if (entityProps == null) throw new ArgumentNullException(nameof(entityProps), $"ClusterSharding start requires Props for [{typeName}] to be provided");
 
                 TypeName = typeName;
-                EntityProps = entityProps;
+                EntityProps = entityProps ?? throw new ArgumentNullException(nameof(entityProps), $"ClusterSharding start requires Props for [{typeName}] to be provided");
                 Settings = settings;
                 MessageExtractor = extractor;
                 AllocationStrategy = allocationStrategy;
diff --git a/src/contrib/cluster/Akka.DistributedData/ORDictionary.cs b/src/contrib/cluster/Akka.DistributedData/ORDictionary.cs
@@ -488,9 +488,7 @@ internal sealed class PutDeltaOperation : AtomicDeltaOperation, ORDictionary.IPu
 
             public PutDeltaOperation(ORSet<TKey>.IDeltaOperation underlying, TKey key, TValue value)
             {
-                if (underlying == null) throw new ArgumentNullException(nameof(underlying));
-
-                Underlying = underlying;
+                Underlying = underlying ?? throw new ArgumentNullException(nameof(underlying));
                 Key = key;
                 Value = value;
             }
diff --git a/src/core/Akka.Cluster/SplitBrainResolver.cs b/src/core/Akka.Cluster/SplitBrainResolver.cs
@@ -257,10 +257,8 @@ public static Actor.Props Props(TimeSpan stableAfter, ISplitBrainStrategy strate
 
         public SplitBrainDecider(TimeSpan stableAfter, ISplitBrainStrategy strategy, Cluster cluster)
         {
-            if (strategy == null) throw new ArgumentNullException(nameof(strategy));
-
             _stabilityTimeout = stableAfter;
-            _strategy = strategy;
+            _strategy = strategy ?? throw new ArgumentNullException(nameof(strategy));
             _cluster = cluster;
         }
 
diff --git a/src/core/Akka.Persistence/AtLeastOnceDeliverySemantic.cs b/src/core/Akka.Persistence/AtLeastOnceDeliverySemantic.cs
@@ -37,12 +37,9 @@ public sealed class AtLeastOnceDeliverySnapshot : IMessage, IEquatable<AtLeastOn
         /// </exception>
         public AtLeastOnceDeliverySnapshot(long currentDeliveryId, UnconfirmedDelivery[] unconfirmedDeliveries)
         {
-            if (unconfirmedDeliveries == null)
-                throw new ArgumentNullException(nameof(unconfirmedDeliveries),
-                    "AtLeastOnceDeliverySnapshot expects not null array of unconfirmed deliveries");
-
             CurrentDeliveryId = currentDeliveryId;
-            UnconfirmedDeliveries = unconfirmedDeliveries;
+            UnconfirmedDeliveries = unconfirmedDeliveries ?? throw new ArgumentNullException(nameof(unconfirmedDeliveries),
+                "AtLeastOnceDeliverySnapshot expects not null array of unconfirmed deliveries");
         }
 
         /// <summary>
@@ -97,14 +94,9 @@ public sealed class UnconfirmedWarning : IEquatable<UnconfirmedWarning>
         /// <exception cref="ArgumentNullException">
         /// This exception is thrown when the specified <paramref name="unconfirmedDeliveries"/> array is undefined.
         /// </exception>
-        public UnconfirmedWarning(UnconfirmedDelivery[] unconfirmedDeliveries)
-        {
-            if (unconfirmedDeliveries == null)
-                throw new ArgumentNullException(nameof(unconfirmedDeliveries),
-                    "UnconfirmedWarning expects not null array of unconfirmed deliveries");
-
-            UnconfirmedDeliveries = unconfirmedDeliveries;
-        }
+        public UnconfirmedWarning(UnconfirmedDelivery[] unconfirmedDeliveries) =>
+            UnconfirmedDeliveries = unconfirmedDeliveries ?? throw new ArgumentNullException(nameof(unconfirmedDeliveries),
+                "UnconfirmedWarning expects not null array of unconfirmed deliveries");
 
         /// <summary>
         /// TBD
diff --git a/src/core/Akka.Persistence/Journal/AsyncWriteProxy.cs b/src/core/Akka.Persistence/Journal/AsyncWriteProxy.cs
@@ -94,13 +94,8 @@ public sealed class ReplayFailure
             /// <exception cref="System.ArgumentNullException">
             /// This exception is thrown when the specified <paramref name="cause"/> is undefined.
             /// </exception>
-            public ReplayFailure(Exception cause)
-            {
-                if (cause == null)
-                    throw new ArgumentNullException(nameof(cause), "AsyncWriteTarget.ReplayFailure cause exception cannot be null");
-
-                Cause = cause;
-            }
+            public ReplayFailure(Exception cause) =>
+                Cause = cause ?? throw new ArgumentNullException(nameof(cause), "AsyncWriteTarget.ReplayFailure cause exception cannot be null");
 
             /// <summary>
             /// The cause of the failure
diff --git a/src/core/Akka.Persistence/JournalProtocol.cs b/src/core/Akka.Persistence/JournalProtocol.cs
@@ -78,10 +78,7 @@ public sealed class DeleteMessagesFailure : IEquatable<DeleteMessagesFailure>, I
         /// </exception>
         public DeleteMessagesFailure(Exception cause, long toSequenceNr)
         {
-            if (cause == null)
-                throw new ArgumentNullException(nameof(cause), "DeleteMessagesFailure cause exception cannot be null");
-
-            Cause = cause;
+            Cause = cause ?? throw new ArgumentNullException(nameof(cause), "DeleteMessagesFailure cause exception cannot be null");
             ToSequenceNr = toSequenceNr;
         }
 
@@ -373,11 +370,8 @@ public sealed class WriteMessageRejected : IJournalResponse, INoSerializationVer
         /// </exception>
         public WriteMessageRejected(IPersistentRepresentation persistent, Exception cause, int actorInstanceId)
         {
-            if (cause == null)
-                throw new ArgumentNullException(nameof(cause), "WriteMessageRejected cause exception cannot be null");
-
             Persistent = persistent;
-            Cause = cause;
+            Cause = cause ?? throw new ArgumentNullException(nameof(cause), "WriteMessageRejected cause exception cannot be null");
             ActorInstanceId = actorInstanceId;
         }
 
@@ -440,11 +434,8 @@ public sealed class WriteMessageFailure : IJournalResponse, INoSerializationVeri
         /// </exception>
         public WriteMessageFailure(IPersistentRepresentation persistent, Exception cause, int actorInstanceId)
         {
-            if (cause == null)
-                throw new ArgumentNullException(nameof(cause), "WriteMessageFailure cause exception cannot be null");
-
             Persistent = persistent;
-            Cause = cause;
+            Cause = cause ?? throw new ArgumentNullException(nameof(cause), "WriteMessageFailure cause exception cannot be null");
             ActorInstanceId = actorInstanceId;
         }
 
@@ -705,20 +696,14 @@ public sealed class ReplayMessagesFailure : IJournalResponse, IDeadLetterSuppres
         /// <exception cref="ArgumentNullException">
         /// This exception is thrown when the specified <paramref name="cause"/> is undefined.
         /// </exception>
-        public ReplayMessagesFailure(Exception cause)
-        {
-            if (cause == null)
-                throw new ArgumentNullException(nameof(cause), "ReplayMessagesFailure cause exception cannot be null");
-
-            Cause = cause;
-        }
+        public ReplayMessagesFailure(Exception cause) =>
+            Cause = cause ?? throw new ArgumentNullException(nameof(cause), "ReplayMessagesFailure cause exception cannot be null");
 
         /// <summary>
         /// The cause of the failure
         /// </summary>
         public Exception Cause { get; }
 
-       
         public bool Equals(ReplayMessagesFailure other)
         {
             if (ReferenceEquals(other, null)) return false;
@@ -727,13 +712,10 @@ public bool Equals(ReplayMessagesFailure other)
             return Equals(Cause, other.Cause);
         }
 
-        
         public override bool Equals(object obj) => Equals(obj as ReplayMessagesFailure);
 
-        
         public override int GetHashCode() => Cause.GetHashCode();
 
-        
         public override string ToString() => $"ReplayMessagesFailure<cause: {Cause}>";
     }
 }
diff --git a/src/core/Akka.Persistence/SnapshotProtocol.cs b/src/core/Akka.Persistence/SnapshotProtocol.cs
@@ -793,10 +793,7 @@ public sealed class SaveSnapshot : ISnapshotRequest, IEquatable<SaveSnapshot>
         /// </exception>
         public SaveSnapshot(SnapshotMetadata metadata, object snapshot)
         {
-            if (metadata == null)
-                throw new ArgumentNullException(nameof(metadata), "SaveSnapshot requires SnapshotMetadata to be provided");
-
-            Metadata = metadata;
+            Metadata = metadata ?? throw new ArgumentNullException(nameof(metadata), "SaveSnapshot requires SnapshotMetadata to be provided");
             Snapshot = snapshot;
         }
 
@@ -848,13 +845,8 @@ public sealed class DeleteSnapshot : ISnapshotRequest, IEquatable<DeleteSnapshot
         /// <exception cref="ArgumentNullException">
         /// This exception is thrown when the specified <paramref name="metadata"/> is undefined.
         /// </exception>
-        public DeleteSnapshot(SnapshotMetadata metadata)
-        {
-            if (metadata == null)
-                throw new ArgumentNullException(nameof(metadata), "DeleteSnapshot requires SnapshotMetadata to be provided");
-
-            Metadata = metadata;
-        }
+        public DeleteSnapshot(SnapshotMetadata metadata) =>
+            Metadata = metadata ?? throw new ArgumentNullException(nameof(metadata), "DeleteSnapshot requires SnapshotMetadata to be provided");
 
         /// <summary>
         /// Snapshot metadata.
diff --git a/src/core/Akka.Streams/Actors/ActorPublisher.cs b/src/core/Akka.Streams/Actors/ActorPublisher.cs
@@ -666,11 +666,8 @@ public sealed class ActorPublisherImpl<T> : IPublisher<T>
         /// <exception cref="ArgumentNullException">
         /// This exception is thrown when the specified <paramref name="ref"/> is undefined.
         /// </exception>
-        public ActorPublisherImpl(IActorRef @ref)
-        {
-            if(@ref == null) throw new ArgumentNullException(nameof(@ref), "ActorPublisherImpl requires IActorRef to be defined");
-            _ref = @ref;
-        }
+        public ActorPublisherImpl(IActorRef @ref) =>
+            _ref = @ref ?? throw new ArgumentNullException(nameof(@ref), "ActorPublisherImpl requires IActorRef to be defined");
 
         /// <summary>
         /// TBD
@@ -700,11 +697,8 @@ public sealed class ActorPublisherSubscription : ISubscription
         /// <exception cref="ArgumentNullException">
         /// This exception is thrown when the specified <paramref name="ref"/> is undefined.
         /// </exception>
-        public ActorPublisherSubscription(IActorRef @ref)
-        {
-            if (@ref == null) throw new ArgumentNullException(nameof(@ref), "ActorPublisherSubscription requires IActorRef to be defined");
-            _ref = @ref;
-        }
+        public ActorPublisherSubscription(IActorRef @ref) =>
+            _ref = @ref ?? throw new ArgumentNullException(nameof(@ref), "ActorPublisherSubscription requires IActorRef to be defined");
 
         /// <summary>
         /// TBD
diff --git a/src/core/Akka.Streams/Actors/ActorSubscriber.cs b/src/core/Akka.Streams/Actors/ActorSubscriber.cs
@@ -319,11 +319,8 @@ public sealed class ActorSubscriberImpl<T> : ISubscriber<T>
         /// <exception cref="ArgumentNullException">
         /// This exception is thrown when the specified <paramref name="impl"/> is undefined.
         /// </exception>
-        public ActorSubscriberImpl(IActorRef impl)
-        {
-            if (impl == null) throw new ArgumentNullException(nameof(impl), "ActorSubscriberImpl requires actor impl to be defined");
-            _impl = impl;
-        }
+        public ActorSubscriberImpl(IActorRef impl) =>
+            _impl = impl ?? throw new ArgumentNullException(nameof(impl), "ActorSubscriberImpl requires actor impl to be defined");
 
         /// <summary>
         /// TBD
diff --git a/src/core/Akka.Streams/FanInShape.cs b/src/core/Akka.Streams/FanInShape.cs
@@ -91,11 +91,8 @@ public sealed class InitPorts : IInit
             /// <param name="inlets">TBD</param>
             public InitPorts(Outlet<TOut> outlet, IEnumerable<Inlet> inlets)
             {
-                if (outlet == null) throw new ArgumentNullException(nameof(outlet));
-                if (inlets == null) throw new ArgumentNullException(nameof(inlets));
-
-                _outlet = outlet;
-                _inlets = inlets;
+                _outlet = outlet ?? throw new ArgumentNullException(nameof(outlet));
+                _inlets = inlets ?? throw new ArgumentNullException(nameof(inlets));
             }
 
             /// <summary>
diff --git a/src/core/Akka.Streams/FanOutShape.cs b/src/core/Akka.Streams/FanOutShape.cs
@@ -87,11 +87,8 @@ public sealed class InitPorts : IInit
             /// <exception cref="ArgumentNullException">TBD</exception>
             public InitPorts(Inlet<TIn> inlet, IEnumerable<Outlet> outlets)
             {
-                if (outlets == null) throw new ArgumentNullException(nameof(outlets));
-                if (inlet == null) throw new ArgumentNullException(nameof(inlet));
-
-                Inlet = inlet;
-                Outlets = outlets;
+                Inlet = inlet ?? throw new ArgumentNullException(nameof(inlet));
+                Outlets = outlets ?? throw new ArgumentNullException(nameof(outlets));
                 Name = "FanOut";
             }
 
diff --git a/src/core/Akka.Streams/Fusing.cs b/src/core/Akka.Streams/Fusing.cs
@@ -66,11 +66,8 @@ public sealed class FusedGraph<TShape, TMat> : IGraph<TShape, TMat> where TShape
             /// <exception cref="ArgumentException">TBD</exception>
             public FusedGraph(FusedModule module, TShape shape)
             {
-                if (module == null) throw new ArgumentNullException(nameof(module));
-                if (shape == null) throw new ArgumentNullException(nameof(shape));
-
-                Module = module;
-                Shape = shape;
+                Module = module ?? throw new ArgumentNullException(nameof(module));
+                Shape = shape ?? throw new ArgumentNullException(nameof(shape));
             }
 
             /// <summary>
diff --git a/src/core/Akka.Streams/Stage/Stage.cs b/src/core/Akka.Streams/Stage/Stage.cs
@@ -275,12 +275,8 @@ protected StatefulStage(StageState<TIn, TOut> current)
         /// <exception cref="ArgumentNullException">
         /// This exception is thrown when the specified <paramref name="state"/> is undefined.
         /// </exception>
-        public void Become(StageState<TIn, TOut> state)
-        {
-            if (state == null)
-                throw new ArgumentNullException(nameof(state));
-            _current = state;
-        }
+        public void Become(StageState<TIn, TOut> state) =>
+            _current = state ?? throw new ArgumentNullException(nameof(state));
 
         /// <summary>
         /// Invokes current state.
diff --git a/src/core/Akka/Routing/ResizablePoolCell.cs b/src/core/Akka/Routing/ResizablePoolCell.cs
@@ -23,10 +23,12 @@ namespace Akka.Routing
     internal class ResizablePoolCell : RoutedActorCell
     {
         private Resizer resizer;
+
         /// <summary>
         /// must always use ResizeInProgressState static class to compare or assign values
         /// </summary>
         private AtomicBoolean _resizeInProgress;
+
         private AtomicCounterLong _resizeCounter;
         private Pool _pool;
 
@@ -53,9 +55,7 @@ public ResizablePoolCell(
             Pool pool)
             : base(system, self, routerProps, dispatcher, routeeProps, supervisor)
         {
-            if (pool.Resizer == null) throw new ArgumentException("RouterConfig must be a Pool with defined resizer", nameof(pool));
-
-            resizer = pool.Resizer;
+            resizer = pool.Resizer ?? throw new ArgumentException("RouterConfig must be a Pool with defined resizer", nameof(pool));
             _pool = pool;
             _resizeCounter = new AtomicCounterLong(0);
             _resizeInProgress = new AtomicBoolean();
@@ -79,7 +79,7 @@ protected override void PreSuperStart()
         /// <param name="envelope">TBD</param>
         public override void SendMessage(Envelope envelope)
         {
-            if(!(RouterConfig.IsManagementMessage(envelope.Message)) &&
+            if (!(RouterConfig.IsManagementMessage(envelope.Message)) &&
                 resizer.IsTimeForResize(_resizeCounter.GetAndIncrement()) &&
                 _resizeInProgress.CompareAndSet(false, true))
             {
@@ -123,4 +123,4 @@ internal void Resize(bool initial)
             }
         }
     }
-}
+}
diff --git a/src/core/Akka/Serialization/NewtonSoftJsonSerializer.cs b/src/core/Akka/Serialization/NewtonSoftJsonSerializer.cs
@@ -126,12 +126,9 @@ private static IEnumerable<Type> GetConverterTypes(Config config)
         /// <param name="stringBuilderMaxSize">Max retained size used for pooled string builders if enabled</param>
         public NewtonSoftJsonSerializerSettings(bool encodeTypeNames, bool preserveObjectReferences, IEnumerable<Type> converters, bool usePooledStringBuilder, int stringBuilderMinSize, int stringBuilderMaxSize)
         {
-            if (converters == null)
-                throw new ArgumentNullException(nameof(converters), $"{nameof(NewtonSoftJsonSerializerSettings)} requires a sequence of converters.");
-
             EncodeTypeNames = encodeTypeNames;
             PreserveObjectReferences = preserveObjectReferences;
-            Converters = converters;
+            Converters = converters ?? throw new ArgumentNullException(nameof(converters), $"{nameof(NewtonSoftJsonSerializerSettings)} requires a sequence of converters.");
             UsePooledStringBuilder = usePooledStringBuilder;
             StringBuilderMinSize = stringBuilderMinSize;
             StringBuilderMaxSize = stringBuilderMaxSize;
diff --git a/src/core/Akka/Util/Internal/Collections/ListSlice.cs b/src/core/Akka/Util/Internal/Collections/ListSlice.cs
@@ -81,33 +81,26 @@ public T Current
 
             public void Dispose()
             {
-                
             }
         }
-        
+
         private readonly IReadOnlyList<T> _array;
 
         public ListSlice(IReadOnlyList<T> array)
         {
-           
-            if (array == null)
-                throw new ArgumentNullException(nameof(array));
-
-            _array = array;
+            _array = array ?? throw new ArgumentNullException(nameof(array));
             Offset = 0;
             Count = array.Count;
         }
-        
+
         public ListSlice(IReadOnlyList<T> array, int offset, int count)
         {
-            if (array == null)
-                throw new ArgumentNullException(nameof(array));
             if (offset < 0)
                 throw new ArgumentOutOfRangeException(nameof(offset), "Cannot be below zero.");
             if (count < 0)
                 throw new ArgumentOutOfRangeException(nameof(count), "Cannot be below zero.");
-            
-            _array = array;
+
+            _array = array ?? throw new ArgumentNullException(nameof(array));
             Offset = offset;
             Count = count;
         }
diff --git a/src/core/Akka/Util/MatchHandler/MatchBuilder.cs b/src/core/Akka/Util/MatchHandler/MatchBuilder.cs
diff --git a/src/core/Akka/Util/MatchHandler/TypeHandler.cs b/src/core/Akka/Util/MatchHandler/TypeHandler.cs

Original file line number	Diff line number	Diff line change
`@@ -488,9 +488,7 @@ internal sealed class PutDeltaOperation : AtomicDeltaOperation, ORDictionary.IPu`
`488`	`488`
`489`	`489`	`public PutDeltaOperation(ORSet<TKey>.IDeltaOperation underlying, TKey key, TValue value)`
`490`	`490`	`{`
`491`		`- if (underlying == null) throw new ArgumentNullException(nameof(underlying));`
`492`		`-`
`493`		`- Underlying = underlying;`
	`491`	`+ Underlying = underlying ?? throw new ArgumentNullException(nameof(underlying));`
`494`	`492`	`Key = key;`
`495`	`493`	`Value = value;`
`496`	`494`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,10 +257,8 @@ public static Actor.Props Props(TimeSpan stableAfter, ISplitBrainStrategy strate`
`257`	`257`
`258`	`258`	`public SplitBrainDecider(TimeSpan stableAfter, ISplitBrainStrategy strategy, Cluster cluster)`
`259`	`259`	`{`
`260`		`- if (strategy == null) throw new ArgumentNullException(nameof(strategy));`
`261`		`-`
`262`	`260`	`_stabilityTimeout = stableAfter;`
`263`		`- _strategy = strategy;`
	`261`	`+ _strategy = strategy ?? throw new ArgumentNullException(nameof(strategy));`
`264`	`262`	`_cluster = cluster;`
`265`	`263`	`}`
`266`	`264`