Adjust subscription persistence

Author: danielmarbach

src/ServiceControl/Infrastructure/Subscriptions/ServiceControlSubscriptionPersistence.cs

@@ -1,14 +1,12 @@
 namespace ServiceControl.Infrastructure.Subscriptions
 {
     using NServiceBus;
-    using NServiceBus.Features;
     using NServiceBus.Persistence;
 
-    class ServiceControlSubscriptionPersistence : PersistenceDefinition
+    class ServiceControlSubscriptionPersistence : PersistenceDefinition, IPersistenceDefinitionFactory<ServiceControlSubscriptionPersistence>
     {
-        public ServiceControlSubscriptionPersistence()
-        {
-            Supports<StorageType.Subscriptions>(s => s.EnableFeatureByDefault<SubscriptionStorage>());
-        }
+        ServiceControlSubscriptionPersistence() => Supports<StorageType.Subscriptions, SubscriptionStorage>();
+
+        static ServiceControlSubscriptionPersistence IPersistenceDefinitionFactory<ServiceControlSubscriptionPersistence>.Create() => new();
     }
 }

src/ServiceControl/Infrastructure/Subscriptions/SubscriptionStorage.cs

@@ -8,36 +8,17 @@
     using NServiceBus.Transport;
     using ServiceControl.Persistence;
 
-    class SubscriptionStorage : Feature
+    sealed class SubscriptionStorage : Feature
     {
-        SubscriptionStorage()
-        {
-            Prerequisite(c => c.Settings.Get<TransportDefinition>().SupportsPublishSubscribe == false, "The transport supports native pub sub");
-        }
+        public SubscriptionStorage() => Prerequisite(c => c.Settings.Get<TransportDefinition>().SupportsPublishSubscribe == false, "The transport supports native pub sub");
 
-        protected override void Setup(FeatureConfigurationContext context)
-        {
-            context.RegisterStartupTask(b => new PrimeSubscriptions(b.GetRequiredService<IServiceControlSubscriptionStorage>()));
-        }
+        protected override void Setup(FeatureConfigurationContext context) => context.RegisterStartupTask(b => new PrimeSubscriptions(b.GetRequiredService<IServiceControlSubscriptionStorage>()));
 
-        class PrimeSubscriptions : FeatureStartupTask
+        class PrimeSubscriptions(IServiceControlSubscriptionStorage persister) : FeatureStartupTask
         {
-            public IServiceControlSubscriptionStorage persister;
-
-            public PrimeSubscriptions(IServiceControlSubscriptionStorage persister)
-            {
-                this.persister = persister;
-            }
-
-            protected override Task OnStart(IMessageSession session, CancellationToken cancellationToken = default)
-            {
-                return persister?.Initialize() ?? Task.CompletedTask;
-            }
+            protected override Task OnStart(IMessageSession session, CancellationToken cancellationToken = default) => persister?.Initialize() ?? Task.CompletedTask;
 
-            protected override Task OnStop(IMessageSession session, CancellationToken cancellationToken = default)
-            {
-                return Task.CompletedTask;
-            }
+            protected override Task OnStop(IMessageSession session, CancellationToken cancellationToken = default) => Task.CompletedTask;
         }
     }
 }