From f322bb3d6d37e7cf9c8bccc1be0727ef75e30dce Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Fri, 4 Oct 2024 22:18:12 +1000 Subject: [PATCH] remove some redundant casts --- src/FluentValidation.Tests/InheritanceValidatorTest.cs | 2 +- src/FluentValidation.Tests/ValidateAndThrowTester.cs | 2 +- src/FluentValidation/DefaultValidatorExtensions.cs | 2 +- src/FluentValidation/DefaultValidatorOptions.cs | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/FluentValidation.Tests/InheritanceValidatorTest.cs b/src/FluentValidation.Tests/InheritanceValidatorTest.cs index f328c4f2a..c828aeace 100644 --- a/src/FluentValidation.Tests/InheritanceValidatorTest.cs +++ b/src/FluentValidation.Tests/InheritanceValidatorTest.cs @@ -297,7 +297,7 @@ public async Task Validates_ruleset_async() { [Fact] public void Can_use_custom_subclass_with_nongeneric_overload() { var validator = new InlineValidator(); - validator.RuleFor(x => x.Foo).SetAsyncValidator((IAsyncPropertyValidator) new TypeUnsafePolymorphicValidator()); + validator.RuleFor(x => x.Foo).SetAsyncValidator(new TypeUnsafePolymorphicValidator()); var result = validator.Validate(new Root {Foo = new FooImpl1()}); result.Errors.Single().PropertyName.ShouldEqual("Foo.Name"); } diff --git a/src/FluentValidation.Tests/ValidateAndThrowTester.cs b/src/FluentValidation.Tests/ValidateAndThrowTester.cs index 0b9b44556..f820d0299 100644 --- a/src/FluentValidation.Tests/ValidateAndThrowTester.cs +++ b/src/FluentValidation.Tests/ValidateAndThrowTester.cs @@ -117,7 +117,7 @@ public void Populates_errors() { v => v.RuleFor(x => x.Surname).NotNull() }; - var ex = (ValidationException) Assert.Throws(() => validator.ValidateAndThrow(new Person())); + var ex = Assert.Throws(() => validator.ValidateAndThrow(new Person())); ex.Errors.Count().ShouldEqual(1); } diff --git a/src/FluentValidation/DefaultValidatorExtensions.cs b/src/FluentValidation/DefaultValidatorExtensions.cs index 0eac005df..2096fae26 100644 --- a/src/FluentValidation/DefaultValidatorExtensions.cs +++ b/src/FluentValidation/DefaultValidatorExtensions.cs @@ -1242,7 +1242,7 @@ public static IRuleBuilderOptions SetInheritanceValidator(); validatorConfiguration(validator); - return ruleBuilder.SetAsyncValidator((IAsyncPropertyValidator) validator); + return ruleBuilder.SetAsyncValidator(validator); } private static string GetDisplayName(MemberInfo member, Expression> expression) diff --git a/src/FluentValidation/DefaultValidatorOptions.cs b/src/FluentValidation/DefaultValidatorOptions.cs index 3d185ed27..a292e8011 100644 --- a/src/FluentValidation/DefaultValidatorOptions.cs +++ b/src/FluentValidation/DefaultValidatorOptions.cs @@ -205,7 +205,7 @@ public static IRuleBuilderOptionsConditions When(this public static IRuleBuilderOptions When(this IRuleBuilderOptions rule, Func, bool> predicate, ApplyConditionTo applyConditionTo = ApplyConditionTo.AllValidators) { predicate.Guard("A predicate must be specified when calling When.", nameof(predicate)); // Default behaviour for When/Unless as of v1.3 is to apply the condition to all previous validators in the chain. - Configurable(rule).ApplyCondition(ctx => predicate((T)ctx.InstanceToValidate, ValidationContext.GetFromNonGenericContext(ctx)), applyConditionTo); + Configurable(rule).ApplyCondition(ctx => predicate(ctx.InstanceToValidate, ValidationContext.GetFromNonGenericContext(ctx)), applyConditionTo); return rule; } @@ -220,7 +220,7 @@ public static IRuleBuilderOptions When(this IRuleBui public static IRuleBuilderOptionsConditions When(this IRuleBuilderOptionsConditions rule, Func, bool> predicate, ApplyConditionTo applyConditionTo = ApplyConditionTo.AllValidators) { predicate.Guard("A predicate must be specified when calling When.", nameof(predicate)); // Default behaviour for When/Unless as of v1.3 is to apply the condition to all previous validators in the chain. - Configurable(rule).ApplyCondition(ctx => predicate((T)ctx.InstanceToValidate, ValidationContext.GetFromNonGenericContext(ctx)), applyConditionTo); + Configurable(rule).ApplyCondition(ctx => predicate(ctx.InstanceToValidate, ValidationContext.GetFromNonGenericContext(ctx)), applyConditionTo); return rule; } @@ -313,7 +313,7 @@ public static IRuleBuilderOptionsConditions WhenAsync WhenAsync(this IRuleBuilderOptions rule, Func, CancellationToken, Task> predicate, ApplyConditionTo applyConditionTo = ApplyConditionTo.AllValidators) { predicate.Guard("A predicate must be specified when calling WhenAsync.", nameof(predicate)); // Default behaviour for When/Unless as of v1.3 is to apply the condition to all previous validators in the chain. - Configurable(rule).ApplyAsyncCondition((ctx, ct) => predicate((T)ctx.InstanceToValidate, ValidationContext.GetFromNonGenericContext(ctx), ct), applyConditionTo); + Configurable(rule).ApplyAsyncCondition((ctx, ct) => predicate(ctx.InstanceToValidate, ValidationContext.GetFromNonGenericContext(ctx), ct), applyConditionTo); return rule; } @@ -328,7 +328,7 @@ public static IRuleBuilderOptions WhenAsync(this IRu public static IRuleBuilderOptionsConditions WhenAsync(this IRuleBuilderOptionsConditions rule, Func, CancellationToken, Task> predicate, ApplyConditionTo applyConditionTo = ApplyConditionTo.AllValidators) { predicate.Guard("A predicate must be specified when calling WhenAsync.", nameof(predicate)); // Default behaviour for When/Unless as of v1.3 is to apply the condition to all previous validators in the chain. - Configurable(rule).ApplyAsyncCondition((ctx, ct) => predicate((T)ctx.InstanceToValidate, ValidationContext.GetFromNonGenericContext(ctx), ct), applyConditionTo); + Configurable(rule).ApplyAsyncCondition((ctx, ct) => predicate(ctx.InstanceToValidate, ValidationContext.GetFromNonGenericContext(ctx), ct), applyConditionTo); return rule; }