Changed Notification to Message (#1)

Kralizek · Sep 9, 2018 · f671098 · f671098
1 parent 87032ff
commit f671098
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/src/Kralizek.Lambda.Template.Sqs/IMessageHandler.cs b/src/Kralizek.Lambda.Template.Sqs/IMessageHandler.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Amazon.Lambda.Core;
+
+namespace Kralizek.Lambda
+{
+    public interface IMessageHandler<in TMessage> where TMessage : class
+    {
+        Task HandleAsync(TMessage message, ILambdaContext context);
+    }
+}
diff --git a/src/Kralizek.Lambda.Template.Sqs/INotificationHandler.cs b/src/Kralizek.Lambda.Template.Sqs/INotificationHandler.cs
diff --git a/src/Kralizek.Lambda.Template.Sqs/ServiceCollectionExtensions.cs b/src/Kralizek.Lambda.Template.Sqs/ServiceCollectionExtensions.cs
@@ -5,13 +5,13 @@ namespace Kralizek.Lambda
 {
     public static class ServiceCollectionExtensions
     {
-        public static IServiceCollection UseSqsHandler<TNotification, THandler>(this IServiceCollection services) 
-            where TNotification : class
-            where THandler : class, INotificationHandler<TNotification>
+        public static IServiceCollection UseSqsHandler<TMessage, THandler>(this IServiceCollection services) 
+            where TMessage : class
+            where THandler : class, IMessageHandler<TMessage>
         {
-            services.AddTransient<IEventHandler<SQSEvent>, SqsEventHandler<TNotification>>();
+            services.AddTransient<IEventHandler<SQSEvent>, SqsEventHandler<TMessage>>();
 
-            services.AddTransient<INotificationHandler<TNotification>, THandler>();
+            services.AddTransient<IMessageHandler<TMessage>, THandler>();
 
             return services;
         }

diff --git a/src/Kralizek.Lambda.Template.Sqs/SqsEventHandler.cs b/src/Kralizek.Lambda.Template.Sqs/SqsEventHandler.cs
@@ -8,7 +8,7 @@
 
 namespace Kralizek.Lambda
 {
-    public class SqsEventHandler<TNotification> : IEventHandler<SQSEvent> where TNotification : class
+    public class SqsEventHandler<TMessage> : IEventHandler<SQSEvent> where TMessage : class
     {
         private readonly ILogger _logger;
         private readonly IServiceProvider _serviceProvider;
@@ -25,19 +25,19 @@ public async Task HandleAsync(SQSEvent input, ILambdaContext context)
             {
                 using (_serviceProvider.CreateScope())
                 {
-                    var message = record.Body;
-                    var notification = JsonConvert.DeserializeObject<TNotification>(message);
+                    var sqsMessage = record.Body;
+                    var message = JsonConvert.DeserializeObject<TMessage>(sqsMessage);
 
-                    var handler = _serviceProvider.GetService<INotificationHandler<TNotification>>();
+                    var handler = _serviceProvider.GetService<IMessageHandler<TMessage>>();
 
                     if (handler == null)
                     {
-                        _logger.LogCritical($"No INotificationHandler<{typeof(TNotification).Name}> could be found.");
-                        throw new InvalidOperationException($"No INotificationHandler<{typeof(TNotification).Name}> could be found.");
+                        _logger.LogCritical($"No IMessageHandler<{typeof(TMessage).Name}> could be found.");
+                        throw new InvalidOperationException($"No IMessageHandler<{typeof(TMessage).Name}> could be found.");
                     }
 
                     _logger.LogInformation("Invoking notification handler");
-                    await handler.HandleAsync(notification, context);
+                    await handler.HandleAsync(message, context);
                 }
             }
         }