Merge branch 'cremor-NH-3119'

Author: hazzik

releasenotes.txt

@@ -4,6 +4,11 @@ Build vNext
 ** Known BREAKING CHANGES from NH4.0.0.Alpha1 to 4.0.0.Alpha1
 
     Fixed mapping by code behaviour when map child subclasses (see NH-3135 and NH-3269)
+    
+    The constructor of AbstractComponentTuplizer now behaves like AbstractEntityTuplizer in the way
+    that it doesn't create the instantiator any more. Custom component tuplizers that derive
+    directly from AbstractComponentTuplizer need to add this line of code in their constructor:
+      instantiator = BuildInstantiator(component);
 
 
 Build 4.0.0.Alpha1

src/NHibernate.Test/NHSpecificTest/NH3119/Entity.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Diagnostics;
+
+namespace NHibernate.Test.NHSpecificTest.NH3119
+{
+	public class Entity
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual Component Component { get; set; }
+	}
+
+	public class Component
+	{
+		public Component()
+		{
+			LastCtorStackTrace = new StackTrace().ToString();
+		}
+
+		public string Value { get; set; }
+		public string LastCtorStackTrace { get; private set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3119/FixtureByCode.cs

@@ -0,0 +1,105 @@
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization.Formatters.Binary;
+using NHibernate.Cfg;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Linq;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3119
+{
+	/// <summary>
+	/// Fixture using 'by code' mappings
+	/// </summary>
+	/// <remarks>
+	/// This fixture is identical to <see cref="Fixture" /> except the <see cref="Entity" /> mapping is performed 
+	/// by code in the GetMappings method, and does not require the <c>Mappings.hbm.xml</c> file. Use this approach
+	/// if you prefer.
+	/// </remarks>
+	public class ByCodeFixture : TestCaseMappingByCode
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Entity>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+				rc.Component(x => x.Component, c =>
+				{
+					c.Property(x => x.Value);
+				});
+			});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			if (!Cfg.Environment.UseReflectionOptimizer)
+			{
+				Assert.Ignore("Test only works with reflection optimization enabled");
+			}
+
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { Name = "Name", Component = new Component { Value = "Value" } };
+				session.Save(e1);
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void PocoComponentTuplizer_Instantiate_UsesReflectonOptimizer()
+		{
+			using (ISession freshSession = OpenSession())
+			using (freshSession.BeginTransaction())
+			{
+				Entity entity = freshSession.Query<Entity>().Single();
+
+				string stackTrace = entity.Component.LastCtorStackTrace;
+
+				StringAssert.Contains("NHibernate.Bytecode.Lightweight.ReflectionOptimizer.CreateInstance", stackTrace);
+			}
+		}
+
+		[Test]
+		public void PocoComponentTuplizerOfDeserializedConfiguration_Instantiate_UsesReflectonOptimizer()
+		{
+			MemoryStream configMemoryStream = new MemoryStream();
+			BinaryFormatter writer = new BinaryFormatter();
+			writer.Serialize(configMemoryStream, cfg);
+
+			configMemoryStream.Seek(0, SeekOrigin.Begin);
+			BinaryFormatter reader = new BinaryFormatter();
+			Configuration deserializedConfig = (Configuration)reader.Deserialize(configMemoryStream);
+			ISessionFactory factoryFromDeserializedConfig = deserializedConfig.BuildSessionFactory();
+
+			using (ISession deserializedSession = factoryFromDeserializedConfig.OpenSession())
+			using (deserializedSession.BeginTransaction())
+			{
+				Entity entity = deserializedSession.Query<Entity>().Single();
+
+				string stackTrace = entity.Component.LastCtorStackTrace;
+
+				StringAssert.Contains("NHibernate.Bytecode.Lightweight.ReflectionOptimizer.CreateInstance", stackTrace);
+			}
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1128,6 +1128,8 @@
     <Compile Include="NHSpecificTest\NH3126\Item.cs" />
     <Compile Include="NHSpecificTest\NH3126\Property.cs" />
     <Compile Include="NHSpecificTest\NH3126\PropertyValue.cs" />
+    <Compile Include="NHSpecificTest\NH3119\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3119\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3124\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3142\ChildrenTest.cs" />
     <Compile Include="NHSpecificTest\NH3142\DomainClass.cs" />

src/NHibernate/Tuple/Component/AbstractComponentTuplizer.cs

@@ -33,12 +33,12 @@ protected internal AbstractComponentTuplizer(Mapping.Component component)
 				{
 					foundCustomAccessor = true;
 				}
-				i++;				
+				i++;
 			}
 			if (log.IsDebugEnabled)
 			{
 				log.DebugFormat("{0} accessors found for component: {1}", foundCustomAccessor ? "Custom" : "No custom",
-				                component.ComponentClassName);
+								component.ComponentClassName);
 			}
 			hasCustomAccessors = foundCustomAccessor;
 
@@ -53,7 +53,8 @@ protected internal AbstractComponentTuplizer(Mapping.Component component)
 				propTypes[j] = getters[j].ReturnType;
 			}
 
-			instantiator = BuildInstantiator(component);
+			// Fix for NH-3119
+			//instantiator = BuildInstantiator(component);
 		}
 
 		#region IComponentTuplizer Members
@@ -68,7 +69,7 @@ public virtual void SetParent(object component, object parent, ISessionFactoryIm
 			throw new NotSupportedException();
 		}
 
-		public virtual bool HasParentProperty 
+		public virtual bool HasParentProperty
 		{
 			get { return false; }
 		}

src/NHibernate/Tuple/Component/DynamicMapComponentTuplizer.cs

@@ -9,7 +9,12 @@ namespace NHibernate.Tuple.Component
 	[Serializable]
 	public class DynamicMapComponentTuplizer : AbstractComponentTuplizer
 	{
-		public DynamicMapComponentTuplizer(Mapping.Component component) : base(component) { }
+		public DynamicMapComponentTuplizer(Mapping.Component component)
+			: base(component)
+		{
+			// Fix for NH-3119
+			instantiator = BuildInstantiator(component);
+		}
 
 		public override System.Type MappedClass
 		{

src/NHibernate/Tuple/Component/PocoComponentTuplizer.cs

@@ -22,9 +22,20 @@ public class PocoComponentTuplizer : AbstractComponentTuplizer
 		[OnDeserialized]
 		internal void OnDeserialized(StreamingContext context)
 		{
-			this.optimizer = Cfg.Environment.BytecodeProvider.GetReflectionOptimizer(componentClass, getters, setters);
+			SetReflectionOptimizer();
+
+			if (optimizer != null)
+			{
+				// Fix for NH-3119:
+				// Also set the InstantiationOptimizer on the deserialized PocoInstantiator.
+				((PocoInstantiator)instantiator).SetOptimizer(optimizer.InstantiationOptimizer);
+			}
+
+			ClearOptimizerWhenUsingCustomAccessors();
 		}
-		public PocoComponentTuplizer(Mapping.Component component) : base(component)
+
+		public PocoComponentTuplizer(Mapping.Component component)
+			: base(component)
 		{
 			componentClass = component.ComponentClass;
 
@@ -40,14 +51,12 @@ public PocoComponentTuplizer(Mapping.Component component) : base(component)
 				parentGetter = parentProperty.GetGetter(componentClass);
 			}
 
-			if (hasCustomAccessors || !Cfg.Environment.UseReflectionOptimizer)
-			{
-				optimizer = null;
-			}
-			else
-			{
-				optimizer = Cfg.Environment.BytecodeProvider.GetReflectionOptimizer(componentClass, getters, setters);
-			}
+			SetReflectionOptimizer();
+
+			// Fix for NH-3119
+			instantiator = BuildInstantiator(component);
+
+			ClearOptimizerWhenUsingCustomAccessors();
 		}
 
 		public override System.Type MappedClass
@@ -127,5 +136,21 @@ protected internal override ISetter BuildSetter(Mapping.Component component, Map
 		{
 			return prop.GetSetter(component.ComponentClass);
 		}
+
+		protected void SetReflectionOptimizer()
+		{
+			if (Cfg.Environment.UseReflectionOptimizer)
+			{
+				optimizer = Cfg.Environment.BytecodeProvider.GetReflectionOptimizer(componentClass, getters, setters);
+			}
+		}
+
+		protected void ClearOptimizerWhenUsingCustomAccessors()
+		{
+			if (hasCustomAccessors)
+			{
+				optimizer = null;
+			}
+		}
 	}
 }

src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs

@@ -34,6 +34,14 @@ public class PocoEntityTuplizer : AbstractEntityTuplizer
 		internal void OnDeserialized(StreamingContext context)
 		{
 			SetReflectionOptimizer();
+
+			if (optimizer != null)
+			{
+				// Also set the InstantiationOptimizer on the deserialized PocoInstantiator.
+				((PocoInstantiator)Instantiator).SetOptimizer(optimizer.InstantiationOptimizer);
+			}
+
+			ClearOptimizerWhenUsingCustomAccessors();
 		}
 		protected void SetReflectionOptimizer()
 		{
@@ -62,10 +70,7 @@ public PocoEntityTuplizer(EntityMetamodel entityMetamodel, PersistentClass mappe
 
 			Instantiator = BuildInstantiator(mappedEntity);
 
-			if (hasCustomAccessors)
-			{
-				optimizer = null;
-			}
+			ClearOptimizerWhenUsingCustomAccessors();
 
 			proxyValidator = Cfg.Environment.BytecodeProvider.ProxyFactoryFactory.ProxyValidator;
 		}
@@ -316,5 +321,13 @@ public override EntityMode EntityMode
 		{
 			get { return EntityMode.Poco; }
 		}
+
+		protected void ClearOptimizerWhenUsingCustomAccessors()
+		{
+			if (hasCustomAccessors)
+			{
+				optimizer = null;
+			}
+		}
 	}
 }

src/NHibernate/Tuple/PocoInstantiator.cs

@@ -14,21 +14,21 @@ namespace NHibernate.Tuple
 	public class PocoInstantiator : IInstantiator, IDeserializationCallback
 	{
 		private static readonly IInternalLogger log = LoggerProvider.LoggerFor(typeof(PocoInstantiator));
-		
+
 		private readonly System.Type mappedClass;
-		
+
 		[NonSerialized]
-		private readonly IInstantiationOptimizer optimizer;
+		private IInstantiationOptimizer optimizer;
 
 		private readonly IProxyFactory proxyFactory;
 
 		private readonly bool generateFieldInterceptionProxy;
 
 		private readonly bool embeddedIdentifier;
-		
+
 		[NonSerialized]
 		private ConstructorInfo constructor;
-		
+
 		private readonly System.Type proxyInterface;
 
 		public PocoInstantiator()
@@ -134,5 +134,10 @@ public void OnDeserialization(object sender)
 		}
 
 		#endregion
+
+		public void SetOptimizer(IInstantiationOptimizer optimizer)
+		{
+			this.optimizer = optimizer;
+		}
 	}
 }