Obsolete interfaces for Loquacios configuration and use config classes directly

Author: bahusoid

src/NHibernate/Cfg/Configuration.cs

@@ -47,7 +47,7 @@ namespace NHibernate.Cfg
 	/// </para>
 	/// </remarks>
 	[Serializable]
-	public class Configuration : ISerializable
+	public partial class Configuration : ISerializable
 	{
 		/// <summary>Default name for hibernate configuration file.</summary>
 		public const string DefaultHibernateCfgFileName = "hibernate.cfg.xml";

src/NHibernate/Cfg/ConfigurationExtensions.cs

@@ -1,82 +1,107 @@
 using System;
 using NHibernate.Cfg.Loquacious;
 using NHibernate.Context;
-using NHibernate.Engine;
 using NHibernate.Hql;
 using NHibernate.Linq;
 using NHibernate.Linq.Functions;
 using NHibernate.Util;
 
 namespace NHibernate.Cfg
 {
+	//Since 5.3
+	[Obsolete]
 	public static class ConfigurationExtensions
 	{
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static IFluentSessionFactoryConfiguration SessionFactory(this Configuration configuration)
 		{
 			return new FluentSessionFactoryConfiguration(configuration);
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration SessionFactoryName(this Configuration configuration, string sessionFactoryName)
 		{
 			configuration.SetProperty(Environment.SessionFactoryName, sessionFactoryName);
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration Cache(this Configuration configuration, Action<ICacheConfigurationProperties> cacheProperties)
 		{
 			cacheProperties(new CacheConfigurationProperties(configuration));
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration CollectionTypeFactory<TCollecionsFactory>(this Configuration configuration)
 		{
 			configuration.SetProperty(Environment.CollectionTypeFactoryClass,
 																	 typeof(TCollecionsFactory).AssemblyQualifiedName);
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration Proxy(this Configuration configuration, Action<IProxyConfigurationProperties> proxyProperties)
 		{
 			proxyProperties(new ProxyConfigurationProperties(configuration));
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration HqlQueryTranslator<TQueryTranslator>(this Configuration configuration) where TQueryTranslator : IQueryTranslatorFactory
 		{
 			configuration.SetProperty(Environment.QueryTranslator, typeof(TQueryTranslator).AssemblyQualifiedName);
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration LinqQueryProvider<TQueryProvider>(this Configuration configuration) where TQueryProvider : INhQueryProvider
 		{
 			configuration.SetProperty(Environment.QueryLinqProvider, typeof(TQueryProvider).AssemblyQualifiedName);
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration LinqToHqlGeneratorsRegistry<TLinqToHqlGeneratorsRegistry>(this Configuration configuration) where TLinqToHqlGeneratorsRegistry : ILinqToHqlGeneratorsRegistry
 		{
 			configuration.SetProperty(Environment.LinqToHqlGeneratorsRegistry, typeof(TLinqToHqlGeneratorsRegistry).AssemblyQualifiedName);
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration CurrentSessionContext<TCurrentSessionContext>(this Configuration configuration) where TCurrentSessionContext : ICurrentSessionContext
 		{
 			configuration.SetProperty(Environment.CurrentSessionContextClass, typeof(TCurrentSessionContext).AssemblyQualifiedName);
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration Mappings(this Configuration configuration, Action<IMappingsConfigurationProperties> mappingsProperties)
 		{
 			mappingsProperties(new MappingsConfigurationProperties(configuration));
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration DataBaseIntegration(this Configuration configuration, Action<IDbIntegrationConfigurationProperties> dataBaseIntegration)
 		{
 			dataBaseIntegration(new DbIntegrationConfigurationProperties(configuration));
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration EntityCache<TEntity>(this Configuration configuration, Action<IEntityCacheConfigurationProperties<TEntity>> entityCacheConfiguration)
 			where TEntity : class
 		{
@@ -126,14 +151,16 @@ public static Configuration EntityCache<TEntity>(this Configuration configuratio
 		///</list>
 		/// </para>
 		/// </remarks>
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration TypeDefinition<TDef>(this Configuration configuration, Action<ITypeDefConfigurationProperties> typeDefConfiguration)
 			where TDef : class
 		{
 			if (typeDefConfiguration == null)
 			{
 				return configuration;
 			}
-			var tdConfiguration = new TypeDefConfigurationProperties<TDef>();
+			var tdConfiguration = TypeDefConfigurationProperties.Create<TDef>();
 			typeDefConfiguration(tdConfiguration);
 			if(string.IsNullOrEmpty(tdConfiguration.Alias))
 			{
@@ -145,6 +172,8 @@ public static Configuration TypeDefinition<TDef>(this Configuration configuratio
 			return configuration;
 		}
 
+		//Since 5.3
+		[Obsolete("Please use Configuration instance method instead")]
 		public static Configuration AddNamedQuery(this Configuration configuration, string queryIdentifier, Action<INamedQueryDefinitionBuilder> namedQueryDefinition)
 		{
 			if (configuration == null)
@@ -165,4 +194,4 @@ public static Configuration AddNamedQuery(this Configuration configuration, stri
 			return configuration;
 		}
 	}
-}
+}

src/NHibernate/Cfg/Loquacious/CacheConfiguration.cs

@@ -3,7 +3,10 @@
 
 namespace NHibernate.Cfg.Loquacious
 {
-	internal class CacheConfigurationProperties : ICacheConfigurationProperties
+	public class CacheConfigurationProperties
+#pragma warning disable 618
+		: ICacheConfigurationProperties
+#pragma warning restore 618
 	{
 		private readonly Configuration cfg;
 
@@ -46,6 +49,8 @@ public void QueryCache<TFactory>() where TFactory : IQueryCache
 			throw new InvalidOperationException("This method is invalid and should not be used. Use QueryCacheFactory method instead.");
 		}
 
+		#endregion
+
 		public void QueryCacheFactory<TFactory>() where TFactory : IQueryCacheFactory
 		{
 			UseSecondLevelCache = true;
@@ -57,10 +62,12 @@ private bool UseSecondLevelCache
 		{
 			set { cfg.SetProperty(Environment.UseSecondLevelCache, value.ToString().ToLowerInvariant()); }
 		}
-		#endregion
 	}
 
-	internal class CacheConfiguration : ICacheConfiguration
+	public class CacheConfiguration 
+#pragma warning disable 618
+		: ICacheConfiguration
+#pragma warning restore 618
 	{
 		private readonly FluentSessionFactoryConfiguration fc;
 
@@ -75,39 +82,66 @@ internal Configuration Configuration
 			get { return fc.Configuration; }
 		}
 
-		#region Implementation of ICacheConfiguration
-
-		public ICacheConfiguration Through<TProvider>() where TProvider : ICacheProvider
+		public CacheConfiguration Through<TProvider>() where TProvider : ICacheProvider
 		{
 			fc.Configuration.SetProperty(Environment.UseSecondLevelCache, "true");
 			fc.Configuration.SetProperty(Environment.CacheProvider, typeof(TProvider).AssemblyQualifiedName);
 			return this;
 		}
 
-		public ICacheConfiguration PrefixingRegionsWith(string regionPrefix)
+		public CacheConfiguration PrefixingRegionsWith(string regionPrefix)
 		{
 			fc.Configuration.SetProperty(Environment.CacheRegionPrefix, regionPrefix);
 			return this;
 		}
 
-		public ICacheConfiguration UsingMinimalPuts()
+		public CacheConfiguration UsingMinimalPuts()
 		{
 			fc.Configuration.SetProperty(Environment.UseMinimalPuts, true.ToString().ToLowerInvariant());
 			return this;
 		}
 
-		public IFluentSessionFactoryConfiguration WithDefaultExpiration(int seconds)
+		public FluentSessionFactoryConfiguration WithDefaultExpiration(int seconds)
 		{
 			fc.Configuration.SetProperty(Environment.CacheDefaultExpiration, seconds.ToString());
 			return fc;
 		}
 
-		public IQueryCacheConfiguration Queries { get; private set; }
+		public QueryCacheConfiguration Queries { get; }
+
+#pragma warning disable 618
+		#region Implementation of ICacheConfiguration
+
+		ICacheConfiguration ICacheConfiguration.Through<TProvider>()
+		{
+			return Through<TProvider>();
+		}
+
+		ICacheConfiguration ICacheConfiguration.PrefixingRegionsWith(string regionPrefix)
+		{
+			return PrefixingRegionsWith(regionPrefix);
+		}
+
+		ICacheConfiguration ICacheConfiguration.UsingMinimalPuts()
+		{
+			return UsingMinimalPuts();
+		}
+
+		IFluentSessionFactoryConfiguration ICacheConfiguration.WithDefaultExpiration(int seconds)
+		{
+			return WithDefaultExpiration(seconds);
+		}
+
+		IQueryCacheConfiguration ICacheConfiguration.Queries => Queries;
 
 		#endregion
+#pragma warning restore 618
 	}
 
-	internal class QueryCacheConfiguration : IQueryCacheConfiguration
+	public class QueryCacheConfiguration 
+#pragma warning disable 618
+		: IQueryCacheConfiguration
+#pragma warning restore 618
 	{
 		private readonly CacheConfiguration cc;
 
@@ -116,10 +150,8 @@ public QueryCacheConfiguration(CacheConfiguration cc)
 			this.cc = cc;
 		}
 
-		#region Implementation of IQueryCacheConfiguration
-
 		// 6.0 TODO: enable constraint and remove runtime type check
-		public ICacheConfiguration Through<TFactory>() // where TFactory : IQueryCacheFactory
+		public CacheConfiguration Through<TFactory>() //where TFactory : IQueryCacheFactory
 		{
 			if (!typeof(IQueryCacheFactory).IsAssignableFrom(typeof(TFactory)))
 				throw new ArgumentException($"{nameof(TFactory)} must be an {nameof(IQueryCacheFactory)}", nameof(TFactory));
@@ -130,6 +162,15 @@ public ICacheConfiguration Through<TFactory>() // where TFactory : IQueryCacheFa
 			return cc;
 		}
 
+		#region Implementation of IQueryCacheConfiguration
+#pragma warning disable 618
+
+		ICacheConfiguration IQueryCacheConfiguration.Through<TFactory>()
+		{
+			return Through<TFactory>();
+		}
+
+#pragma warning restore 618
 		#endregion
 	}
 }