NH-3884 - Alternate implementation without a new method.

Author: fredericDelaporte

src/NHibernate.Test/TypesTest/ChangeDefaultTypeFixture.cs

@@ -25,17 +25,17 @@ protected override void Configure(Configuration configuration)
 			_originalDefaultDateTimeType = TypeFactory.GetDefaultTypeFor(typeof(DateTime));
 			Assert.That(_originalDefaultDateTimeType, Is.Not.Null);
 			_testDefaultDateTimeType = NHibernateUtil.DateTime.Equals(_originalDefaultDateTimeType)
-				? (IType) NHibernateUtil.Timestamp
+				? (IType) NHibernateUtil.DateTimeNoMs
 				: NHibernateUtil.DateTime;
-			TypeFactory.SetDefaultType<DateTime>(_testDefaultDateTimeType);
+			TypeFactory.RegisterType(typeof(DateTime), _testDefaultDateTimeType, TypeFactory.EmptyAliases);
 			base.Configure(configuration);
 		}
 
 		protected override void DropSchema()
 		{
 			base.DropSchema();
 			if (_originalDefaultDateTimeType != null)
-				TypeFactory.SetDefaultType<DateTime>(_originalDefaultDateTimeType);
+				TypeFactory.RegisterType(typeof(DateTime), _originalDefaultDateTimeType, TypeFactory.EmptyAliases);
 		}
 
 		[Test]
@@ -72,13 +72,13 @@ public void ParameterType()
 				var q = s.CreateQuery($"from {nameof(ChangeDefaultTypeClass)} where :date1 = :date2 or :date1 = :date3")
 				         .SetParameter("date1", DateTime.Now)
 				         .SetDateTime("date2", DateTime.Now)
-				         .SetTimestamp("date3", DateTime.Now);
+				         .SetDateTimeNoMs("date3", DateTime.Now);
 
 				var namedParameters = namedParametersField.GetValue(q) as Dictionary<string, TypedValue>;
 				Assert.That(namedParameters, Is.Not.Null, "Unable to retrieve parameters internal field");
 				Assert.That(namedParameters["date1"].Type, Is.EqualTo(_testDefaultDateTimeType));
 				Assert.That(namedParameters["date2"].Type, Is.EqualTo(NHibernateUtil.DateTime));
-				Assert.That(namedParameters["date3"].Type, Is.EqualTo(NHibernateUtil.Timestamp));
+				Assert.That(namedParameters["date3"].Type, Is.EqualTo(NHibernateUtil.DateTimeNoMs));
 			}
 		}
 	}

src/NHibernate/Type/TypeFactory.cs

@@ -34,8 +34,9 @@ private enum TypeClassification
 			PrecisionScale
 		}
 
+		public static readonly string[] EmptyAliases = new string[0];
+
 		private static readonly INHibernateLogger _log = NHibernateLogger.For(typeof(TypeFactory));
-		private static readonly string[] EmptyAliases= new string[0];
 		private static readonly char[] PrecisionScaleSplit = { '(', ')', ',' };
 		private static readonly char[] LengthSplit = { '(', ')' };
 
@@ -96,7 +97,15 @@ private enum TypeClassification
 
 		private delegate NullableType NullableTypeCreatorDelegate(SqlType sqlType);
 
-		private static void RegisterType(System.Type systemType, IType nhibernateType, IEnumerable<string> aliases)
+		/// <summary>
+		/// <para>Defines which NHibernate type should be chosen by default for handling a given .Net type.</para>
+		/// <para>This must be done before any operation on NHibernate, including building its
+		/// <see cref="Configuration" /> and building session factory. Otherwise the behavior will be undefined.</para>
+		/// </summary>
+		/// <param name="systemType">The .Net type.</param>
+		/// <param name="nhibernateType">The NHibernate type.</param>
+		/// <param name="aliases">The additional aliases to map to the type. Use <see cref="EmptyAliases"/> if none.</param>
+		public static void RegisterType(System.Type systemType, IType nhibernateType, IEnumerable<string> aliases)
 		{
 			var typeAliases = new List<string>(aliases);
 			typeAliases.AddRange(GetClrTypeAliases(systemType));
@@ -314,25 +323,6 @@ private static void RegisterBuiltInTypes()
 								 len => new SerializableType(typeof (object), SqlTypeFactory.GetBinary(len))));
 		}
 
-		/// <summary>
-		/// <para>Defines which NHibernate type should be chosen by default for handling a given .Net type.</para>
-		/// <para>This must be done before any operation on NHibernate, including building its
-		/// <see cref="Configuration" /> and building session factory. Otherwise the behavior will be undefined.</para>
-		/// </summary>
-		/// <param name="targetType">The NHibernate type.</param>
-		/// <typeparam name="T">The .Net type.</typeparam>
-		public static void SetDefaultType<T>(IType targetType)
-		{
-			if (targetType == null)
-				throw new ArgumentNullException(nameof(targetType));
-
-			var type = typeof(T);
-			foreach (var alias in GetClrTypeAliases(type))
-			{
-				typeByTypeOfName[alias] = targetType;
-			}
-		}
-
 		private static ICollectionTypeFactory CollectionTypeFactory =>
 			Environment.BytecodeProvider.CollectionTypeFactory;