Simplify logic

Author: hazzik

src/NHibernate/Type/TypeFactory.cs

@@ -535,7 +535,16 @@ public static IType HeuristicType(string typeName)
 		/// </remarks>
 		public static IType HeuristicType(System.Type type)
 		{
-			return HeuristicType(type, parameters: null, length: null);
+			// Use the basic name (such as String) to get the instance of the IType object.
+			if (typeByTypeOfName.TryGetValue(type.AssemblyQualifiedName, out var returnType))
+			{
+				if (_obsoleteMessageByAlias.TryGetValue(type.AssemblyQualifiedName, out string obsoleteMessage))
+					_log.Warn("{0} is obsolete. {1}", type.AssemblyQualifiedName, obsoleteMessage);
+
+				return returnType;
+			}
+
+			return GetNHibernateTypeFromSystemType(type, null, null);
 		}
 
 		/// <summary>
@@ -586,18 +595,12 @@ public static IType HeuristicType(string typeName, IDictionary<string, string> p
 			{
 				throw new MappingException("Could not find IType for given" + typeName + ": " + ex, ex);
 			}
-			return HeuristicType(typeClass, parameters, length, false);
+
+			return GetNHibernateTypeFromSystemType(typeClass, parameters, length);
 		}
 
-		private static IType HeuristicType(System.Type typeClass, IDictionary<string, string> parameters, int? length, bool tryBasic = true)
+		private static IType GetNHibernateTypeFromSystemType(System.Type typeClass, IDictionary<string, string> parameters, int? length)
 		{
-			if(tryBasic)
-			{
-				IType type = Basic(typeClass.AssemblyQualifiedName, parameters);
-
-				if (type != null)
-					return type;
-			}
 			if (typeof(IType).IsAssignableFrom(typeClass))
 			{
 				try
@@ -610,6 +613,7 @@ private static IType HeuristicType(System.Type typeClass, IDictionary<string, st
 					{
 						_log.Warn("{0} is obsolete. {1}", typeClass.AssemblyQualifiedName, obsolete.Message);
 					}
+
 					return type;
 				}
 				catch (HibernateException)
@@ -621,14 +625,17 @@ private static IType HeuristicType(System.Type typeClass, IDictionary<string, st
 					throw new MappingException("Could not instantiate IType " + typeClass.Name + ": " + e, e);
 				}
 			}
+
 			if (typeof(ICompositeUserType).IsAssignableFrom(typeClass))
 			{
 				return new CompositeCustomType(typeClass, parameters);
 			}
+
 			if (typeof(IUserType).IsAssignableFrom(typeClass))
 			{
 				return new CustomType(typeClass, parameters);
 			}
+
 			if (typeof(ILifecycle).IsAssignableFrom(typeClass))
 			{
 				return NHibernateUtil.Entity(typeClass);