Remove some dead code in System.ComponentModel.Annotations

dotnet · Jun 19, 2017 · 4721339 · 4721339
1 parent 4467f39
commit 4721339
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 28 deletions.
diff --git a/...tModel.Annotations/src/System/ComponentModel/DataAnnotations/CustomValidationAttribute.cs b/...tModel.Annotations/src/System/ComponentModel/DataAnnotations/CustomValidationAttribute.cs
@@ -184,12 +184,7 @@ protected override ValidationResult IsValid(object value, ValidationContext vali
             }
             catch (TargetInvocationException tie)
             {
-                if (tie.InnerException != null)
-                {
-                    throw tie.InnerException;
-                }
-
-                throw;
+                throw tie.InnerException;
             }
         }
 

diff --git a/...ntModel.Annotations/src/System/ComponentModel/DataAnnotations/ValidationAttributeStore.cs b/...ntModel.Annotations/src/System/ComponentModel/DataAnnotations/ValidationAttributeStore.cs
@@ -253,6 +253,7 @@ private class PropertyStoreItem : StoreItem
             internal PropertyStoreItem(Type propertyType, IEnumerable<Attribute> attributes)
                 : base(attributes)
             {
+                Debug.Assert(propertyType != null);
                 _propertyType = propertyType;
             }
 

diff --git a/src/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/Validator.cs b/src/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/Validator.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -352,12 +353,9 @@ public static void ValidateValue(object value, ValidationContext validationConte
         /// </param>
         /// <returns>A new <see cref="ValidationContext" /> for the <paramref name="instance" /> provided.</returns>
         /// <exception cref="ArgumentNullException">When <paramref name="validationContext" /> is null.</exception>
-        internal static ValidationContext CreateValidationContext(object instance, ValidationContext validationContext)
+        private static ValidationContext CreateValidationContext(object instance, ValidationContext validationContext)
         {
-            if (validationContext == null)
-            {
-                throw new ArgumentNullException(nameof(validationContext));
-            }
+            Debug.Assert(validationContext != null);
 
             // Create a new context using the existing ValidationContext that acts as an IServiceProvider and contains our existing items.
             var context = new ValidationContext(instance, validationContext, validationContext.Items);
@@ -376,11 +374,6 @@ internal static ValidationContext CreateValidationContext(object instance, Valid
         /// <exception cref="ArgumentNullException">When <paramref name="destinationType" /> is null.</exception>
         private static bool CanBeAssigned(Type destinationType, object value)
         {
-            if (destinationType == null)
-            {
-                throw new ArgumentNullException(nameof(destinationType));
-            }
-
             if (value == null)
             {
                 // Null can be assigned only to reference types or Nullable or Nullable<>
@@ -431,10 +424,7 @@ private static void EnsureValidPropertyType(string propertyName, Type propertyTy
         private static IEnumerable<ValidationError> GetObjectValidationErrors(object instance,
             ValidationContext validationContext, bool validateAllProperties, bool breakOnFirstError)
         {
-            if (instance == null)
-            {
-                throw new ArgumentNullException(nameof(instance));
-            }
+            Debug.Assert(instance != null);
 
             if (validationContext == null)
             {
@@ -633,10 +623,7 @@ private static IEnumerable<ValidationError> GetValidationErrors(object value,
         private static bool TryValidate(object value, ValidationContext validationContext, ValidationAttribute attribute,
             out ValidationError validationError)
         {
-            if (validationContext == null)
-            {
-                throw new ArgumentNullException(nameof(validationContext));
-            }
+            Debug.Assert(validationContext != null);
 
             var validationResult = attribute.GetValidationResult(value, validationContext);
             if (validationResult != ValidationResult.Success)
@@ -669,10 +656,7 @@ internal ValidationError(ValidationAttribute validationAttribute, object value,
 
             internal ValidationResult ValidationResult { get; set; }
 
-            internal void ThrowValidationException()
-            {
-                throw new ValidationException(ValidationResult, ValidationAttribute, Value);
-            }
+            internal Exception ThrowValidationException() => throw new ValidationException(ValidationResult, ValidationAttribute, Value);
         }
     }
 }