Merge pull request #12 from cime/validation_enumerable

change: domain validator - enumerable ValidationFailure-s
cime · Mar 1, 2021 · 8e7ed47 · 8e7ed47
2 parents 9d6efcd + 7a87301
commit 8e7ed47
Show file tree

Hide file tree

Showing 21 changed files with 73 additions and 57 deletions.
diff --git a/CoreSharp.NHibernate.Generator/CoreSharp.NHibernate.Generator.csproj b/CoreSharp.NHibernate.Generator/CoreSharp.NHibernate.Generator.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <AssemblyName>NHibernateGenerator</AssemblyName>
     </PropertyGroup>
 

diff --git a/CoreSharp.Validation.Abstractions/CoreSharp.Validation.Abstractions.csproj b/CoreSharp.Validation.Abstractions/CoreSharp.Validation.Abstractions.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>9.0</LangVersion>
+    <RootNamespace>CoreSharp.Validation</RootNamespace>
   </PropertyGroup>
 
 </Project>
diff --git a/CoreSharp.Validation.Tests/CoreSharp.Validation.Tests.csproj b/CoreSharp.Validation.Tests/CoreSharp.Validation.Tests.csproj
@@ -4,10 +4,12 @@
         <TargetFramework>netcoreapp3.1</TargetFramework>
 
         <IsPackable>false</IsPackable>
+        <LangVersion>9.0</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

diff --git a/CoreSharp.Validation.Tests/Models/AsyncParent.cs b/CoreSharp.Validation.Tests/Models/AsyncParent.cs
@@ -84,10 +84,11 @@ public override Task BeforeValidationAsync(TModel root, ValidationContext contex
             return Task.CompletedTask;
         }
 
-        public override Task<ValidationFailure> ValidateAsync(TChild child, ValidationContext context)
+        public override IAsyncEnumerable<ValidationFailure> ValidateAsync(TChild child, ValidationContext context)
         {
             ValidateModels.Add(new Tuple<TChild, IAsyncDomainValidator>(child, this));
-            return Task.FromResult(Success);
+
+            return null;
         }
 
         public override Task<bool> CanValidateAsync(TChild child, ValidationContext context)

diff --git a/CoreSharp.Validation.Tests/Models/GenericChildModel.cs b/CoreSharp.Validation.Tests/Models/GenericChildModel.cs
@@ -36,14 +36,14 @@ public GenericChildParentValidator(IValidator<GenericChildChild> childValidator)
 
     public class GenericChildDomainValidator<TChild> : AbstractDomainValidator<GenericChildParent, TChild> where TChild : GenericChildChild
     {
-        public override ValidationFailure Validate(TChild child, ValidationContext context)
+        public override IEnumerable<ValidationFailure> Validate(TChild child, ValidationContext context)
         {
             if (child.Name == "Invalid")
             {
-                return Failure("Invalid name", context);
+                yield return Failure("Invalid name", context);
             }
 
-            return string.IsNullOrEmpty(child.Name) ? Failure(o => o.Name, "Should not be empty", context) : Success;
+            yield return string.IsNullOrEmpty(child.Name) ? Failure(o => o.Name, "Should not be empty", context) : Success;
         }
 
         public override bool CanValidate(TChild child, ValidationContext context)

diff --git a/CoreSharp.Validation.Tests/Models/GenericRootChildModel.cs b/CoreSharp.Validation.Tests/Models/GenericRootChildModel.cs
@@ -37,14 +37,14 @@ public class GenericRootChildDomainValidator<TRoot, TChild> : AbstractDomainVali
         where TRoot : GenericRootChildParent
         where TChild : GenericRootChildChild
     {
-        public override ValidationFailure Validate(TChild child, ValidationContext context)
+        public override IEnumerable<ValidationFailure> Validate(TChild child, ValidationContext context)
         {
             if (child.Name == "Invalid")
             {
-                return Failure("Invalid name", context);
+                yield return Failure("Invalid name", context);
             }
 
-            return string.IsNullOrEmpty(child.Name) ? Failure(o => o.Name, "Should not be empty", context) :  Success;
+            yield return string.IsNullOrEmpty(child.Name) ? Failure(o => o.Name, "Should not be empty", context) :  Success;
         }
 
         public override bool CanValidate(TChild child, ValidationContext context)

diff --git a/CoreSharp.Validation.Tests/Models/GenericRootModel.cs b/CoreSharp.Validation.Tests/Models/GenericRootModel.cs
@@ -26,14 +26,14 @@ public GenericRootModelValidator()
     public class GenericRootDomainValidator<TRoot> : AbstractDomainValidator<TRoot>
         where TRoot : GenericRootModel
     {
-        public override ValidationFailure Validate(TRoot child, ValidationContext context)
+        public override IEnumerable<ValidationFailure> Validate(TRoot child, ValidationContext context)
         {
             if (child.Name == "Invalid")
             {
-                return Failure("Invalid name", context);
+                yield return Failure("Invalid name", context);
             }
 
-            return string.IsNullOrEmpty(child.Name) ? Failure(o => o.Name, "Should not be empty", context) : Success;
+            yield return string.IsNullOrEmpty(child.Name) ? Failure(o => o.Name, "Should not be empty", context) : Success;
         }
 
         public override bool CanValidate(TRoot child, ValidationContext context)

diff --git a/CoreSharp.Validation.Tests/Models/Parent.cs b/CoreSharp.Validation.Tests/Models/Parent.cs
@@ -63,7 +63,7 @@ public abstract class TestDomainValidator<TModel, TChild> : TestDomainValidator<
         where TChild : class
     { }
 
-    public abstract class TestDomainValidator<TModel, TChild, TType> : AbstractDomainValidator<TModel, TChild> 
+    public abstract class TestDomainValidator<TModel, TChild, TType> : AbstractDomainValidator<TModel, TChild>
         where TModel : class
         where TChild : class
     {
@@ -82,10 +82,10 @@ public override void BeforeValidation(TModel root, ValidationContext context)
             BeforeValidationModels.Add(new Tuple<TModel, IDomainValidator>(root, this));
         }
 
-        public override ValidationFailure Validate(TChild child, ValidationContext context)
+        public override IEnumerable<ValidationFailure> Validate(TChild child, ValidationContext context)
         {
             ValidateModels.Add(new Tuple<TChild, IDomainValidator>(child, this));
-            return Success;
+            yield break;
         }
 
         public override bool CanValidate(TChild child, ValidationContext context)

diff --git a/CoreSharp.Validation.Tests/Models/TestModel.cs b/CoreSharp.Validation.Tests/Models/TestModel.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using FluentValidation;
 using FluentValidation.Results;
 
@@ -21,17 +22,18 @@ public class TestModelDomainValidator : AbstractDomainValidator<TestModel>
     {
         public static int ValidateCount;
         public static int CanValidateCount;
-        public static int ValidatBeforeValidationCount;
+        public static int ValidateBeforeValidationCount;
 
         public override void BeforeValidation(TestModel root, ValidationContext context)
         {
-            ValidatBeforeValidationCount++;
+            ValidateBeforeValidationCount++;
         }
 
-        public override ValidationFailure Validate(TestModel child, ValidationContext context)
+        public override IEnumerable<ValidationFailure> Validate(TestModel child, ValidationContext context)
         {
             ValidateCount++;
-            return Success;
+
+            yield break;
         }
 
         public override bool CanValidate(TestModel child, ValidationContext context)
@@ -47,18 +49,19 @@ public class TestModelAsyncDomainValidator : AbstractAsyncDomainValidator<TestMo
     {
         public static int ValidateCount;
         public static int CanValidateCount;
-        public static int ValidatBeforeValidationCount;
+        public static int ValidateBeforeValidationCount;
 
         public override Task BeforeValidationAsync(TestModel root, ValidationContext context)
         {
-            ValidatBeforeValidationCount++;
+            ValidateBeforeValidationCount++;
             return Task.CompletedTask;
         }
 
-        public override Task<ValidationFailure> ValidateAsync(TestModel child, ValidationContext context)
+        public override IAsyncEnumerable<ValidationFailure> ValidateAsync(TestModel child, ValidationContext context)
         {
             ValidateCount++;
-            return Task.FromResult(Success);
+
+            return null;
         }
 
         public override Task<bool> CanValidateAsync(TestModel child, ValidationContext context)

diff --git a/CoreSharp.Validation.Tests/ValidationTests.cs b/CoreSharp.Validation.Tests/ValidationTests.cs
@@ -27,10 +27,10 @@ public void ValidateWithDomainValidator()
         {
             TestModelDomainValidator.ValidateCount = 0;
             TestModelDomainValidator.CanValidateCount = 0;
-            TestModelDomainValidator.ValidatBeforeValidationCount = 0;
+            TestModelDomainValidator.ValidateBeforeValidationCount = 0;
             TestModelAsyncDomainValidator.ValidateCount = 0;
             TestModelAsyncDomainValidator.CanValidateCount = 0;
-            TestModelAsyncDomainValidator.ValidatBeforeValidationCount = 0;
+            TestModelAsyncDomainValidator.ValidateBeforeValidationCount = 0;
             var validator = Container.GetInstance<IValidator<TestModel>>();
 
             for (var i = 0; i < 5; i++)
@@ -40,10 +40,10 @@ public void ValidateWithDomainValidator()
                 Assert.True(valResult.IsValid);
                 Assert.Equal(i + 1, TestModelDomainValidator.ValidateCount);
                 Assert.Equal(i + 1, TestModelDomainValidator.CanValidateCount);
-                Assert.Equal(i + 1, TestModelDomainValidator.ValidatBeforeValidationCount);
+                Assert.Equal(i + 1, TestModelDomainValidator.ValidateBeforeValidationCount);
                 Assert.Equal(i + 1, TestModelAsyncDomainValidator.ValidateCount);
                 Assert.Equal(i + 1, TestModelAsyncDomainValidator.CanValidateCount);
-                Assert.Equal(i + 1, TestModelAsyncDomainValidator.ValidatBeforeValidationCount);
+                Assert.Equal(i + 1, TestModelAsyncDomainValidator.ValidateBeforeValidationCount);
             }
         }
 
@@ -52,10 +52,10 @@ public async Task ValidateWithAsyncDomainValidator()
         {
             TestModelDomainValidator.ValidateCount = 0;
             TestModelDomainValidator.CanValidateCount = 0;
-            TestModelDomainValidator.ValidatBeforeValidationCount = 0;
+            TestModelDomainValidator.ValidateBeforeValidationCount = 0;
             TestModelAsyncDomainValidator.ValidateCount = 0;
             TestModelAsyncDomainValidator.CanValidateCount = 0;
-            TestModelAsyncDomainValidator.ValidatBeforeValidationCount = 0;
+            TestModelAsyncDomainValidator.ValidateBeforeValidationCount = 0;
             var validator = Container.GetInstance<IValidator<TestModel>>();
 
             for (var i = 0; i < 5; i++)
@@ -65,10 +65,10 @@ public async Task ValidateWithAsyncDomainValidator()
                 Assert.True(valResult.IsValid);
                 Assert.Equal(i + 1, TestModelDomainValidator.ValidateCount);
                 Assert.Equal(i + 1, TestModelDomainValidator.CanValidateCount);
-                Assert.Equal(i + 1, TestModelDomainValidator.ValidatBeforeValidationCount);
+                Assert.Equal(i + 1, TestModelDomainValidator.ValidateBeforeValidationCount);
                 Assert.Equal(i + 1, TestModelAsyncDomainValidator.ValidateCount);
                 Assert.Equal(i + 1, TestModelAsyncDomainValidator.CanValidateCount);
-                Assert.Equal(i + 1, TestModelAsyncDomainValidator.ValidatBeforeValidationCount);
+                Assert.Equal(i + 1, TestModelAsyncDomainValidator.ValidateBeforeValidationCount);
             }
         }
 

diff --git a/CoreSharp.Validation/AbstractAsyncDomainValidator.cs b/CoreSharp.Validation/AbstractAsyncDomainValidator.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreSharp.Validation.Internal;
@@ -15,7 +16,7 @@ public abstract class AbstractAsyncDomainValidator<TRoot, TChild> : IAsyncDomain
     {
         public virtual string[] RuleSets { get; }
 
-        public abstract Task<ValidationFailure> ValidateAsync(TChild model, ValidationContext context);
+        public abstract IAsyncEnumerable<ValidationFailure> ValidateAsync(TChild model, ValidationContext context);
 
         public virtual Task<bool> CanValidateAsync(TChild model, ValidationContext context)
         {
@@ -27,7 +28,7 @@ public virtual Task BeforeValidationAsync(TRoot root, ValidationContext context)
             return Task.CompletedTask;
         }
 
-        Task<ValidationFailure> IAsyncDomainValidator.ValidateAsync(object model, ValidationContext context)
+        IAsyncEnumerable<ValidationFailure> IAsyncDomainValidator.ValidateAsync(object model, ValidationContext context)
         {
             return ValidateAsync((TChild)model, context);
         }
@@ -51,7 +52,5 @@ protected ValidationFailure Failure(string errorMessage, ValidationContext conte
         {
             return DomainValidationContext.CreateValidationFailure(errorMessage, context);
         }
-
-        protected ValidationFailure Success => null;
     }
 }
diff --git a/CoreSharp.Validation/AbstractAsyncPropertyDomainValidator.cs b/CoreSharp.Validation/AbstractAsyncPropertyDomainValidator.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using CoreSharp.Validation;
@@ -9,7 +10,7 @@ namespace CoreSharp.Validation
 {
     public abstract class AbstractAsyncPropertyDomainValidator<TModel, TProp> : AbstractAsyncDomainValidator<TModel>
     {
-        public override async Task<ValidationFailure> ValidateAsync(TModel model, ValidationContext context)
+        public override async IAsyncEnumerable<ValidationFailure> ValidateAsync(TModel model, ValidationContext context)
         {
             var propGetter = PropertyExpression.Compile();
             var propVal = propGetter(model);
@@ -26,10 +27,8 @@ public override async Task<ValidationFailure> ValidateAsync(TModel model, Valida
 
             if (!valid)
             {
-                return Failure(PropertyExpression, ErrorTemplate, context);
+                yield return Failure(PropertyExpression, ErrorTemplate, context);
             }
-
-            return Success;
         }
 
         protected abstract string ErrorTemplate { get; }

diff --git a/CoreSharp.Validation/AbstractDomainValidator.cs b/CoreSharp.Validation/AbstractDomainValidator.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq.Expressions;
 using CoreSharp.Validation.Internal;
 using FluentValidation;
@@ -14,7 +15,7 @@ public abstract class AbstractDomainValidator<TRoot, TChild> : IDomainValidator<
     {
         public virtual string[] RuleSets { get; }
 
-        public abstract ValidationFailure Validate(TChild model, ValidationContext context);
+        public abstract IEnumerable<ValidationFailure> Validate(TChild model, ValidationContext context);
 
         public virtual bool CanValidate(TChild model, ValidationContext context)
         {
@@ -25,7 +26,7 @@ public virtual void BeforeValidation(TRoot root, ValidationContext context)
         {
         }
 
-        ValidationFailure IDomainValidator.Validate(object model, ValidationContext context)
+        IEnumerable<ValidationFailure> IDomainValidator.Validate(object model, ValidationContext context)
         {
             return Validate((TChild)model, context);
         }

diff --git a/CoreSharp.Validation/CoreSharp.Validation.csproj b/CoreSharp.Validation/CoreSharp.Validation.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <PackageId>CoreSharp.Validation</PackageId>
+        <LangVersion>9.0</LangVersion>
 
         <Authors>cime</Authors>
         <Description>.NET standard implementation of validation</Description>

diff --git a/CoreSharp.Validation/CoreSharpFluentValidationExtensions.cs b/CoreSharp.Validation/CoreSharpFluentValidationExtensions.cs
@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using CoreSharp.Common.Models;
 using CoreSharp.Validation;
+using CoreSharp.Validation.PropertyValidators;
 
+// ReSharper disable once CheckNamespace
 namespace FluentValidation
 {
     public static class CoreSharpFluentValidationExtensions

diff --git a/CoreSharp.Validation/IAsyncDomainValidator.cs b/CoreSharp.Validation/IAsyncDomainValidator.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using FluentValidation;
 using FluentValidation.Results;
 
@@ -8,7 +9,7 @@ public interface IAsyncDomainValidator
     {
         Task BeforeValidationAsync(object model, ValidationContext context);
 
-        Task<ValidationFailure> ValidateAsync(object model, ValidationContext context);
+        IAsyncEnumerable<ValidationFailure> ValidateAsync(object model, ValidationContext context);
 
         Task<bool> CanValidateAsync(object model, ValidationContext context);
 
@@ -23,7 +24,7 @@ public interface IAsyncDomainValidator<TRoot, TChild> : IAsyncDomainValidator
     {
         Task BeforeValidationAsync(TRoot root, ValidationContext context);
 
-        Task<ValidationFailure> ValidateAsync(TChild child, ValidationContext context);
+        IAsyncEnumerable<ValidationFailure> ValidateAsync(TChild child, ValidationContext context);
 
         Task<bool> CanValidateAsync(TChild child, ValidationContext context);
     }

diff --git a/CoreSharp.Validation/IDomainValidator.cs b/CoreSharp.Validation/IDomainValidator.cs
@@ -1,4 +1,5 @@
-using FluentValidation;
+using System.Collections.Generic;
+using FluentValidation;
 using FluentValidation.Results;
 
 namespace CoreSharp.Validation
@@ -7,7 +8,7 @@ public interface IDomainValidator
     {
         void BeforeValidation(object model, ValidationContext context);
 
-        ValidationFailure Validate(object model, ValidationContext context);
+        IEnumerable<ValidationFailure> Validate(object model, ValidationContext context);
 
         bool CanValidate(object model, ValidationContext context);
 
@@ -22,7 +23,7 @@ public interface IDomainValidator<TRoot, TChild> : IDomainValidator
     {
         void BeforeValidation(TRoot root, ValidationContext context);
 
-        ValidationFailure Validate(TChild child, ValidationContext context);
+        IEnumerable<ValidationFailure> Validate(TChild child, ValidationContext context);
 
         bool CanValidate(TChild child, ValidationContext context);
     }