leverage exception when (#7614)

SimonCropp · Aaronontheweb · Arkatufus · web-flow · commit 2d2929974295 · 2025-05-12T14:52:19.000-05:00
* leverage exception when

* Post-merge fix

---------

Co-authored-by: Aaron Stannard &lt;aaron@petabridge.com&gt;
Co-authored-by: Gregorius Soedharmo &lt;arkatufus@yahoo.com&gt;
diff --git a/src/contrib/testkits/Akka.TestKit.Xunit/Internals/Loggers.cs b/src/contrib/testkits/Akka.TestKit.Xunit/Internals/Loggers.cs
@@ -46,17 +46,13 @@ private void HandleLogEvent(LogEvent e)
             _output.WriteLine(e.ToString());
         }
         catch (FormatException ex)
+            when (e.Message is LogMessage msg)
         {
-            if (e.Message is LogMessage msg)
-            {
-                var message =
-                    $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";
-                if (e.Cause != null)
-                    throw new AggregateException(message, ex, e.Cause);
-                throw new FormatException(message, ex);
-            }
-
-            throw;
+            var message =
+                $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";
+            if (e.Cause != null)
+                throw new AggregateException(message, ex, e.Cause);
+            throw new FormatException(message, ex);
         }
         catch (InvalidOperationException ie)
         {
diff --git a/src/contrib/testkits/Akka.TestKit.Xunit2/Internals/Loggers.cs b/src/contrib/testkits/Akka.TestKit.Xunit2/Internals/Loggers.cs
@@ -46,17 +46,13 @@ private void HandleLogEvent(LogEvent e)
                 _output.WriteLine(e.ToString());
             }
             catch (FormatException ex)
+                when (e.Message is LogMessage msg)
             {
-                if (e.Message is LogMessage msg)
-                {
-                    var message =
-                        $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";
-                    if (e.Cause != null)
-                        throw new AggregateException(message, ex, e.Cause);
-                    throw new FormatException(message, ex);
-                }
-
-                throw;
+                var message =
+                    $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";
+                if (e.Cause != null)
+                    throw new AggregateException(message, ex, e.Cause);
+                throw new FormatException(message, ex);
             }
             catch (InvalidOperationException ie)
             {
diff --git a/src/core/Akka.Discovery/Discovery.cs b/src/core/Akka.Discovery/Discovery.cs
@@ -79,17 +79,16 @@ private ServiceDiscovery CreateServiceDiscovery(string method)
                 return Create(className);
             }
             catch (Exception ex)
+                when (ex is TypeLoadException or MissingMethodException)
             {
-                if (ex is TypeLoadException or MissingMethodException)
-                    throw new ArgumentException(
-                        message: $"Illegal akka.discovery.{method}.class value or incompatible class!\n" +
-                                 "The implementation class MUST extend Akka.Discovery.ServiceDiscovery with:\n" +
-                                 "  * parameterless constructor, " +
-                                 $"  * constructor with a single {nameof(ExtendedActorSystem)} parameter, or\n" +
-                                 $"  * constructor with {nameof(ExtendedActorSystem)} and {nameof(Configuration.Config)} parameters.",
-                        paramName: nameof(method), 
-                        innerException: ex);
-                throw;
+                throw new ArgumentException(
+                    message: $"Illegal akka.discovery.{method}.class value or incompatible class!\n" +
+                             "The implementation class MUST extend Akka.Discovery.ServiceDiscovery with:\n" +
+                             "  * parameterless constructor, " +
+                             $"  * constructor with a single {nameof(ExtendedActorSystem)} parameter, or\n" +
+                             $"  * constructor with {nameof(ExtendedActorSystem)} and {nameof(Configuration.Config)} parameters.",
+                    paramName: nameof(method),
+                    innerException: ex);
             }
 
             ServiceDiscovery Create(string typeName)
diff --git a/src/core/Akka.Persistence/Journal/ReplayFilter.cs b/src/core/Akka.Persistence/Journal/ReplayFilter.cs
@@ -233,18 +233,18 @@ protected override bool Receive(object message)
                                         throw new ArgumentException("Mode must not be Disabled");
                                 }
                             }
+
                             node = next;
                         }
+
                         _buffer.AddLast(value);
                     }
 
                 }
                 catch (IllegalStateException ex)
+                    when (Mode == ReplayFilterMode.Fail)
                 {
-                    if (Mode == ReplayFilterMode.Fail)
-                        Fail(ex);
-                    else
-                        throw;
+                    Fail(ex);
                 }
             }
             else if (message is RecoverySuccess or ReplayMessagesFailure)
diff --git a/src/core/Akka.Remote.Tests/Transport/DotNettyTransportDnsResolutionSpec.cs b/src/core/Akka.Remote.Tests/Transport/DotNettyTransportDnsResolutionSpec.cs
@@ -155,13 +155,11 @@ public Property HeliosTransport_Should_Resolve_DNS(EndPoint inbound, EndPoint ou
                           useIpv6Dns: dnsIpv6,
                           enforceIpFamily: enforceIpFamily);
                 }
-                catch
+                catch when (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsIpv6))
                 {
                     //if ip family is enforced, there are some special cases when it is normal to unable 
                     //to create actor system
-                    if (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsIpv6))
-                        return true.ToProperty();
-                    throw;
+                    return true.ToProperty();
                 }
 
                 var outboundReceivedAck = true;
@@ -246,14 +244,13 @@ public Property HeliosTransport_Should_Resolve_DNS_with_PublicHostname(IPEndPoin
                           dnsUseIpv6,
                           enforceIpFamily);
                 }
-                catch
+                catch when (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsUseIpv6))
                 {
                     //if ip family is enforced, there are some special cases when it is normal to unable 
                     //to create actor system
-                    if (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsUseIpv6))
-                        return true.ToProperty();
-                    throw;
+                    return true.ToProperty();
                 }
+
                 var outboundReceivedAck = true;
                 var inboundReceivedAck = true;
                 _outbound.ActorSelection(_inboundAck).Tell("ping", _outboundProbe.Ref);
diff --git a/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransportSettings.cs b/src/core/Akka.Remote/Transport/DotNetty/DotNettyTransportSettings.cs
@@ -257,11 +257,10 @@ public static SslSettings CreateOrDefault(Config config, SslSettings? @default =
             {
                 return Create(config);
             }
-            catch(Exception)
+            catch (Exception)
+                when (@default != null)
             {
-                if (@default != null)
-                    return @default;
-                throw;
+                return @default;
             }
         }
 
diff --git a/src/core/Akka.Streams/Implementation/ActorPublisher.cs b/src/core/Akka.Streams/Implementation/ActorPublisher.cs
@@ -267,9 +267,8 @@ private void ReportSubscribeFailure(ISubscriber<TOut> subscriber)
                 }
             }
             catch (Exception exception)
+                when (exception is ISpecViolation)
             {
-                if (!(exception is ISpecViolation))
-                    throw;
             }
         }
     }
diff --git a/src/core/Akka.Streams/Implementation/CompletedPublishers.cs b/src/core/Akka.Streams/Implementation/CompletedPublishers.cs
@@ -38,9 +38,8 @@ public void Subscribe(ISubscriber<T> subscriber)
                 ReactiveStreamsCompliance.TryOnComplete(subscriber);
             }
             catch (Exception e)
+                when (e is ISpecViolation)
             {
-                if (!(e is ISpecViolation))
-                    throw;
             }
         }
 
@@ -91,9 +90,8 @@ public void Subscribe(ISubscriber<T> subscriber)
                 ReactiveStreamsCompliance.TryOnError(subscriber, Cause);
             }
             catch (Exception e)
+                when (e is ISpecViolation)
             {
-                if (!(e is ISpecViolation))
-                    throw;
             }
         }
 
@@ -270,9 +268,8 @@ public void Subscribe(ISubscriber<T> subscriber)
                 ReactiveStreamsCompliance.RejectAdditionalSubscriber(subscriber, "Publisher");
             }
             catch (Exception e)
+                when (e is ISpecViolation)
             {
-                if (!(e is ISpecViolation))
-                    throw;
             }
         }
 
diff --git a/src/core/Akka.Streams/Implementation/SubscriberManagement.cs b/src/core/Akka.Streams/Implementation/SubscriberManagement.cs
@@ -265,14 +265,10 @@ private long DispatchFromBufferAndReturnRemainingRequested(long requested, ISubs
                         goOn = true;
                     }
                     catch (Exception e)
+                        when (e is ISpecViolation)
                     {
-                        if (e is ISpecViolation)
-                        {
-                            UnregisterSubscriptionInternal(subscription);
-                            goOn = false;
-                        }
-                        else
-                            throw;
+                        UnregisterSubscriptionInternal(subscription);
+                        goOn = false;
                     }
 
                     if (!goOn)
diff --git a/src/core/Akka.TestKit/Internal/InternalTestActor.cs b/src/core/Akka.TestKit/Internal/InternalTestActor.cs
@@ -45,12 +45,10 @@ protected override void OnReceive(object message)
                 System.Diagnostics.Debug.WriteLine("TestActor received " + message);
             }
             catch (FormatException)
+                when (message is LogEvent { Message: LogMessage msg })
             {
-                if (message is LogEvent { Message: LogMessage msg })
-                    System.Diagnostics.Debug.WriteLine(
-                        $"TestActor received a malformed formatted message. Template:[{msg.Format}], args:[{string.Join(",", msg.Unformatted())}]");
-                else
-                    throw;
+                System.Diagnostics.Debug.WriteLine(
+                    $"TestActor received a malformed formatted message. Template:[{msg.Format}], args:[{string.Join(",", msg.Unformatted())}]");
             }
 
             switch (message)
diff --git a/src/core/Akka/Dispatch/Mailboxes.cs b/src/core/Akka/Dispatch/Mailboxes.cs
@@ -315,10 +315,9 @@ MailboxType VerifyRequirements(MailboxType mailboxType)
                     return VerifyRequirements(LookupByQueueType(actorRequirement.Value));
                 }
                 catch (Exception)
+                    when (hasMailboxRequirement)
                 {
-                    if (hasMailboxRequirement)
-                        return VerifyRequirements(LookupByQueueType(mailboxRequirement));
-                    throw;
+                    return VerifyRequirements(LookupByQueueType(mailboxRequirement));
                 }
             }
             if (hasMailboxRequirement)

Original file line number	Diff line number	Diff line change
`@@ -46,17 +46,13 @@ private void HandleLogEvent(LogEvent e)`
`46`	`46`	`_output.WriteLine(e.ToString());`
`47`	`47`	`}`
`48`	`48`	`catch (FormatException ex)`
	`49`	`+ when (e.Message is LogMessage msg)`
`49`	`50`	`{`
`50`		`- if (e.Message is LogMessage msg)`
`51`		`- {`
`52`		`- var message =`
`53`		`- $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";`
`54`		`- if (e.Cause != null)`
`55`		`- throw new AggregateException(message, ex, e.Cause);`
`56`		`- throw new FormatException(message, ex);`
`57`		`- }`
`58`		`-`
`59`		`- throw;`
	`51`	`+ var message =`
	`52`	`+ $"Received a malformed formatted message. Log level: [{e.LogLevel()}], Template: [{msg.Format}], args: [{string.Join(",", msg.Unformatted())}]";`
	`53`	`+ if (e.Cause != null)`
	`54`	`+ throw new AggregateException(message, ex, e.Cause);`
	`55`	`+ throw new FormatException(message, ex);`
`60`	`56`	`}`
`61`	`57`	`catch (InvalidOperationException ie)`
`62`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -233,18 +233,18 @@ protected override bool Receive(object message)`
`233`	`233`	`throw new ArgumentException("Mode must not be Disabled");`
`234`	`234`	`}`
`235`	`235`	`}`
	`236`	`+`
`236`	`237`	`node = next;`
`237`	`238`	`}`
	`239`	`+`
`238`	`240`	`_buffer.AddLast(value);`
`239`	`241`	`}`
`240`	`242`
`241`	`243`	`}`
`242`	`244`	`catch (IllegalStateException ex)`
	`245`	`+ when (Mode == ReplayFilterMode.Fail)`
`243`	`246`	`{`
`244`		`- if (Mode == ReplayFilterMode.Fail)`
`245`		`- Fail(ex);`
`246`		`- else`
`247`		`- throw;`
	`247`	`+ Fail(ex);`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`	`else if (message is RecoverySuccess or ReplayMessagesFailure)`
Original file line number	Diff line number	Diff line change
`@@ -155,13 +155,11 @@ public Property HeliosTransport_Should_Resolve_DNS(EndPoint inbound, EndPoint ou`
`155`	`155`	`useIpv6Dns: dnsIpv6,`
`156`	`156`	`enforceIpFamily: enforceIpFamily);`
`157`	`157`	`}`
`158`		`- catch`
	`158`	`+ catch when (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsIpv6))`
`159`	`159`	`{`
`160`	`160`	`//if ip family is enforced, there are some special cases when it is normal to unable`
`161`	`161`	`//to create actor system`
`162`		`- if (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsIpv6))`
`163`		`- return true.ToProperty();`
`164`		`- throw;`
	`162`	`+ return true.ToProperty();`
`165`	`163`	`}`
`166`	`164`
`167`	`165`	`var outboundReceivedAck = true;`
`@@ -246,14 +244,13 @@ public Property HeliosTransport_Should_Resolve_DNS_with_PublicHostname(IPEndPoin`
`246`	`244`	`dnsUseIpv6,`
`247`	`245`	`enforceIpFamily);`
`248`	`246`	`}`
`249`		`- catch`
	`247`	`+ catch when (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsUseIpv6))`
`250`	`248`	`{`
`251`	`249`	`//if ip family is enforced, there are some special cases when it is normal to unable`
`252`	`250`	`//to create actor system`
`253`		`- if (enforceIpFamily && IsExpectedFailure(inbound, outbound, dnsUseIpv6))`
`254`		`- return true.ToProperty();`
`255`		`- throw;`
	`251`	`+ return true.ToProperty();`
`256`	`252`	`}`
	`253`	`+`
`257`	`254`	`var outboundReceivedAck = true;`
`258`	`255`	`var inboundReceivedAck = true;`
`259`	`256`	`_outbound.ActorSelection(_inboundAck).Tell("ping", _outboundProbe.Ref);`
Original file line number	Diff line number	Diff line change
`@@ -257,11 +257,10 @@ public static SslSettings CreateOrDefault(Config config, SslSettings? @default =`
`257`	`257`	`{`
`258`	`258`	`return Create(config);`
`259`	`259`	`}`
`260`		`- catch(Exception)`
	`260`	`+ catch (Exception)`
	`261`	`+ when (@default != null)`
`261`	`262`	`{`
`262`		`- if (@default != null)`
`263`		`- return @default;`
`264`		`- throw;`
	`263`	`+ return @default;`
`265`	`264`	`}`
`266`	`265`	`}`
`267`	`266`
Original file line number	Diff line number	Diff line change
`@@ -267,9 +267,8 @@ private void ReportSubscribeFailure(ISubscriber<TOut> subscriber)`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`	`catch (Exception exception)`
	`270`	`+ when (exception is ISpecViolation)`
`270`	`271`	`{`
`271`		`- if (!(exception is ISpecViolation))`
`272`		`- throw;`
`273`	`272`	`}`
`274`	`273`	`}`
`275`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,8 @@ public void Subscribe(ISubscriber<T> subscriber)`
`38`	`38`	`ReactiveStreamsCompliance.TryOnComplete(subscriber);`
`39`	`39`	`}`
`40`	`40`	`catch (Exception e)`
	`41`	`+ when (e is ISpecViolation)`
`41`	`42`	`{`
`42`		`- if (!(e is ISpecViolation))`
`43`		`- throw;`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`
`@@ -91,9 +90,8 @@ public void Subscribe(ISubscriber<T> subscriber)`
`91`	`90`	`ReactiveStreamsCompliance.TryOnError(subscriber, Cause);`
`92`	`91`	`}`
`93`	`92`	`catch (Exception e)`
	`93`	`+ when (e is ISpecViolation)`
`94`	`94`	`{`
`95`		`- if (!(e is ISpecViolation))`
`96`		`- throw;`
`97`	`95`	`}`
`98`	`96`	`}`
`99`	`97`
`@@ -270,9 +268,8 @@ public void Subscribe(ISubscriber<T> subscriber)`
`270`	`268`	`ReactiveStreamsCompliance.RejectAdditionalSubscriber(subscriber, "Publisher");`
`271`	`269`	`}`
`272`	`270`	`catch (Exception e)`
	`271`	`+ when (e is ISpecViolation)`
`273`	`272`	`{`
`274`		`- if (!(e is ISpecViolation))`
`275`		`- throw;`
`276`	`273`	`}`
`277`	`274`	`}`
`278`	`275`
Original file line number	Diff line number	Diff line change
`@@ -265,14 +265,10 @@ private long DispatchFromBufferAndReturnRemainingRequested(long requested, ISubs`
`265`	`265`	`goOn = true;`
`266`	`266`	`}`
`267`	`267`	`catch (Exception e)`
	`268`	`+ when (e is ISpecViolation)`
`268`	`269`	`{`
`269`		`- if (e is ISpecViolation)`
`270`		`- {`
`271`		`- UnregisterSubscriptionInternal(subscription);`
`272`		`- goOn = false;`
`273`		`- }`
`274`		`- else`
`275`		`- throw;`
	`270`	`+ UnregisterSubscriptionInternal(subscription);`
	`271`	`+ goOn = false;`
`276`	`272`	`}`
`277`	`273`
`278`	`274`	`if (!goOn)`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,10 @@ protected override void OnReceive(object message)`
`45`	`45`	`System.Diagnostics.Debug.WriteLine("TestActor received " + message);`
`46`	`46`	`}`
`47`	`47`	`catch (FormatException)`
	`48`	`+ when (message is LogEvent { Message: LogMessage msg })`
`48`	`49`	`{`
`49`		`- if (message is LogEvent { Message: LogMessage msg })`
`50`		`- System.Diagnostics.Debug.WriteLine(`
`51`		`- $"TestActor received a malformed formatted message. Template:[{msg.Format}], args:[{string.Join(",", msg.Unformatted())}]");`
`52`		`- else`
`53`		`- throw;`
	`50`	`+ System.Diagnostics.Debug.WriteLine(`
	`51`	`+ $"TestActor received a malformed formatted message. Template:[{msg.Format}], args:[{string.Join(",", msg.Unformatted())}]");`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`switch (message)`