Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: removing deprecated code #308

Merged
merged 8 commits into from
Dec 25, 2023
Merged

chore: removing deprecated code #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
53ff11e
chore: removed the deprecated CanProcessMessage method from the Messa…
pcarmo Jun 21, 2022
5388049
chore: removed the AsServiceBusMessage to create a ServiceBusMessage …
pcarmo Jun 21, 2022
99fbcde
chore: removed ObjectExtensions.cs since the extension class got empt…
pcarmo Jun 21, 2022
e616701
chore: removed deprecated MessageCorrelationInfoEnricher in pump name…
pcarmo Jun 21, 2022
cb2f283
Removed unexistant namespace Arcus.Messaging.Pumps.Abstractions.Telem…
pcarmo Jun 21, 2022
52b2d6c
Fixed unit test related with the deletion of the deprecated CanProces…
pcarmo Jun 21, 2022
22660e3
Fixed unit tests related with the removal of the object extension AsS…
pcarmo Jun 21, 2022
74ce542
Merge branch 'main' into chore/removing-deprecated-code
stijnmoreels Dec 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions src/Arcus.Messaging.Abstractions/MessageHandling/MessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
48 changes: 0 additions & 48 deletions src/Arcus.Messaging.Abstractions/Telemetry/ObsoleteMessageCorrelationInfoEnricher.cs
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions src/Arcus.Messaging.ServiceBus.Core/Extensions/ObjectExtensions.cs
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePumpDockerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions src/Arcus.Messaging.Tests.Unit/MessageHandling/MessageHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
13 changes: 9 additions & 4 deletions src/Arcus.Messaging.Tests.Unit/ServiceBus/ObjectExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
Loading