Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactored GetUnsatisfiedDependencies() into AutowireUtils for better AutoMocking support

Browse Source
This commit is contained in:
eeichinger
2009-11-21 11:48:49 +00:00
parent c92240b5bf
commit feb302dc91
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs
View File

@@ -1156,22 +1156,15 @@ namespace Spring.Objects.Factory.Support
CheckDependencies(name, definition, filteredPropInfo, properties);
}
private static void CheckDependencies(string name, IConfigurableObjectDefinition definition, PropertyInfo[] filteredPropInfo, IPropertyValues properties)
private void CheckDependencies(string name, IConfigurableObjectDefinition definition, PropertyInfo[] filteredPropInfo, IPropertyValues properties)
{
DependencyCheckingMode dependencyCheck = definition.DependencyCheck;
foreach (PropertyInfo property in filteredPropInfo)
PropertyInfo[] unsatisfiedDependencies = AutowireUtils.GetUnsatisfiedDependencies(filteredPropInfo, properties, dependencyCheck);
if (unsatisfiedDependencies.Length > 0)
{
if (property.CanWrite && properties.GetPropertyValue(property.Name) == null)
{
bool isSimple = ObjectUtils.IsSimpleProperty(property.PropertyType);
bool unsatisfied = (dependencyCheck == DependencyCheckingMode.All) || (isSimple && dependencyCheck == DependencyCheckingMode.Simple)
|| (!isSimple && dependencyCheck == DependencyCheckingMode.Objects);
if (unsatisfied)
{
throw new UnsatisfiedDependencyException(definition.ResourceDescription, name, property.Name,
"Set this property value or disable dependency checking for this object.");
}
}
throw new UnsatisfiedDependencyException(definition.ResourceDescription, name, unsatisfiedDependencies[0].Name,
"Set this property value or disable dependency checking for this object.");
}
}

23
src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs
View File

@@ -349,5 +349,28 @@ namespace Spring.Objects.Factory.Support
{
return new SimpleAutowireCandidateResolver();
}
/// <summary>
/// Returns the list of <paramref name="propertyInfos"/> that are not satisfied by <paramref name="properties"/>.
/// </summary>
/// <returns>the filtered list. Is never <c>null</c></returns>
public static PropertyInfo[] GetUnsatisfiedDependencies(PropertyInfo[] propertyInfos, IPropertyValues properties, DependencyCheckingMode dependencyCheck)
{
ArrayList unsatisfiedDependenciesList = new ArrayList();
foreach (PropertyInfo property in propertyInfos)
{
if (property.CanWrite && properties.GetPropertyValue(property.Name) == null)
{
bool isSimple = ObjectUtils.IsSimpleProperty(property.PropertyType);
bool unsatisfied = (dependencyCheck == DependencyCheckingMode.All) || (isSimple && dependencyCheck == DependencyCheckingMode.Simple)
|| (!isSimple && dependencyCheck == DependencyCheckingMode.Objects);
if (unsatisfied)
{
unsatisfiedDependenciesList.Add(property);
}
}
}
return (PropertyInfo[])unsatisfiedDependenciesList.ToArray(typeof(PropertyInfo));
}
}
}