UPdate readme for 1.4.0

mrpmorris · mrpmorris · commit 5055db0e7b67 · 2020-07-26T18:53:44.000+01:00
diff --git a/README.md b/README.md
@@ -33,6 +33,9 @@ More sample projects will be added as the framework develops.
  - [FluentValidation Sample]- Shows how to use the [FluentValidation.com] library to validate.
 
 ## What's new
+### New in 1.4.0
+- Upgrade to FluentValidation 9
+
 ### New in 1.3.0
 - Add new EditContext.ValidateProperties for validating sub-sets of an object
 
diff --git a/samples/02-FluentValidation/FluentValidationSample/FluentValidators/PersonValidator.cs b/samples/02-FluentValidation/FluentValidationSample/FluentValidators/PersonValidator.cs
@@ -13,17 +13,17 @@ public PersonValidator()
 			RuleFor(x => x.Salutation)
 				.Cascade(CascadeMode.StopOnFirstFailure)
 				.NotEmpty()
-				.MustAsync(UpdateUIOnError).WithMessage("Cannot be DR");
+				.MustAsync(LongRunningAsyncMethod).WithMessage("Cannot be DR");
 			RuleFor(x => x.GivenName).NotEmpty();
 			RuleFor(x => x.FamilyName).NotEmpty();
 			RuleFor(x => x.EmailAddress).NotEmpty().EmailAddress();
 			RuleFor(x => x.Addresses).NotEmpty().WithMessage("At least one address is required");
 		}
 
-		private async Task<bool> UpdateUIOnError(string arg1, CancellationToken arg2)
+		private async Task<bool> LongRunningAsyncMethod(string arg1, CancellationToken arg2)
 		{
-			await Task.Delay(2000);
-			if (string.Compare(arg1, "DR", StringComparison.InvariantCultureIgnoreCase) == 0)
+			await Task.Delay(1000);
+			if ("DR".Equals(arg1, StringComparison.InvariantCultureIgnoreCase))
 				return false;
 			return true;
 		}
diff --git a/src/PeterLeslieMorris.Blazor.FluentValidation/FuentValidationValidatorProvider.cs b/src/PeterLeslieMorris.Blazor.FluentValidation/FuentValidationValidatorProvider.cs
@@ -6,12 +6,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace PeterLeslieMorris.Blazor.FluentValidation
 {
 	public class FluentValidationValidatorProvider : IValidationProvider
 	{
-		public void InitializeEditContext(EditContext editContext, IServiceProvider serviceProvider)
+		public void InitializeEditContext(
+			EditContext editContext,
+			IServiceProvider serviceProvider)
 		{
 			if (editContext == null)
 				throw new ArgumentNullException(nameof(editContext));
@@ -20,13 +23,22 @@ public void InitializeEditContext(EditContext editContext, IServiceProvider serv
 
 			var messages = new ValidationMessageStore(editContext);
 			editContext.OnValidationRequested +=
-				(sender, _) => ValidateModel((EditContext)sender, messages, serviceProvider);
+				(sender, eventArgs) =>
+				{
+					_ = ValidateModel((EditContext)sender, messages, serviceProvider);
+				};
 
 			editContext.OnFieldChanged +=
-				(sender, eventArgs) => ValidateField(editContext, messages, eventArgs.FieldIdentifier, serviceProvider);
+				(sender, eventArgs) =>
+				{
+					_ = ValidateField(editContext, messages, eventArgs.FieldIdentifier, serviceProvider);
+				};
 		}
 
-		private async void ValidateModel(EditContext editContext, ValidationMessageStore messages, IServiceProvider serviceProvider)
+		private async Task ValidateModel(
+			EditContext editContext,
+			ValidationMessageStore messages,
+			IServiceProvider serviceProvider)
 		{
 			if (editContext == null)
 				throw new ArgumentNullException(nameof(editContext));
@@ -58,7 +70,7 @@ private async void ValidateModel(EditContext editContext, ValidationMessageStore
 			editContext.NotifyValidationStateChanged();
 		}
 
-		private async void ValidateField(
+		private async Task ValidateField(
 			EditContext editContext,
 			ValidationMessageStore messages,
 			FieldIdentifier fieldIdentifier,
@@ -105,7 +117,9 @@ private async void ValidateField(
 			editContext.NotifyValidationStateChanged();
 		}
 
-		private static IEnumerable<IValidator> GetValidatorsForObject(object model, IServiceProvider serviceProvider)
+		private static IEnumerable<IValidator> GetValidatorsForObject(
+			object model,
+			IServiceProvider serviceProvider)
 		{
 			var validatorTypesRepository = (FluentValidationRepository)serviceProvider.GetService(typeof(FluentValidationRepository));
 			IEnumerable<Type> validatorTypes = validatorTypesRepository.GetValidatorTypesForObject(model);
diff --git a/src/PeterLeslieMorris.Blazor.Validation/DataAnnotationsValidatorProvider.cs b/src/PeterLeslieMorris.Blazor.Validation/DataAnnotationsValidatorProvider.cs
@@ -6,15 +6,18 @@ namespace PeterLeslieMorris.Blazor.Validation
 {
 	public class DataAnnotationsValidatorProvider : IValidationProvider
 	{
-		public void InitializeEditContext(EditContext editContext, IServiceProvider serviceProvider)
+		public void InitializeEditContext(
+			EditContext editContext,
+			IServiceProvider serviceProvider)
 		{
 			editContext.AddDataAnnotationsValidation();
 		}
 	}
 
 	public static class ValidationConfigurationDataAnnotationsExtensions
 	{
-		public static ValidationConfiguration AddDataAnnotationsValidation(this ValidationConfiguration config)
+		public static ValidationConfiguration AddDataAnnotationsValidation(
+			this ValidationConfiguration config)
 		{
 			config.Services.AddScoped<DataAnnotationsValidatorProvider>();
 			config.Repository.Add(typeof(DataAnnotationsValidatorProvider));
diff --git a/src/PeterLeslieMorris.Blazor.Validation/Extensions/EditContextExtensions.cs b/src/PeterLeslieMorris.Blazor.Validation/Extensions/EditContextExtensions.cs
@@ -25,7 +25,9 @@ public static bool ValidateObjectTree(this EditContext editContext)
 			return !editContext.GetValidationMessages().Any();
 		}
 
-		public static bool ValidateProperty(this EditContext editContext, FieldIdentifier fieldIdentifier)
+		public static bool ValidateProperty(
+			this EditContext editContext,
+			FieldIdentifier fieldIdentifier)
 		{
 			if (fieldIdentifier.Model == null)
 				return false;
@@ -40,7 +42,9 @@ public static bool ValidateProperty(this EditContext editContext, FieldIdentifie
 			return !editContext.GetValidationMessages(fieldIdentifier).Any();
 		}
 
-		public static bool ValidateProperties(this EditContext editContext, params FieldIdentifier[] properties)
+		public static bool ValidateProperties(
+			this EditContext editContext,
+			params FieldIdentifier[] properties)
 		{
 			if (properties == null || properties.Length == 0)
 				throw new ArgumentNullException(nameof(properties));
@@ -117,6 +121,5 @@ private static void NotifyPropertyChanged(
 			editContext.NotifyFieldChanged(fieldIdentifier);
 			IsModifiedProperty.SetValue(fieldState, originalIsModified);
 		}
-
 	}
 }
diff --git a/src/PeterLeslieMorris.Blazor.Validation/Validate.cs b/src/PeterLeslieMorris.Blazor.Validation/Validate.cs
@@ -7,9 +7,14 @@ namespace PeterLeslieMorris.Blazor.Validation
 {
 	public class Validate : ComponentBase
 	{
-		[CascadingParameter] EditContext CurrentEditContext { get; set; }
-		[Inject] IValidationProviderRepository Repository { get; set; }
-		[Inject] IServiceProvider ServiceProvider { get; set; }
+		[CascadingParameter]
+		EditContext CurrentEditContext { get; set; }
+
+		[Inject]
+		IValidationProviderRepository Repository { get; set; }
+
+		[Inject]
+		IServiceProvider ServiceProvider { get; set; }
 
 		public override async Task SetParametersAsync(ParameterView parameters)
 		{
diff --git a/src/PeterLeslieMorris.Blazor.Validation/ValidationConfiguration.cs b/src/PeterLeslieMorris.Blazor.Validation/ValidationConfiguration.cs
@@ -8,7 +8,9 @@ public class ValidationConfiguration
 		public IServiceCollection Services { get; }
 		public IValidationProviderRepository Repository { get; }
 
-		public ValidationConfiguration(IServiceCollection services, IValidationProviderRepository repository)
+		public ValidationConfiguration(
+			IServiceCollection services,
+			IValidationProviderRepository repository)
 		{
 			Services = services ?? throw new ArgumentNullException(nameof(services));
 			Repository = repository ?? throw new ArgumentNullException(nameof(repository));
diff --git a/src/PeterLeslieMorris.Blazor.Validation/ValidationProviderRepository.cs b/src/PeterLeslieMorris.Blazor.Validation/ValidationProviderRepository.cs
@@ -14,7 +14,8 @@ public IValidationProviderRepository Add(Type providerType)
 			if (providerType == null)
 				throw new ArgumentNullException(nameof(providerType));
 			if (!typeof(IValidationProvider).IsAssignableFrom(providerType))
-				throw new ArgumentException($"{providerType.Name} does not implement {nameof(IValidationProvider)}");
+				throw new ArgumentException($"{providerType.Name} " +
+					$"does not implement {nameof(IValidationProvider)}");
 
 			Providers = Providers.Concat(new Type[] { providerType }).ToArray();
 			return this;
diff --git a/src/PeterLeslieMorris.Blazor.Validation/ValidationServiceCollectionExtensions.cs b/src/PeterLeslieMorris.Blazor.Validation/ValidationServiceCollectionExtensions.cs
@@ -5,7 +5,9 @@ namespace PeterLeslieMorris.Blazor.Validation
 {
 	public static class ValidationServiceCollectionExtensions
 	{
-		public static IServiceCollection AddFormValidation(this IServiceCollection instance, Action<ValidationConfiguration> config = null)
+		public static IServiceCollection AddFormValidation(
+			this IServiceCollection instance,
+			Action<ValidationConfiguration> config = null)
 		{
 			var repository = new ValidationProviderRepository();
 			instance.AddScoped<IValidationProviderRepository>((_) => repository);

Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,18 @@ namespace PeterLeslieMorris.Blazor.Validation`
`6`	`6`	`{`
`7`	`7`	`public class DataAnnotationsValidatorProvider : IValidationProvider`
`8`	`8`	`{`
`9`		`- public void InitializeEditContext(EditContext editContext, IServiceProvider serviceProvider)`
	`9`	`+ public void InitializeEditContext(`
	`10`	`+ EditContext editContext,`
	`11`	`+ IServiceProvider serviceProvider)`
`10`	`12`	`{`
`11`	`13`	`editContext.AddDataAnnotationsValidation();`
`12`	`14`	`}`
`13`	`15`	`}`
`14`	`16`
`15`	`17`	`public static class ValidationConfigurationDataAnnotationsExtensions`
`16`	`18`	`{`
`17`		`- public static ValidationConfiguration AddDataAnnotationsValidation(this ValidationConfiguration config)`
	`19`	`+ public static ValidationConfiguration AddDataAnnotationsValidation(`
	`20`	`+ this ValidationConfiguration config)`
`18`	`21`	`{`
`19`	`22`	`config.Services.AddScoped<DataAnnotationsValidatorProvider>();`
`20`	`23`	`config.Repository.Add(typeof(DataAnnotationsValidatorProvider));`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,9 @@ public static bool ValidateObjectTree(this EditContext editContext)`
`25`	`25`	`return !editContext.GetValidationMessages().Any();`
`26`	`26`	`}`
`27`	`27`
`28`		`- public static bool ValidateProperty(this EditContext editContext, FieldIdentifier fieldIdentifier)`
	`28`	`+ public static bool ValidateProperty(`
	`29`	`+ this EditContext editContext,`
	`30`	`+ FieldIdentifier fieldIdentifier)`
`29`	`31`	`{`
`30`	`32`	`if (fieldIdentifier.Model == null)`
`31`	`33`	`return false;`
`@@ -40,7 +42,9 @@ public static bool ValidateProperty(this EditContext editContext, FieldIdentifie`
`40`	`42`	`return !editContext.GetValidationMessages(fieldIdentifier).Any();`
`41`	`43`	`}`
`42`	`44`
`43`		`- public static bool ValidateProperties(this EditContext editContext, params FieldIdentifier[] properties)`
	`45`	`+ public static bool ValidateProperties(`
	`46`	`+ this EditContext editContext,`
	`47`	`+ params FieldIdentifier[] properties)`
`44`	`48`	`{`
`45`	`49`	`if (properties == null \|\| properties.Length == 0)`
`46`	`50`	`throw new ArgumentNullException(nameof(properties));`
`@@ -117,6 +121,5 @@ private static void NotifyPropertyChanged(`
`117`	`121`	`editContext.NotifyFieldChanged(fieldIdentifier);`
`118`	`122`	`IsModifiedProperty.SetValue(fieldState, originalIsModified);`
`119`	`123`	`}`
`120`		`-`
`121`	`124`	`}`
`122`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,14 @@ namespace PeterLeslieMorris.Blazor.Validation`
`7`	`7`	`{`
`8`	`8`	`public class Validate : ComponentBase`
`9`	`9`	`{`
`10`		`- [CascadingParameter] EditContext CurrentEditContext { get; set; }`
`11`		`- [Inject] IValidationProviderRepository Repository { get; set; }`
`12`		`- [Inject] IServiceProvider ServiceProvider { get; set; }`
	`10`	`+ [CascadingParameter]`
	`11`	`+ EditContext CurrentEditContext { get; set; }`
	`12`	`+`
	`13`	`+ [Inject]`
	`14`	`+ IValidationProviderRepository Repository { get; set; }`
	`15`	`+`
	`16`	`+ [Inject]`
	`17`	`+ IServiceProvider ServiceProvider { get; set; }`
`13`	`18`
`14`	`19`	`public override async Task SetParametersAsync(ParameterView parameters)`
`15`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@ namespace PeterLeslieMorris.Blazor.Validation`
`5`	`5`	`{`
`6`	`6`	`public static class ValidationServiceCollectionExtensions`
`7`	`7`	`{`
`8`		`- public static IServiceCollection AddFormValidation(this IServiceCollection instance, Action<ValidationConfiguration> config = null)`
	`8`	`+ public static IServiceCollection AddFormValidation(`
	`9`	`+ this IServiceCollection instance,`
	`10`	`+ Action<ValidationConfiguration> config = null)`
`9`	`11`	`{`
`10`	`12`	`var repository = new ValidationProviderRepository();`
`11`	`13`	`instance.AddScoped<IValidationProviderRepository>((_) => repository);`