Remove WithMessageHandler<IHandlerAsync<T>>

src/JustSaying/JustSayingFluently.cs

@@ -250,46 +250,6 @@ public IFluentSubscription IntoQueue(string queueName)
             return this;
         }
 
-        /// <summary>
-        /// Set message handlers for the given topic
-        /// </summary>
-        /// <typeparam name="T">Message type to be handled</typeparam>
-        /// <param name="handler">Handler for the message type</param>
-        /// <returns></returns>
-        public IHaveFulfilledSubscriptionRequirements WithMessageHandler<T>(IHandlerAsync<T> handler) where T : Message
-        {
-            if (handler == null)
-            {
-                throw new ArgumentNullException(nameof(handler));
-            }
-
-            if (_serializationFactory == null)
-            {
-                throw new InvalidOperationException($"No {nameof(IMessageSerializationFactory)} has been configured.");
-            }
-
-            // TODO - Subscription listeners should be just added once per queue,
-            // and not for each message handler
-            var thing = _subscriptionConfig.SubscriptionType == SubscriptionType.PointToPoint
-                ? PointToPointHandler<T>()
-                : TopicHandler<T>();
-
-            Bus.SerializationRegister.AddSerializer<T>(_serializationFactory.GetSerializer<T>());
-
-            foreach (var region in Bus.Config.Regions)
-            {
-                Bus.AddMessageHandler(region, _subscriptionConfig.QueueName, () => handler);
-            }
-
-            _log.LogInformation(
-                "Added a message handler of type '{HandlerType}' for message type '{MessageType}' on queue '{QueueName}'.",
-                handler.GetType(),
-                typeof(T),
-                _subscriptionConfig.QueueName);
-
-            return thing;
-        }
-
         public IHaveFulfilledSubscriptionRequirements WithMessageHandler<T>(IHandlerResolver handlerResolver) where T : Message
         {
             if (_serializationFactory == null)

src/JustSaying/JustSayingFluentlyExtensions.cs

@@ -1,11 +1,8 @@
-using System;
 using System.Collections.Generic;
 using JustSaying.AwsTools;
 using JustSaying.AwsTools.QueueCreation;
-using JustSaying.Messaging.MessageHandling;
 using JustSaying.Messaging.MessageSerialization;
 using JustSaying.Messaging.Monitoring;
-using JustSaying.Models;
 
 namespace JustSaying
 {
@@ -62,27 +59,5 @@ public static IFluentSubscription IntoDefaultQueue(this ISubscriberIntoQueue sub
         {
             return subscriber.IntoQueue(string.Empty);
         }
-
-        public static IHaveFulfilledSubscriptionRequirements WithMessageHandlers<T>(
-             this IFluentSubscription sub, params IHandlerAsync<T>[] handlers) where T : Message
-        {
-            if (handlers == null)
-            {
-                throw new ArgumentNullException(nameof(handlers));
-            }
-
-            if (handlers.Length == 0)
-            {
-                throw new ArgumentException("No message handlers specified.", nameof(handlers));
-            }
-
-            if (handlers.Length == 1)
-            {
-                sub.WithMessageHandler(handlers[0]);
-            }
-
-            var listHandler = new ListHandler<T>(handlers);
-            return sub.WithMessageHandler(listHandler);
-        }
     }
 }

src/JustSaying/JustSayingFluentlyInterfaces.cs

@@ -83,8 +83,6 @@ public interface IAmJustSayingFluently : IMessagePublisher
 
     public interface IFluentSubscription
     {
-        IHaveFulfilledSubscriptionRequirements WithMessageHandler<T>(IHandlerAsync<T> handler) where T : Message;
-
         IHaveFulfilledSubscriptionRequirements WithMessageHandler<T>(IHandlerResolver handlerResolver) where T : Message;
 
         IFluentSubscription ConfigureSubscriptionWith(Action<SqsReadConfiguration> config);

tests/JustSaying.UnitTests/JustSayingFluently/AddingHandlers/WhenAddingASubscriptionHandler.cs

@@ -16,12 +16,17 @@ public class WhenAddingASubscriptionHandler : JustSayingFluentlyTestBase
         private readonly IHandlerAsync<Message> _handler = Substitute.For<IHandlerAsync<Message>>();
         private object _response;
 
+        protected override void Given()
+        {
+            HandlerResolver.ResolveHandler<Message>(new HandlerResolutionContext("queue-name")).Returns(_handler);
+        }
+
         protected override Task WhenAsync()
         {
             _response = SystemUnderTest
                 .WithSqsTopicSubscriber()
                 .IntoDefaultQueue()
-                .WithMessageHandler(_handler);
+                .WithMessageHandler<Message>(HandlerResolver);
 
             return Task.CompletedTask;
         }

tests/JustSaying.UnitTests/JustSayingFluently/AddingHandlers/WhenAddingASubscriptionHandlerForAGenericMessage.cs

@@ -19,12 +19,17 @@ public class WhenAddingASubscriptionHandlerForAGenericMessage : JustSayingFluent
         private readonly IHandlerAsync<JustSayingMessage<MyMessage>> _handler = Substitute.For<IHandlerAsync<JustSayingMessage<MyMessage>>>();
         private object _response;
 
+        protected override void Given()
+        {
+            HandlerResolver.ResolveHandler<JustSayingMessage<MyMessage>>(new HandlerResolutionContext("queue-name")).Returns(_handler);
+        }
+
         protected override Task WhenAsync()
         {
             _response = SystemUnderTest
                 .WithSqsTopicSubscriber()
                 .IntoDefaultQueue()
-                .WithMessageHandler(_handler);
+                .WithMessageHandler<JustSayingMessage<MyMessage>>(HandlerResolver);
 
             return Task.CompletedTask;
         }

tests/JustSaying.UnitTests/JustSayingFluently/AddingHandlers/WhenSubscribingPointToPoint.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Reflection.Metadata;
 using System.Threading.Tasks;
 using JustSaying.AwsTools.QueueCreation;
 using JustSaying.Messaging;
@@ -16,12 +17,17 @@ public class WhenSubscribingPointToPoint : JustSayingFluentlyTestBase
         private readonly IHandlerAsync<Message> _handler = Substitute.For<IHandlerAsync<Message>>();
         private object _response;
 
+        protected override void Given()
+        {
+            HandlerResolver.ResolveHandler<Message>(new HandlerResolutionContext("queue-name")).Returns(_handler);
+        }
+
         protected override Task WhenAsync()
         {
             _response = SystemUnderTest
                 .WithSqsPointToPointSubscriber()
                 .IntoDefaultQueue()
-                .WithMessageHandler(_handler);
+                .WithMessageHandler<Message>(HandlerResolver);
 
             return Task.CompletedTask;
         }

tests/JustSaying.UnitTests/JustSayingFluentlyTestBase.cs

@@ -12,6 +12,7 @@ public abstract class JustSayingFluentlyTestBase : IAsyncLifetime
     {
         protected IPublishConfiguration Configuration;
         protected IAmJustSaying Bus;
+        protected readonly IHandlerResolver HandlerResolver = Substitute.For<IHandlerResolver>();
         protected readonly IVerifyAmazonQueues QueueVerifier = Substitute.For<IVerifyAmazonQueues>();
         private bool _recordThrownExceptions;
         protected Exception ThrownException { get; private set; }