refactor: ScadaBridge validators onto OptionsValidatorBase (messages unchanged)

src/ZB.MOM.WW.ScadaBridge.Security/SecurityOptionsValidator.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Options;
+using ZB.MOM.WW.Configuration;
 
 namespace ZB.MOM.WW.ScadaBridge.Security;
 
@@ -29,7 +29,7 @@ namespace ZB.MOM.WW.ScadaBridge.Security;
 /// minimum-byte length contract co-located with the type that enforces it.
 /// </para>
 /// </summary>
-public sealed class SecurityOptionsValidator : IValidateOptions<SecurityOptions>
+public sealed class SecurityOptionsValidator : OptionsValidatorBase<SecurityOptions>
 {
     /// <summary>
     /// The configuration section name <see cref="SecurityOptions"/> is bound
@@ -41,30 +41,16 @@ public sealed class SecurityOptionsValidator : IValidateOptions<SecurityOptions>
     public const string ConfigSectionName = "Security";
 
     /// <inheritdoc />
-    public ValidateOptionsResult Validate(string? name, SecurityOptions options)
+    protected override void Validate(ValidationBuilder builder, SecurityOptions options)
     {
-        ArgumentNullException.ThrowIfNull(options);
+        builder.RequireThat(!string.IsNullOrWhiteSpace(options.LdapServer),
+            $"{ConfigSectionName}:{nameof(SecurityOptions.LdapServer)} is required " +
+            "but was empty or whitespace — set it to the LDAP server hostname or IP " +
+            "(e.g. \"ldap.example.com\").");
 
-        var failures = new List<string>();
-
-        if (string.IsNullOrWhiteSpace(options.LdapServer))
-        {
-            failures.Add(
-                $"{ConfigSectionName}:{nameof(SecurityOptions.LdapServer)} is required " +
-                "but was empty or whitespace — set it to the LDAP server hostname or IP " +
-                "(e.g. \"ldap.example.com\").");
-        }
-
-        if (string.IsNullOrWhiteSpace(options.LdapSearchBase))
-        {
-            failures.Add(
-                $"{ConfigSectionName}:{nameof(SecurityOptions.LdapSearchBase)} is required " +
-                "but was empty or whitespace — set it to the search-base DN " +
-                "(e.g. \"dc=example,dc=com\").");
-        }
-
-        return failures.Count == 0
-            ? ValidateOptionsResult.Success
-            : ValidateOptionsResult.Fail(failures);
+        builder.RequireThat(!string.IsNullOrWhiteSpace(options.LdapSearchBase),
+            $"{ConfigSectionName}:{nameof(SecurityOptions.LdapSearchBase)} is required " +
+            "but was empty or whitespace — set it to the search-base DN " +
+            "(e.g. \"dc=example,dc=com\").");
     }
 }

src/ZB.MOM.WW.ScadaBridge.Security/ZB.MOM.WW.ScadaBridge.Security.csproj

@@ -14,6 +14,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authorization" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" />
+    <PackageReference Include="ZB.MOM.WW.Configuration" />
   </ItemGroup>
 
   <ItemGroup>