Adjust for new feature api

Author: andreasohlund

src/NServiceBus.Transport.SQS.AcceptanceTests/Sending/When_sending_control_messages_without_body.cs

@@ -34,12 +34,14 @@ public async Task Can_be_sent_and_processed()
 
     class Sender : EndpointConfigurationBuilder
     {
-        public Sender() => EndpointSetup<DefaultServer>(cfg => cfg.ConfigureSqsTransport().DoNotWrapOutgoingMessages = true);
+        public Sender() => EndpointSetup<DefaultServer>(cfg =>
+        {
+            cfg.EnableFeature<DispatchControlMessageAtStartup>();
+            cfg.ConfigureSqsTransport().DoNotWrapOutgoingMessages = true;
+        });
 
         class DispatchControlMessageAtStartup : Feature
         {
-            public DispatchControlMessageAtStartup() => EnableByDefault();
-
             protected override void Setup(FeatureConfigurationContext context) =>
                 context.RegisterStartupTask(sp => new Startup(
                     sp.GetRequiredService<IMessageDispatcher>(),

src/NServiceBus.Transport.SQS.AcceptanceTests/Sending/When_sending_messages_with_invalid_sqs_chars.cs

@@ -36,12 +36,14 @@ public async Task Can_be_sent_and_processed()
 
     class Sender : EndpointConfigurationBuilder
     {
-        public Sender() => EndpointSetup<DefaultServer>(cfg => cfg.ConfigureSqsTransport().DoNotWrapOutgoingMessages = true);
+        public Sender() => EndpointSetup<DefaultServer>(cfg =>
+        {
+            cfg.EnableFeature<DispatchControlMessageAtStartup>();
+            cfg.ConfigureSqsTransport().DoNotWrapOutgoingMessages = true;
+        });
 
         class DispatchControlMessageAtStartup : Feature
         {
-            public DispatchControlMessageAtStartup() => EnableByDefault();
-
             protected override void Setup(FeatureConfigurationContext context) =>
                 context.RegisterStartupTask(sp => new Startup(
                     sp.GetRequiredService<IMessageDispatcher>(),

src/NServiceBus.Transport.SQS.AcceptanceTests/TestingInMemoryPersistence.cs

@@ -15,23 +15,16 @@
 using Unicast.Subscriptions;
 using Unicast.Subscriptions.MessageDrivenSubscriptions;
 
-public class TestingInMemoryPersistence : PersistenceDefinition
+public class TestingInMemoryPersistence : PersistenceDefinition, IPersistenceDefinitionFactory<TestingInMemoryPersistence>
 {
-    internal TestingInMemoryPersistence()
-    {
-        Supports<StorageType.Subscriptions>(s =>
-        {
-            s.EnableFeatureByDefault<TestingInMemorySubscriptionPersistence>();
-        });
-    }
+    TestingInMemoryPersistence() => Supports<StorageType.Subscriptions, TestingInMemorySubscriptionPersistence>();
+
+    public static TestingInMemoryPersistence Create() => new();
 }
 
 public static class InMemoryPersistenceExtensions
 {
-    public static void UseStorage(this PersistenceExtensions<TestingInMemoryPersistence> extensions, TestingInMemorySubscriptionStorage storageInstance)
-    {
-        extensions.GetSettings().Set("InMemoryPersistence.StorageInstance", storageInstance);
-    }
+    public static void UseStorage(this PersistenceExtensions<TestingInMemoryPersistence> extensions, TestingInMemorySubscriptionStorage storageInstance) => extensions.GetSettings().Set("InMemoryPersistence.StorageInstance", storageInstance);
 }
 
 public class TestingInMemorySubscriptionPersistence : Features.Feature
@@ -57,29 +50,31 @@ public Task Subscribe(Subscriber subscriber, MessageType messageType, ContextBag
         return Task.FromResult(true);
     }
 
-    static string BuildKey(Subscriber subscriber)
-    {
-        return $"{subscriber.TransportAddress ?? ""}_{subscriber.Endpoint ?? ""}";
-    }
+    static string BuildKey(Subscriber subscriber) => $"{subscriber.TransportAddress ?? ""}_{subscriber.Endpoint ?? ""}";
 
     public Task Unsubscribe(Subscriber subscriber, MessageType messageType, ContextBag context, CancellationToken cancellationToken)
     {
         if (storage.TryGetValue(messageType, out var dict))
         {
             dict.TryRemove(BuildKey(subscriber), out var _);
         }
+
         return Task.FromResult(true);
     }
 
     public Task<IEnumerable<Subscriber>> GetSubscriberAddressesForMessage(IEnumerable<MessageType> messageTypes, ContextBag context, CancellationToken cancellationToken)
     {
         var subscribers = messageTypes
             .SelectMany(msgType => storage.TryGetValue(msgType, out var subs) ? subs.Values : [])
-            .GroupBy(s => new { s.TransportAddress, s.Endpoint }) // Subscriber does not implement IEquatable<T>
+            .GroupBy(s => new
+            {
+                s.TransportAddress,
+                s.Endpoint
+            }) // Subscriber does not implement IEquatable<T>
             .Select(g => g.First());
 
         return Task.FromResult(subscribers);
     }
 
-    ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>> storage = new ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>>();
+    readonly ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>> storage = new();
 }