Remove base message constraint

samples/src/JustSaying.Sample.Middleware/Middlewares/InterrogateMiddleware.cs

@@ -1,4 +1,5 @@
 using JustSaying.Messaging.Middleware;
+using JustSaying.Models;
 using JustSaying.Sample.Middleware.Messages;
 using Serilog;
 
@@ -17,7 +18,8 @@ protected override async Task<bool> RunInnerAsync(HandleMessageContext context,
         }
         else if (context.Message is UnreliableMessage unreliableMessage)
         {
-            Log.Information("[{MiddlewareName}] Hello UnreliableMessage! Hope you work this time....your Name is {Name} and Id is {Id}", nameof(InterrogateMiddleware),unreliableMessage.Name, context.Message.Id);
+            var messageId = (context.Message as Message)?.Id.ToString() ?? "<unknown>";
+            Log.Information("[{MiddlewareName}] Hello UnreliableMessage! Hope you work this time....your Name is {Name} and Id is {Id}", nameof(InterrogateMiddleware),unreliableMessage.Name, messageId);
         }
 
         return await func(stoppingToken);

src/JustSaying.Extensions.DependencyInjection.Microsoft/IServiceCollectionExtensions.cs

@@ -8,7 +8,6 @@
 using JustSaying.Messaging.Middleware.Logging;
 using JustSaying.Messaging.Middleware.PostProcessing;
 using JustSaying.Messaging.Monitoring;
-using JustSaying.Models;
 using JustSaying.Naming;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -116,7 +115,7 @@ public static IServiceCollection AddJustSaying(this IServiceCollection services,
         {
             throw new ArgumentNullException(nameof(configure));
         }
-        
+
         // Register as self so the same singleton instance implements two different interfaces
         services.TryAddSingleton((p) => new ServiceProviderResolver(p));
         services.TryAddSingleton<IHandlerResolver>((p) => p.GetRequiredService<ServiceProviderResolver>());
@@ -197,7 +196,7 @@ public static IServiceCollection AddJustSaying(this IServiceCollection services,
     /// <paramref name="services"/> is <see langword="null"/>.
     /// </exception>
     public static IServiceCollection AddJustSayingHandler<TMessage, THandler>(this IServiceCollection services)
-        where TMessage : Message
+        where TMessage : class
         where THandler : class, IHandlerAsync<TMessage>
     {
         if (services == null)
@@ -227,7 +226,7 @@ public static IServiceCollection AddJustSayingHandler<TMessage, THandler>(this I
     public static IServiceCollection AddJustSayingHandlers<TMessage>(
         this IServiceCollection services,
         IEnumerable<IHandlerAsync<TMessage>> handlers)
-        where TMessage : Message
+        where TMessage : class
     {
         if (services == null)
         {

src/JustSaying.Extensions.DependencyInjection.StructureMap/RegistryExtensions.cs

@@ -1,6 +1,5 @@
 using System.ComponentModel;
 using JustSaying.Messaging.MessageHandling;
-using JustSaying.Models;
 
 namespace StructureMap;
 
@@ -20,7 +19,7 @@ public static class RegistryExtensions
     /// <paramref name="registry"/> is <see langword="null"/>.
     /// </exception>
     public static void AddJustSayingHandler<TMessage, THandler>(this Registry registry)
-        where TMessage : Message
+        where TMessage : class
         where THandler : class, IHandlerAsync<TMessage>
     {
         if (registry == null)
@@ -30,4 +29,4 @@ public static void AddJustSayingHandler<TMessage, THandler>(this Registry regist
 
         registry.For<IHandlerAsync<TMessage>>().Use<THandler>();
     }
-}
+}

src/JustSaying/AwsTools/MessageHandling/Dispatch/MessageDispatcher.cs

@@ -3,7 +3,6 @@
 using JustSaying.Messaging.MessageSerialization;
 using JustSaying.Messaging.Middleware;
 using JustSaying.Messaging.Monitoring;
-using JustSaying.Models;
 using Microsoft.Extensions.Logging;
 
 namespace JustSaying.AwsTools.MessageHandling.Dispatch;
@@ -37,29 +36,29 @@ public async Task DispatchMessageAsync(
             return;
         }
 
-        (bool success, Message typedMessage, MessageAttributes attributes) =
+        (bool success, object messageInstance, MessageAttributes attributes) =
             await DeserializeMessage(messageContext, cancellationToken).ConfigureAwait(false);
 
         if (!success)
         {
             return;
         }
 
-        var messageType = typedMessage.GetType();
+        var messageType = messageInstance.GetType();
         var middleware = _middlewareMap.Get(messageContext.QueueName, messageType);
 
         if (middleware == null)
         {
             _logger.LogError(
                 "Failed to dispatch. Middleware for message of type '{MessageTypeName}' not found in middleware map.",
-                typedMessage.GetType().FullName);
+                messageInstance.GetType().FullName);
             return;
         }
 
         var handleContext = new HandleMessageContext(
             messageContext.QueueName,
             messageContext.Message,
-            typedMessage,
+            messageInstance,
             messageType,
             messageContext,
             messageContext,
@@ -71,8 +70,7 @@ await middleware.RunAsync(handleContext, null, cancellationToken)
 
     }
 
-    private async Task<(bool success, Message typedMessage, MessageAttributes attributes)>
-        DeserializeMessage(IQueueMessageContext messageContext, CancellationToken cancellationToken)
+    private async Task<(bool success, object messageInstance, MessageAttributes attributes)> DeserializeMessage(IQueueMessageContext messageContext, CancellationToken cancellationToken)
     {
         try
         {

src/JustSaying/AwsTools/MessageHandling/Dispatch/MiddlewareMap.cs

@@ -1,5 +1,4 @@
 using JustSaying.Messaging.Interrogation;
-using JustSaying.Models;
 using HandleMessageMiddleware = JustSaying.Messaging.Middleware.MiddlewareBase<JustSaying.Messaging.Middleware.HandleMessageContext, bool>;
 
 namespace JustSaying.AwsTools.MessageHandling.Dispatch;
@@ -49,15 +48,15 @@ public IEnumerable<Type> Types
     /// Adds a middleware chain to be executed when a message arrives in a queue.
     /// If the middleware is already registered for a queue, it will not be added again.
     /// </summary>
-    /// <typeparam name="T">The type of the message to handle on this queue.</typeparam>
+    /// <typeparam name="TMessage">The type of the message to handle on this queue.</typeparam>
     /// <param name="queueName">The queue to register the middleware for.</param>
     /// <param name="middleware">The factory function to create middleware with.</param>
-    public MiddlewareMap Add<T>(string queueName, HandleMessageMiddleware middleware) where T : Message
+    public MiddlewareMap Add<TMessage>(string queueName, HandleMessageMiddleware middleware) where TMessage : class
     {
         if (queueName is null) throw new ArgumentNullException(nameof(queueName));
         if (middleware is null) throw new ArgumentNullException(nameof(middleware));
 
-        _middlewares[(queueName, typeof(T))] = middleware;
+        _middlewares[(queueName, typeof(TMessage))] = middleware;
 
         return this;
     }
@@ -91,4 +90,4 @@ public InterrogationResult Interrogate()
             Middlewares = middlewares
         });
     }
-}
+}

src/JustSaying/AwsTools/MessageHandling/SnsMessagePublisher.cs

@@ -10,12 +10,12 @@
 
 namespace JustSaying.AwsTools.MessageHandling;
 
-public class SnsMessagePublisher : IMessagePublisher, IInterrogable
+public class SnsMessagePublisher<TMessage> : IMessagePublisher<TMessage>, IInterrogable where TMessage : class
 {
     private readonly IMessageSerializationRegister _serializationRegister;
     private readonly IMessageSubjectProvider _messageSubjectProvider;
-    private readonly Func<Exception, Message, bool> _handleException;
-    public Action<MessageResponse, Message> MessageResponseLogger { get; set; }
+    private readonly Func<Exception, TMessage, bool> _handleException;
+    public Action<MessageResponse, TMessage> MessageResponseLogger { get; set; }
     public string Arn { get; internal set; }
     protected IAmazonSimpleNotificationService Client { get; }
     private readonly ILogger _logger;
@@ -26,7 +26,7 @@ public SnsMessagePublisher(
         IMessageSerializationRegister serializationRegister,
         ILoggerFactory loggerFactory,
         IMessageSubjectProvider messageSubjectProvider,
-        Func<Exception, Message, bool> handleException = null)
+        Func<Exception, TMessage, bool> handleException = null)
         : this(client, serializationRegister, loggerFactory, messageSubjectProvider, handleException)
     {
         Arn = topicArn;
@@ -37,7 +37,7 @@ public SnsMessagePublisher(
         IMessageSerializationRegister serializationRegister,
         ILoggerFactory loggerFactory,
         IMessageSubjectProvider messageSubjectProvider,
-        Func<Exception, Message, bool> handleException = null)
+        Func<Exception, TMessage, bool> handleException = null)
     {
         Client = client;
         _serializationRegister = serializationRegister;
@@ -51,10 +51,10 @@ public Task StartAsync(CancellationToken cancellationToken)
         return Task.CompletedTask;
     }
 
-    public Task PublishAsync(Message message, CancellationToken cancellationToken)
+    public Task PublishAsync(TMessage message, CancellationToken cancellationToken)
         => PublishAsync(message, null, cancellationToken);
 
-    public async Task PublishAsync(Message message, PublishMetadata metadata, CancellationToken cancellationToken)
+    public async Task PublishAsync(TMessage message, PublishMetadata metadata, CancellationToken cancellationToken)
     {
         var request = BuildPublishRequest(message, metadata);
         PublishResponse response = null;
@@ -79,7 +79,7 @@ public async Task PublishAsync(Message message, PublishMetadata metadata, Cancel
         {
             _logger.LogInformation(
                 "Published message {MessageId} of type {MessageType} to {DestinationType} '{MessageDestination}'.",
-                message.Id,
+                (message as Message)?.Id.ToString() ?? "<unknown>",
                 message.GetType().FullName,
                 "Topic",
                 request.TopicArn);
@@ -97,9 +97,9 @@ public async Task PublishAsync(Message message, PublishMetadata metadata, Cancel
         }
     }
 
-    private bool ClientExceptionHandler(Exception ex, Message message) => _handleException?.Invoke(ex, message) ?? false;
+    private bool ClientExceptionHandler(Exception ex, TMessage message) => _handleException?.Invoke(ex, message) ?? false;
 
-    private PublishRequest BuildPublishRequest(Message message, PublishMetadata metadata)
+    private PublishRequest BuildPublishRequest(TMessage message, PublishMetadata metadata)
     {
         var messageToSend = _serializationRegister.Serialize(message, serializeForSnsPublishing: true);
         var messageType = _messageSubjectProvider.GetSubjectForType(message.GetType());

src/JustSaying/AwsTools/MessageHandling/SqsMessagePublisher.cs

@@ -9,12 +9,12 @@
 
 namespace JustSaying.AwsTools.MessageHandling;
 
-public class SqsMessagePublisher : IMessagePublisher
+public class SqsMessagePublisher<TMessage> : IMessagePublisher<TMessage>  where TMessage : class
 {
     private readonly IAmazonSQS _client;
     private readonly IMessageSerializationRegister _serializationRegister;
     private readonly ILogger _logger;
-    public Action<MessageResponse, Message> MessageResponseLogger { get; set; }
+    public Action<MessageResponse, TMessage> MessageResponseLogger { get; set; }
 
     public Uri QueueUrl { get; internal set; }
 
@@ -42,10 +42,10 @@ public Task StartAsync(CancellationToken cancellationToken)
         return Task.CompletedTask;
     }
 
-    public async Task PublishAsync(Message message, CancellationToken cancellationToken)
+    public async Task PublishAsync(TMessage message, CancellationToken cancellationToken)
         => await PublishAsync(message, null, cancellationToken).ConfigureAwait(false);
 
-    public async Task PublishAsync(Message message, PublishMetadata metadata, CancellationToken cancellationToken)
+    public async Task PublishAsync(TMessage message, PublishMetadata metadata, CancellationToken cancellationToken)
     {
         if (QueueUrl is null) throw new PublishException("Queue URL was null, perhaps you need to call `StartAsync` on the `IMessagePublisher` before publishing.");
 
@@ -69,7 +69,7 @@ public async Task PublishAsync(Message message, PublishMetadata metadata, Cancel
         {
             _logger.LogInformation(
                 "Published message {MessageId} of type {MessageType} to {DestinationType} '{MessageDestination}'.",
-                message.Id,
+                (message as Message)?.Id.ToString() ?? "<unknown>",
                 message.GetType().FullName,
                 "Queue",
                 request.QueueUrl);
@@ -87,7 +87,7 @@ public async Task PublishAsync(Message message, PublishMetadata metadata, Cancel
         }
     }
 
-    private SendMessageRequest BuildSendMessageRequest(Message message, PublishMetadata metadata)
+    private SendMessageRequest BuildSendMessageRequest(TMessage message, PublishMetadata metadata)
     {
         var request = new SendMessageRequest
         {
@@ -103,7 +103,7 @@ private SendMessageRequest BuildSendMessageRequest(Message message, PublishMetad
         return request;
     }
 
-    public string GetMessageInContext(Message message) => _serializationRegister.Serialize(message, serializeForSnsPublishing: false);
+    public string GetMessageInContext(TMessage message) => _serializationRegister.Serialize(message, serializeForSnsPublishing: false);
 
     public InterrogationResult Interrogate()
     {

src/JustSaying/Fluent/IPublicationBuilder`1.cs

@@ -7,11 +7,7 @@ namespace JustSaying.Fluent;
 /// <summary>
 /// Defines a builder for a publication.
 /// </summary>
-/// <typeparam name="T">
-/// The type of the messages to publish.
-/// </typeparam>
-internal interface IPublicationBuilder<out T>
-    where T : Message
+internal interface IPublicationBuilder
 {
     /// <summary>
     /// Configures the publication for the <see cref="JustSayingBus"/>.
@@ -20,4 +16,4 @@ internal interface IPublicationBuilder<out T>
     /// <param name="proxy">The <see cref="IAwsClientFactoryProxy"/> to use to create SQS/SNS clients with.</param>
     /// <param name="loggerFactory">The <see cref="ILoggerFactory"/> logger factory to use.</param>
     void Configure(JustSayingBus bus, IAwsClientFactoryProxy proxy, ILoggerFactory loggerFactory);
-}
+}

src/JustSaying/Fluent/ISubscriptionBuilder`1.cs

@@ -9,11 +9,11 @@ namespace JustSaying.Fluent;
 /// <summary>
 /// Defines a builder for a subscription.
 /// </summary>
-/// <typeparam name="T">
+/// <typeparam name="TMessage">
 /// The type of the messages to subscribe to.
 /// </typeparam>
-public interface ISubscriptionBuilder<out T>
-    where T : Message
+public interface ISubscriptionBuilder<out TMessage>
+    where TMessage : class
 {
     /// <summary>
     /// Configures the middleware pipeline for this subscription.
@@ -53,7 +53,7 @@ public interface ISubscriptionBuilder<out T>
     /// </ul>
     /// </example>
     /// <returns>The current <see cref="SqsReadConfigurationBuilder"/>.</returns>
-    public ISubscriptionBuilder<T> WithMiddlewareConfiguration(Action<HandlerMiddlewareBuilder> middlewareConfiguration);
+    public ISubscriptionBuilder<TMessage> WithMiddlewareConfiguration(Action<HandlerMiddlewareBuilder> middlewareConfiguration);
 
 
     /// <summary>

src/JustSaying/Fluent/MessagingConfigurationBuilder.cs

@@ -30,7 +30,7 @@ internal MessagingConfigurationBuilder(MessagingBusBuilder busBuilder)
     /// <summary>
     /// Gets or sets the optional value to use for <see cref="IPublishConfiguration.MessageResponseLogger"/>
     /// </summary>
-    private Action<MessageResponse, Message> MessageResponseLogger { get; set; }
+    private Action<MessageResponse, object> MessageResponseLogger { get; set; }
 
     /// <summary>
     /// Gets or sets the optional value to use for <see cref="IPublishConfiguration.PublishFailureBackoff"/>
@@ -133,7 +133,7 @@ public MessagingConfigurationBuilder WithAdditionalSubscriberAccount(string acco
     /// <exception cref="ArgumentNullException">
     /// <paramref name="logger"/> is <see langword="null"/>.
     /// </exception>
-    public MessagingConfigurationBuilder WithMessageResponseLogger(Action<MessageResponse, Message> logger)
+    public MessagingConfigurationBuilder WithMessageResponseLogger(Action<MessageResponse, object> logger)
     {
         MessageResponseLogger = logger ?? throw new ArgumentNullException(nameof(logger));
         return this;
@@ -334,4 +334,4 @@ public IMessagingConfig Build()
 
         return config;
     }
-}
+}