From e8bed331c9ab1ba34c6a4a93232cd116b0a56d1e Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Wed, 18 Apr 2012 15:44:43 -0400
Subject: [PATCH] SPRNET-1478 change default behavior to use NH internal
 ProxyFactoryFactory instead of the SPRNET implmentation

---
 .../Data/NHibernate/LocalSessionFactoryObject.cs  | 15 ---------------
 .../NHibernate/LocalSessionFactoryObjectTests.cs  | 13 +++++++++----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
index 23f41534..a374db6b 100644
--- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
@@ -534,21 +534,6 @@ namespace Spring.Data.NHibernate
                 }
             }
 
-            // check whether proxy factory has been initialized
-            if (config.GetProperty(Environment.ProxyFactoryFactoryClass) == null
-                && (hibernateProperties == null || !hibernateProperties.Contains(Environment.ProxyFactoryFactoryClass)))
-            {
-                // nothing set by user, lets use Spring.NET's proxy factory factory
-                #region Logging
-                if (log.IsInfoEnabled)
-                {
-                    log.Info("Setting proxy factory to Spring provided one as user did not specify any");
-                }
-                #endregion
-                config.Properties.Add(
-                    Environment.ProxyFactoryFactoryClass, typeof(Bytecode.ProxyFactoryFactory).AssemblyQualifiedName);
-            }
-
             if (this.hibernateProperties != null)
             {
                 if (config.GetProperty(Environment.ConnectionProvider) != null &&
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
index 9c6ead15..1a359138 100644
--- a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
@@ -19,6 +19,7 @@
 #endregion
 
 using System.Collections;
+using System.Collections.Generic;
 using System.IO;
 
 using NHibernate;
@@ -68,9 +69,13 @@ namespace Spring.Data.NHibernate
             Assert.AreEqual(sfo.Configuration.Properties[Environment.ConnectionDriver], typeof(SqlClientDriver).AssemblyQualifiedName);
             Assert.AreEqual(sfo.Configuration.Properties[Environment.Dialect], typeof(MsSql2000Dialect).AssemblyQualifiedName);
 
-            Assert.AreEqual(sfo.Configuration.Properties[Environment.ProxyFactoryFactoryClass], typeof(ProxyFactoryFactory).AssemblyQualifiedName);
-            // Spring's IBytecodeProvider should be the default
-            // Assert.AreEqual(typeof(BytecodeProvider), Environment.BytecodeProvider.GetType(), "default IBytecodeProvider was not Spring's BytecodeProvider");
+            Assert.Throws<KeyNotFoundException>(() =>
+                                                    {
+                                                        var x =
+                                                          sfo.Configuration.Properties[Environment.ProxyFactoryFactoryClass];
+                                                    }, "ProxyFactoryFactory should not be explicitly set!");
+            
+            Assert.AreNotEqual(typeof(BytecodeProvider), Environment.BytecodeProvider.GetType(), "default IBytecodeProvider should not be Spring's BytecodeProvider!");
         }
 
         [Test]
@@ -78,7 +83,7 @@ namespace Spring.Data.NHibernate
         public void LocalSessionFactoryObjectWithInvalidMapping()
         {
             LocalSessionFactoryObject sfo = new LocalSessionFactoryObject();
-            sfo.MappingResources = new string[] { "mapping.hbm.xml"};
+            sfo.MappingResources = new string[] { "mapping.hbm.xml" };
             sfo.AfterPropertiesSet();
 
         }