Skip to content

Commit cb6f1fe

Browse files
committed
Use old-style null validation
1 parent d4bf50a commit cb6f1fe

1 file changed

Lines changed: 35 additions & 6 deletions

File tree

src/libraries/Microsoft.Extensions.Options/src/ValidateOptions.cs

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@ public class ValidateOptions<TOptions> : IValidateOptions<TOptions> where TOptio
1717
/// <param name="name">Options name.</param>
1818
/// <param name="validation">Validation function.</param>
1919
/// <param name="failureMessage">Validation failure message.</param>
20-
public ValidateOptions(string? name, Func<TOptions, bool> validation!!, string failureMessage)
20+
public ValidateOptions(string? name, Func<TOptions, bool> validation, string failureMessage)
2121
{
22+
if (validation == null)
23+
{
24+
throw new ArgumentNullException(nameof(validation));
25+
}
26+
2227
Name = name;
2328
Validation = validation;
2429
FailureMessage = failureMessage;
@@ -76,8 +81,13 @@ public class ValidateOptions<TOptions, TDep> : IValidateOptions<TOptions> where
7681
/// <param name="dependency">The dependency.</param>
7782
/// <param name="validation">Validation function.</param>
7883
/// <param name="failureMessage">Validation failure message.</param>
79-
public ValidateOptions(string? name, TDep dependency, Func<TOptions, TDep, bool> validation!!, string failureMessage)
84+
public ValidateOptions(string? name, TDep dependency, Func<TOptions, TDep, bool> validation, string failureMessage)
8085
{
86+
if (validation == null)
87+
{
88+
throw new ArgumentNullException(nameof(validation));
89+
}
90+
8191
Name = name;
8292
Validation = validation;
8393
FailureMessage = failureMessage;
@@ -143,8 +153,13 @@ public class ValidateOptions<TOptions, TDep1, TDep2> : IValidateOptions<TOptions
143153
/// <param name="dependency2">The second dependency.</param>
144154
/// <param name="validation">Validation function.</param>
145155
/// <param name="failureMessage">Validation failure message.</param>
146-
public ValidateOptions(string? name, TDep1 dependency1, TDep2 dependency2, Func<TOptions, TDep1, TDep2, bool> validation!!, string failureMessage)
156+
public ValidateOptions(string? name, TDep1 dependency1, TDep2 dependency2, Func<TOptions, TDep1, TDep2, bool> validation, string failureMessage)
147157
{
158+
if (validation == null)
159+
{
160+
throw new ArgumentNullException(nameof(validation));
161+
}
162+
148163
Name = name;
149164
Validation = validation;
150165
FailureMessage = failureMessage;
@@ -218,8 +233,13 @@ public class ValidateOptions<TOptions, TDep1, TDep2, TDep3> : IValidateOptions<T
218233
/// <param name="dependency3">The third dependency.</param>
219234
/// <param name="validation">Validation function.</param>
220235
/// <param name="failureMessage">Validation failure message.</param>
221-
public ValidateOptions(string? name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, Func<TOptions, TDep1, TDep2, TDep3, bool> validation!!, string failureMessage)
236+
public ValidateOptions(string? name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, Func<TOptions, TDep1, TDep2, TDep3, bool> validation, string failureMessage)
222237
{
238+
if (validation == null)
239+
{
240+
throw new ArgumentNullException(nameof(validation));
241+
}
242+
223243
Name = name;
224244
Validation = validation;
225245
FailureMessage = failureMessage;
@@ -301,8 +321,13 @@ public class ValidateOptions<TOptions, TDep1, TDep2, TDep3, TDep4> : IValidateOp
301321
/// <param name="dependency4">The fourth dependency.</param>
302322
/// <param name="validation">Validation function.</param>
303323
/// <param name="failureMessage">Validation failure message.</param>
304-
public ValidateOptions(string? name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, Func<TOptions, TDep1, TDep2, TDep3, TDep4, bool> validation!!, string failureMessage)
324+
public ValidateOptions(string? name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, Func<TOptions, TDep1, TDep2, TDep3, TDep4, bool> validation, string failureMessage)
305325
{
326+
if (validation == null)
327+
{
328+
throw new ArgumentNullException(nameof(validation));
329+
}
330+
306331
Name = name;
307332
Validation = validation;
308333
FailureMessage = failureMessage;
@@ -392,8 +417,12 @@ public class ValidateOptions<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5> : IVal
392417
/// <param name="dependency5">The fifth dependency.</param>
393418
/// <param name="validation">Validation function.</param>
394419
/// <param name="failureMessage">Validation failure message.</param>
395-
public ValidateOptions(string? name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, TDep5 dependency5, Func<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5, bool> validation!!, string failureMessage)
420+
public ValidateOptions(string? name, TDep1 dependency1, TDep2 dependency2, TDep3 dependency3, TDep4 dependency4, TDep5 dependency5, Func<TOptions, TDep1, TDep2, TDep3, TDep4, TDep5, bool> validation, string failureMessage)
396421
{
422+
if (validation == null)
423+
{
424+
throw new ArgumentNullException(nameof(validation));
425+
}
397426
Name = name;
398427
Validation = validation;
399428
FailureMessage = failureMessage;

0 commit comments

Comments
 (0)