AddAssemblyTriggers now ignores Abstract classes

Author: koenbeuk

src/EntityFrameworkCore.Triggered.Extensions/ServiceCollectionExtensions.cs

@@ -76,7 +76,8 @@ public static IServiceCollection AddAssemblyTriggers(this IServiceCollection ser
 
             var assemblyTypes = assemblies
                 .SelectMany(x => x.GetTypes())
-                .Where(x => x.IsClass);
+                .Where(x => x.IsClass)
+                .Where(x => !x.IsAbstract);
 
             foreach (var assemblyType in assemblyTypes)
             {

src/EntityFrameworkCore.Triggered.Extensions/TriggersContextOptionsBuilderExtensions.cs

@@ -26,7 +26,8 @@ public static TriggersContextOptionsBuilder AddAssemblyTriggers(this TriggersCon
 
             var assemblyTypes = assemblies
                 .SelectMany(x => x.GetTypes())
-                .Where(x => x.IsClass);
+                .Where(x => x.IsClass)
+                .Where(x => !x.IsAbstract);
 
             foreach (var assemblyType in assemblyTypes)
             {

test/EntityFrameworkCore.Triggered.Extensions.Tests/AbstractTrigger.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace EntityFrameworkCore.Triggered.Extensions.Tests
+{
+    public abstract class AbstractTrigger : IBeforeSaveTrigger<object>
+    {
+        public Task BeforeSave(ITriggerContext<object> context, CancellationToken cancellationToken) => throw new NotImplementedException();
+    }
+}

test/EntityFrameworkCore.Triggered.Extensions.Tests/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Usage", "EF1001:Internal EF Core API usage.", Justification = "<Pending>", Scope = "member", Target = "~M:EntityFrameworkCore.Triggered.Extensions.Tests.TriggerContextOptionsBuilderExtensionsTests.AddAssemblyTriggers_AbstractTrigger_GetsIgnored")]

test/EntityFrameworkCore.Triggered.Extensions.Tests/ServiceCollectionExtensionsTests.cs

@@ -127,5 +127,15 @@ public Task SaveChanges_ExplicitlyAddedTriggerThroughDI_RaisesAllTriggerTypes()
         [Fact]
         public Task SaveChanges_DiscoveredTriggerThroughDI_RaisesAllTriggerTypes()
             => SaveChanges_TriggeredAddedThroughDI_Template(x => x.AddAssemblyTriggers());
+
+        [Fact]
+        public void AddAssemblyTriggers_AbstractTrigger_GetsIgnored()
+        {
+            var serviceCollection = new ServiceCollection()
+                .AddAssemblyTriggers();
+
+            // Ensure that we did not register the AbstractTrigger
+            Assert.Empty(serviceCollection.Where(x => x.ImplementationType == typeof(AbstractTrigger)));
+        }
     }
 }

test/EntityFrameworkCore.Triggered.Extensions.Tests/TriggerContextOptionsBuilderExtensionsTests.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Triggered.Infrastructure;
+using EntityFrameworkCore.Triggered.Infrastructure.Internal;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace EntityFrameworkCore.Triggered.Extensions.Tests
+{
+    public class TriggerContextOptionsBuilderExtensionsTests
+    {
+        [Fact]
+        public void AddAssemblyTriggers_AbstractTrigger_GetsIgnored()
+        {
+            var context = new DbContextOptionsBuilder();
+            var builder = new TriggersContextOptionsBuilder(context);
+
+            builder.AddAssemblyTriggers();
+
+            var triggerOptionExtension = context.Options.Extensions.OfType<TriggersOptionExtension>().Single();
+
+            // Ensure that we did not register the AbstractTrigger
+            Assert.Empty(triggerOptionExtension.Triggers.Where(x => ReferenceEquals(x.typeOrInstance, typeof(AbstractTrigger))));
+        }
+    }
+}