Refactored GetValidators method

NancyFx · Mar 2, 2014 · 0080553 · 0080553
1 parent 9f207dd
commit 0080553
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/src/Nancy.Validation.DataAnnotations/DefaultPropertyValidatorFactory.cs b/src/Nancy.Validation.DataAnnotations/DefaultPropertyValidatorFactory.cs
@@ -32,22 +32,19 @@ public IEnumerable<IPropertyValidator> GetValidators(Type type)
             var typeDescriptor =
                 new AssociatedMetadataTypeTypeDescriptionProvider(type).GetTypeDescriptor(type);
 
-            var propertyDescriptors =
-                typeDescriptor.GetProperties();
-
             var results =
                 new List<IPropertyValidator>();
 
-            var classAttributes =
-                typeDescriptor.GetAttributes().OfType<ValidationAttribute>();
+            results.Add(this.GetTypeValidator(typeDescriptor));
+            results.AddRange(this.GetPropertyValidators(typeDescriptor));
 
-            var classValidator =
-                new PropertyValidator
-                {
-                    AttributeAdaptors = this.GetAttributeAdaptors(classAttributes)
-                };
+            return results;
+        }
 
-            results.Add(classValidator);
+        private IEnumerable<PropertyValidator> GetPropertyValidators(ICustomTypeDescriptor typeDescriptor)
+        {
+            var propertyDescriptors =
+                typeDescriptor.GetProperties();
 
             foreach (PropertyDescriptor descriptor in propertyDescriptors)
             {
@@ -61,10 +58,21 @@ public IEnumerable<IPropertyValidator> GetValidators(Type type)
                         Descriptor = descriptor
                     };
 
-                results.Add(validator);
+                yield return validator;
             }
+        }
 
-            return results;
+        private PropertyValidator GetTypeValidator(ICustomTypeDescriptor typeDescriptor)
+        {
+            var classAttributes =
+                typeDescriptor.GetAttributes().OfType<ValidationAttribute>();
+
+            var classValidator =
+                new PropertyValidator
+                {
+                    AttributeAdaptors = this.GetAttributeAdaptors(classAttributes)
+                };
+            return classValidator;
         }
 
         private IDictionary<ValidationAttribute, IEnumerable<IDataAnnotationsValidatorAdapter>> GetAttributeAdaptors(IEnumerable<ValidationAttribute> attributes)