Serialize system types in preparation for .NET Core.

Serialize System.Type, ConstructorInfo, FieldInfo, MethodInfo,
and PropertyInfo using only basic types.

Author: ngbrown

src/NHibernate/Async/Type/ArrayType.cs

@@ -70,4 +70,4 @@ public override async Task<object> ReplaceElementsAsync(object original, object
 			return result;
 		}
 	}
-}
+}

src/NHibernate/Async/Type/EntityType.cs

@@ -98,9 +98,9 @@ public override async Task<object> ReplaceAsync(object original, object target,
 				{
 					return target;
 				}
-				if (session.GetContextEntityIdentifier(original) == null && (await (ForeignKeys.IsTransientFastAsync(associatedEntityName, original, session, cancellationToken)).ConfigureAwait(false)).GetValueOrDefault())
+				if (session.GetContextEntityIdentifier(original) == null && (await (ForeignKeys.IsTransientFastAsync(_associatedEntityName, original, session, cancellationToken)).ConfigureAwait(false)).GetValueOrDefault())
 				{
-					object copy = session.Factory.GetEntityPersister(associatedEntityName).Instantiate(null);
+					object copy = session.Factory.GetEntityPersister(_associatedEntityName).Instantiate(null);
 					//TODO: should this be Session.instantiate(Persister, ...)?
 					copyCache.Add(original, copy);
 					return copy;
@@ -129,7 +129,7 @@ public override async Task<object> ReplaceAsync(object original, object target,
 		/// <returns>
 		/// An instance of the object or <see langword="null" /> if the identifer was null.
 		/// </returns>
-		public override sealed async Task<object> NullSafeGetAsync(DbDataReader rs, string[] names, ISessionImplementor session, object owner, CancellationToken cancellationToken)
+		public sealed override async Task<object> NullSafeGetAsync(DbDataReader rs, string[] names, ISessionImplementor session, object owner, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			return await (ResolveIdentifierAsync(await (HydrateAsync(rs, names, session, owner, cancellationToken)).ConfigureAwait(false), session, owner, cancellationToken)).ConfigureAwait(false);
@@ -144,10 +144,10 @@ protected async Task<object> ResolveIdentifierAsync(object id, ISessionImplement
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			string entityName = GetAssociatedEntityName();
-			bool isProxyUnwrapEnabled = unwrapProxy && session.Factory
+			bool isProxyUnwrapEnabled = _unwrapProxy && session.Factory
 			                                                  .GetEntityPersister(entityName).IsInstrumented;
 
-			object proxyOrEntity = await (session.InternalLoadAsync(entityName, id, eager, IsNullable && !isProxyUnwrapEnabled, cancellationToken)).ConfigureAwait(false);
+			object proxyOrEntity = await (session.InternalLoadAsync(entityName, id, _eager, IsNullable && !isProxyUnwrapEnabled, cancellationToken)).ConfigureAwait(false);
 
 			if (proxyOrEntity.IsProxy())
 			{
@@ -178,21 +178,19 @@ public override Task<object> ResolveIdentifierAsync(object value, ISessionImplem
 				{
 					return Task.FromResult<object>(null);
 				}
-				else
+
+				if (IsNull(owner, session))
 				{
-					if (IsNull(owner, session))
-					{
-						return Task.FromResult<object>(null); //EARLY EXIT!
-					}
+					return Task.FromResult<object>(null); //EARLY EXIT!
+				}
 
-					if (IsReferenceToPrimaryKey)
-					{
-						return ResolveIdentifierAsync(value, session, cancellationToken);
-					}
-					else
-					{
-						return LoadByUniqueKeyAsync(GetAssociatedEntityName(), uniqueKeyPropertyName, value, session, cancellationToken);
-					}
+				if (IsReferenceToPrimaryKey)
+				{
+					return ResolveIdentifierAsync(value, session, cancellationToken);
+				}
+				else
+				{
+					return LoadByUniqueKeyAsync(GetAssociatedEntityName(), uniqueKeyPropertyName, value, session, cancellationToken);
 				}
 			}
 			catch (Exception ex)

src/NHibernate/Async/Type/SerializableType.cs

@@ -16,6 +16,7 @@
 using System.Runtime.Serialization.Formatters.Binary;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
+using NHibernate.Util;
 
 namespace NHibernate.Type
 {
@@ -56,4 +57,4 @@ public override Task<object> DisassembleAsync(object value, ISessionImplementor
 			}
 		}
 	}
-}
+}

src/NHibernate/Engine/Query/QueryPlanCache.cs

@@ -176,7 +176,7 @@ private class HQLQueryPlanKey : IEquatable<HQLQueryPlanKey>
 			private readonly bool shallow;
 			private readonly HashSet<string> filterNames;
 			private readonly int hashCode;
-			private readonly System.Type queryTypeDiscriminator;
+			private readonly SerializableSystemType queryTypeDiscriminator;
 
 			public HQLQueryPlanKey(string query, bool shallow, IDictionary<string, IFilter> enabledFilters)
 				: this(typeof(object), query, shallow, enabledFilters)

src/NHibernate/Impl/CriteriaImpl.cs

@@ -17,7 +17,7 @@ namespace NHibernate.Impl
 	[Serializable]
 	public partial class CriteriaImpl : ICriteria
 	{
-		private readonly System.Type persistentClass;
+		private readonly SerializableSystemType persistentClass;
 		private readonly List<CriterionEntry> criteria = new List<CriterionEntry>();
 		private readonly List<OrderEntry> orderEntries = new List<OrderEntry>(10);
 		private readonly Dictionary<string, FetchMode> fetchModes = new Dictionary<string, FetchMode>();
@@ -521,7 +521,7 @@ public object Clone()
 			CriteriaImpl clone;
 			if (persistentClass != null)
 			{
-				clone = new CriteriaImpl(persistentClass, Alias, Session);
+				clone = new CriteriaImpl((System.Type)persistentClass, Alias, Session);
 			}
 			else
 			{
@@ -994,7 +994,7 @@ public override string ToString()
 		public System.Type GetRootEntityTypeIfAvailable()
 		{
 			if (persistentClass != null)
-				return persistentClass;
+				return (System.Type)persistentClass;
 			throw new HibernateException("Cannot provide root entity type because this criteria was initialized with an entity name.");
 		}
 	}

src/NHibernate/InstantiationException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 using System.Security;
-using System.Security.Permissions;
+using NHibernate.Util;
 
 namespace NHibernate
 {
@@ -11,15 +11,12 @@ namespace NHibernate
 	[Serializable]
 	public class InstantiationException : HibernateException
 	{
-		private readonly System.Type type;
+		private readonly SerializableSystemType _type;
 
 		public InstantiationException(string message, System.Type type)
 			: base(message)
 		{
-			if (type == null)
-				throw new ArgumentNullException("type");
-
-			this.type = type;
+			_type = type ?? throw new ArgumentNullException(nameof(type));
 		}
 
 		/// <summary>
@@ -35,19 +32,13 @@ public InstantiationException(string message, System.Type type)
 		public InstantiationException(string message, Exception innerException, System.Type type)
 			: base(message, innerException)
 		{
-			if (type == null)
-				throw new ArgumentNullException("type");
-
-			this.type = type;
+			_type = type ?? throw new ArgumentNullException(nameof(type));
 		}
 
 		/// <summary>
 		/// Gets the <see cref="System.Type"/> that NHibernate was trying to instantiate.
 		/// </summary>
-		public System.Type PersistentType
-		{
-			get { return type; }
-		}
+		public System.Type PersistentType => _type?.TryGetType();
 
 		/// <summary>
 		/// Gets a message that describes the current <see cref="InstantiationException"/>.
@@ -56,10 +47,7 @@ public System.Type PersistentType
 		/// The error message that explains the reason for this exception and the Type that
 		/// was trying to be instantiated.
 		/// </value>
-		public override string Message
-		{
-			get { return base.Message + (type == null ? "" : type.FullName); }
-		}
+		public override string Message => base.Message + (_type == null ? "" : _type.FullName);
 
 		#region ISerializable Members
 
@@ -76,7 +64,19 @@ public override string Message
 		/// </param>
 		protected InstantiationException(SerializationInfo info, StreamingContext context) : base(info, context)
 		{
-			this.type = info.GetValue("type", typeof(System.Type)) as System.Type;
+			foreach (SerializationEntry entry in info)
+			{
+				switch (entry.Name)
+				{
+					// TODO 6.0: remove "type" deserialization
+					case "type":
+						_type = (System.Type)entry.Value;
+						break;
+					case "_type":
+						_type = (SerializableSystemType) entry.Value;
+						break;
+				}
+			}
 		}
 
 		/// <summary>
@@ -94,7 +94,7 @@ protected InstantiationException(SerializationInfo info, StreamingContext contex
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
-			info.AddValue("type", type, typeof(System.Type));
+			info.AddValue("_type", _type);
 		}
 
 		#endregion

src/NHibernate/Intercept/AbstractFieldInterceptor.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using NHibernate.Engine;
 using NHibernate.Proxy;
+using NHibernate.Util;
 
 namespace NHibernate.Intercept
 {
@@ -16,7 +17,7 @@ public abstract class AbstractFieldInterceptor : IFieldInterceptor
 		private readonly ISet<string> unwrapProxyFieldNames;
 		private readonly HashSet<string> loadedUnwrapProxyFieldNames = new HashSet<string>();
 		private readonly string entityName;
-		private readonly System.Type mappedClass;
+		private readonly SerializableSystemType mappedClass;
 
 		[NonSerialized]
 		private bool initializing;
@@ -71,7 +72,7 @@ public string EntityName
 
 		public System.Type MappedClass
 		{
-			get { return mappedClass; }
+			get { return (System.Type)mappedClass; }
 		}
 
 		#endregion

src/NHibernate/Mapping/Array.cs

@@ -10,7 +10,9 @@ namespace NHibernate.Mapping
 	[Serializable]
 	public class Array : List
 	{
+		[NonSerialized]
 		private System.Type elementClass;
+
 		private string elementClassName;
 
 		public Array(PersistentClass owner) : base(owner)
@@ -21,23 +23,22 @@ public System.Type ElementClass
 		{
 			get
 			{
-				if (elementClass == null)
+				if (elementClass != null) return elementClass;
+
+				if (elementClassName == null)
+				{
+					IType elementType = Element.Type;
+					elementClass = IsPrimitiveArray ? ((PrimitiveType) elementType).PrimitiveClass : elementType.ReturnedClass;
+				}
+				else
 				{
-					if (elementClassName == null)
+					try
 					{
-						IType elementType = Element.Type;
-						elementClass = IsPrimitiveArray ? ((PrimitiveType) elementType).PrimitiveClass : elementType.ReturnedClass;
+						elementClass = ReflectHelper.ClassForName(elementClassName);
 					}
-					else
+					catch (Exception cnfe)
 					{
-						try
-						{
-							elementClass = ReflectHelper.ClassForName(elementClassName);
-						}
-						catch (Exception cnfe)
-						{
-							throw new MappingException(cnfe);
-						}
+						throw new MappingException(cnfe);
 					}
 				}
 				return elementClass;
@@ -68,4 +69,4 @@ public string ElementClassName
 			}
 		}
 	}
-}
+}

src/NHibernate/Mapping/Collection.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
@@ -42,7 +43,7 @@ public abstract class Collection : IFetchable, IValue, IFilterable
 		private bool orphanDelete;
 		private int batchSize = -1;
 		private FetchMode fetchMode;
-		private System.Type collectionPersisterClass;
+		private SerializableSystemType collectionPersisterClass;
 		private string referencedPropertyName;
 		private string typeName;
 
@@ -65,7 +66,7 @@ public abstract class Collection : IFetchable, IValue, IFilterable
 		private ExecuteUpdateResultCheckStyle deleteAllCheckStyle;
 
 		private bool isGeneric;
-		private System.Type[] genericArguments;
+		private SerializableSystemType[] genericArguments;
 		private readonly Dictionary<string, string> filters = new Dictionary<string, string>();
 		private readonly Dictionary<string, string> manyToManyFilters = new Dictionary<string, string>();
 		private bool subselectLoadable;
@@ -138,7 +139,7 @@ public PersistentClass Owner
 
 		public System.Type CollectionPersisterClass
 		{
-			get { return collectionPersisterClass; }
+			get { return (System.Type) collectionPersisterClass; }
 			set { collectionPersisterClass = value; }
 		}
 
@@ -323,8 +324,8 @@ public bool IsGeneric
 		/// </summary>
 		public System.Type[] GenericArguments
 		{
-			get { return genericArguments; }
-			set { genericArguments = value; }
+			get => genericArguments.Select(sst => (System.Type)sst).ToArray();
+			set => genericArguments = value?.Select(t => (SerializableSystemType)t).ToArray();
 		}
 
 		protected void CheckGenericArgumentsLength(int expectedLength)

src/NHibernate/Mapping/Component.cs

@@ -14,7 +14,10 @@ namespace NHibernate.Mapping
 	public class Component : SimpleValue, IMetaAttributable
 	{
 		private readonly List<Property> properties = new List<Property>();
+
+		[NonSerialized]
 		private System.Type componentClass;
+
 		private bool embedded;
 		private Property parentProperty;
 		private PersistentClass owner;
@@ -133,26 +136,27 @@ public System.Type ComponentClass
 			get
 			{
 				// NH Different implementation (we use reflection only when needed)
-				if (componentClass == null)
+				if (componentClass != null) return componentClass;
+
+				try
 				{
-					try
-					{
-						componentClass = ReflectHelper.ClassForName(componentClassName);
-					}
-					catch (Exception cnfe)
-					{
-						if (!IsDynamic) // TODO remove this if leave the Exception
-							throw new MappingException("component class not found: " + componentClassName, cnfe);
-						return null;
-					}
+					componentClass = ReflectHelper.ClassForName(componentClassName);
+				}
+				catch (Exception cnfe)
+				{
+					if (!IsDynamic) // TODO remove this if leave the Exception
+						throw new MappingException("component class not found: " + componentClassName, cnfe);
+					return null;
 				}
 				return componentClass;
 			}
 			set // TODO NH: Remove the setter
 			{
 				componentClass = value;
 				if (componentClass != null)
+				{
 					componentClassName = componentClass.AssemblyQualifiedName;
+				}
 			} 
 		}