Merge pull request #53 from adriangodong/remove-wildcard-handlers

Removed wildcard event handler registration

Author: adriangodong

GitHubHook.Tests/EventHandlersRegistryTests.cs

@@ -41,36 +41,16 @@ public void RegisterEventHandler_WithInstance_ShouldSucceed()
             Assert.AreEqual(1, eventHandlers.eventHandlers.Count);
         }
 
-        [TestMethod]
-        public void RegisterWildcardEventHandler_ShouldSucceed()
-        {
-            // Act
-            eventHandlers.RegisterWildcardEventHandler<DefaultHandler>();
-
-            // Assert
-            Assert.AreEqual(1, eventHandlers.wildcardEventHandlers.Count);
-        }
-
-        [TestMethod]
-        public void RegisterWildcardEventHandler_WithInstance_ShouldSucceed()
-        {
-            // Act
-            eventHandlers.RegisterWildcardEventHandler(new DefaultHandler());
-
-            // Assert
-            Assert.AreEqual(1, eventHandlers.wildcardEventHandlers.Count);
-        }
-
         [TestMethod]
         public void GetEventHandlersOrDefault_ShouldReturnOnlyDefaultHandler_IfEmpty()
         {
             // Act
-            var handlers = eventHandlers.GetEventHandlersOrDefault(new TestEvent());
+            var handlers = eventHandlers.GetEventHandlersOrDefault(new TestEvent()).ToList();
 
             // Assert
             Assert.IsNotNull(handlers);
-            Assert.AreEqual(1, handlers.Count());
-            Assert.IsTrue(handlers.First() is DefaultHandler);
+            Assert.AreEqual(1, handlers.Count);
+            Assert.IsTrue(handlers[0] is DefaultHandler);
         }
 
         [TestMethod]
@@ -80,37 +60,21 @@ public void GetEventHandlersOrDefault_ShouldReturnRegisteredHandler_IfAdded()
             eventHandlers.RegisterEventHandler<TestHandler>();
 
             // Act
-            var handlers = eventHandlers.GetEventHandlersOrDefault(new TestEvent());
+            var handlers = eventHandlers.GetEventHandlersOrDefault(new TestEvent()).ToList();
 
             // Assert
             Assert.IsNotNull(handlers);
-            Assert.AreEqual(1, handlers.Count());
-            Assert.IsFalse(handlers.First() is DefaultHandler);
-            Assert.IsTrue(handlers.First() is TestHandler);
+            Assert.AreEqual(1, handlers.Count);
+            Assert.IsFalse(handlers[0] is DefaultHandler);
+            Assert.IsTrue(handlers[0] is TestHandler);
         }
 
         [TestMethod]
-        public void GetEventHandlersOrDefault_ShouldReturnRegisteredWildcardHandler_IfAdded()
-        {
-            // Arrange
-            eventHandlers.RegisterWildcardEventHandler<TestHandler>();
-
-            // Act
-            var handlers = eventHandlers.GetEventHandlersOrDefault(new TestEvent());
-
-            // Assert
-            Assert.IsNotNull(handlers);
-            Assert.AreEqual(1, handlers.Count());
-            Assert.IsFalse(handlers.First() is DefaultHandler);
-            Assert.IsTrue(handlers.First() is TestHandler);
-        }
-
-        [TestMethod]
-        public void GetEventHandlersOrDefault_ShouldReturnRegisteredAndWildcardHandler_IfAdded()
+        public void GetEventHandlersOrDefault_ShouldReturnMatchedHandlers()
         {
             // Arrange
             eventHandlers.RegisterEventHandler<TestHandler>();
-            eventHandlers.RegisterWildcardEventHandler<TestHandler>();
+            eventHandlers.RegisterEventHandler<TestEventHandler>();
 
             // Act
             var handlers = eventHandlers.GetEventHandlersOrDefault(new TestEvent());
@@ -121,24 +85,28 @@ public void GetEventHandlersOrDefault_ShouldReturnRegisteredAndWildcardHandler_I
         }
 
         [TestMethod]
-        public void GetEventHandlersOrDefault_ShouldReturnAllValidHandlers()
+        public void GetEventHandlersOrDefault_ShouldNotReturnMismatchedHandlers()
         {
             // Arrange
-            eventHandlers.RegisterEventHandler<TestHandler>();
-            eventHandlers.RegisterEventHandler<DerivedTestHandler>();
+            eventHandlers.RegisterEventHandler<TestEventHandler>();
 
             // Act
-            var handlers = eventHandlers.GetEventHandlersOrDefault(new TestEvent());
+            var handlers = eventHandlers.GetEventHandlersOrDefault(new AnotherTestEvent()).ToList();
 
             // Assert
             Assert.IsNotNull(handlers);
-            Assert.AreEqual(2, handlers.Count());
+            Assert.AreEqual(1, handlers.Count);
+            Assert.IsTrue(handlers[0] is DefaultHandler);
         }
 
         private class TestEvent : BaseEvent
         {
         }
 
+        private class AnotherTestEvent : BaseEvent
+        {
+        }
+
         private class TestHandler : BaseEventHandler
         {
             public override Task<string> HandleEvent(
@@ -151,9 +119,12 @@ public override Task<string> HandleEvent(
             }
         }
 
-        private class DerivedTestHandler : GitHubHook.Handlers.EventHandler<TestEvent>
+        private class TestEventHandler : GitHubHook.Handlers.EventHandler<TestEvent>
         {
-            public override Task<string> HandleEvent(APIGatewayProxyRequest request, ILambdaContext context, string deliveryId,
+            public override Task<string> HandleEvent(
+                APIGatewayProxyRequest request,
+                ILambdaContext context,
+                string deliveryId,
                 TestEvent eventPayload)
             {
                 throw new NotImplementedException();

GitHubHook/EventHandlersRegistry.cs

@@ -8,12 +8,10 @@ public class EventHandlersRegistry : IEventHandlersRegistry
     {
 
         internal readonly List<BaseEventHandler> eventHandlers;
-        internal readonly List<BaseEventHandler> wildcardEventHandlers;
 
         public EventHandlersRegistry()
         {
             eventHandlers = new List<BaseEventHandler>();
-            wildcardEventHandlers = new List<BaseEventHandler>();
         }
 
         public void RegisterEventHandler<T>()
@@ -28,18 +26,6 @@ public void RegisterEventHandler<T>(T handler)
             eventHandlers.Add(handler);
         }
 
-        public void RegisterWildcardEventHandler<T>()
-            where T : BaseEventHandler, new()
-        {
-            RegisterWildcardEventHandler(new T());
-        }
-
-        public void RegisterWildcardEventHandler<T>(T handler)
-            where T : BaseEventHandler
-        {
-            wildcardEventHandlers.Add(handler);
-        }
-
         public IEnumerable<BaseEventHandler> GetEventHandlersOrDefault(BaseEvent eventPayload)
         {
             var type = eventPayload.GetType();
@@ -54,8 +40,6 @@ public IEnumerable<BaseEventHandler> GetEventHandlersOrDefault(BaseEvent eventPa
 
             }
 
-            handlers.AddRange(wildcardEventHandlers);
-
             if (handlers.Count == 0)
             {
                 handlers.Add(new DefaultHandler());

GitHubHook/IEventHandlersRegistry.cs

@@ -8,8 +8,6 @@ public interface IEventHandlersRegistry
     {
         void RegisterEventHandler<T>() where T : BaseEventHandler, new();
         void RegisterEventHandler<T>(T handler) where T : BaseEventHandler;
-        void RegisterWildcardEventHandler<T>() where T : BaseEventHandler, new();
-        void RegisterWildcardEventHandler<T>(T handler) where T : BaseEventHandler;
         IEnumerable<BaseEventHandler> GetEventHandlersOrDefault(BaseEvent eventPayload);
     }
 }

samples/GitHubHook.S3Dump/Function.cs

@@ -21,7 +21,7 @@ public async Task<APIGatewayProxyResponse> FunctionHandler(
         public Function()
         {
             var eventHandlers = new EventHandlersRegistry();
-            eventHandlers.RegisterWildcardEventHandler<AnyToS3Handler>();
+            eventHandlers.RegisterEventHandler<AnyToS3Handler>();
 
             lambdaHandler = new LambdaHandler(
                 new Authentication(),