Removed registration logic from DefaultServiceProvider and renamed it to ActivatorServiceProvider

Author: maca88

src/NHibernate.Test/Async/CfgTest/SettingsFactoryFixture.cs

@@ -50,7 +50,7 @@ private Task InvalidRegisteredServiceAsync<TService>()
 		{
 			try
 			{
-				var sp = new DefaultServiceProvider();
+				var sp = new SimpleServiceProvider();
 				sp.Register<TService>(() => throw new InvalidOperationException());
 
 				Environment.ServiceProvider = sp;

src/NHibernate.Test/Bytecode/ActivatorServiceProviderFixture.cs

@@ -0,0 +1,41 @@
+using System;
+using NHibernate.Bytecode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.Bytecode
+{
+	[TestFixture]
+	public class ActivatorServiceProviderFixture
+	{
+		public class WithOutPublicParameterLessCtor
+		{
+			public string Something { get; set; }
+			protected WithOutPublicParameterLessCtor() { }
+
+			public WithOutPublicParameterLessCtor(string something)
+			{
+				Something = something;
+			}
+		}
+
+		public class PublicParameterLessCtor
+		{
+		}
+
+		protected virtual IServiceProvider GetServiceProvider()
+		{
+			return new ActivatorServiceProvider();
+		}
+
+		[Test]
+		public void CreateInstanceDefCtor()
+		{
+			var sp = GetServiceProvider();
+			Assert.Throws<ArgumentNullException>(() => sp.GetService(null));
+			Assert.Throws<MissingMethodException>(() => sp.GetService(typeof(WithOutPublicParameterLessCtor)));
+			var instance = sp.GetService(typeof(PublicParameterLessCtor));
+			Assert.That(instance, Is.Not.Null);
+			Assert.That(instance, Is.InstanceOf<PublicParameterLessCtor>());
+		}
+	}
+}

src/NHibernate.Test/Bytecode/DefaultServiceProviderFixture.cs

@@ -68,7 +68,7 @@ public void RegisteredServices()
 			var sqlExceptionConverter = Substitute.For<ISQLExceptionConverter>();
 			var transactionFactory = Substitute.For<ITransactionFactory>();
 
-			var sp = new DefaultServiceProvider();
+			var sp = new SimpleServiceProvider();
 			sp.Register(() => batcherFactory);
 			sp.Register(() => cacheProvider);
 			sp.Register(() => connectionProvider);
@@ -115,7 +115,7 @@ public void InvalidRegisteredServices()
 
 		private void InvalidRegisteredService<TService>()
 		{
-			var sp = new DefaultServiceProvider();
+			var sp = new SimpleServiceProvider();
 			sp.Register<TService>(() => throw new InvalidOperationException());
 
 			Environment.ServiceProvider = sp;

src/NHibernate.Test/CfgTest/SettingsFactoryFixture.cs

@@ -5,13 +5,9 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NHibernate.Bytecode
+namespace NHibernate.Test.CfgTest
 {
-	/// <summary>
-	/// The default NHibernate service provider that uses <see cref="Activator.CreateInstance(System.Type)"/> to instantiate
-	/// services by default.
-	/// </summary>
-	public class DefaultServiceProvider : IServiceProvider
+	public class SimpleServiceProvider : IServiceProvider
 	{
 		private readonly ConcurrentDictionary<System.Type, Func<object>> _registeredTypeProviders =
 			new ConcurrentDictionary<System.Type, Func<object>>();

src/NHibernate/Bytecode/DefaultServiceProvider.cs renamed to src/NHibernate.Test/CfgTest/SimpleServiceProvider.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using NHibernate.Bytecode;
 using NHibernate.Connection;
+using NHibernate.Test.CfgTest;
 using NHibernate.Util;
 using NUnit.Framework;
 
@@ -60,7 +61,7 @@ public void GetInstanceByDefault()
 		[Test]
 		public void GetInstanceByRegistration()
 		{
-			var sp = new DefaultServiceProvider();
+			var sp = new SimpleServiceProvider();
 			sp.Register<IConnectionProvider, DriverConnectionProvider>();
 			Cfg.Environment.ServiceProvider = sp;
 			var instance = PropertiesHelper.GetInstance<IConnectionProvider>(
@@ -98,7 +99,7 @@ public void GetInstanceByInvalidDefault()
 		[Test]
 		public void GetInstanceByInvalidRegistration()
 		{
-			var sp = new DefaultServiceProvider();
+			var sp = new SimpleServiceProvider();
 			sp.Register(typeof(IConnectionProvider), () => new PropertiesHelperTest());
 			Cfg.Environment.ServiceProvider = sp;
 			Assert.Throws<HibernateException>(

src/NHibernate.Test/UtilityTest/PropertiesHelperTest.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NHibernate.Bytecode
+{
+	/// <summary>
+	/// The default NHibernate service provider that uses <see cref="Activator.CreateInstance(System.Type)"/> to instantiate
+	/// services.
+	/// </summary>
+	public class ActivatorServiceProvider : IServiceProvider
+	{
+		/// <inheritdoc />
+		public object GetService(System.Type serviceType)
+		{
+			if (serviceType == null)
+			{
+				throw new ArgumentNullException(nameof(serviceType));
+			}
+
+			if (serviceType.IsInterface || serviceType.IsAbstract)
+			{
+				return null;
+			}
+
+			return Activator.CreateInstance(serviceType);
+		}
+	}
+}

src/NHibernate/Bytecode/ActivatorServiceProvider.cs

@@ -432,7 +432,7 @@ public object GetService(System.Type serviceType)
 		/// is created, otherwise the change may not take effect.
 		/// For entities see <see cref="IReflectionOptimizer"/> and its implementations.
 		/// </remarks>
-		public static IServiceProvider ServiceProvider { get; set; } = new DefaultServiceProvider();
+		public static IServiceProvider ServiceProvider { get; set; } = new ActivatorServiceProvider();
 
 		/// <summary>
 		/// Whether to enable the use of reflection optimizer
@@ -478,7 +478,7 @@ public static IServiceProvider BuildServiceProvider(IDictionary<string, string>
 			var typeAssemblyQualifiedName = PropertiesHelper.GetString(PropertyServiceProvider, properties, null);
 			if (typeAssemblyQualifiedName == null)
 			{
-				var serviceProvider = new DefaultServiceProvider();
+				var serviceProvider = new ActivatorServiceProvider();
 				log.Info("Service provider class : {0}", serviceProvider.GetType());
 				return serviceProvider;
 			}