From c674de31f708ea10d17a2c2a6d40626a7cf203a7 Mon Sep 17 00:00:00 2001 From: Louis Seubert Date: Sat, 30 May 2026 19:36:28 +0200 Subject: [PATCH] chore: rename internal types Rename internal types in the validation to be more consistent with other projects --- .../DispatchingValidator.cs | 32 +---------------- src/request.validation/ValidatorInvoker.cs | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 31 deletions(-) create mode 100644 src/request.validation/ValidatorInvoker.cs diff --git a/src/request.validation/DispatchingValidator.cs b/src/request.validation/DispatchingValidator.cs index 2bd17e6..3c3db7f 100644 --- a/src/request.validation/DispatchingValidator.cs +++ b/src/request.validation/DispatchingValidator.cs @@ -4,14 +4,11 @@ using System.Collections.Concurrent; using System.Reflection.Metadata; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; - [assembly: MetadataUpdateHandler(typeof(Geekeey.Request.Validation.DispatchingValidator))] namespace Geekeey.Request.Validation; -internal sealed class DispatchingValidator : IValidator +internal sealed partial class DispatchingValidator : IValidator { private static readonly ConcurrentDictionary ValidatorsHandlers = new(); @@ -44,31 +41,4 @@ internal sealed class DispatchingValidator : IValidator return handler.Validate(context, _serviceProvider); } - - private abstract class ValidatorInvoker - { - public abstract Validation Validate(ValidationContext context, IServiceProvider serviceProvider); - } - - private sealed class ValidatorInvoker : ValidatorInvoker - { - public override Validation Validate(ValidationContext context, IServiceProvider serviceProvider) - { - var options = serviceProvider.GetRequiredService>().Value; - - var validators = options.GetValidators(serviceProvider); - - var problems = new List(); - - foreach (var validator in validators) - { - if (validator.Validate(context) is { IsValid: false, Problems: { } result }) - { - problems.AddRange(result); - } - } - - return new Validation(problems); - } - } } diff --git a/src/request.validation/ValidatorInvoker.cs b/src/request.validation/ValidatorInvoker.cs new file mode 100644 index 0000000..ad41030 --- /dev/null +++ b/src/request.validation/ValidatorInvoker.cs @@ -0,0 +1,34 @@ +// Copyright (c) The Geekeey Authors +// SPDX-License-Identifier: EUPL-1.2 + +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; + +namespace Geekeey.Request.Validation; + +internal abstract class ValidatorInvoker +{ + public abstract Validation Validate(ValidationContext context, IServiceProvider serviceProvider); +} + +internal sealed class ValidatorInvoker : ValidatorInvoker +{ + public override Validation Validate(ValidationContext context, IServiceProvider serviceProvider) + { + var options = serviceProvider.GetRequiredService>().Value; + + var validators = options.GetValidators(serviceProvider); + + var problems = new List(); + + foreach (var validator in validators) + { + if (validator.Validate(context) is { IsValid: false, Problems: { } result }) + { + problems.AddRange(result); + } + } + + return new Validation(problems); + } +} -- 2.52.0