Clean-up IObjectsFactory usages

IObjectsFactory is meant for instantiating NHibernate dependencies, but
it was used in some cases for instantiating value types. Some of its
methods are also hard or impossible to implement with many dependency
injection frameworks.

Follow up to nhibernate#1758

Author: fredericDelaporte

src/NHibernate.Test/Bytecode/ActivatorObjectFactoryFixture.cs

@@ -45,7 +45,7 @@ public void CreateInstanceDefCtor()
 
 
 
-		[Test]
+		[Test, Obsolete]
 		public void CreateInstanceWithNoPublicCtor()
 		{
 			IObjectsFactory of = GetObjectsFactory();
@@ -55,7 +55,7 @@ public void CreateInstanceWithNoPublicCtor()
 			Assert.That(instance, Is.InstanceOf<WithOutPublicParameterLessCtor>());
 		}
 
-		[Test]
+		[Test, Obsolete]
 		public void CreateInstanceOfValueType()
 		{
 			IObjectsFactory of = GetObjectsFactory();
@@ -64,7 +64,7 @@ public void CreateInstanceOfValueType()
 			Assert.That(instance, Is.InstanceOf<ValueType>());
 		}
 
-		[Test]
+		[Test, Obsolete]
 		public void CreateInstanceWithArguments()
 		{
 			IObjectsFactory of = GetObjectsFactory();
@@ -76,4 +76,4 @@ public void CreateInstanceWithArguments()
 			Assert.That(((WithOutPublicParameterLessCtor)instance).Something, Is.EqualTo(value));
 		}
 	}
-}
+}

src/NHibernate.Test/ConnectionTest/MapBasedSessionContextFixture.cs

@@ -2,7 +2,6 @@
 using System.Threading;
 using NHibernate.Cfg;
 using NHibernate.Context;
-using NHibernate.Engine;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ConnectionTest
@@ -59,8 +58,6 @@ public void MapContextThreadSafety()
 
 	public class TestableMapBasedSessionContext : MapBasedSessionContext
 	{
-		public TestableMapBasedSessionContext(ISessionFactoryImplementor factory) : base(factory) { }
-
 		// Context is the app with such implementation. Just for the test case.
 		internal static IDictionary _map;
 
@@ -76,4 +73,4 @@ protected override void SetMap(IDictionary value)
 			_map = value;
 		}
 	}
-}
+}

src/NHibernate.Test/ConnectionTest/ThreadLocalCurrentSessionTest.cs

@@ -1,6 +1,5 @@
 using NHibernate.Cfg;
 using NHibernate.Context;
-using NHibernate.Engine;
 using NUnit.Framework;
 
 namespace NHibernate.Test.ConnectionTest
@@ -71,8 +70,7 @@ public class TestableThreadLocalContext : ThreadLocalSessionContext
 	{
 		private static TestableThreadLocalContext me;
 
-		public TestableThreadLocalContext(ISessionFactoryImplementor factory)
-			: base(factory)
+		public TestableThreadLocalContext()
 		{
 			me = this;
 		}
@@ -88,4 +86,4 @@ public static bool HasBind()
 			return context != null && context.ContainsKey(me.factory);
 		}
 	}
-}
+}

src/NHibernate/Async/Context/ThreadLocalSessionContext.cs

@@ -11,14 +11,13 @@
 using System;
 using System.Collections.Generic;
 
-using NHibernate;
 using NHibernate.Engine;
 
 namespace NHibernate.Context
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class ThreadLocalSessionContext : ICurrentSessionContext
+	public partial class ThreadLocalSessionContext : ICurrentSessionContextWithFactory
 	{
 
 		private static async Task CleanupAnyOrphanedSessionAsync(ISessionFactory factory, CancellationToken cancellationToken)

src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs

@@ -187,10 +187,7 @@ private async Task ExecuteInitializedAsync(Action<string> scriptAction, bool exe
 			cancellationToken.ThrowIfCancellationRequested();
 			if (dialect.SupportsSqlBatches)
 			{
-				var objFactory = Environment.ObjectsFactory;
-				ScriptSplitter splitter = (ScriptSplitter)objFactory.CreateInstance(typeof(ScriptSplitter), sql);
-
-				foreach (string stmt in splitter)
+				foreach (var stmt in new ScriptSplitter(sql))
 				{
 					log.Debug("SQL Batch: {0}", stmt);
 					cmd.CommandText = stmt;

src/NHibernate/Bytecode/ActivatorObjectsFactory.cs

@@ -9,14 +9,18 @@ public object CreateInstance(System.Type type)
 			return Activator.CreateInstance(type);
 		}
 
+		// Since v5.2
+		[Obsolete("This method has no more usages and will be removed in a future version")]
 		public object CreateInstance(System.Type type, bool nonPublic)
 		{
 			return Activator.CreateInstance(type, nonPublic);
 		}
 
+		// Since v5.2
+		[Obsolete("This method has no more usages and will be removed in a future version")]
 		public object CreateInstance(System.Type type, params object[] ctorArgs)
 		{
 			return Activator.CreateInstance(type, ctorArgs);
 		}
 	}
-}
+}

src/NHibernate/Bytecode/IObjectsFactory.cs

@@ -1,7 +1,9 @@
+using System;
+
 namespace NHibernate.Bytecode
 {
 	/// <summary>
-	/// Interface for instantiate all NHibernate objects.
+	/// Interface for instantiating NHibernate dependencies.
 	/// </summary>
 	public interface IObjectsFactory
 	{
@@ -18,6 +20,8 @@ public interface IObjectsFactory
 		/// <param name="type">The type of object to create.</param>
 		/// <param name="nonPublic">true if a public or nonpublic default constructor can match; false if only a public default constructor can match.</param>
 		/// <returns>A reference to the created object.</returns>
+		// Since v5.2
+		[Obsolete("This method has no more usages and will be removed in a future version")]
 		object CreateInstance(System.Type type, bool nonPublic);
 
 		/// <summary>
@@ -27,6 +31,8 @@ public interface IObjectsFactory
 		/// <param name="type">The type of object to create.</param>
 		/// <param name="ctorArgs">An array of constructor arguments.</param>
 		/// <returns>A reference to the created object.</returns>
+		// Since v5.2
+		[Obsolete("This method has no more usages and will be removed in a future version")]
 		object CreateInstance(System.Type type, params object[] ctorArgs);
 	}
-}
+}

src/NHibernate/Context/AsyncLocalSessionContext.cs

@@ -21,13 +21,16 @@ public class AsyncLocalSessionContext : CurrentSessionContext
 	{
 		private readonly AsyncLocal<ISession> _session = new AsyncLocal<ISession>();
 
-		// Constructor signature required for dynamic invocation code.
+		// Since v5.2
+		[Obsolete("This constructor has no more usages and will be removed in a future version")]
 		public AsyncLocalSessionContext(ISessionFactoryImplementor factory) { }
 
+		public AsyncLocalSessionContext() { }
+
 		protected override ISession Session
 		{
 			get => _session.Value;
 			set => _session.Value = value;
 		}
 	}
-}
+}

src/NHibernate/Context/CallSessionContext.cs

@@ -27,10 +27,14 @@ public class CallSessionContext : MapBasedSessionContext
 		private static readonly AsyncLocal<IDictionary> SessionFactoryMap = new AsyncLocal<IDictionary>();
 		#endif
 
+		// Since v5.2
+		[Obsolete("This constructor has no more usages and will be removed in a future version")]
 		public CallSessionContext(ISessionFactoryImplementor factory) : base(factory)
 		{
 		}
 
+		public CallSessionContext() { }
+
 		/// <summary>
 		/// The key is the session factory and the value is the bound session.
 		/// </summary>

src/NHibernate/Context/CurrentSessionContext.cs

@@ -16,7 +16,7 @@ namespace NHibernate.Context
 	/// through <see cref="ISessionFactory.GetCurrentSession()"/> calls.
 	/// </remarks>
 	[Serializable]
-	public abstract class CurrentSessionContext : ICurrentSessionContext
+	public abstract class CurrentSessionContext : ICurrentSessionContextWithFactory
 	{
 		/// <summary> Gets or sets the currently bound session. </summary>
 		protected abstract ISession Session { get; set; }
@@ -37,6 +37,12 @@ public virtual ISession CurrentSession()
 			return Session;
 		}
 
+		/// <inheritdoc />
+		public virtual void SetFactory(ISessionFactoryImplementor factory)
+		{
+			// No-op by default.
+		}
+
 		/// <summary>
 		/// Binds the specified session to the current context.
 		/// </summary>
@@ -86,4 +92,4 @@ private static CurrentSessionContext GetCurrentSessionContext(ISessionFactory fa
 			return currentSessionContext;
 		}
 	}
-}
+}

src/NHibernate/Context/ICurrentSessionContext.cs

@@ -1,4 +1,3 @@
-using System;
 using NHibernate.Engine;
 
 namespace NHibernate.Context
@@ -42,4 +41,17 @@ public interface ICurrentSessionContext
 		/// locating or creating the current session.</exception>
 		ISession CurrentSession();
 	}
+
+	// 6.0 TODO: merge into ICurrentSessionContext
+	/// <summary>
+	/// Transitional interface for <see cref="ICurrentSessionContext"/>.
+	/// </summary>
+	public interface ICurrentSessionContextWithFactory : ICurrentSessionContext
+	{
+		/// <summary>
+		/// Sets the factory. This method should be called once after creating the context.
+		/// </summary>
+		/// <param name="factory">The factory.</param>
+		void SetFactory(ISessionFactoryImplementor factory);
+	}
 }

src/NHibernate/Context/MapBasedSessionContext.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using NHibernate.Engine;
@@ -6,16 +7,28 @@ namespace NHibernate.Context
 {
 	public abstract class MapBasedSessionContext : CurrentSessionContext
 	{
-		private readonly ISessionFactoryImplementor _factory;
+		private ISessionFactoryImplementor _factory;
 
 		// Must be static, different instances of MapBasedSessionContext may have to yield the same map.
 		private static readonly object _locker = new object();
 
+		// Since v5.2
+		[Obsolete("This constructor has no more usages and will be removed in a future version")]
 		protected MapBasedSessionContext(ISessionFactoryImplementor factory)
 		{
 			_factory = factory;
 		}
 
+		protected MapBasedSessionContext() { }
+
+		/// <inheritdoc />
+		public override void SetFactory(ISessionFactoryImplementor factory)
+		{
+			if (_factory != null)
+				throw new InvalidOperationException("The factory has already been set");
+			_factory = factory;
+		}
+
 		/// <summary>
 		/// Gets or sets the currently bound session.
 		/// </summary>
@@ -64,4 +77,4 @@ private ConcurrentDictionary<ISessionFactoryImplementor, ISession> GetConcreteMa
 		/// </summary>
 		protected abstract void SetMap(IDictionary value);
 	}
-}
+}

src/NHibernate/Context/ThreadLocalSessionContext.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-using NHibernate;
 using NHibernate.Engine;
 
 namespace NHibernate.Context
@@ -31,21 +30,25 @@ namespace NHibernate.Context
 	/// <para>The cleanup on transaction end is indeed not implemented.</para>
 	/// </summary>
 	[Serializable]
-	public partial class ThreadLocalSessionContext : ICurrentSessionContext
+	public partial class ThreadLocalSessionContext : ICurrentSessionContextWithFactory
 	{
 		private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(ThreadLocalSessionContext));
 
 		[ThreadStatic]
 		protected static IDictionary<ISessionFactory, ISession> context;
 
-		protected readonly ISessionFactoryImplementor factory;
+		protected ISessionFactoryImplementor factory;
 
 
+		// Since v5.2
+		[Obsolete("This constructor has no more usages and will be removed in a future version")]
 		public ThreadLocalSessionContext(ISessionFactoryImplementor factory)
 		{
 			this.factory = factory;
 		}
 
+		public ThreadLocalSessionContext() { }
+
 		#region ICurrentSessionContext Members
 
 		public ISession CurrentSession()
@@ -66,6 +69,14 @@ public ISession CurrentSession()
 			return current;
 		}
 
+		/// <inheritdoc />
+		public void SetFactory(ISessionFactoryImplementor factory)
+		{
+			if (this.factory != null)
+				throw new InvalidOperationException("The factory has already been set");
+			this.factory = factory;
+		}
+
 		#endregion
 
 		private static void CleanupAnyOrphanedSession(ISessionFactory factory)

src/NHibernate/Context/ThreadStaticSessionContext.cs

@@ -14,8 +14,12 @@ public class ThreadStaticSessionContext : MapBasedSessionContext
 		[ThreadStatic]
 		private static IDictionary _map;
 
+		// Since v5.2
+		[Obsolete("This constructor has no more usages and will be removed in a future version")]
 		public ThreadStaticSessionContext(ISessionFactoryImplementor factory) : base (factory) { }
 
+		public ThreadStaticSessionContext() { }
+
 		protected override IDictionary GetMap()
 		{
 			return _map;

src/NHibernate/Context/WcfOperationSessionContext.cs

@@ -12,8 +12,12 @@ namespace NHibernate.Context
 	/// </summary>
 	public class WcfOperationSessionContext : MapBasedSessionContext
 	{
+		// Since v5.2
+		[Obsolete("This constructor has no more usages and will be removed in a future version")]
 		public WcfOperationSessionContext(ISessionFactoryImplementor factory) : base(factory) {}
 
+		public WcfOperationSessionContext() { }
+
 		private static WcfStateExtension WcfOperationState
 		{
 			get
@@ -49,4 +53,4 @@ public class WcfStateExtension : IExtension<OperationContext>
 		public void Attach(OperationContext owner) { }
 		public void Detach(OperationContext owner) { }
 	}
-}
+}

src/NHibernate/Context/WebSessionContext.cs

@@ -13,8 +13,12 @@ public class WebSessionContext : MapBasedSessionContext
 	{
 		private const string SessionFactoryMapKey = "NHibernate.Context.WebSessionContext.SessionFactoryMapKey";
 
+		// Since v5.2
+		[Obsolete("This constructor has no more usages and will be removed in a future version")]
 		public WebSessionContext(ISessionFactoryImplementor factory) : base(factory) {}
 
+		public WebSessionContext() { }
+
 		protected override IDictionary GetMap()
 		{
 			return ReflectiveHttpContext.HttpContextCurrentItems[SessionFactoryMapKey] as IDictionary;
@@ -25,4 +29,4 @@ protected override void SetMap(IDictionary value)
 			ReflectiveHttpContext.HttpContextCurrentItems[SessionFactoryMapKey] = value;
 		}
 	}
-}
+}