move AddMediator and AddValidatorsFromAssembly, source cleanup

MediatR.CommandQuery.sln

@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.0.31825.309
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0EE0FE20-53A5-41C9-BBAE-B2EC1B3808F8}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.CommandQuery.Tests", "test\MediatR.CommandQuery.Tests\MediatR.CommandQuery.Tests.csproj", "{22432F49-0412-4979-8C05-62768A48CA2E}"
 EndProject

samples/Tracker.WebService.EntityFrameworkCore/Domain/DomainServiceRegistration.cs

@@ -1,12 +1,7 @@
-using Injectio.Attributes;
-
-using MediatR.CommandQuery.EntityFrameworkCore;
+using MediatR.CommandQuery;
 
 using Microsoft.Extensions.DependencyInjection;
 
-using Tracker.WebService.Data.Entities;
-using Tracker.WebService.Domain.Mapping;
-
 namespace Tracker.WebService.Domain;
 
 public class DomainServiceRegistration

samples/Tracker.WebService.MongoDB/Domain/DomainServiceRegistration.cs

@@ -1,6 +1,6 @@
 using Injectio.Attributes;
 
-using MediatR.CommandQuery.MongoDB;
+using MediatR.CommandQuery;
 
 using Microsoft.Extensions.DependencyInjection;
 

src/MediatR.CommandQuery.Cosmos/DomainServiceExtensions.cs

@@ -18,37 +18,6 @@ namespace MediatR.CommandQuery.Cosmos;
 
 public static class DomainServiceExtensions
 {
-    public static IServiceCollection AddMediator(this IServiceCollection services)
-    {
-        if (services is null)
-            throw new System.ArgumentNullException(nameof(services));
-
-        // Register MediatR
-        var serviceConfig = new MediatRServiceConfiguration();
-        ServiceRegistrar.AddRequiredServices(services, serviceConfig);
-
-        return services;
-    }
-
-    public static IServiceCollection AddValidatorsFromAssembly<T>(this IServiceCollection services)
-    {
-        if (services is null)
-            throw new System.ArgumentNullException(nameof(services));
-
-        // Register validators
-        var scanner = AssemblyScanner.FindValidatorsInAssemblyContaining<T>();
-        foreach (var scanResult in scanner)
-        {
-            //Register as interface
-            services.TryAdd(new ServiceDescriptor(scanResult.InterfaceType, scanResult.ValidatorType, ServiceLifetime.Singleton));
-            //Register as self
-            services.TryAdd(new ServiceDescriptor(scanResult.ValidatorType, scanResult.ValidatorType, ServiceLifetime.Singleton));
-        }
-
-        return services;
-    }
-
-
     public static IServiceCollection AddEntityQueries<TRepository, TEntity, TReadModel>(this IServiceCollection services)
         where TRepository : ICosmosRepository<TEntity>
         where TEntity : class, IHaveIdentifier<string>, new()

src/MediatR.CommandQuery.EntityFrameworkCore/DomainServiceExtensions.cs

@@ -7,6 +7,7 @@
 using MediatR.CommandQuery.Extensions;
 using MediatR.CommandQuery.Queries;
 using MediatR.CommandQuery.Services;
+using MediatR.NotificationPublishers;
 using MediatR.Registration;
 
 using Microsoft.EntityFrameworkCore;
@@ -17,37 +18,6 @@ namespace MediatR.CommandQuery.EntityFrameworkCore;
 
 public static class DomainServiceExtensions
 {
-    public static IServiceCollection AddMediator(this IServiceCollection services)
-    {
-        if (services is null)
-            throw new System.ArgumentNullException(nameof(services));
-
-        // Register MediatR
-        var serviceConfig = new MediatRServiceConfiguration();
-        ServiceRegistrar.AddRequiredServices(services, serviceConfig);
-
-        return services;
-    }
-
-    public static IServiceCollection AddValidatorsFromAssembly<T>(this IServiceCollection services)
-    {
-        if (services is null)
-            throw new System.ArgumentNullException(nameof(services));
-
-        // Register validators
-        var scanner = AssemblyScanner.FindValidatorsInAssemblyContaining<T>();
-        foreach (var scanResult in scanner)
-        {
-            //Register as interface
-            services.TryAdd(new ServiceDescriptor(scanResult.InterfaceType, scanResult.ValidatorType, ServiceLifetime.Singleton));
-            //Register as self
-            services.TryAdd(new ServiceDescriptor(scanResult.ValidatorType, scanResult.ValidatorType, ServiceLifetime.Singleton));
-        }
-
-        return services;
-    }
-
-
     public static IServiceCollection AddEntityQueries<TContext, TEntity, TKey, TReadModel>(this IServiceCollection services)
         where TContext : DbContext
         where TEntity : class, IHaveIdentifier<TKey>, new()
@@ -111,7 +81,6 @@ public static IServiceCollection AddEntityQueryDistributedCache<TContext, TEntit
     }
 
 
-
     public static IServiceCollection AddEntityCommands<TContext, TEntity, TKey, TReadModel, TCreateModel, TUpdateModel>(this IServiceCollection services)
         where TContext : DbContext
         where TEntity : class, IHaveIdentifier<TKey>, new()

src/MediatR.CommandQuery.MongoDB/DomainServiceExtensions.cs

@@ -1,13 +1,10 @@
-using FluentValidation;
-
 using MediatR.CommandQuery.Behaviors;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Extensions;
 using MediatR.CommandQuery.MongoDB.Handlers;
 using MediatR.CommandQuery.Queries;
 using MediatR.CommandQuery.Services;
-using MediatR.Registration;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -18,37 +15,6 @@ namespace MediatR.CommandQuery.MongoDB;
 
 public static class DomainServiceExtensions
 {
-    public static IServiceCollection AddMediator(this IServiceCollection services)
-    {
-        if (services is null)
-            throw new System.ArgumentNullException(nameof(services));
-
-        // Register MediatR
-        var serviceConfig = new MediatRServiceConfiguration();
-        ServiceRegistrar.AddRequiredServices(services, serviceConfig);
-
-        return services;
-    }
-
-    public static IServiceCollection AddValidatorsFromAssembly<T>(this IServiceCollection services)
-    {
-        if (services is null)
-            throw new System.ArgumentNullException(nameof(services));
-
-        // Register validators
-        var scanner = AssemblyScanner.FindValidatorsInAssemblyContaining<T>();
-        foreach (var scanResult in scanner)
-        {
-            //Register as interface
-            services.TryAdd(new ServiceDescriptor(scanResult.InterfaceType, scanResult.ValidatorType, ServiceLifetime.Singleton));
-            //Register as self
-            services.TryAdd(new ServiceDescriptor(scanResult.ValidatorType, scanResult.ValidatorType, ServiceLifetime.Singleton));
-        }
-
-        return services;
-    }
-
-
     public static IServiceCollection AddEntityQueries<TRepository, TEntity, TKey, TReadModel>(this IServiceCollection services)
         where TRepository : IMongoRepository<TEntity, TKey>
         where TEntity : class, IHaveIdentifier<TKey>, new()

src/MediatR.CommandQuery/Behaviors/DeletedFilterBehaviorBase.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Security.Principal;
 
 using MediatR.CommandQuery.Definitions;

src/MediatR.CommandQuery/Behaviors/DeletedPagedQueryBehavior.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
 using MediatR.CommandQuery.Queries;
 
 using Microsoft.Extensions.Logging;

src/MediatR.CommandQuery/Behaviors/DeletedSelectQueryBehavior.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
 using MediatR.CommandQuery.Queries;
 
 using Microsoft.Extensions.Logging;

src/MediatR.CommandQuery/Behaviors/DistributedCacheQueryBehavior.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
 using MediatR.CommandQuery.Definitions;
 
 using Microsoft.Extensions.Caching.Distributed;

src/MediatR.CommandQuery/Behaviors/EntityChangeNotificationBehavior.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Notifications;
 

src/MediatR.CommandQuery/Behaviors/TenantAuthenticateCommandBehavior.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Definitions;

src/MediatR.CommandQuery/Behaviors/TenantDefaultCommandBehavior.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Definitions;
 

src/MediatR.CommandQuery/Behaviors/TenantFilterBehaviorBase.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Security.Principal;
-using System.Threading.Tasks;
 
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Queries;

src/MediatR.CommandQuery/Behaviors/TenantPagedQueryBehavior.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Queries;
 

src/MediatR.CommandQuery/Behaviors/TenantSelectQueryBehavior.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Queries;
 

src/MediatR.CommandQuery/Behaviors/TrackChangeCommandBehavior.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Definitions;
 

src/MediatR.CommandQuery/Behaviors/ValidateEntityModelCommandBehavior.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
 using FluentValidation;
 
 using MediatR.CommandQuery.Commands;

src/MediatR.CommandQuery/Commands/EntityDeleteCommand.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Principal;
 

src/MediatR.CommandQuery/Commands/EntityIdentifierCommand.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Principal;
 

src/MediatR.CommandQuery/Commands/EntityIdentifiersCommand.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Security.Principal;
 
 namespace MediatR.CommandQuery.Commands;

src/MediatR.CommandQuery/Commands/EntityModelCommand.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Principal;
 

src/MediatR.CommandQuery/Commands/EntityUpdateCommand.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Principal;
 

src/MediatR.CommandQuery/Commands/EntityUpsertCommand.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Principal;
 

src/MediatR.CommandQuery/Commands/PrincipalCommandBase.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Security.Principal;
 
 namespace MediatR.CommandQuery.Commands;

src/MediatR.CommandQuery/Definitions/ICacheQueryResult.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace MediatR.CommandQuery.Definitions;
 
 public interface ICacheQueryResult

src/MediatR.CommandQuery/Definitions/IDistributedCacheSerializer.cs

@@ -1,5 +1,3 @@
-using System.Threading.Tasks;
-
 namespace MediatR.CommandQuery.Definitions;
 
 public interface IDistributedCacheSerializer

src/MediatR.CommandQuery/Definitions/IHaveTenant.cs

@@ -1,5 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
-
 namespace MediatR.CommandQuery.Definitions;
 
 /// <summary>

src/MediatR.CommandQuery/Definitions/ITenantResolver.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Security.Principal;
-using System.Threading.Tasks;
 
 namespace MediatR.CommandQuery.Definitions;
 

src/MediatR.CommandQuery/Definitions/ITrackCreated.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace MediatR.CommandQuery.Definitions;
 
 public interface ITrackCreated

src/MediatR.CommandQuery/Definitions/ITrackHistory.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace MediatR.CommandQuery.Definitions;
 
 public interface ITrackHistory

src/MediatR.CommandQuery/Definitions/ITrackUpdated.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace MediatR.CommandQuery.Definitions;
 
 public interface ITrackUpdated

src/MediatR.CommandQuery/DomainException.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Net;
 
 namespace MediatR.CommandQuery;

src/MediatR.CommandQuery/Extensions/QueryExtensions.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Text;
 

src/MediatR.CommandQuery/Extensions/TypeExtensions.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace MediatR.CommandQuery.Extensions;
 
 public static class TypeExtensions

src/MediatR.CommandQuery/Handlers/RequestHandlerBase.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
 
 using Microsoft.Extensions.Logging;