From b4fe130a49d87d563427df020e44e363c613e20d Mon Sep 17 00:00:00 2001
From: Daniel Marbach <daniel.marbach@openplace.net>
Date: Fri, 9 Sep 2022 11:33:04 +0200
Subject: [PATCH] Align names and namespaces with the v7 branch (#88)

---
 ...nsaction.cs => AcceptanceTestingTransaction.cs} |  2 +-
 ...torage.cs => CustomTestingOutboxPersistence.cs} |  8 ++++----
 ...xPersister.cs => CustomTestingOutboxStorage.cs} |  6 +++---
 ...action.cs => CustomTestingOutboxTransaction.cs} |  9 +++++----
 .../CustomTestingPersistence.cs                    |  2 +-
 .../CustomTestingPersistenceOpenSessionOptions.cs  |  3 +--
 ... => CustomTestingSynchronizedStorageFeature.cs} | 10 ++++------
 ... => CustomTestingSynchronizedStorageSession.cs} | 14 +++++++-------
 8 files changed, 26 insertions(+), 28 deletions(-)
 rename src/NServiceBus.TransactionalSession.CustomTestingPersistence/{Transaction.cs => AcceptanceTestingTransaction.cs} (90%)
 rename src/NServiceBus.TransactionalSession.CustomTestingPersistence/{OutboxStorage.cs => CustomTestingOutboxPersistence.cs} (58%)
 rename src/NServiceBus.TransactionalSession.CustomTestingPersistence/{OutboxPersister.cs => CustomTestingOutboxStorage.cs} (94%)
 rename src/NServiceBus.TransactionalSession.CustomTestingPersistence/{OutboxTransaction.cs => CustomTestingOutboxTransaction.cs} (76%)
 rename src/NServiceBus.TransactionalSession.CustomTestingPersistence/{SynchronizedStorage.cs => CustomTestingSynchronizedStorageFeature.cs} (58%)
 rename src/NServiceBus.TransactionalSession.CustomTestingPersistence/{StorageSession.cs => CustomTestingSynchronizedStorageSession.cs} (82%)

diff --git a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/Transaction.cs b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/AcceptanceTestingTransaction.cs
similarity index 90%
rename from src/NServiceBus.TransactionalSession.CustomTestingPersistence/Transaction.cs
rename to src/NServiceBus.TransactionalSession.CustomTestingPersistence/AcceptanceTestingTransaction.cs
index 38b7bc9..b17294d 100644
--- a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/Transaction.cs
+++ b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/AcceptanceTestingTransaction.cs
@@ -3,7 +3,7 @@ namespace NServiceBus.AcceptanceTesting
     using System;
     using System.Collections.Generic;
 
-    class Transaction
+    sealed class AcceptanceTestingTransaction
     {
         public void Enlist(Action action) => actions.Add(action);
 
diff --git a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/OutboxStorage.cs b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingOutboxPersistence.cs
similarity index 58%
rename from src/NServiceBus.TransactionalSession.CustomTestingPersistence/OutboxStorage.cs
rename to src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingOutboxPersistence.cs
index 89e623a..75a99b9 100644
--- a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/OutboxStorage.cs
+++ b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingOutboxPersistence.cs
@@ -4,17 +4,17 @@ namespace NServiceBus.AcceptanceTesting
     using Microsoft.Extensions.DependencyInjection;
     using Outbox;
 
-    class OutboxStorage : Feature
+    sealed class CustomTestingOutboxPersistence : Feature
     {
-        public OutboxStorage()
+        public CustomTestingOutboxPersistence()
         {
             DependsOn<Outbox>();
-            Defaults(s => s.EnableFeatureByDefault<SynchronizedStorage>());
+            Defaults(s => s.EnableFeatureByDefault<CustomTestingSynchronizedStorageFeature>());
         }
 
         protected override void Setup(FeatureConfigurationContext context)
         {
-            var outboxStorage = new OutboxPersister();
+            var outboxStorage = new CustomTestingOutboxStorage();
 
             context.Services.AddSingleton(typeof(IOutboxStorage), outboxStorage);
         }
diff --git a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/OutboxPersister.cs b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingOutboxStorage.cs
similarity index 94%
rename from src/NServiceBus.TransactionalSession.CustomTestingPersistence/OutboxPersister.cs
rename to src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingOutboxStorage.cs
index 77189e8..fd641b6 100644
--- a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/OutboxPersister.cs
+++ b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingOutboxStorage.cs
@@ -7,7 +7,7 @@ namespace NServiceBus.AcceptanceTesting
     using Extensibility;
     using Outbox;
 
-    class OutboxPersister : IOutboxStorage
+    sealed class CustomTestingOutboxStorage : IOutboxStorage
     {
         public Task<OutboxMessage> Get(string messageId, ContextBag context, CancellationToken cancellationToken = default)
         {
@@ -26,12 +26,12 @@ public Task<OutboxMessage> Get(string messageId, ContextBag context, Cancellatio
 
         public Task<IOutboxTransaction> BeginTransaction(ContextBag context, CancellationToken cancellationToken = default)
         {
-            return Task.FromResult<IOutboxTransaction>(new OutboxTransaction(context));
+            return Task.FromResult<IOutboxTransaction>(new CustomTestingOutboxTransaction(context));
         }
 
         public Task Store(OutboxMessage message, IOutboxTransaction transaction, ContextBag context, CancellationToken cancellationToken = default)
         {
-            var tx = (OutboxTransaction)transaction;
+            var tx = (CustomTestingOutboxTransaction)transaction;
             tx.Enlist(() =>
             {
                 if (!storage.TryAdd(message.MessageId, new StoredMessage(message.MessageId, message.TransportOperations)))
diff --git a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/OutboxTransaction.cs b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingOutboxTransaction.cs
similarity index 76%
rename from src/NServiceBus.TransactionalSession.CustomTestingPersistence/OutboxTransaction.cs
rename to src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingOutboxTransaction.cs
index c76c744..086f26b 100644
--- a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/OutboxTransaction.cs
+++ b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingOutboxTransaction.cs
@@ -5,22 +5,23 @@ namespace NServiceBus.AcceptanceTesting
     using System.Threading.Tasks;
     using Extensibility;
     using Outbox;
+    using TransactionalSession;
 
-    class OutboxTransaction : IOutboxTransaction
+    sealed class CustomTestingOutboxTransaction : IOutboxTransaction
     {
         public TaskCompletionSource<bool> CommitTaskCompletionSource { get; set; } = null;
 
-        public OutboxTransaction(ContextBag contextBag)
+        public CustomTestingOutboxTransaction(ContextBag contextBag)
         {
             if (contextBag.TryGet(out CustomTestingPersistenceOpenSessionOptions options))
             {
                 CommitTaskCompletionSource = options.TransactionCommitTaskCompletionSource;
             }
 
-            Transaction = new Transaction();
+            Transaction = new AcceptanceTestingTransaction();
         }
 
-        public Transaction Transaction { get; private set; }
+        public AcceptanceTestingTransaction Transaction { get; private set; }
 
         public void Dispose()
         {
diff --git a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingPersistence.cs b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingPersistence.cs
index aacd097..5bbef3a 100644
--- a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingPersistence.cs
+++ b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingPersistence.cs
@@ -6,6 +6,6 @@ namespace NServiceBus.AcceptanceTesting
     public class CustomTestingPersistence : PersistenceDefinition
     {
         internal CustomTestingPersistence() =>
-            Supports<StorageType.Outbox>(s => s.EnableFeatureByDefault<OutboxStorage>());
+            Supports<StorageType.Outbox>(s => s.EnableFeatureByDefault<CustomTestingOutboxPersistence>());
     }
 }
\ No newline at end of file
diff --git a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingPersistenceOpenSessionOptions.cs b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingPersistenceOpenSessionOptions.cs
index c4c5ca4..f911852 100644
--- a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingPersistenceOpenSessionOptions.cs
+++ b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingPersistenceOpenSessionOptions.cs
@@ -1,7 +1,6 @@
-namespace NServiceBus.AcceptanceTesting
+namespace NServiceBus.TransactionalSession
 {
     using System.Threading.Tasks;
-    using TransactionalSession;
 
     public class CustomTestingPersistenceOpenSessionOptions : OpenSessionOptions
     {
diff --git a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/SynchronizedStorage.cs b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingSynchronizedStorageFeature.cs
similarity index 58%
rename from src/NServiceBus.TransactionalSession.CustomTestingPersistence/SynchronizedStorage.cs
rename to src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingSynchronizedStorageFeature.cs
index ed648d1..ccf4645 100644
--- a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/SynchronizedStorage.cs
+++ b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingSynchronizedStorageFeature.cs
@@ -4,15 +4,13 @@ namespace NServiceBus.AcceptanceTesting
     using Microsoft.Extensions.DependencyInjection;
     using Persistence;
 
-    class SynchronizedStorage : Feature
+    sealed class CustomTestingSynchronizedStorageFeature : Feature
     {
-        public SynchronizedStorage()
-        {
-            DependsOn<Features.SynchronizedStorage>();
-        }
+        public CustomTestingSynchronizedStorageFeature() => DependsOn<SynchronizedStorage>();
+
         protected override void Setup(FeatureConfigurationContext context)
         {
-            context.Services.AddScoped<ICompletableSynchronizedStorageSession, StorageSession>();
+            context.Services.AddScoped<ICompletableSynchronizedStorageSession, CustomTestingSynchronizedStorageSession>();
         }
     }
 }
\ No newline at end of file
diff --git a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/StorageSession.cs b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingSynchronizedStorageSession.cs
similarity index 82%
rename from src/NServiceBus.TransactionalSession.CustomTestingPersistence/StorageSession.cs
rename to src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingSynchronizedStorageSession.cs
index f4a3f1b..661d28a 100644
--- a/src/NServiceBus.TransactionalSession.CustomTestingPersistence/StorageSession.cs
+++ b/src/NServiceBus.TransactionalSession.CustomTestingPersistence/CustomTestingSynchronizedStorageSession.cs
@@ -9,16 +9,16 @@ namespace NServiceBus.AcceptanceTesting
     using Persistence;
     using Transport;
 
-    class StorageSession : ICompletableSynchronizedStorageSession
+    sealed class CustomTestingSynchronizedStorageSession : ICompletableSynchronizedStorageSession
     {
-        public Transaction Transaction { get; private set; }
+        public AcceptanceTestingTransaction Transaction { get; private set; }
 
         public void Dispose() => Transaction = null;
 
         public ValueTask<bool> TryOpen(IOutboxTransaction transaction, ContextBag context,
             CancellationToken cancellationToken = default)
         {
-            if (transaction is OutboxTransaction inMemOutboxTransaction)
+            if (transaction is CustomTestingOutboxTransaction inMemOutboxTransaction)
             {
                 Transaction = inMemOutboxTransaction.Transaction;
                 ownsTransaction = false;
@@ -36,7 +36,7 @@ public ValueTask<bool> TryOpen(TransportTransaction transportTransaction, Contex
                 return new ValueTask<bool>(false);
             }
 
-            Transaction = new Transaction();
+            Transaction = new AcceptanceTestingTransaction();
             ambientTransaction.EnlistVolatile(new EnlistmentNotification(Transaction), EnlistmentOptions.None);
             ownsTransaction = true;
             return new ValueTask<bool>(true);
@@ -45,7 +45,7 @@ public ValueTask<bool> TryOpen(TransportTransaction transportTransaction, Contex
         public Task Open(ContextBag contextBag, CancellationToken cancellationToken = default)
         {
             ownsTransaction = true;
-            Transaction = new Transaction();
+            Transaction = new AcceptanceTestingTransaction();
             return Task.CompletedTask;
         }
 
@@ -65,7 +65,7 @@ public Task CompleteAsync(CancellationToken cancellationToken = default)
 
         sealed class EnlistmentNotification : IEnlistmentNotification
         {
-            public EnlistmentNotification(Transaction transaction) => this.transaction = transaction;
+            public EnlistmentNotification(AcceptanceTestingTransaction transaction) => this.transaction = transaction;
 
             public void Prepare(PreparingEnlistment preparingEnlistment)
             {
@@ -90,7 +90,7 @@ public void Rollback(Enlistment enlistment)
 
             public void InDoubt(Enlistment enlistment) => enlistment.Done();
 
-            readonly Transaction transaction;
+            readonly AcceptanceTestingTransaction transaction;
         }
     }
 }
\ No newline at end of file