feat: v5

benmccallum · Feb 20, 2021 · 776435f · 776435f
1 parent cb6a21d
commit 776435f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 91 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -17,7 +17,7 @@
     <PackageIconUrl>https://github.com/benmccallum/fairybread/raw/master/logo-400x400.png</PackageIconUrl>
     <PackageLicenseUrl>https://github.com/benmccallum/fairybread/blob/master/LICENSE</PackageLicenseUrl>
 
-    <Version>4.1.1</Version>
+    <Version>4.1.2</Version>
 
     <HotChocolateVersion>11.0.9</HotChocolateVersion>
 

diff --git a/src/FairyBread.Tests/InputValidationMiddlewareTests.cs b/src/FairyBread.Tests/InputValidationMiddlewareTests.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using FluentValidation;
 using HotChocolate;
-using HotChocolate.Configuration;
 using HotChocolate.Execution;
 using HotChocolate.Language;
 using HotChocolate.Types;
@@ -85,25 +84,6 @@ public async Task Query_Doesnt_Validate_By_Default()
             await Verifier.Verify(result);
         }
 
-        [Fact]
-        public async Task Auto_Validator_Scanning_Works()
-        {
-            // Arrange
-            var executor = await GetRequestExecutorAsync(options =>
-            {
-                options.ShouldValidate = (ctx, arg) => ctx.Operation.Operation == OperationType.Query;
-                options.AssembliesToScanForValidators = null;
-            });
-
-            var query = @"query { read(foo: { someInteger: -1, someString: ""hello"" }) }";
-
-            // Act
-            var result = await executor.ExecuteAsync(query);
-
-            // Assert
-            await Verifier.Verify(result);
-        }
-
         [Theory]
         [MemberData(nameof(Cases))]
         public async Task Mutation_Works(CaseData caseData)
@@ -228,33 +208,6 @@ public async Task Should_Respect_ThrowIfNoValidatorsFound_Option(bool throwIfNoV
             await Verifier.Verify(result, verifySettings);
         }
 
-        [Fact]
-        public async Task Should_Respect_AssembliesToScanForValidators_Option()
-        {
-            // Arrange
-            var executor = await GetRequestExecutorAsync(
-                options =>
-                {
-                    options.ShouldValidate = (ctx, arg) => ctx.Operation.Operation == OperationType.Query;
-                    options.AssembliesToScanForValidators = new[] { typeof(FooInputDtoValidator).Assembly };
-                },
-                services =>
-                {
-                    services.AddSingleton<FooInputDtoValidator>();
-                    services.AddSingleton<BarInputDtoValidator>();
-                    services.AddSingleton<BarInputDtoAsyncValidator>();
-                },
-                registerValidatorFromAssembly: false);
-
-            var query = @"query { read(foo: { someInteger: -1, someString: ""hello"" }) }";
-
-            // Act
-            var result = await executor.ExecuteAsync(query);
-
-            // Assert
-            await Verifier.Verify(result);
-        }
-
         // TODO: Unit tests for:
         // - cancellation
 

diff --git a/src/FairyBread/DefaultFairyBreadOptions.cs b/src/FairyBread/DefaultFairyBreadOptions.cs
@@ -10,8 +10,6 @@ namespace FairyBread
 {
     public class DefaultFairyBreadOptions : IFairyBreadOptions
     {
-        public virtual IEnumerable<Assembly>? AssembliesToScanForValidators { get; set; }
-
         public virtual bool ThrowIfNoValidatorsFound { get; set; } = true;
 
         /// <inheritdoc/>

diff --git a/src/FairyBread/DefaultValidatorProvider.cs b/src/FairyBread/DefaultValidatorProvider.cs
@@ -18,47 +18,30 @@ public DefaultValidatorProvider(IServiceProvider serviceProvider, IServiceCollec
         {
             ServiceProvider = serviceProvider;
 
-            List<AssemblyScanner.AssemblyScanResult> validatorResults;
+            var validatorResults = new List<AssemblyScanner.AssemblyScanResult>();
+            var validatorInterface = typeof(IValidator);
+            var objectValidatorInterface = typeof(IValidator<object>);
+            var underlyingValidatorType = objectValidatorInterface.GetGenericTypeDefinition().UnderlyingSystemType;
 
-            var useExplicitAssemblySearch = options.AssembliesToScanForValidators != null;
-            if (useExplicitAssemblySearch)
+            foreach (var service in services)
             {
-                validatorResults = AssemblyScanner.FindValidatorsInAssemblies(options.AssembliesToScanForValidators).ToList();
-            }
-            else
-            {
-                validatorResults = new List<AssemblyScanner.AssemblyScanResult>();
-
-                var validatorInterface = typeof(IValidator);
-                var objectValidatorInterface = typeof(IValidator<object>);
-                var underlyingValidatorType = objectValidatorInterface.GetGenericTypeDefinition().UnderlyingSystemType;
-
-                foreach (var service in services)
+                if (!service.ServiceType.IsGenericType ||
+                    service.ServiceType.Name != objectValidatorInterface.Name ||
+                    service.ServiceType.GetGenericTypeDefinition() != underlyingValidatorType)
                 {
-                    if (!service.ServiceType.IsGenericType ||
-                        service.ServiceType.Name != objectValidatorInterface.Name ||
-                        service.ServiceType.GetGenericTypeDefinition() != underlyingValidatorType)
-                    {
-                        continue;
-                    }
-
-                    validatorResults.Add(
-                        new AssemblyScanner.AssemblyScanResult(
-                            service.ServiceType,
-                            service.ImplementationType));
+                    continue;
                 }
+
+                validatorResults.Add(
+                    new AssemblyScanner.AssemblyScanResult(
+                        service.ServiceType,
+                        service.ImplementationType));
             }
 
             if (!validatorResults.Any() && options.ThrowIfNoValidatorsFound)
             {
-                throw new Exception($"No validators were found by FairyBread." +
-                    $"{nameof(IFairyBreadOptions)}.{nameof(IFairyBreadOptions.AssembliesToScanForValidators)} " +
-                    (useExplicitAssemblySearch
-                        ? $"was provided and no validators could be found in the provided assemblies: " +
-                            $"{string.Join(",", options.AssembliesToScanForValidators!)}."
-                        : $"was not provided and no validators could be found in your service registrations." +
-                            $"Ensure you're registering your FluentValidation validators.")
-                    );
+                throw new Exception($"No validators were found by FairyBread. " +
+                    $"Ensure you're registering your FluentValidation validators for DI.");
             }
 
             foreach (var validatorResult in validatorResults)

diff --git a/src/FairyBread/IFairyBreadOptions.cs b/src/FairyBread/IFairyBreadOptions.cs
@@ -1,19 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Reflection;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 
 namespace FairyBread
 {
     public interface IFairyBreadOptions
     {
-        /// <summary>
-        /// If set, FairyBread will look for validators only in these assemblies.
-        /// If not set, FairyBread will look for validators registered with DI.
-        /// </summary>
-        IEnumerable<Assembly>? AssembliesToScanForValidators { get; set; }
-
         /// <summary>
         /// If true, FairyBread will throw on startup if no validators are found.
         /// This is on by default to avoid an accidental release with no validators