Skip to content

TopicPerEvent: Fix leftover names #1158

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

Merged
merged 1 commit into from
Feb 11, 2025
Merged

TopicPerEvent: Fix leftover names #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 ...e_topology_for_mapped_events.approved.txt → ...e_topology_for_mapped_events.approved.txt
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...topology_for_unmapped_events.approved.txt → ...topology_for_unmapped_events.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CreateSubscriptionOptions: {
"AutoDeleteOnIdle": "10675199.02:48:05.4775807",
"DeadLetteringOnMessageExpiration": false,
"EnableDeadLetteringOnFilterEvaluationExceptions": false,
"TopicName": "NServiceBus.Transport.AzureServiceBus.Tests.TopicPerEventTypeSubscriptionManagerTests\u002BMyEvent1",
"TopicName": "NServiceBus.Transport.AzureServiceBus.Tests.TopicPerEventSubscriptionManagerTests\u002BMyEvent1",
"SubscriptionName": "MySubscriptionName",
"MaxDeliveryCount": 2147483647,
"Status": {},
Expand All @@ -30,7 +30,7 @@ CreateSubscriptionOptions: {
"AutoDeleteOnIdle": "10675199.02:48:05.4775807",
"DeadLetteringOnMessageExpiration": false,
"EnableDeadLetteringOnFilterEvaluationExceptions": false,
"TopicName": "NServiceBus.Transport.AzureServiceBus.Tests.TopicPerEventTypeSubscriptionManagerTests\u002BMyEvent2",
"TopicName": "NServiceBus.Transport.AzureServiceBus.Tests.TopicPerEventSubscriptionManagerTests\u002BMyEvent2",
"SubscriptionName": "MySubscriptionName",
"MaxDeliveryCount": 2147483647,
"Status": {},
Expand Down
0 ...gyTests.Should_self_validate.approved.txt → ...gyTests.Should_self_validate.approved.txt
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...icPerEventTypeSubscriptionManagerTests.cs → .../TopicPerEventSubscriptionManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace NServiceBus.Transport.AzureServiceBus.Tests;
using Unicast.Messages;

[TestFixture]
public class TopicPerEventTypeSubscriptionManagerTests
public class TopicPerEventSubscriptionManagerTests
{
[Test]
public async Task Should_create_topology_for_mapped_events()
Expand All @@ -27,7 +27,7 @@ public async Task Should_create_topology_for_mapped_events()
var client = new RecordingServiceBusClient(builder);
var administrationClient = new RecordingServiceBusAdministrationClient(builder);

var subscriptionManager = new TopicPerEventTypeTopologySubscriptionManager(new SubscriptionManagerCreationOptions
var subscriptionManager = new TopicPerEventTopologySubscriptionManager(new SubscriptionManagerCreationOptions
{
SubscribingQueueName = "SubscribingQueue",
Client = client,
Expand All @@ -51,7 +51,7 @@ public async Task Should_create_topology_for_unmapped_events()
var client = new RecordingServiceBusClient(builder);
var administrationClient = new RecordingServiceBusAdministrationClient(builder);

var subscriptionManager = new TopicPerEventTypeTopologySubscriptionManager(new SubscriptionManagerCreationOptions
var subscriptionManager = new TopicPerEventTopologySubscriptionManager(new SubscriptionManagerCreationOptions
{
SubscribingQueueName = "SubscribingQueue",
Client = client,
Expand Down
2 changes: 1 addition & 1 deletion ...Routing/TopicPerEventTypeTopologyTests.cs → ...ventRouting/TopicPerEventTopologyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace NServiceBus.Transport.AzureServiceBus.Tests;
using Particular.Approvals;

[TestFixture]
public class TopicPerEventTypeTopologyTests
public class TopicPerEventTopologyTests
{
[Test]
public void PublishDestination_Should_return_mapped_topic_when_event_is_mapped()
Expand Down
6 changes: 4 additions & 2 deletions src/Transport/EventRouting/MigrationTopologySubscriptionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ async Task SubscribeEvent(string eventTypeFullName, CancellationToken cancellati

if (topologyOptions.SubscribedEventToTopicsMap.TryGetValue(eventTypeFullName, out var topics))
{
await TopicPerEventTypeTopologySubscriptionManager.CreateSubscriptionsForTopics(topics, subscriptionName, CreationOptions, cancellationToken)
await TopicPerEventTopologySubscriptionManager
.CreateSubscriptionsForTopics(topics, subscriptionName, CreationOptions, cancellationToken)
.ConfigureAwait(false);
return;
}
Expand Down Expand Up @@ -91,7 +92,8 @@ public override async Task Unsubscribe(MessageMetadata eventType, ContextBag con

if (topologyOptions.SubscribedEventToTopicsMap.TryGetValue(eventTypeFullName, out var topics))
{
await TopicPerEventTypeTopologySubscriptionManager.DeleteSubscriptionsForTopics(topics, subscriptionName, CreationOptions.AdministrationClient, cancellationToken)
await TopicPerEventTopologySubscriptionManager.DeleteSubscriptionsForTopics(topics, subscriptionName,
CreationOptions.AdministrationClient, cancellationToken)
.ConfigureAwait(false);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Transport/EventRouting/TopicPerEventTopology.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace NServiceBus.Transport.AzureServiceBus;
using System.Collections.Generic;

/// <summary>
/// A topology that uses separate topic for each event type.
/// A topology that uses separate topic for each event.
/// </summary>
public sealed class TopicPerEventTopology : TopicTopology
{
Expand Down Expand Up @@ -86,5 +86,5 @@ protected override string GetPublishDestinationCore(string eventTypeFullName)

internal override SubscriptionManager CreateSubscriptionManager(
SubscriptionManagerCreationOptions creationOptions) =>
new TopicPerEventTypeTopologySubscriptionManager(creationOptions, Options);
new TopicPerEventTopologySubscriptionManager(creationOptions, Options);
}
6 changes: 3 additions & 3 deletions ...erEventTypeTopologySubscriptionManager.cs → ...picPerEventTopologySubscriptionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ namespace NServiceBus.Transport.AzureServiceBus;
using Logging;
using Unicast.Messages;

sealed class TopicPerEventTypeTopologySubscriptionManager : SubscriptionManager
sealed class TopicPerEventTopologySubscriptionManager : SubscriptionManager
{
readonly TopologyOptions topologyOptions;
readonly string subscriptionName;

public TopicPerEventTypeTopologySubscriptionManager(SubscriptionManagerCreationOptions creationOptions,
public TopicPerEventTopologySubscriptionManager(SubscriptionManagerCreationOptions creationOptions,
TopologyOptions topologyOptions) : base(creationOptions)
{
this.topologyOptions = topologyOptions;
subscriptionName = topologyOptions.QueueNameToSubscriptionNameMap.GetValueOrDefault(CreationOptions.SubscribingQueueName, CreationOptions.SubscribingQueueName);
}

static readonly ILog Logger = LogManager.GetLogger<TopicPerEventTypeTopologySubscriptionManager>();
static readonly ILog Logger = LogManager.GetLogger<TopicPerEventTopologySubscriptionManager>();

public override Task SubscribeAll(MessageMetadata[] eventTypes, ContextBag context,
CancellationToken cancellationToken = default) =>
Expand Down