Skip to content

Commit fdf12f7

Browse files
mvdgunmvdgun
committed
minor code quality improvements
1 parent 36d2c58 commit fdf12f7

File tree

4 files changed

+35
-36
lines changed

4 files changed

+35
-36
lines changed

‎FluentValidation.AutoValidation.Mvc/src/Attributes/AutoValidateAlways.cs renamed to ‎FluentValidation.AutoValidation.Mvc/src/Attributes/AutoValidateAlwaysAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace SharpGrip.FluentValidation.AutoValidation.Mvc.Attributes
44
{
55
[AttributeUsage(AttributeTargets.Parameter)]
6-
public class AutoValidateAlways : Attribute
6+
public class AutoValidateAlwaysAttribute : Attribute
77
{
88
}
99
}

‎FluentValidation.AutoValidation.Mvc/src/Attributes/AutoValidateNever.cs renamed to ‎FluentValidation.AutoValidation.Mvc/src/Attributes/AutoValidateNeverAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace SharpGrip.FluentValidation.AutoValidation.Mvc.Attributes
44
{
55
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Parameter)]
6-
public class AutoValidateNever : Attribute
6+
public class AutoValidateNeverAttribute : Attribute
77
{
88
}
99
}

‎FluentValidation.AutoValidation.Mvc/src/Filters/FluentValidationAutoValidationActionFilter.cs

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task OnActionExecutionAsync(ActionExecutingContext actionExecutingC
4141
if (endpoint != null &&
4242
((autoValidationMvcConfiguration.ValidationStrategy == ValidationStrategy.Annotations &&
4343
!endpoint.Metadata.OfType<FluentValidationAutoValidationAttribute>().Any() && !endpoint.Metadata.OfType<AutoValidationAttribute>().Any()) ||
44-
endpoint.Metadata.OfType<AutoValidateNever>().Any()))
44+
endpoint.Metadata.OfType<AutoValidateNeverAttribute>().Any()))
4545
{
4646
HandleUnvalidatedEntries(actionExecutingContext);
4747

@@ -58,47 +58,46 @@ public async Task OnActionExecutionAsync(ActionExecutingContext actionExecutingC
5858
var parameterType = parameter.ParameterType;
5959
var bindingSource = parameter.BindingInfo?.BindingSource;
6060

61-
var hasAutoValidateAlwaysAttribute = parameterInfo?.HasCustomAttribute<AutoValidateAlways>() ?? false;
62-
var hasAutoValidateNeverAttribute = parameterInfo?.HasCustomAttribute<AutoValidateNever>() ?? false;
61+
var hasAutoValidateAlwaysAttribute = parameterInfo?.HasCustomAttribute<AutoValidateAlwaysAttribute>() ?? false;
62+
var hasAutoValidateNeverAttribute = parameterInfo?.HasCustomAttribute<AutoValidateNeverAttribute>() ?? false;
6363

64-
if (subject != null && parameterType.IsCustomType() && !hasAutoValidateNeverAttribute && (hasAutoValidateAlwaysAttribute || HasValidBindingSource(bindingSource)))
64+
if (subject != null && parameterType.IsCustomType() &&
65+
!hasAutoValidateNeverAttribute && (hasAutoValidateAlwaysAttribute || HasValidBindingSource(bindingSource)) &&
66+
serviceProvider.GetValidator(parameterType) is IValidator validator)
6567
{
66-
if (serviceProvider.GetValidator(parameterType) is IValidator validator)
67-
{
68-
// ReSharper disable once SuspiciousTypeConversion.Global
69-
var validatorInterceptor = validator as IValidatorInterceptor;
70-
var globalValidationInterceptor = serviceProvider.GetService<IGlobalValidationInterceptor>();
68+
// ReSharper disable once SuspiciousTypeConversion.Global
69+
var validatorInterceptor = validator as IValidatorInterceptor;
70+
var globalValidationInterceptor = serviceProvider.GetService<IGlobalValidationInterceptor>();
7171

72-
IValidationContext validationContext = new ValidationContext<object>(subject);
72+
IValidationContext validationContext = new ValidationContext<object>(subject);
7373

74-
if (validatorInterceptor != null)
75-
{
76-
validationContext = validatorInterceptor.BeforeValidation(actionExecutingContext, validationContext) ?? validationContext;
77-
}
74+
if (validatorInterceptor != null)
75+
{
76+
validationContext = validatorInterceptor.BeforeValidation(actionExecutingContext, validationContext) ?? validationContext;
77+
}
7878

79-
if (globalValidationInterceptor != null)
80-
{
81-
validationContext = globalValidationInterceptor.BeforeValidation(actionExecutingContext, validationContext) ?? validationContext;
82-
}
79+
if (globalValidationInterceptor != null)
80+
{
81+
validationContext = globalValidationInterceptor.BeforeValidation(actionExecutingContext, validationContext) ?? validationContext;
82+
}
8383

84-
var validationResult = await validator.ValidateAsync(validationContext, actionExecutingContext.HttpContext.RequestAborted);
84+
var validationResult = await validator.ValidateAsync(validationContext, actionExecutingContext.HttpContext.RequestAborted);
8585

86-
if (validatorInterceptor != null)
87-
{
88-
validationResult = validatorInterceptor.AfterValidation(actionExecutingContext, validationContext) ?? validationResult;
89-
}
86+
if (validatorInterceptor != null)
87+
{
88+
validationResult = validatorInterceptor.AfterValidation(actionExecutingContext, validationContext) ?? validationResult;
89+
}
9090

91-
if (globalValidationInterceptor != null)
92-
{
93-
validationResult = globalValidationInterceptor.AfterValidation(actionExecutingContext, validationContext) ?? validationResult;
94-
}
91+
if (globalValidationInterceptor != null)
92+
{
93+
validationResult = globalValidationInterceptor.AfterValidation(actionExecutingContext, validationContext) ?? validationResult;
94+
}
9595

96-
if (!validationResult.IsValid)
96+
if (!validationResult.IsValid)
97+
{
98+
foreach (var error in validationResult.Errors)
9799
{
98-
foreach (var error in validationResult.Errors)
99-
{
100-
actionExecutingContext.ModelState.AddModelError(error.PropertyName, error.ErrorMessage);
101-
}
100+
actionExecutingContext.ModelState.AddModelError(error.PropertyName, error.ErrorMessage);
102101
}
103102
}
104103
}

‎Tests/src/FluentValidation.AutoValidation.Shared/Extensions/TypeExtensionsTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public void Test_IsCustomType()
4141
public void Test_HasCustomAttribute()
4242
{
4343
Assert.True(typeof(TestModelClass).HasCustomAttribute<AutoValidationAttribute>());
44-
Assert.False(typeof(TestModelClass).HasCustomAttribute<AutoValidateNever>());
45-
Assert.True(typeof(TestModelRecord).HasCustomAttribute<AutoValidateNever>());
44+
Assert.False(typeof(TestModelClass).HasCustomAttribute<AutoValidateNeverAttribute>());
45+
Assert.True(typeof(TestModelRecord).HasCustomAttribute<AutoValidateNeverAttribute>());
4646
Assert.False(typeof(TestModelRecord).HasCustomAttribute<AutoValidationAttribute>());
4747
}
4848

0 commit comments

Comments
 (0)