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

merge mods to pull 6 for SPRNET-1470, SPRNET-1471

Browse Source
This commit is contained in:
Steve Bohlen
2011-11-15 11:11:09 -05:00
parent aecb61fa54
commit 43516e6dbe
6 changed files with 240 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs
View File

@@ -28,6 +28,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using Spring.Util;
using System.Reflection;
#endregion
@@ -116,6 +117,45 @@ namespace Spring.Core.TypeConversion
return ToTypedCollectionWithTypeConversion(typeof(List<>), componentType, elements, propertyName);
}
}
// if required type is some IDictionary<K,V>, convert all the elements
if (requiredType != null && requiredType.IsGenericType && TypeImplementsGenericInterface(requiredType, typeof(IDictionary<,>)))
{
Type[] typeParameters = requiredType.GetGenericArguments();
Type keyType = typeParameters[0];
Type valueType = typeParameters[1];
if (newValue is IDictionary)
{
IDictionary elements = (IDictionary)newValue;
Type targetCollectionType = typeof(Dictionary<,>);
Type collectionType = targetCollectionType.MakeGenericType(new Type[] { keyType, valueType });
object typedCollection = Activator.CreateInstance(collectionType);
MethodInfo addMethod = collectionType.GetMethod("Add", new Type[] { keyType, valueType });
int i = 0;
foreach (DictionaryEntry entry in elements)
{
string propertyExpr = BuildIndexedPropertyName(propertyName, i);
object key = ConvertValueIfNecessary(keyType, entry.Key, propertyExpr + ".Key");
object value = ConvertValueIfNecessary(valueType, entry.Value, propertyExpr + ".Value");
addMethod.Invoke(typedCollection, new object[] { key, value });
i++;
}
return typedCollection;
}
}
// if required type is some IEnumerable<T>, convert all the elements
if (requiredType != null && requiredType.IsGenericType && TypeImplementsGenericInterface(requiredType, typeof(IEnumerable<>)))
{
// convert individual elements to array elements
Type componentType = requiredType.GetGenericArguments()[0];
if (newValue is ICollection)
{
ICollection elements = (ICollection)newValue;
return ToTypedCollectionWithTypeConversion(typeof(List<>), componentType, elements, propertyName);
}
}
#endif
// try to convert using type converter
@@ -289,18 +329,16 @@ namespace Spring.Core.TypeConversion
throw new ArgumentException("matchingInterface Type must be an Interface Type", "matchingInterface");
}
bool match = false;
if (candidateType.IsInterface && IsMatchingGenericInterface(candidateType, matchingInterface))
{
return true;
}
bool match = false;
Type[] implementedInterfaces = candidateType.GetInterfaces();
foreach (Type interfaceType in implementedInterfaces)
{
if (false == interfaceType.IsGenericType)
{
continue;
}
Type genericType = interfaceType.GetGenericTypeDefinition();
if (genericType == matchingInterface)
if (IsMatchingGenericInterface(interfaceType, matchingInterface))
{
match = true;
break;
@@ -309,6 +347,11 @@ namespace Spring.Core.TypeConversion
return match;
}
private static bool IsMatchingGenericInterface(Type candidateInterfaceType, Type matchingGenericInterface)
{
return candidateInterfaceType.IsGenericType && candidateInterfaceType.GetGenericTypeDefinition() == matchingGenericInterface;
}
#endif
}
}