Add reply code and reply text to the new PublishBasicException

exception type.

Author: lukebakken

projects/RabbitMQ.Client/Exceptions/PublishException.cs

@@ -73,40 +73,50 @@ public class PublishReturnException : PublishException
     {
         private readonly string _exchange;
         private readonly string _routingKey;
+        private readonly ushort _replyCode;
+        private readonly string _replyText;
 
-        public PublishReturnException(ulong publishSequenceNumber, string exchange, string routingKey)
+        public PublishReturnException(ulong publishSequenceNumber,
+            string? exchange = null, string? routingKey = null,
+            ushort? replyCode = null, string? replyText = null)
             : base(publishSequenceNumber, true)
         {
-            _exchange = exchange;
-            _routingKey = routingKey;
+            _exchange = exchange ?? string.Empty;
+            _routingKey = routingKey ?? string.Empty;
+            _replyCode = replyCode ?? 0;
+            _replyText = replyText ?? string.Empty;
         }
 
         /// <summary>
-        /// Get the Exchange associated with this <c>basic.return</c>
+        /// Get the exchange associated with this <c>basic.return</c>
         /// </summary>
         public string Exchange => _exchange;
 
         /// <summary>
-        /// Get the RoutingKey associated with this <c>basic.return</c>
+        /// Get the routing key associated with this <c>basic.return</c>
         /// </summary>
         public string RoutingKey => _routingKey;
+
+        /// <summary>
+        /// Get the reply code associated with this <c>basic.return</c>
+        /// </summary>
+        public ushort ReplyCode => _replyCode;
+
+        /// <summary>
+        /// Get the reply text associated with this <c>basic.return</c>
+        /// </summary>
+        public string ReplyText => _replyText;
     }
 
     internal static class PublishExceptionFactory
     {
         internal static PublishException Create(bool isReturn,
-            ulong deliveryTag, string? exchange = null, string? routingKey = null)
+            ulong deliveryTag, string? exchange = null, string? routingKey = null,
+            ushort? replyCode = null, string? replyText = null)
         {
             if (isReturn)
             {
-                if (exchange is not null && routingKey is not null)
-                {
-                    return new PublishReturnException(deliveryTag, exchange, routingKey);
-                }
-                else
-                {
-                    return new PublishException(deliveryTag, isReturn);
-                }
+                return new PublishReturnException(deliveryTag, exchange, routingKey, replyCode, replyText);
             }
             else
             {

projects/RabbitMQ.Client/Impl/Channel.PublisherConfirms.cs

@@ -201,7 +201,8 @@ private void HandleAck(ulong deliveryTag, bool multiple)
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void HandleNack(ulong deliveryTag, bool multiple, bool isReturn,
-            string? exchange = null, string? routingKey = null)
+            string? exchange = null, string? routingKey = null,
+            ushort? replyCode = null, string? replyText = null)
         {
             if (ShouldHandleAckOrNack(deliveryTag))
             {
@@ -211,7 +212,8 @@ private void HandleNack(ulong deliveryTag, bool multiple, bool isReturn,
                     {
                         if (pair.Key <= deliveryTag)
                         {
-                            PublishException ex = PublishExceptionFactory.Create(isReturn, pair.Key, exchange, routingKey);
+                            PublishException ex = PublishExceptionFactory.Create(isReturn, pair.Key,
+                                exchange, routingKey, replyCode, replyText);
                             pair.Value.SetException(ex);
                             _confirmsTaskCompletionSources.Remove(pair.Key, out _);
                         }
@@ -253,7 +255,8 @@ private void HandleReturn(BasicReturnEventArgs basicReturnEvent)
                 }
 
                 HandleNack(publishSequenceNumber, multiple: false, isReturn: true,
-                    exchange: basicReturnEvent.Exchange, routingKey: basicReturnEvent.RoutingKey);
+                    exchange: basicReturnEvent.Exchange, routingKey: basicReturnEvent.RoutingKey,
+                    replyCode: basicReturnEvent.ReplyCode, replyText: basicReturnEvent.ReplyText);
             }
         }
 

projects/RabbitMQ.Client/PublicAPI.Unshipped.txt

@@ -1,4 +1,6 @@
 RabbitMQ.Client.Exceptions.PublishReturnException
 RabbitMQ.Client.Exceptions.PublishReturnException.Exchange.get -> string!
-RabbitMQ.Client.Exceptions.PublishReturnException.PublishReturnException(ulong publishSequenceNumber, string! exchange, string! routingKey) -> void
+RabbitMQ.Client.Exceptions.PublishReturnException.PublishReturnException(ulong publishSequenceNumber, string? exchange = null, string? routingKey = null, ushort? replyCode = null, string? replyText = null) -> void
+RabbitMQ.Client.Exceptions.PublishReturnException.ReplyCode.get -> ushort
+RabbitMQ.Client.Exceptions.PublishReturnException.ReplyText.get -> string!
 RabbitMQ.Client.Exceptions.PublishReturnException.RoutingKey.get -> string!