From 3a097a8572791331f6c44fbb82f2616bf75ad287 Mon Sep 17 00:00:00 2001 From: zedy Date: Fri, 16 Jul 2021 10:28:09 +0800 Subject: [PATCH] update the method to get topicName --- src/Services/Basket/Basket.API/Startup.cs | 4 +++- src/Services/Catalog/Catalog.API/Startup.cs | 4 +++- src/Services/Ordering/Ordering.API/Startup.cs | 4 +++- .../Extensions/CustomExtensionMethods.cs | 4 +++- src/Services/Ordering/Ordering.SignalrHub/Startup.cs | 4 +++- src/Services/Payment/Payment.API/Startup.cs | 4 +++- src/Services/Webhooks/Webhooks.API/Startup.cs | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 15f7ef8d4..8bff247f8 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -284,7 +284,9 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); var serviceBusConnectionString = Configuration["EventBusConnection"]; - string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath; + string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace; + string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.'); + string topicName = fulNamespaceArray[0]; string subscriptionName = Configuration["SubscriptionClientName"]; return new EventBusServiceBus(serviceBusPersisterConnection, logger, diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index 924f78444..8319322d4 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -333,7 +333,9 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); var serviceBusConnectionString = configuration["EventBusConnection"]; - string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath; + string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace; + string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.'); + string topicName = fulNamespaceArray[0]; string subscriptionName = configuration["SubscriptionClientName"]; return new EventBusServiceBus(serviceBusPersisterConnection, logger, diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 4a80aa77e..a25c69999 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -376,7 +376,9 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); var serviceBusConnectionString = configuration["EventBusConnection"]; - string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath; + string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace; + string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.'); + string topicName = fulNamespaceArray[0]; string subscriptionName = configuration["SubscriptionClientName"]; return new EventBusServiceBus(serviceBusPersisterConnection, logger, diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs b/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs index ff7f2ea82..62dafde37 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs @@ -65,7 +65,9 @@ namespace Ordering.BackgroundTasks.Extensions var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); var serviceBusConnectionString = configuration["EventBusConnection"]; - string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath; + string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace; + string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.'); + string topicName = fulNamespaceArray[0]; string subscriptionName = configuration["SubscriptionClientName"]; return new EventBusServiceBus(serviceBusPersisterConnection, logger, eventBusSubcriptionsManager, iLifetimeScope, topicName, subscriptionName); diff --git a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs index f72dbc093..a037ad9b4 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs @@ -213,7 +213,9 @@ namespace Ordering.SignalrHub var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); var serviceBusConnectionString = Configuration["EventBusConnection"]; - string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath; + string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace; + string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.'); + string topicName = fulNamespaceArray[0]; string subscriptionName = Configuration["SubscriptionClientName"]; return new EventBusServiceBus(serviceBusPersisterConnection, logger, diff --git a/src/Services/Payment/Payment.API/Startup.cs b/src/Services/Payment/Payment.API/Startup.cs index 01d81fed3..46a4b11e4 100644 --- a/src/Services/Payment/Payment.API/Startup.cs +++ b/src/Services/Payment/Payment.API/Startup.cs @@ -130,7 +130,9 @@ namespace Payment.API var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); var serviceBusConnectionString = Configuration["EventBusConnection"]; - string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath; + string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace; + string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.'); + string topicName = fulNamespaceArray[0]; string subscriptionName = Configuration["SubscriptionClientName"]; return new EventBusServiceBus(serviceBusPersisterConnection, logger, diff --git a/src/Services/Webhooks/Webhooks.API/Startup.cs b/src/Services/Webhooks/Webhooks.API/Startup.cs index c7a359186..924dd8469 100644 --- a/src/Services/Webhooks/Webhooks.API/Startup.cs +++ b/src/Services/Webhooks/Webhooks.API/Startup.cs @@ -216,7 +216,9 @@ namespace Webhooks.API var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); var serviceBusConnectionString = configuration["EventBusConnection"]; - string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath; + string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace; + string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.'); + string topicName = fulNamespaceArray[0]; string subscriptionName = configuration["SubscriptionClientName"]; return new EventBusServiceBus(serviceBusPersisterConnection, logger,