chore: removing deprecated code (#308)

* chore: removed the deprecated CanProcessMessage method from the MessageHandler in the Arcus.Messaging.Abstractions project - issue #297 * chore: removed the AsServiceBusMessage to create a ServiceBusMessage instance in the Arcus.Messaging.ServiceBus.Core project - issue #296 * chore: removed ObjectExtensions.cs since the extension class got empty after removing AsServiceBusMessage deprecated method - related to issue #296 * chore: removed deprecated MessageCorrelationInfoEnricher in pump namespace - issue #300 * Removed unexistant namespace Arcus.Messaging.Pumps.Abstractions.Telemetry due to deprecated MessageCorrelationInfoEnricher deletion - issue #300 * Fixed unit test related with the deletion of the deprecated CanProcessMessage method - issue #297 * Fixed unit tests related with the removal of the object extension AsServiceBusMessage - issue #296 --------- Co-authored-by: Stijn Moreels <[email protected]>
arcus-azure · Dec 25, 2023 · 23c58b6 · 23c58b6
1 parent d70ed08
commit 23c58b6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 129 deletions.
diff --git a/src/Arcus.Messaging.Abstractions/MessageHandling/MessageHandler.cs b/src/Arcus.Messaging.Abstractions/MessageHandling/MessageHandler.cs
@@ -214,22 +214,6 @@ public Type GetMessageHandlerType()
             return _messageHandlerInstanceType;
         }
 
-        /// <summary>
-        /// Determines if the given <typeparamref name="TMessageContext"/> matches the generic parameter of this message handler.
-        /// </summary>
-        /// <param name="messageContext">The messaging context information that holds information about the currently processing message.</param>
-        /// <returns>
-        ///     [true] if the registered <typeparamref name="TMessageContext"/> predicate holds; [false] otherwise.
-        /// </returns>
-        /// <typeparam name="TMessageContext">The type of the message context.</typeparam>
-        [Obsolete("Use the " + nameof(CanProcessMessageBasedOnContext) + " specific message context overload instead")]
-        public bool CanProcessMessage<TMessageContext>(TMessageContext messageContext)
-            where TMessageContext : MessageContext
-        {
-            bool canProcessMessageBasedOnContext = CanProcessMessageBasedOnContext(messageContext);
-            return canProcessMessageBasedOnContext;
-        }
-
         /// <summary>
         /// Determines if the given <typeparamref name="TMessageContext"/> matches the generic parameter of this message handler.
         /// </summary>

diff --git a/src/Arcus.Messaging.Abstractions/Telemetry/ObsoleteMessageCorrelationInfoEnricher.cs b/src/Arcus.Messaging.Abstractions/Telemetry/ObsoleteMessageCorrelationInfoEnricher.cs
diff --git a/src/Arcus.Messaging.ServiceBus.Core/Extensions/ObjectExtensions.cs b/src/Arcus.Messaging.ServiceBus.Core/Extensions/ObjectExtensions.cs
diff --git a/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePumpDockerTests.cs b/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePumpDockerTests.cs
@@ -35,6 +35,7 @@ public async Task ServiceBusTopicMessagePump_PublishServiceBusMessage_MessageSuc
             // Arrange
             var traceParent = TraceParent.Generate();
             Order order = OrderGenerator.Generate();
+
             var orderMessage = new ServiceBusMessage(BinaryData.FromObjectAsJson(order))
                 .WithDiagnosticId(traceParent);
 

diff --git a/src/Arcus.Messaging.Tests.Unit/MessageHandling/MessageHandlerTests.cs b/src/Arcus.Messaging.Tests.Unit/MessageHandling/MessageHandlerTests.cs
@@ -216,7 +216,7 @@ public void CustomMessageHandlerConstructor_WithContextFilterObsolete_SubtractsR
             Assert.NotNull(messageHandler);
 
             var context = TestMessageContext.Generate();
-            Assert.Equal(matchesContext, messageHandler.CanProcessMessage(messageContext: context));
+            Assert.Equal(matchesContext, messageHandler.CanProcessMessageBasedOnContext(messageContext: context));
         }
 
         [Theory]
@@ -264,7 +264,7 @@ public void CustomMessageHandlerFactory_WithDefaultContextFilterObsolete_Subtrac
             Assert.NotNull(messageHandler);
 
             var context = new MessageContext("message-id", new Dictionary<string, object>());
-            Assert.Equal(matchesContext, messageHandler.CanProcessMessage(messageContext: context));
+            Assert.Equal(matchesContext, messageHandler.CanProcessMessageBasedOnContext(messageContext: context));
         }
 
         [Fact]

diff --git a/src/Arcus.Messaging.Tests.Unit/ServiceBus/ObjectExtensionsTests.cs b/src/Arcus.Messaging.Tests.Unit/ServiceBus/ObjectExtensionsTests.cs
@@ -25,7 +25,7 @@ public void WrapInServiceBusMessage_BasicWithoutOptions_ReturnsValidServiceBusMe
             Order messagePayload = OrderGenerator.Generate();
 
             // Act
-            ServiceBusMessage serviceBusMessage = messagePayload.AsServiceBusMessage();
+            ServiceBusMessage serviceBusMessage = ServiceBusMessageBuilder.CreateForBody(messagePayload).Build();
 
             // Assert
             Assert.NotNull(serviceBusMessage);
@@ -47,7 +47,9 @@ public void WrapInServiceBusMessage_BasicWithOperationId_ReturnsValidServiceBusM
             var operationId = Guid.NewGuid().ToString();
 
             // Act
-            ServiceBusMessage serviceBusMessage = messagePayload.AsServiceBusMessage(operationId: operationId);
+            var serviceBusMessageBuilder = ServiceBusMessageBuilder.CreateForBody(messagePayload);
+            serviceBusMessageBuilder.WithOperationId(operationId);
+            ServiceBusMessage serviceBusMessage = serviceBusMessageBuilder.Build();
 
             // Assert
             Assert.NotNull(serviceBusMessage);
@@ -69,7 +71,9 @@ public void WrapInServiceBusMessage_BasicWithTransactionId_ReturnsValidServiceBu
             var expectedTransactionId = Guid.NewGuid().ToString();
 
             // Act
-            ServiceBusMessage serviceBusMessage = messagePayload.AsServiceBusMessage(transactionId: expectedTransactionId);
+            var serviceBusMessageBuilder = ServiceBusMessageBuilder.CreateForBody(messagePayload);
+            serviceBusMessageBuilder.WithTransactionId(transactionId: expectedTransactionId);
+            ServiceBusMessage serviceBusMessage = serviceBusMessageBuilder.Build();
 
             // Assert
             Assert.NotNull(serviceBusMessage);
@@ -92,7 +96,8 @@ public void WrapInServiceBusMessage_BasicWithEncoding_ReturnsValidServiceBusMess
             Encoding expectedEncoding = Encoding.ASCII;
 
             // Act
-            ServiceBusMessage serviceBusMessage = originalMessagePayload.AsServiceBusMessage(encoding: expectedEncoding);
+            var serviceBusMessageBuilder = ServiceBusMessageBuilder.CreateForBody(originalMessagePayload, encoding: expectedEncoding);
+            ServiceBusMessage serviceBusMessage = serviceBusMessageBuilder.Build();
 
             // Assert
             Assert.NotNull(serviceBusMessage);