Merge pull request #29 from servicetitan/argument-validator

alex-kulakov · web-flow · commit 98ce02f6892d · 2020-05-13T21:07:07.000+05:00
ArgumentValidator - Do not check parameter names for null
diff --git a/Orm/Xtensive.Orm/Core/ArgumentValidator.cs b/Orm/Xtensive.Orm/Core/ArgumentValidator.cs
@@ -7,7 +7,6 @@
 using System;
 using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
-using Xtensive.Core;
 using Xtensive.Comparison;
 
 
@@ -28,7 +27,6 @@ public static class ArgumentValidator
     public static void EnsureArgumentNotNull(object value, [InvokerParameterName] string parameterName)
     {
       if (value==null) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
         throw new ArgumentNullException(parameterName);
       }
     }
@@ -45,13 +43,11 @@ public static void EnsureArgumentIsNotDefault<T>(T value, [InvokerParameterName]
     {
       if (default(T)==null) {
         if (value==null) {
-          EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
-          throw Exceptions.InvalidArgument(value, "parameterName");
+          throw Exceptions.InvalidArgument(value, parameterName);
         }
       }
-      else if (AdvancedComparerStruct<T>.System.Equals(value, default(T))) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
-        throw Exceptions.InvalidArgument(value, "parameterName");
+      else if (AdvancedComparerStruct<T>.System.Equals(value, default)) {
+        throw Exceptions.InvalidArgument(value, parameterName);
       }
     }
 
@@ -65,11 +61,9 @@ public static void EnsureArgumentIsNotDefault<T>(T value, [InvokerParameterName]
     public static void EnsureArgumentNotNullOrEmpty(string value, [InvokerParameterName] string parameterName)
     {
       if (value == null) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
         throw new ArgumentNullException(parameterName);
       }
       if (value.Length == 0) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
         throw new ArgumentException(Strings.ExArgumentCannotBeEmptyString, parameterName);
       }
     }
@@ -78,15 +72,14 @@ public static void EnsureArgumentNotNullOrEmpty(string value, [InvokerParameterN
     public static void EnsureArgumentNotNullOrEmptyOrWhiteSpace(string value, [InvokerParameterName] string parameterName)
     {
       if (value==null) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
         throw new ArgumentNullException(parameterName);
       }
+
       if (value.Length==0) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
         throw new ArgumentException(Strings.ExArgumentCannotBeEmptyString, parameterName);
       }
+
       if (value.Trim().Length==0) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
         throw new ArgumentException(Strings.ExArgumentCannotBeWhiteSpacesOnlyString, parameterName);
       }
     }
@@ -103,7 +96,6 @@ public static void EnsureArgumentIs<T>(object value, [InvokerParameterName] stri
     {
       EnsureArgumentNotNull(value, parameterName);
       if (!(value is T)) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
         throw new ArgumentException(string.Format(Strings.ExInvalidArgumentType, typeof(T)), parameterName);
       }
     }
@@ -119,8 +111,7 @@ public static void EnsureArgumentIs<T>(object value, [InvokerParameterName] stri
     public static void EnsureArgumentIs(object value, Type type, [InvokerParameterName] string parameterName)
     {
       EnsureArgumentNotNull(value, parameterName);
-      if (!type.IsAssignableFrom(value.GetType())) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
+      if (!type.IsInstanceOfType(value)) {
         throw new ArgumentException(string.Format(Strings.ExInvalidArgumentType, type), parameterName);
       }
     }
@@ -138,7 +129,6 @@ public static void EnsureArgumentIsNullOr<T>(object value, [InvokerParameterName
       if (value==null)
         return;
       if (!(value is T)) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
         throw new ArgumentException(string.Format(Strings.ExInvalidArgumentType, typeof(T)), parameterName);
       }
     }
@@ -157,7 +147,6 @@ public static void EnsureArgumentIsInRange<T>(T value, T lowerBoundary, T upperB
       where T: struct, IComparable<T>
     {
       if (value.CompareTo(lowerBoundary)<0 || value.CompareTo(upperBoundary)>0) {
-        EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
         throw new ArgumentOutOfRangeException(parameterName, value,
           string.Format(Strings.ExArgumentShouldBeInRange, lowerBoundary, upperBoundary));
       }
@@ -176,7 +165,6 @@ public static void EnsureArgumentIsGreaterThan<T>(T value, T boundary, [InvokerP
     {
       if (value.CompareTo(boundary) > 0)
         return;
-      EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
       throw new ArgumentOutOfRangeException(parameterName, value,
         string.Format(Strings.ExArgumentMustBeGreaterThanX, boundary));
     }
@@ -195,7 +183,6 @@ public static void EnsureArgumentIsGreaterThanOrEqual<T>(T value, T boundary, [I
     {
       if (value.CompareTo(boundary) >= 0)
         return;
-      EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
       throw new ArgumentOutOfRangeException(parameterName, value,
         string.Format(Strings.ExArgumentMustBeGreaterThatOrEqualX, boundary));
     }
@@ -214,7 +201,6 @@ public static void EnsureArgumentIsLessThan<T>(T value, T boundary, [InvokerPara
     {
       if (value.CompareTo(boundary) < 0)
         return;
-      EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
       throw new ArgumentOutOfRangeException(parameterName, value,
         string.Format(Strings.ExArgumentMustBeLessThanX, boundary));
     }
@@ -233,7 +219,6 @@ public static void EnsureArgumentIsLessThanOrEqual<T>(T value, T boundary, [Invo
     {
       if (value.CompareTo(boundary) <= 0)
         return;
-      EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");
       throw new ArgumentOutOfRangeException(parameterName, value,
         string.Format(Strings.ExArgumentMustBeLessThanOrEqualX, boundary));
     }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using System;`
`8`	`8`	`using System.Runtime.CompilerServices;`
`9`	`9`	`using JetBrains.Annotations;`
`10`		`-using Xtensive.Core;`
`11`	`10`	`using Xtensive.Comparison;`
`12`	`11`
`13`	`12`
`@@ -28,7 +27,6 @@ public static class ArgumentValidator`
`28`	`27`	`public static void EnsureArgumentNotNull(object value, [InvokerParameterName] string parameterName)`
`29`	`28`	`{`
`30`	`29`	`if (value==null) {`
`31`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`32`	`30`	`throw new ArgumentNullException(parameterName);`
`33`	`31`	`}`
`34`	`32`	`}`
`@@ -45,13 +43,11 @@ public static void EnsureArgumentIsNotDefault<T>(T value, [InvokerParameterName]`
`45`	`43`	`{`
`46`	`44`	`if (default(T)==null) {`
`47`	`45`	`if (value==null) {`
`48`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`49`		`- throw Exceptions.InvalidArgument(value, "parameterName");`
	`46`	`+ throw Exceptions.InvalidArgument(value, parameterName);`
`50`	`47`	`}`
`51`	`48`	`}`
`52`		`- else if (AdvancedComparerStruct<T>.System.Equals(value, default(T))) {`
`53`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`54`		`- throw Exceptions.InvalidArgument(value, "parameterName");`
	`49`	`+ else if (AdvancedComparerStruct<T>.System.Equals(value, default)) {`
	`50`	`+ throw Exceptions.InvalidArgument(value, parameterName);`
`55`	`51`	`}`
`56`	`52`	`}`
`57`	`53`
`@@ -65,11 +61,9 @@ public static void EnsureArgumentIsNotDefault<T>(T value, [InvokerParameterName]`
`65`	`61`	`public static void EnsureArgumentNotNullOrEmpty(string value, [InvokerParameterName] string parameterName)`
`66`	`62`	`{`
`67`	`63`	`if (value == null) {`
`68`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`69`	`64`	`throw new ArgumentNullException(parameterName);`
`70`	`65`	`}`
`71`	`66`	`if (value.Length == 0) {`
`72`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`73`	`67`	`throw new ArgumentException(Strings.ExArgumentCannotBeEmptyString, parameterName);`
`74`	`68`	`}`
`75`	`69`	`}`
`@@ -78,15 +72,14 @@ public static void EnsureArgumentNotNullOrEmpty(string value, [InvokerParameterN`
`78`	`72`	`public static void EnsureArgumentNotNullOrEmptyOrWhiteSpace(string value, [InvokerParameterName] string parameterName)`
`79`	`73`	`{`
`80`	`74`	`if (value==null) {`
`81`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`82`	`75`	`throw new ArgumentNullException(parameterName);`
`83`	`76`	`}`
	`77`	`+`
`84`	`78`	`if (value.Length==0) {`
`85`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`86`	`79`	`throw new ArgumentException(Strings.ExArgumentCannotBeEmptyString, parameterName);`
`87`	`80`	`}`
	`81`	`+`
`88`	`82`	`if (value.Trim().Length==0) {`
`89`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`90`	`83`	`throw new ArgumentException(Strings.ExArgumentCannotBeWhiteSpacesOnlyString, parameterName);`
`91`	`84`	`}`
`92`	`85`	`}`
`@@ -103,7 +96,6 @@ public static void EnsureArgumentIs<T>(object value, [InvokerParameterName] stri`
`103`	`96`	`{`
`104`	`97`	`EnsureArgumentNotNull(value, parameterName);`
`105`	`98`	`if (!(value is T)) {`
`106`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`107`	`99`	`throw new ArgumentException(string.Format(Strings.ExInvalidArgumentType, typeof(T)), parameterName);`
`108`	`100`	`}`
`109`	`101`	`}`
`@@ -119,8 +111,7 @@ public static void EnsureArgumentIs<T>(object value, [InvokerParameterName] stri`
`119`	`111`	`public static void EnsureArgumentIs(object value, Type type, [InvokerParameterName] string parameterName)`
`120`	`112`	`{`
`121`	`113`	`EnsureArgumentNotNull(value, parameterName);`
`122`		`- if (!type.IsAssignableFrom(value.GetType())) {`
`123`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
	`114`	`+ if (!type.IsInstanceOfType(value)) {`
`124`	`115`	`throw new ArgumentException(string.Format(Strings.ExInvalidArgumentType, type), parameterName);`
`125`	`116`	`}`
`126`	`117`	`}`
`@@ -138,7 +129,6 @@ public static void EnsureArgumentIsNullOr<T>(object value, [InvokerParameterName`
`138`	`129`	`if (value==null)`
`139`	`130`	`return;`
`140`	`131`	`if (!(value is T)) {`
`141`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`142`	`132`	`throw new ArgumentException(string.Format(Strings.ExInvalidArgumentType, typeof(T)), parameterName);`
`143`	`133`	`}`
`144`	`134`	`}`
`@@ -157,7 +147,6 @@ public static void EnsureArgumentIsInRange<T>(T value, T lowerBoundary, T upperB`
`157`	`147`	`where T: struct, IComparable<T>`
`158`	`148`	`{`
`159`	`149`	`if (value.CompareTo(lowerBoundary)<0 \|\| value.CompareTo(upperBoundary)>0) {`
`160`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`161`	`150`	`throw new ArgumentOutOfRangeException(parameterName, value,`
`162`	`151`	`string.Format(Strings.ExArgumentShouldBeInRange, lowerBoundary, upperBoundary));`
`163`	`152`	`}`
`@@ -176,7 +165,6 @@ public static void EnsureArgumentIsGreaterThan<T>(T value, T boundary, [InvokerP`
`176`	`165`	`{`
`177`	`166`	`if (value.CompareTo(boundary) > 0)`
`178`	`167`	`return;`
`179`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`180`	`168`	`throw new ArgumentOutOfRangeException(parameterName, value,`
`181`	`169`	`string.Format(Strings.ExArgumentMustBeGreaterThanX, boundary));`
`182`	`170`	`}`
`@@ -195,7 +183,6 @@ public static void EnsureArgumentIsGreaterThanOrEqual<T>(T value, T boundary, [I`
`195`	`183`	`{`
`196`	`184`	`if (value.CompareTo(boundary) >= 0)`
`197`	`185`	`return;`
`198`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`199`	`186`	`throw new ArgumentOutOfRangeException(parameterName, value,`
`200`	`187`	`string.Format(Strings.ExArgumentMustBeGreaterThatOrEqualX, boundary));`
`201`	`188`	`}`
`@@ -214,7 +201,6 @@ public static void EnsureArgumentIsLessThan<T>(T value, T boundary, [InvokerPara`
`214`	`201`	`{`
`215`	`202`	`if (value.CompareTo(boundary) < 0)`
`216`	`203`	`return;`
`217`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`218`	`204`	`throw new ArgumentOutOfRangeException(parameterName, value,`
`219`	`205`	`string.Format(Strings.ExArgumentMustBeLessThanX, boundary));`
`220`	`206`	`}`
`@@ -233,7 +219,6 @@ public static void EnsureArgumentIsLessThanOrEqual<T>(T value, T boundary, [Invo`
`233`	`219`	`{`
`234`	`220`	`if (value.CompareTo(boundary) <= 0)`
`235`	`221`	`return;`
`236`		`- EnsureArgumentNotNullOrEmpty(parameterName, "parameterName");`
`237`	`222`	`throw new ArgumentOutOfRangeException(parameterName, value,`
`238`	`223`	`string.Format(Strings.ExArgumentMustBeLessThanOrEqualX, boundary));`
`239`	`224`	`}`