Rename GetGenericType API's which traverse heirachy to FirstGenericType()

Author: mythz

src/ServiceStack.Text/CollectionExtensions.cs

@@ -9,7 +9,7 @@ public static ICollection<T> CreateAndPopulate<T>(Type ofCollectionType, T[] wit
         {
             if (ofCollectionType == null) return new List<T>(withItems);
 
-            var genericType = ofCollectionType.GetGenericType();
+            var genericType = ofCollectionType.FirstGenericType();
             var genericTypeDefinition = genericType != null
                 ? genericType.GetGenericTypeDefinition()
                 : null;

src/ServiceStack.Text/ReflectionExtensions.cs

@@ -130,7 +130,7 @@ public static bool HasGenericType(this Type type)
             return false;
         }
 
-        public static Type GetGenericType(this Type type)
+        public static Type FirstGenericType(this Type type)
         {
             while (type != null)
             {
@@ -174,7 +174,7 @@ public static Type GetTypeWithGenericTypeDefinitionOf(this Type type, Type gener
                 }
             }
 
-            var genericType = type.GetGenericType();
+            var genericType = type.FirstGenericType();
             if (genericType != null && genericType.GetGenericTypeDefinition() == genericTypeDefinition)
             {
                 return genericType;
@@ -321,7 +321,7 @@ public static Type GetTypeWithGenericInterfaceOf(this Type type, Type genericInt
 
             if (!type.IsGeneric()) return null;
 
-            var genericType = type.GetGenericType();
+            var genericType = type.FirstGenericType();
             return genericType.GetGenericTypeDefinition() == genericInterfaceType
                     ? genericType
                     : null;
@@ -1325,12 +1325,11 @@ public static Type FirstGenericTypeDefinition(this Type type)
         {
             while (type != null)
             {
-                if (type.HasGenericType())
+                if (type.IsGenericTypeDefinition())
                     return type.GenericTypeDefinition();
 
                 type = type.BaseType();
             }
-
             return null;
         }
 

src/ServiceStack.Text/TranslateListWithElements.cs

@@ -58,7 +58,7 @@ public static object TranslateToConvertibleGenericICollectionCache(
             ConvertInstanceDelegate translateToFn;
             if (TranslateConvertibleICollectionCache.TryGetValue(typeKey, out translateToFn)) return translateToFn(from, toInstanceOfType);
 
-            var toElementType = toInstanceOfType.GetGenericType().GenericTypeArguments()[0];
+            var toElementType = toInstanceOfType.FirstGenericType().GenericTypeArguments()[0];
             var genericType = typeof(TranslateListWithConvertibleElements<,>).MakeGenericType(fromElementType, toElementType);
             var mi = genericType.GetStaticMethod("LateBoundTranslateToGenericICollection");
             translateToFn = (ConvertInstanceDelegate)mi.MakeDelegate(typeof(ConvertInstanceDelegate));