Automatically setting the value of ProcessorEndpointKey

Author: cquirosj

src/NServiceBus.NHibernate.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt

@@ -26,7 +26,6 @@ namespace NServiceBus
     }
     public static class OutboxSettingsExtensions
     {
-        public static void EndpointName(this NServiceBus.Outbox.OutboxSettings configuration, string endpointName) { }
         public static void TransactionIsolationLevel(this NServiceBus.Outbox.OutboxSettings outboxSettings, System.Data.IsolationLevel isolationLevel) { }
         public static void UsePessimisticConcurrencyControl(this NServiceBus.Outbox.OutboxSettings outboxSettings) { }
         public static void UseTransactionScope(this NServiceBus.Outbox.OutboxSettings outboxSettings) { }

src/NServiceBus.NHibernate.TransactionalSession.AcceptanceTests/When_using_outbox_send_only.cs

@@ -73,11 +73,9 @@ public Task Handle(SampleMessage message, IMessageHandlerContext context)
 
     class ProcessorEndpoint : EndpointConfigurationBuilder
     {
-        public ProcessorEndpoint() => EndpointSetup<TransactionSessionDefaultServer>(c =>
+        public ProcessorEndpoint() => EndpointSetup<TransactionSessionWithOutboxEndpoint>(c =>
         {
-            c.ConfigureTransport().TransportTransactionMode = TransportTransactionMode.ReceiveOnly;
 
-            c.EnableOutbox().EndpointName(Conventions.EndpointNamingConvention.Invoke(typeof(SendOnlyEndpoint)));
         });
     }
 

src/NServiceBus.NHibernate.TransactionalSession/NHibernateTransactionalSessionExtensions.cs

@@ -22,7 +22,8 @@ public static PersistenceExtensions<NHibernatePersistence> EnableTransactionalSe
         /// <summary>
         /// Enables the transactional session for this endpoint using the specified TransactionalSessionOptions.
         /// </summary>
-        public static PersistenceExtensions<NHibernatePersistence> EnableTransactionalSession(this PersistenceExtensions<NHibernatePersistence> persistenceExtensions,
+        public static PersistenceExtensions<NHibernatePersistence> EnableTransactionalSession(
+            this PersistenceExtensions<NHibernatePersistence> persistenceExtensions,
             TransactionalSessionOptions transactionalSessionOptions)
         {
             ArgumentNullException.ThrowIfNull(persistenceExtensions);
@@ -33,19 +34,28 @@ public static PersistenceExtensions<NHibernatePersistence> EnableTransactionalSe
             settings.Set(transactionalSessionOptions);
             settings.EnableFeatureByDefault<NHibernateTransactionalSession>();
 
-            if (!string.IsNullOrEmpty(transactionalSessionOptions.ProcessorAddress))
+            if (string.IsNullOrEmpty(transactionalSessionOptions.ProcessorAddress))
             {
-                // remote processor configured, so turn off the outbox cleanup on this instance
-                ConfigurationManager.AppSettings.Set("NServiceBus/Outbox/NHibernate/FrequencyToRunDeduplicationDataCleanup", Timeout.InfiniteTimeSpan.ToString());
+                return persistenceExtensions;
             }
 
+            // remote processor configured, so turn off the outbox cleanup on this instance
+            ConfigurationManager.AppSettings.Set(
+                "NServiceBus/Outbox/NHibernate/FrequencyToRunDeduplicationDataCleanup",
+                Timeout.InfiniteTimeSpan.ToString());
+
+            //set the endpoint name to be the processor address, this makes sure that the outbox uses this value when generate qualified message IDs.
+            //By default, the endpoint name used is automatically managed and set to the originating endpoint's name unless overridden by setting a value to NHibernateOutbox.ProcessorEndpointKey
+            settings.Set(NHibernateOutbox.ProcessorEndpointKey, transactionalSessionOptions.ProcessorAddress);
+
             return persistenceExtensions;
         }
 
         /// <summary>
         /// Opens the transactional session
         /// </summary>
-        public static Task Open(this ITransactionalSession transactionalSession, CancellationToken cancellationToken = default)
+        public static Task Open(this ITransactionalSession transactionalSession,
+            CancellationToken cancellationToken = default)
             => transactionalSession.Open(new NHibernateOpenSessionOptions(), cancellationToken);
     }
 }

src/NServiceBus.NHibernate/NServiceBus.NHibernate.csproj

@@ -25,8 +25,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="NServiceBus.NHibernate.PersistenceTests" Key="$(NServiceBusTestsKey)" />
+    <InternalsVisibleTo Include="NServiceBus.NHibernate.PersistenceTests" Key="$(NServiceBusTestsKey)" />        
     <InternalsVisibleTo Include="NServiceBus.NHibernate.Tests" Key="$(NServiceBusTestsKey)" />
+    <InternalsVisibleTo Include="NServiceBus.NHibernate.TransactionalSession" Key="$(NServiceBusKey)" />
   </ItemGroup>
 
 </Project>

src/NServiceBus.NHibernate/Outbox/NHibernateOutbox.cs

@@ -24,7 +24,7 @@ class NHibernateOutbox : Feature
         internal const string OutboxTransactionModeSettingsKey = "NServiceBus.NHibernate.OutboxTransactionScopeMode";
         internal const string OutboxTransactionIsolationLevelSettingsKey = "NServiceBus.NHibernate.OutboxTransactionIsolationLevel";
         internal const string OutboxTransactionScopeModeIsolationLevelSettingsKey = "NServiceBus.NHibernate.OutboxTransactionScopeModeIsolationLevel";
-        internal const string EndpointNameKey = "NHibernate.Outbox.EndpointName";
+        internal const string ProcessorEndpointKey = "NHibernate.TransactionalSession.ProcessorEndpoint";
         /// <summary>
         /// Creates a new instance of the feature
         /// </summary>
@@ -73,7 +73,7 @@ protected override void Setup(FeatureConfigurationContext context)
             context.Services.AddSingleton<IOutboxStorage>(sp =>
             {
                 var holder = sp.GetRequiredService<SessionFactoryHolder>();
-                var endpointName = context.Settings.GetOrDefault<string>(EndpointNameKey) ?? context.Settings.EndpointName();
+                var endpointName = context.Settings.GetOrDefault<string>(ProcessorEndpointKey) ?? context.Settings.EndpointName();
                 var persister = persisterFactory.Create(holder.SessionFactory, endpointName, pessimisticMode, transactionScopeMode, adoIsolationLevel, transactionScopeIsolationLevel);
                 return persister;
             });

src/NServiceBus.NHibernate/Outbox/OutboxSettingsExtensions.cs

@@ -71,18 +71,5 @@ or IsolationLevel.Snapshot
             outboxSettings.GetSettings().Set(NHibernateOutbox.OutboxTransactionModeSettingsKey, true);
             outboxSettings.GetSettings().Set(NHibernateOutbox.OutboxTransactionScopeModeIsolationLevelSettingsKey, isolationLevel);
         }
-
-        /// <summary>
-        /// Sets the endpoint name used to generate qualified message IDs, ensuring uniqueness and preventing ID collisions. 
-        /// By default, this value is automatically managed and set to the originating endpoint's name. 
-        /// This function allows overriding the default endpoint name for specific scenarios, such as configuring a transactional session processor endpoint.
-        /// </summary>
-        public static void EndpointName(this OutboxSettings configuration, string endpointName)
-        {
-            ArgumentNullException.ThrowIfNull(configuration);
-            ArgumentException.ThrowIfNullOrWhiteSpace(endpointName);
-
-            configuration.GetSettings().Set(NHibernateOutbox.EndpointNameKey, endpointName);
-        }
     }
 }