IQueryCache constraint should be an IQueryCacheFactory constraint

The configuration setting is used to create an instance of a factory, not of the query cache itself.

Author: Ivar Tiller

src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs

@@ -29,7 +29,7 @@ public void CompleteConfiguration()
 					.Through<HashtableCacheProvider>()
 					.PrefixingRegionsWith("xyz")
 					.Queries
-						.Through<StandardQueryCache>()
+						.Through<StandardQueryCacheFactory>()
 					.UsingMinimalPuts()
 					.WithDefaultExpiration(15)
 				.GeneratingCollections
@@ -69,7 +69,7 @@ public void CompleteConfiguration()
 			Assert.That(cfg.Properties[Environment.SessionFactoryName], Is.EqualTo("SomeName"));
 			Assert.That(cfg.Properties[Environment.CacheProvider], Is.EqualTo(typeof(HashtableCacheProvider).AssemblyQualifiedName));
 			Assert.That(cfg.Properties[Environment.CacheRegionPrefix], Is.EqualTo("xyz"));
-			Assert.That(cfg.Properties[Environment.QueryCacheFactory], Is.EqualTo(typeof(StandardQueryCache).AssemblyQualifiedName));
+			Assert.That(cfg.Properties[Environment.QueryCacheFactory], Is.EqualTo(typeof(StandardQueryCacheFactory).AssemblyQualifiedName));
 			Assert.That(cfg.Properties[Environment.UseMinimalPuts], Is.EqualTo("true"));
 			Assert.That(cfg.Properties[Environment.CacheDefaultExpiration], Is.EqualTo("15"));
 			Assert.That(cfg.Properties[Environment.CollectionTypeFactoryClass], Is.EqualTo(typeof(DefaultCollectionTypeFactory).AssemblyQualifiedName));

src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs

@@ -27,7 +27,7 @@ public void FullConfiguration()
 													c.DefaultExpiration = 15;
 													c.RegionsPrefix = "xyz";
 													c.Provider<HashtableCacheProvider>();
-													c.QueryCache<StandardQueryCache>();
+													c.QueryCache<StandardQueryCacheFactory>();
 												});
 			configure.CollectionTypeFactory<DefaultCollectionTypeFactory>();
 			configure.HqlQueryTranslator<ASTQueryTranslatorFactory>();
@@ -69,7 +69,7 @@ public void FullConfiguration()
 									Is.EqualTo(typeof(HashtableCacheProvider).AssemblyQualifiedName));
 			Assert.That(configure.Properties[Environment.CacheRegionPrefix], Is.EqualTo("xyz"));
 			Assert.That(configure.Properties[Environment.QueryCacheFactory],
-									Is.EqualTo(typeof(StandardQueryCache).AssemblyQualifiedName));
+									Is.EqualTo(typeof(StandardQueryCacheFactory).AssemblyQualifiedName));
 			Assert.That(configure.Properties[Environment.UseMinimalPuts], Is.EqualTo("true"));
 			Assert.That(configure.Properties[Environment.CacheDefaultExpiration], Is.EqualTo("15"));
 			Assert.That(configure.Properties[Environment.CollectionTypeFactoryClass],

src/NHibernate/Cfg/Loquacious/CacheConfiguration.cs

@@ -39,7 +39,7 @@ public void Provider<TProvider>() where TProvider : ICacheProvider
 			cfg.SetProperty(Environment.CacheProvider, typeof(TProvider).AssemblyQualifiedName);
 		}
 
-		public void QueryCache<TFactory>() where TFactory : IQueryCache
+		public void QueryCache<TFactory>() where TFactory : IQueryCacheFactory
 		{
 			UseSecondLevelCache = true;
 			UseQueryCache = true;
@@ -111,7 +111,7 @@ public QueryCacheConfiguration(CacheConfiguration cc)
 
 		#region Implementation of IQueryCacheConfiguration
 
-		public ICacheConfiguration Through<TFactory>() where TFactory : IQueryCache
+		public ICacheConfiguration Through<TFactory>() where TFactory : IQueryCacheFactory
 		{
 			cc.Configuration.SetProperty(Environment.UseSecondLevelCache, "true");
 			cc.Configuration.SetProperty(Environment.UseQueryCache, "true");
@@ -121,4 +121,4 @@ public ICacheConfiguration Through<TFactory>() where TFactory : IQueryCache
 
 		#endregion
 	}
-}
+}

src/NHibernate/Cfg/Loquacious/ICacheConfiguration.cs

@@ -17,6 +17,6 @@ public interface ICacheConfigurationProperties
 		string RegionsPrefix { set; }
 		int DefaultExpiration { set; }
 		void Provider<TProvider>() where TProvider : ICacheProvider;
-		void QueryCache<TFactory>() where TFactory : IQueryCache;
+		void QueryCache<TFactory>() where TFactory : IQueryCacheFactory;
 	}
-}
+}

src/NHibernate/Cfg/Loquacious/IQueryCacheConfiguration.cs

@@ -4,6 +4,6 @@ namespace NHibernate.Cfg.Loquacious
 {
 	public interface IQueryCacheConfiguration
 	{
-		ICacheConfiguration Through<TFactory>() where TFactory : IQueryCache;
+		ICacheConfiguration Through<TFactory>() where TFactory : IQueryCacheFactory;
 	}
-}
+}