Merge pull request #895 from danielmarbach/basic-publish-readonlymem

michaelklishin · web-flow · commit 28c2362aef76 · 2020-07-07T13:25:49.000+07:00
7.x: remove deprecated message publishing method overloads
diff --git a/projects/RabbitMQ.Client/client/api/IBasicPublishBatch.cs b/projects/RabbitMQ.Client/client/api/IBasicPublishBatch.cs
@@ -44,8 +44,7 @@ namespace RabbitMQ.Client
 {
     public interface IBasicPublishBatch
     {
-        [Obsolete("Use Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, ReadOnlyMemory<byte> body) instead. Will be replaced in version 7.0", false)]
-        void Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, byte[] body);
+        void Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, ReadOnlyMemory<byte> body);
         void Publish();
     }
 }
diff --git a/projects/RabbitMQ.Client/client/impl/BasicPublishBatch.cs b/projects/RabbitMQ.Client/client/impl/BasicPublishBatch.cs
@@ -62,12 +62,6 @@ internal BasicPublishBatch (ModelBase model, int sizeHint)
             _commands = new List<Command>(sizeHint);
         }
 
-        public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, byte[] body)
-        {
-            ReadOnlyMemory<byte> bodyAsMemory = body;
-            Add(exchange, routingKey, mandatory, basicProperties, bodyAsMemory);
-        }
-
         public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, ReadOnlyMemory<byte> body)
         {
             var method = new BasicPublish
diff --git a/projects/RabbitMQ.Client/client/impl/BasicPublishBatchExtensions.cs b/projects/RabbitMQ.Client/client/impl/BasicPublishBatchExtensions.cs
diff --git a/projects/Unit/APIApproval.Approve.verified.txt b/projects/Unit/APIApproval.Approve.verified.txt
@@ -56,10 +56,6 @@ namespace RabbitMQ.Client
         public bool Redelivered { get; }
         public string RoutingKey { get; }
     }
-    public static class BasicPublishBatchExtensions
-    {
-        public static void Add(this RabbitMQ.Client.IBasicPublishBatch batch, string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, System.ReadOnlyMemory<byte> body) { }
-    }
     public class BinaryTableValue
     {
         public BinaryTableValue() { }
@@ -295,9 +291,7 @@ namespace RabbitMQ.Client
     }
     public interface IBasicPublishBatch
     {
-        [System.Obsolete("Use Add(string exchange, string routingKey, bool mandatory, IBasicProperties prop" +
-            "erties, ReadOnlyMemory<byte> body) instead. Will be replaced in version 7.0", false)]
-        void Add(string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, byte[] body);
+        void Add(string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, System.ReadOnlyMemory<byte> body);
         void Publish();
     }
     public interface IConnection : RabbitMQ.Client.INetworkConnection, System.IDisposable

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ namespace RabbitMQ.Client`
`44`	`44`	`{`
`45`	`45`	`public interface IBasicPublishBatch`
`46`	`46`	`{`
`47`		`- [Obsolete("Use Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, ReadOnlyMemory<byte> body) instead. Will be replaced in version 7.0", false)]`
`48`		`- void Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, byte[] body);`
	`47`	`+ void Add(string exchange, string routingKey, bool mandatory, IBasicProperties properties, ReadOnlyMemory<byte> body);`
`49`	`48`	`void Publish();`
`50`	`49`	`}`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,6 @@ internal BasicPublishBatch (ModelBase model, int sizeHint)`
`62`	`62`	`_commands = new List<Command>(sizeHint);`
`63`	`63`	`}`
`64`	`64`
`65`		`- public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, byte[] body)`
`66`		`- {`
`67`		`- ReadOnlyMemory<byte> bodyAsMemory = body;`
`68`		`- Add(exchange, routingKey, mandatory, basicProperties, bodyAsMemory);`
`69`		`- }`
`70`		`-`
`71`	`65`	`public void Add(string exchange, string routingKey, bool mandatory, IBasicProperties basicProperties, ReadOnlyMemory<byte> body)`
`72`	`66`	`{`
`73`	`67`	`var method = new BasicPublish`
Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,6 @@ namespace RabbitMQ.Client`
`56`	`56`	`public bool Redelivered { get; }`
`57`	`57`	`public string RoutingKey { get; }`
`58`	`58`	`}`
`59`		`- public static class BasicPublishBatchExtensions`
`60`		`- {`
`61`		`- public static void Add(this RabbitMQ.Client.IBasicPublishBatch batch, string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, System.ReadOnlyMemory<byte> body) { }`
`62`		`- }`
`63`	`59`	`public class BinaryTableValue`
`64`	`60`	`{`
`65`	`61`	`public BinaryTableValue() { }`
`@@ -295,9 +291,7 @@ namespace RabbitMQ.Client`
`295`	`291`	`}`
`296`	`292`	`public interface IBasicPublishBatch`
`297`	`293`	`{`
`298`		`- [System.Obsolete("Use Add(string exchange, string routingKey, bool mandatory, IBasicProperties prop" +`
`299`		`- "erties, ReadOnlyMemory<byte> body) instead. Will be replaced in version 7.0", false)]`
`300`		`- void Add(string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, byte[] body);`
	`294`	`+ void Add(string exchange, string routingKey, bool mandatory, RabbitMQ.Client.IBasicProperties properties, System.ReadOnlyMemory<byte> body);`
`301`	`295`	`void Publish();`
`302`	`296`	`}`
`303`	`297`	`public interface IConnection : RabbitMQ.Client.INetworkConnection, System.IDisposable`