- observer refactoring

Author: eben-roux

Shuttle.Recall/EventProcessing/EventProcessor.cs

@@ -39,7 +39,7 @@ public IEventProcessor Start()
 
             foreach (var eventProjection in _projections)
             {
-                var processorThread = new ProcessorThread(string.Format("Projection-{0}", eventProjection.Name),
+                var processorThread = new ProcessorThread($"Projection-{eventProjection.Name}",
                     new ProjectionProcessor(_configuration, _pipelineFactory, eventProjection));
 
                 processorThread.Start();

Shuttle.Recall/EventStore.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Shuttle.Core.Container;
 using Shuttle.Core.Contract;
 using Shuttle.Core.Pipelines;
@@ -158,16 +159,36 @@ public static void Register(IComponentRegistry registry, IEventStoreConfiguratio
                 registry.Register(type, type, Lifestyle.Transient);
             }
 
+            var observers = new List<Type>();
+
             foreach (var type in reflectionService.GetTypesAssignableTo<IPipelineObserver>(typeof(EventStore).Assembly))
             {
-                if (type.IsInterface || registry.IsRegistered(type))
+                if (type.IsInterface || type.IsAbstract)
                 {
                     continue;
                 }
 
-                registry.Register(type, type, Lifestyle.Singleton);
+                var interfaceType = type.InterfaceMatching($"I{type.Name}");
+
+                if (interfaceType != null)
+                {
+                    if (registry.IsRegistered(type))
+                    {
+                        continue;
+                    }
+
+                    registry.Register(interfaceType, type, Lifestyle.Singleton);
+                }
+                else
+                {
+                    throw new ApplicationException(string.Format(Resources.ObserverInterfaceMissingException, type.Name));
+                }
+
+                observers.Add(type);
             }
 
+            registry.RegisterCollection(typeof(IPipelineObserver), observers, Lifestyle.Singleton);
+
             registry.AttemptRegister<IEventStore, EventStore>();
             registry.AttemptRegister<IEventProcessor, EventProcessor>();
         }

Shuttle.Recall/Pipeline/Observers/AcknowledgeEventObserver.cs

@@ -3,7 +3,11 @@
 
 namespace Shuttle.Recall
 {
-    public class AcknowledgeEventObserver : IPipelineObserver<OnAcknowledgeEvent>
+    public interface IAcknowledgeEventObserver : IPipelineObserver<OnAcknowledgeEvent>
+    {
+    }
+
+    public class AcknowledgeEventObserver : IAcknowledgeEventObserver
     {
         private readonly IProjectionRepository _repository;
         private readonly IProjectionSequenceNumberTracker _tracker;

Shuttle.Recall/Pipeline/Observers/EventProjection/GetProjectionSequenceNumberObserver.cs

@@ -3,7 +3,11 @@
 
 namespace Shuttle.Recall
 {
-    public class GetProjectionSequenceNumberObserver : IPipelineObserver<OnGetProjectionSequenceNumber>
+    public interface IGetProjectionSequenceNumberObserver : IPipelineObserver<OnGetProjectionSequenceNumber>
+    {
+    }
+
+    public class GetProjectionSequenceNumberObserver : IGetProjectionSequenceNumberObserver
     {
         private readonly IProjectionRepository _projectionRepository;
         private readonly IProjectionSequenceNumberTracker _tracker;

Shuttle.Recall/Pipeline/Observers/EventProjection/ProcessEventObserver.cs

@@ -5,7 +5,11 @@
 
 namespace Shuttle.Recall
 {
-    public class ProcessEventObserver : IPipelineObserver<OnProcessEvent>
+    public interface IProcessEventObserver : IPipelineObserver<OnProcessEvent>
+    {
+    }
+
+    public class ProcessEventObserver : IProcessEventObserver
     {
         private readonly ILog _log;
 

Shuttle.Recall/Pipeline/Observers/EventProjection/ProjectionEventEnvelopeObserver.cs

@@ -3,7 +3,11 @@
 
 namespace Shuttle.Recall
 {
-    public class ProjectionEventEnvelopeObserver : IPipelineObserver<OnGetProjectionEventEnvelope>
+    public interface IProjectionEventEnvelopeObserver : IPipelineObserver<OnGetProjectionEventEnvelope>
+    {
+    }
+
+    public class ProjectionEventEnvelopeObserver : IProjectionEventEnvelopeObserver
     {
         private readonly IPipelineFactory _pipelineFactory;
 

Shuttle.Recall/Pipeline/Observers/EventProjection/ProjectionPrimitiveEventObserver.cs

@@ -3,7 +3,11 @@
 
 namespace Shuttle.Recall
 {
-    public class ProjectionPrimitiveEventObserver : IPipelineObserver<OnGetProjectionPrimitiveEvent>
+    public interface IProjectionPrimitiveEventObserver : IPipelineObserver<OnGetProjectionPrimitiveEvent>
+    {
+    }
+
+    public class ProjectionPrimitiveEventObserver : IProjectionPrimitiveEventObserver
     {
         private readonly IEventStoreConfiguration _configuration;
         private readonly IPrimitiveEventQueue _queue;

Shuttle.Recall/Pipeline/Observers/EventStream/AssembleEventEnvelopeObserver.cs

@@ -3,7 +3,11 @@
 
 namespace Shuttle.Recall
 {
-    public class AssembleEventEnvelopeObserver : IPipelineObserver<OnAssembleEventEnvelope>
+    public interface IAssembleEventEnvelopeObserver : IPipelineObserver<OnAssembleEventEnvelope>
+    {
+    }
+
+    public class AssembleEventEnvelopeObserver : IAssembleEventEnvelopeObserver
     {
         private readonly IEventStoreConfiguration _configuration;
 

Shuttle.Recall/Pipeline/Observers/EventStream/AssembleEventEnvelopesObserver.cs

@@ -4,7 +4,11 @@
 
 namespace Shuttle.Recall
 {
-    public class AssembleEventEnvelopesObserver : IPipelineObserver<OnAssembleEventEnvelopes>
+    public interface IAssembleEventEnvelopesObserver : IPipelineObserver<OnAssembleEventEnvelopes>
+    {
+    }
+
+    public class AssembleEventEnvelopesObserver : IAssembleEventEnvelopesObserver
     {
         private readonly IPipelineFactory _pipelineFactory;
 

Shuttle.Recall/Pipeline/Observers/EventStream/AssembleEventStreamObserver.cs

@@ -3,7 +3,11 @@
 
 namespace Shuttle.Recall
 {
-    public class AssembleEventStreamObserver : IPipelineObserver<OnAssembleEventStream>
+    public interface IAssembleEventStreamObserver : IPipelineObserver<OnAssembleEventStream>
+    {
+    }
+
+    public class AssembleEventStreamObserver : IAssembleEventStreamObserver
     {
         private readonly IEventMethodInvoker _eventMethodInvoker;