Make ReadonlyBasicProperties a class.

Follow-up to #1601 #1601 (comment) cc @bollhals
rabbitmq · Jun 20, 2024 · 6a2604e · 6a2604e
1 parent 299ccda
commit 6a2604e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/projects/Benchmarks/ConsumerDispatching/ConsumerDispatcher.cs b/projects/Benchmarks/ConsumerDispatching/ConsumerDispatcher.cs
@@ -19,7 +19,7 @@ public class ConsumerDispatcherBase
         protected readonly ulong _deliveryTag = 500UL;
         protected readonly string _exchange = "Exchange";
         protected readonly string _routingKey = "RoutingKey";
-        protected readonly ReadOnlyBasicProperties _properties = new ReadOnlyBasicProperties();
+        protected readonly ReadOnlyBasicProperties _properties = null;
         protected readonly byte[] _body = new byte[512];
 
         public ConsumerDispatcherBase()

diff --git a/projects/RabbitMQ.Client/PublicAPI.Shipped.txt b/projects/RabbitMQ.Client/PublicAPI.Shipped.txt
@@ -681,7 +681,6 @@ RabbitMQ.Client.ReadOnlyBasicProperties.IsUserIdPresent() -> bool
 RabbitMQ.Client.ReadOnlyBasicProperties.MessageId.get -> string
 RabbitMQ.Client.ReadOnlyBasicProperties.Persistent.get -> bool
 RabbitMQ.Client.ReadOnlyBasicProperties.Priority.get -> byte
-RabbitMQ.Client.ReadOnlyBasicProperties.ReadOnlyBasicProperties() -> void
 RabbitMQ.Client.ReadOnlyBasicProperties.ReadOnlyBasicProperties(System.ReadOnlySpan<byte> span) -> void
 RabbitMQ.Client.ReadOnlyBasicProperties.ReplyTo.get -> string
 RabbitMQ.Client.ReadOnlyBasicProperties.ReplyToAddress.get -> RabbitMQ.Client.PublicationAddress

diff --git a/projects/RabbitMQ.Client/client/api/ReadonlyBasicProperties.cs b/projects/RabbitMQ.Client/client/api/ReadonlyBasicProperties.cs
@@ -39,7 +39,7 @@ namespace RabbitMQ.Client
     /// <summary>
     /// AMQP specification content header properties for content class "basic"
     /// </summary>
-    public readonly struct ReadOnlyBasicProperties : IReadOnlyBasicProperties
+    public class ReadOnlyBasicProperties : IReadOnlyBasicProperties
     {
         private readonly string? _contentType;
         private readonly string? _contentEncoding;
@@ -83,7 +83,6 @@ public PublicationAddress? ReplyToAddress
         }
 
         public ReadOnlyBasicProperties(ReadOnlySpan<byte> span)
-            : this()
         {
             int offset = 2;
             ref readonly byte bits = ref span[0];

diff --git a/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs b/projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs
@@ -259,7 +259,7 @@ protected override Task InternalShutdownAsync()
             public readonly bool Redelivered;
             public readonly string? Exchange;
             public readonly string? RoutingKey;
-            public readonly ReadOnlyBasicProperties BasicProperties;
+            public readonly ReadOnlyBasicProperties? BasicProperties;
             public readonly RentedMemory Body;
             public readonly ShutdownEventArgs? Reason;
             public readonly WorkType WorkType;