use some compound statements (#6814)

akkadotnet · Jun 27, 2023 · b5ac7ef · b5ac7ef
1 parent abae81c
commit b5ac7ef
Show file tree

Hide file tree

Showing 31 changed files with 41 additions and 45 deletions.
diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/MultiNodeClusterShardingSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/MultiNodeClusterShardingSpec.cs
@@ -84,7 +84,7 @@ public PingPongActor()
             }
 
             private ILoggingAdapter _log;
-            private ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+            private ILoggingAdapter Log => _log ??= Context.GetLogger();
 
             protected override bool Receive(object message)
             {

diff --git a/...contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/RollingUpdateShardAllocationSpec.cs b/...contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/RollingUpdateShardAllocationSpec.cs
@@ -91,7 +91,7 @@ public Home(Address address)
             };
 
             private ILoggingAdapter _log;
-            private ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+            private ILoggingAdapter Log => _log ??= Context.GetLogger();
 
             private Address SelfAddress => Cluster.Get(Context.System).SelfAddress;
 

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ShardCoordinator.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ShardCoordinator.cs
@@ -1488,7 +1488,7 @@ public static Props Props(
             private readonly bool _isRebalance;
             private ILoggingAdapter _log;
 
-            private ILoggingAdapter Log { get { return _log ?? (_log = Context.GetLogger()); } }
+            private ILoggingAdapter Log { get { return _log ??= Context.GetLogger(); } }
 
             public ITimerScheduler Timers { get; set; }
 

diff --git a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedPubSubMediator.cs b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/DistributedPubSubMediator.cs
@@ -126,7 +126,7 @@ public static Props Props(DistributedPubSubSettings settings)
         /// <summary>
         /// TBD
         /// </summary>
-        public ILoggingAdapter Log { get { return _log ?? (_log = Context.GetLogger()); } }
+        public ILoggingAdapter Log { get { return _log ??= Context.GetLogger(); } }
 
         /// <summary>
         /// TBD

diff --git a/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/TopicMessages.cs b/src/contrib/cluster/Akka.Cluster.Tools/PublishSubscribe/Internal/TopicMessages.cs
@@ -159,7 +159,7 @@ public ValueHolder(long version, IActorRef @ref)
         /// <summary>
         /// TBD
         /// </summary>
-        public Routee Routee { get { return _routee ?? (_routee = Ref != null ? new ActorRefRoutee(Ref) : null); } }
+        public Routee Routee { get { return _routee ??= Ref != null ? new ActorRefRoutee(Ref) : null; } }
 
         /// <inheritdoc/>
         public bool Equals(ValueHolder other)

diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Singleton/ClusterSingletonManager.cs b/src/contrib/cluster/Akka.Cluster.Tools/Singleton/ClusterSingletonManager.cs
@@ -707,7 +707,7 @@ private void SetupCoordinatedShutdown()
             });
         }
 
-        private ILoggingAdapter Log { get { return _log ?? (_log = Context.GetLogger()); } }
+        private ILoggingAdapter Log { get { return _log ??= Context.GetLogger(); } }
 
         /// <inheritdoc cref="ActorBase.PreStart"/>
         protected override void PreStart()

diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Singleton/ClusterSingletonProxy.cs b/src/contrib/cluster/Akka.Cluster.Tools/Singleton/ClusterSingletonProxy.cs
@@ -162,7 +162,7 @@ public ClusterSingletonProxy(string singletonManagerPath, ClusterSingletonProxyS
                 });
         }
 
-        private ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        private ILoggingAdapter Log => _log ??= Context.GetLogger();
 
         /// <summary>
         /// TBD

diff --git a/src/contrib/cluster/Akka.DistributedData/ReadWriteAggregator.cs b/src/contrib/cluster/Akka.DistributedData/ReadWriteAggregator.cs
@@ -36,7 +36,7 @@ private SendToSecondary() { }
 
         private ILoggingAdapter _log;
 
-        protected ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        protected ILoggingAdapter Log => _log ??= Context.GetLogger();
 
         protected abstract int DoneWhenRemainingSize { get; }
 

diff --git a/src/contrib/persistence/Akka.Persistence.Query.InMemory/AllEventsPublisher.cs b/src/contrib/persistence/Akka.Persistence.Query.InMemory/AllEventsPublisher.cs
@@ -44,7 +44,7 @@ protected AbstractAllEventsPublisher(int fromOffset, int maxBufferSize, string w
             JournalRef = Persistence.Instance.Apply(Context.System).JournalFor(writeJournalPluginId);
         }
 
-        protected ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        protected ILoggingAdapter Log => _log ??= Context.GetLogger();
         protected IActorRef JournalRef { get; }
         protected DeliveryBuffer<EventEnvelope> Buffer { get; }
         protected int FromOffset { get; }

diff --git a/src/contrib/persistence/Akka.Persistence.Query.InMemory/EventsByPersistenceIdPublisher.cs b/src/contrib/persistence/Akka.Persistence.Query.InMemory/EventsByPersistenceIdPublisher.cs
@@ -52,7 +52,7 @@ protected AbstractEventsByPersistenceIdPublisher(string persistenceId, long from
             JournalRef = Persistence.Instance.Apply(Context.System).JournalFor(writeJournalPluginId);
         }
 
-        protected ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        protected ILoggingAdapter Log => _log ??= Context.GetLogger();
         protected string PersistenceId { get; }
         protected long FromSequenceNr { get; }
         protected long ToSequenceNr { get; set; }

diff --git a/src/contrib/persistence/Akka.Persistence.Query.InMemory/EventsByTagPublisher.cs b/src/contrib/persistence/Akka.Persistence.Query.InMemory/EventsByTagPublisher.cs
@@ -51,7 +51,7 @@ protected AbstractEventsByTagPublisher(string tag, int fromOffset, int maxBuffer
             JournalRef = Persistence.Instance.Apply(Context.System).JournalFor(writeJournalPluginId);
         }
 
-        protected ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        protected ILoggingAdapter Log => _log ??= Context.GetLogger();
         protected string Tag { get; }
         protected int FromOffset { get; }
         protected abstract int ToOffset { get; }

diff --git a/src/core/Akka.Cluster/SBR/SplitBrainResolver.cs b/src/core/Akka.Cluster/SBR/SplitBrainResolver.cs
@@ -99,7 +99,7 @@ protected SplitBrainResolverBase(TimeSpan stableAfter, DowningStrategy strategy)
 
         public DowningStrategy Strategy { get; }
 
-        public ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        public ILoggingAdapter Log => _log ??= Context.GetLogger();
 
         public abstract UniqueAddress SelfUniqueAddress { get; }
 

diff --git a/src/core/Akka.Cluster/SplitBrainResolver.cs b/src/core/Akka.Cluster/SplitBrainResolver.cs
@@ -264,7 +264,7 @@ public SplitBrainDecider(TimeSpan stableAfter, ISplitBrainStrategy strategy, Clu
             _cluster = cluster;
         }
 
-        public ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        public ILoggingAdapter Log => _log ??= Context.GetLogger();
 
         protected override void PreStart()
         {

diff --git a/src/core/Akka.Coordination/LeaseProvider.cs b/src/core/Akka.Coordination/LeaseProvider.cs
@@ -87,7 +87,7 @@ public static LeaseProvider Get(ActorSystem system)
 
         private ILoggingAdapter _log;
 
-        private ILoggingAdapter Log { get { return _log ?? (_log = Logging.GetLogger(_system, "LeaseProvider")); } }
+        private ILoggingAdapter Log { get { return _log ??= Logging.GetLogger(_system, "LeaseProvider"); } }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LeaseProvider"/> class.

diff --git a/src/core/Akka.Persistence.Query/PersistenceQuery.cs b/src/core/Akka.Persistence.Query/PersistenceQuery.cs
@@ -25,7 +25,7 @@ public static PersistenceQuery Get(ActorSystem system)
             return system.WithExtension<PersistenceQuery, PersistenceQueryProvider>();
         }
 
-        public ILoggingAdapter Log => _log ?? (_log = _system.Log);
+        public ILoggingAdapter Log => _log ??= _system.Log;
 
         public PersistenceQuery(ExtendedActorSystem system)
         {

diff --git a/src/core/Akka.Persistence.Tests/AtLeastOnceDeliveryCrashSpec.cs b/src/core/Akka.Persistence.Tests/AtLeastOnceDeliveryCrashSpec.cs
@@ -74,7 +74,7 @@ internal class CrashingActor : AtLeastOnceDeliveryActor
             private readonly IActorRef _testProbe;
             private ILoggingAdapter _adapter;
 
-            ILoggingAdapter Log { get { return _adapter ?? (_adapter = Context.GetLogger()); } }
+            ILoggingAdapter Log { get { return _adapter ??= Context.GetLogger(); } }
 
             public CrashingActor(IActorRef testProbe)
             {

diff --git a/src/core/Akka.Persistence.Tests/AtLeastOnceDeliveryFailureSpec.cs b/src/core/Akka.Persistence.Tests/AtLeastOnceDeliveryFailureSpec.cs
@@ -134,7 +134,7 @@ internal class ChaosSender : AtLeastOnceDeliveryActor
             private readonly double _replayProcessingFailureRate;
             private ILoggingAdapter _log;
 
-            public ILoggingAdapter Log { get { return _log ?? (_log = Context.GetLogger()); }}
+            public ILoggingAdapter Log { get { return _log ??= Context.GetLogger(); }}
 
             public ChaosSender(IActorRef destination, IActorRef probe) 
                 : base(x => x.WithRedeliverInterval(TimeSpan.FromMilliseconds(500)))
@@ -242,7 +242,7 @@ internal class ChaosDestination : ReceiveActor, IChaosSupport
             private readonly double _confirmFailureRate;
             private ILoggingAdapter _log;
 
-            public ILoggingAdapter Log { get { return _log ?? (_log = Context.GetLogger()); } }
+            public ILoggingAdapter Log { get { return _log ??= Context.GetLogger(); } }
 
             public ChaosDestination(IActorRef probe)
             {

diff --git a/src/core/Akka.Persistence/Fsm/PersistentFSMBase.cs b/src/core/Akka.Persistence/Fsm/PersistentFSMBase.cs
@@ -398,7 +398,7 @@ private StateFunction HandleEventDefault
 
         private StateFunction HandleEvent
         {
-            get { return _handleEvent ?? (_handleEvent = HandleEventDefault); }
+            get { return _handleEvent ??= HandleEventDefault; }
             set { _handleEvent = value; }
         }
 

diff --git a/src/core/Akka.Remote/Transport/AkkaProtocolTransport.cs b/src/core/Akka.Remote/Transport/AkkaProtocolTransport.cs
@@ -140,10 +140,8 @@ protected override Props ManagerProps
         {
             get
             {
-                return _managerProps ??
-                       (_managerProps =
-                           Props.Create(() => new AkkaProtocolManager(WrappedTransport, Settings))
-                               .WithDeploy(Deploy.Local));
+                return _managerProps ??= Props.Create(() => new AkkaProtocolManager(WrappedTransport, Settings))
+                    .WithDeploy(Deploy.Local);
             }
         }
 

diff --git a/src/core/Akka.Streams/Implementation/ActorProcessor.cs b/src/core/Akka.Streams/Implementation/ActorProcessor.cs
@@ -619,7 +619,7 @@ protected ActorProcessorImpl(ActorMaterializerSettings settings)
         /// <summary>
         /// TBD
         /// </summary>
-        protected ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        protected ILoggingAdapter Log => _log ??= Context.GetLogger();
 
         /// <summary>
         /// TBD

diff --git a/src/core/Akka.Streams/Implementation/ActorRefSourceActor.cs b/src/core/Akka.Streams/Implementation/ActorRefSourceActor.cs
@@ -68,7 +68,7 @@ public ActorRefSourceActor(int bufferSize, OverflowStrategy overflowStrategy, in
         /// <summary>
         /// TBD
         /// </summary>
-        protected ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        protected ILoggingAdapter Log => _log ??= Context.GetLogger();
 
         /// <summary>
         /// TBD

diff --git a/src/core/Akka.Streams/Implementation/FanIn.cs b/src/core/Akka.Streams/Implementation/FanIn.cs
@@ -666,7 +666,7 @@ protected FanIn(ActorMaterializerSettings settings, int inputCount)
         /// <summary>
         /// TBD
         /// </summary>
-        protected ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        protected ILoggingAdapter Log => _log ??= Context.GetLogger();
         private ILoggingAdapter _log;
 
         /// <summary>

diff --git a/src/core/Akka.Streams/Implementation/FanOut.cs b/src/core/Akka.Streams/Implementation/FanOut.cs
@@ -590,7 +590,7 @@ protected FanOut(ActorMaterializerSettings settings, int outputCount)
         /// <summary>
         /// TBD
         /// </summary>
-        protected ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        protected ILoggingAdapter Log => _log ??= Context.GetLogger();
         private ILoggingAdapter _log;
 
         /// <summary>

diff --git a/src/core/Akka.Streams/Implementation/Fusing/ActorGraphInterpreter.cs b/src/core/Akka.Streams/Implementation/Fusing/ActorGraphInterpreter.cs
@@ -185,11 +185,11 @@ public GraphInterpreterShell(GraphAssembly assembly, Connection[] connections, G
         /// <summary>
         /// TBD
         /// </summary>
-        public ILoggingAdapter Log => _log ?? (_log = GetLogger());
+        public ILoggingAdapter Log => _log ??= GetLogger();
         /// <summary>
         /// TBD
         /// </summary>
-        public GraphInterpreter Interpreter => _interpreter ?? (_interpreter = GetInterpreter());
+        public GraphInterpreter Interpreter => _interpreter ??= GetInterpreter();
 
         /// <summary>
         /// TBD
@@ -1358,7 +1358,7 @@ public ActorGraphInterpreter(GraphInterpreterShell shell)
         /// <summary>
         /// TBD
         /// </summary>
-        public ILoggingAdapter Log => _log ?? (_log = Context.GetLogger());
+        public ILoggingAdapter Log => _log ??= Context.GetLogger();
 
         private void EnqueueToShortCircuit(object input)
         {

diff --git a/src/core/Akka.Streams/Implementation/Fusing/GraphInterpreter.cs b/src/core/Akka.Streams/Implementation/Fusing/GraphInterpreter.cs
@@ -505,7 +505,7 @@ private string QueueStatus()
         /// <summary>
         /// TBD
         /// </summary>
-        internal string Name => _name ?? (_name = GetHashCode().ToString("x"));
+        internal string Name => _name ??= GetHashCode().ToString("x");
 
         /// <summary>
         /// Assign the boundary logic to a given connection. This will serve as the interface to the external world

diff --git a/src/core/Akka.Streams/Implementation/StreamRef/SinkRefImpl.cs b/src/core/Akka.Streams/Implementation/StreamRef/SinkRefImpl.cs
@@ -78,11 +78,10 @@ private sealed class Logic : TimerGraphStageLogic, IInHandler
             private StreamRefAttributes.SubscriptionTimeout _subscriptionTimeout;
             private string _stageActorName;
 
-            private StreamRefsMaster StreamRefsMaster => _streamRefsMaster ?? (_streamRefsMaster = StreamRefsMaster.Get(ActorMaterializerHelper.Downcast(Materializer).System));
-            private StreamRefSettings Settings => _settings ?? (_settings = ActorMaterializerHelper.Downcast(Materializer).Settings.StreamRefSettings);
-            private StreamRefAttributes.SubscriptionTimeout SubscriptionTimeout => _subscriptionTimeout ?? (_subscriptionTimeout =
-                                                                                       _inheritedAttributes.GetAttribute(new StreamRefAttributes.SubscriptionTimeout(Settings.SubscriptionTimeout)));
-            protected override string StageActorName => _stageActorName ?? (_stageActorName = StreamRefsMaster.NextSinkRefName());
+            private StreamRefsMaster StreamRefsMaster => _streamRefsMaster ??= StreamRefsMaster.Get(ActorMaterializerHelper.Downcast(Materializer).System);
+            private StreamRefSettings Settings => _settings ??= ActorMaterializerHelper.Downcast(Materializer).Settings.StreamRefSettings;
+            private StreamRefAttributes.SubscriptionTimeout SubscriptionTimeout => _subscriptionTimeout ??= _inheritedAttributes.GetAttribute(new StreamRefAttributes.SubscriptionTimeout(Settings.SubscriptionTimeout));
+            protected override string StageActorName => _stageActorName ??= StreamRefsMaster.NextSinkRefName();
 
             private StageActor _stageActor;
 

diff --git a/src/core/Akka.Streams/Implementation/StreamRef/SourceRefImpl.cs b/src/core/Akka.Streams/Implementation/StreamRef/SourceRefImpl.cs
@@ -88,11 +88,10 @@ private sealed class Logic : TimerGraphStageLogic, IOutHandler
             private StageActor _stageActor;
             private IActorRef _partnerRef = null;
 
-            private StreamRefsMaster StreamRefsMaster => _streamRefsMaster ?? (_streamRefsMaster = StreamRefsMaster.Get(ActorMaterializerHelper.Downcast(Materializer).System));
-            private StreamRefSettings Settings => _settings ?? (_settings = ActorMaterializerHelper.Downcast(Materializer).Settings.StreamRefSettings);
-            private StreamRefAttributes.SubscriptionTimeout SubscriptionTimeout => _subscriptionTimeout ?? (_subscriptionTimeout =
-                                                                                       _inheritedAttributes.GetAttribute(new StreamRefAttributes.SubscriptionTimeout(Settings.SubscriptionTimeout)));
-            protected override string StageActorName => _stageActorName ?? (_stageActorName = StreamRefsMaster.NextSourceRefName());
+            private StreamRefsMaster StreamRefsMaster => _streamRefsMaster ??= StreamRefsMaster.Get(ActorMaterializerHelper.Downcast(Materializer).System);
+            private StreamRefSettings Settings => _settings ??= ActorMaterializerHelper.Downcast(Materializer).Settings.StreamRefSettings;
+            private StreamRefAttributes.SubscriptionTimeout SubscriptionTimeout => _subscriptionTimeout ??= _inheritedAttributes.GetAttribute(new StreamRefAttributes.SubscriptionTimeout(Settings.SubscriptionTimeout));
+            protected override string StageActorName => _stageActorName ??= StreamRefsMaster.NextSourceRefName();
 
             public IActorRef Self => _stageActor.Ref;
             public IActorRef PartnerRef

diff --git a/src/core/Akka/Actor/ActorBase.SupervisorStrategy.cs b/src/core/Akka/Actor/ActorBase.SupervisorStrategy.cs
@@ -18,7 +18,7 @@ public abstract partial class ActorBase
         /// </summary>
         internal SupervisorStrategy SupervisorStrategyInternal
         {
-            get { return _supervisorStrategy ?? (_supervisorStrategy = SupervisorStrategy()); }
+            get { return _supervisorStrategy ??= SupervisorStrategy(); }
             set { _supervisorStrategy = value; }
         }
 

diff --git a/src/core/Akka/Actor/FSM.cs b/src/core/Akka/Actor/FSM.cs
@@ -1064,7 +1064,7 @@ private StateFunction HandleEventDefault
 
         private StateFunction HandleEvent
         {
-            get { return _handleEvent ?? (_handleEvent = HandleEventDefault); }
+            get { return _handleEvent ??= HandleEventDefault; }
             set { _handleEvent = value; }
         }
 

diff --git a/src/core/Akka/Configuration/Hocon/AkkaConfigurationSection.cs b/src/core/Akka/Configuration/Hocon/AkkaConfigurationSection.cs
@@ -36,7 +36,7 @@ public class AkkaConfigurationSection : ConfigurationSection
         /// </summary>
         public Config AkkaConfig
         {
-            get { return _akkaConfig ?? (_akkaConfig = ConfigurationFactory.ParseString(Hocon.Content)); }
+            get { return _akkaConfig ??= ConfigurationFactory.ParseString(Hocon.Content); }
         }
 
         /// <summary>

diff --git a/src/core/Akka/Routing/ConsistentHash.cs b/src/core/Akka/Routing/ConsistentHash.cs
@@ -50,7 +50,7 @@ public ConsistentHash(SortedDictionary<int, T> nodes, int virtualNodesFactor)
         private (int[], T[])? _ring = null;
         private (int[], T[])? RingTuple
         {
-            get { return _ring ?? (_ring = (_nodes.Keys.ToArray(), _nodes.Values.ToArray())); }
+            get { return _ring ??= (_nodes.Keys.ToArray(), _nodes.Values.ToArray()); }
             }
 
         private int[] NodeHashRing