NH-3722 - Remove IsEmbedded

* Ported from HHH-10073 hibernate/hibernate-orm@47b8ed5

Author: hazzik

src/NHibernate/Bytecode/ICollectionTypeFactory.cs

@@ -17,11 +17,10 @@ public interface ICollectionTypeFactory
 		/// owner object containing the collection ID, or <see langword="null" /> if it is
 		/// the primary key.</param>
 		/// <param name="elementClass">The <see cref="System.Type"/> to use to create the array.</param>
-		/// <param name="embedded">Is embedded in XML (not supported yet)</param>
 		/// <returns>
 		/// An <see cref="ArrayType"/> for the specified role.
 		/// </returns>
-		CollectionType Array(string role, string propertyRef, bool embedded, System.Type elementClass);
+		CollectionType Array(string role, string propertyRef, System.Type elementClass);
 
 		/// <summary>
 		/// Creates a new <see cref="CollectionType"/> for an 
@@ -33,11 +32,10 @@ public interface ICollectionTypeFactory
 		/// The name of the property in the owner object containing the collection ID, 
 		/// or <see langword="null" /> if it is the primary key.
 		/// </param>
-		/// <param name="embedded">Is embedded in XML (not supported yet)</param>
 		/// <returns>
 		/// A <see cref="GenericBagType{T}"/> for the specified role.
 		/// </returns>
-		CollectionType Bag<T>(string role, string propertyRef, bool embedded);
+		CollectionType Bag<T>(string role, string propertyRef);
 
 		/// <summary>
 		/// Creates a new <see cref="CollectionType"/> for an 
@@ -51,11 +49,10 @@ public interface ICollectionTypeFactory
 		/// owner object containing the collection ID, or <see langword="null" /> if it is
 		/// the primary key.
 		/// </param>
-		/// <param name="embedded">Is embedded in XML (not supported yet)</param>
 		/// <returns>
 		/// A <see cref="GenericListType&lt;T&gt;"/> for the specified role.
 		/// </returns>
-		CollectionType List<T>(string role, string propertyRef, bool embedded);
+		CollectionType List<T>(string role, string propertyRef);
 
 		/// <summary>
 		/// Creates a new <see cref="CollectionType"/> for an 
@@ -68,11 +65,10 @@ public interface ICollectionTypeFactory
 		/// owner object containing the collection ID, or <see langword="null" /> if it is
 		/// the primary key.
 		/// </param>
-		/// <param name="embedded">Is embedded in XML (not supported yet)</param>
 		/// <returns>
 		/// A <see cref="GenericIdentifierBagType{T}"/> for the specified role.
 		/// </returns>
-		CollectionType IdBag<T>(string role, string propertyRef, bool embedded);
+		CollectionType IdBag<T>(string role, string propertyRef);
 
 		/// <summary>
 		/// Creates a new <see cref="CollectionType"/> for an <see cref="ISet{T}" />.
@@ -82,9 +78,8 @@ public interface ICollectionTypeFactory
 		/// <param name="propertyRef">The name of the property in the
 		/// owner object containing the collection ID, or <see langword="null" /> if it is
 		/// the primary key.</param>
-		/// <param name="embedded">Is embedded in XML (not supported yet)</param>
 		/// <returns>A <see cref="GenericSetType{T}" /> for the specified role.</returns>
-		CollectionType Set<T>(string role, string propertyRef, bool embedded);
+		CollectionType Set<T>(string role, string propertyRef);
 
 		/// <summary>
 		/// Creates a new <see cref="CollectionType"/> for a sorted <see cref="ISet{T}" />.
@@ -94,10 +89,9 @@ public interface ICollectionTypeFactory
 		/// <param name="propertyRef">The name of the property in the
 		/// owner object containing the collection ID, or <see langword="null" /> if it is
 		/// the primary key.</param>
-		/// <param name="embedded">Is embedded in XML (not supported yet)</param>
 		/// <param name="comparer">The <see cref="System.Collections.Generic.IComparer{T}" /> to use for the set.</param>
 		/// <returns>A <see cref="GenericSetType{T}" /> for the specified role.</returns>
-		CollectionType SortedSet<T>(string role, string propertyRef, bool embedded, IComparer<T> comparer);
+		CollectionType SortedSet<T>(string role, string propertyRef, IComparer<T> comparer);
 
 		/// <summary>
 		/// Creates a new <see cref="CollectionType"/> for an ordered <see cref="ISet{T}" />.
@@ -108,9 +102,8 @@ public interface ICollectionTypeFactory
 		/// The name of the property in the owner object containing the collection ID, 
 		/// or <see langword="null" /> if it is the primary key.
 		/// </param>
-		/// <param name="embedded">Is embedded in XML (not supported yet)</param>
 		/// <returns>A <see cref="GenericSetType{T}" /> for the specified role.</returns>
-		CollectionType OrderedSet<T>(string role, string propertyRef, bool embedded);
+		CollectionType OrderedSet<T>(string role, string propertyRef);
 
 		/// <summary>
 		/// Creates a new <see cref="CollectionType"/> for an 
@@ -123,14 +116,13 @@ public interface ICollectionTypeFactory
 		/// owner object containing the collection ID, or <see langword="null" /> if it is
 		/// the primary key.
 		/// </param>
-		/// <param name="embedded">Is embedded in XML (not supported yet)</param>
 		/// <returns>
 		/// A <see cref="GenericMapType{TKey, TValue}"/> for the specified role.
 		/// </returns>
-		CollectionType Map<TKey, TValue>(string role, string propertyRef, bool embedded);
+		CollectionType Map<TKey, TValue>(string role, string propertyRef);
 
+		CollectionType SortedDictionary<TKey, TValue>(string role, string propertyRef, IComparer<TKey> comparer);
 
-		CollectionType SortedDictionary<TKey, TValue>(string role, string propertyRef, bool embedded, IComparer<TKey> comparer);
-		CollectionType SortedList<TKey, TValue>(string role, string propertyRef, bool embedded, IComparer<TKey> comparer);
+		CollectionType SortedList<TKey, TValue>(string role, string propertyRef, IComparer<TKey> comparer);
 	}
 }

src/NHibernate/Mapping/Array.cs

@@ -46,7 +46,7 @@ public System.Type ElementClass
 
 		public override CollectionType DefaultCollectionType
 		{
-			get { return TypeFactory.Array(Role, ReferencedPropertyName, Embedded, ElementClass); }
+			get { return TypeFactory.Array(Role, ReferencedPropertyName, ElementClass); }
 		}
 
 		public override bool IsArray

src/NHibernate/Mapping/Collection.cs

@@ -45,7 +45,6 @@ public abstract class Collection : IFetchable, IValue, IFilterable
 		private System.Type collectionPersisterClass;
 		private string referencedPropertyName;
 		private string typeName;
-		private bool embedded = true;
 
 		private string loaderName;
 
@@ -210,7 +209,7 @@ public virtual CollectionType CollectionType
 				}
 				else
 				{
-					return TypeFactory.CustomCollection(typeName, typeParameters, role, referencedPropertyName, Embedded);
+					return TypeFactory.CustomCollection(typeName, typeParameters, role, referencedPropertyName);
 				}
 			}
 		}
@@ -551,12 +550,6 @@ public bool IsOptimisticLocked
 			set { optimisticLocked = value; }
 		}
 
-		public bool Embedded
-		{
-			get { return embedded; }
-			set { embedded = value; }
-		}
-
 		public bool ExtraLazy
 		{
 			get { return extraLazy; }

src/NHibernate/Mapping/ManyToOne.cs

@@ -50,7 +50,7 @@ public override IType Type
 				if (type == null)
 				{
 					type =
-						TypeFactory.ManyToOne(ReferencedEntityName, ReferencedPropertyName, IsLazy, UnwrapProxy, Embedded, IsIgnoreNotFound, isLogicalOneToOne);
+						TypeFactory.ManyToOne(ReferencedEntityName, ReferencedPropertyName, IsLazy, UnwrapProxy, IsIgnoreNotFound, isLogicalOneToOne);
 				}
 				return type;
 			}

src/NHibernate/Mapping/OneToMany.cs

@@ -15,7 +15,6 @@ public class OneToMany : IValue
 		private readonly Table referencingTable;
 		private PersistentClass associatedClass;
 		private bool ignoreNotFound;
-		private bool embedded;
 
 		public OneToMany(PersistentClass owner)
 		{
@@ -24,7 +23,7 @@ public OneToMany(PersistentClass owner)
 
 		private EntityType EntityType
 		{
-			get { return TypeFactory.ManyToOne(ReferencedEntityName, null, false, false, IsEmbedded, IsIgnoreNotFound, false); }
+			get { return TypeFactory.ManyToOne(ReferencedEntityName, null, false, false, IsIgnoreNotFound, false); }
 		}
 
 		public bool IsIgnoreNotFound
@@ -154,11 +153,5 @@ public bool[] ColumnUpdateability
 		{
 			get { throw new InvalidOperationException(); }
 		}
-
-		public bool IsEmbedded
-		{
-			get { return embedded; }
-			set { embedded = value; }
-		}
 	}
 }

src/NHibernate/Mapping/OneToOne.cs

@@ -97,7 +97,7 @@ public override IType Type
 				else
 				{
 					return
-						TypeFactory.OneToOne(ReferencedEntityName, foreignKeyType, referencedPropertyName, IsLazy, UnwrapProxy, Embedded,
+						TypeFactory.OneToOne(ReferencedEntityName, foreignKeyType, referencedPropertyName, IsLazy, UnwrapProxy,
 											 entityName, propertyName);
 				}
 			}

src/NHibernate/Mapping/ToOne.cs

@@ -14,7 +14,6 @@ public abstract class ToOne : SimpleValue, IFetchable
 		private bool lazy = true;
 		internal string referencedPropertyName;
 		private string referencedEntityName;
-		private bool embedded;
 		private bool unwrapProxy;
 
 		/// <summary>
@@ -50,12 +49,6 @@ public bool IsLazy
 			set { lazy = value; }
 		}
 
-		public bool Embedded
-		{
-			get { return embedded; }
-			set { embedded = value; }
-		}
-
 		/// <summary>
 		/// 
 		/// </summary>

src/NHibernate/Param/DynamicFilterParameterSpecification.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq;
-using System.Xml;
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
 using NHibernate.SqlTypes;
@@ -139,11 +138,6 @@ public bool IsAssociationType
 				get { return false; }
 			}
 
-			public bool IsXMLElement
-			{
-				get { return false; }
-			}
-
 			public bool IsCollectionType
 			{
 				get { return false; }
@@ -293,16 +287,6 @@ public IType GetSemiResolvedType(ISessionFactoryImplementor factory)
 				throw new InvalidOperationException();
 			}
 
-			public void SetToXMLNode(XmlNode node, object value, ISessionFactoryImplementor factory)
-			{
-				throw new InvalidOperationException();
-			}
-
-			public object FromXMLNode(XmlNode xml, IMapping factory)
-			{
-				throw new InvalidOperationException();
-			}
-
 			public bool[] ToColumnNullness(object value, IMapping mapping)
 			{
 				throw new InvalidOperationException();

src/NHibernate/Type/AbstractType.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Data.Common;
-using System.Xml;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 using NHibernate.Util;
@@ -24,11 +23,6 @@ public virtual bool IsAssociationType
 			get { return false; }
 		}
 
-		public virtual bool IsXMLElement
-		{
-			get { return false; }
-		}
-
 		/// <summary>
 		/// Gets a value indicating if the <see cref="AbstractType"/> is a <see cref="CollectionType"/>.
 		/// </summary>
@@ -256,21 +250,9 @@ public virtual IType GetSemiResolvedType(ISessionFactoryImplementor factory)
 			return this;
 		}
 
-		protected internal static void ReplaceNode(XmlNode container, XmlNode value)
-		{
-			if (container != value)
-			{
-				//not really necessary, I guess...
-				XmlNode parent = container.ParentNode;
-				parent.ReplaceChild(value, container);
-			}
-		}
-
 		public abstract object Replace(object original, object current, ISessionImplementor session, object owner,
 									   IDictionary copiedAlready);
 
-		public abstract void SetToXMLNode(XmlNode node, object value, ISessionFactoryImplementor factory);
-		public abstract object FromXMLNode(XmlNode xml, IMapping factory);
 		public abstract bool[] ToColumnNullness(object value, IMapping mapping);
 
 		/// <include file='IType.cs.xmldoc' 

src/NHibernate/Type/AnyType.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Data.Common;
 using System.Reflection;
-using System.Xml;
 using NHibernate.Engine;
 using NHibernate.Persister.Entity;
 using NHibernate.Proxy;
@@ -165,12 +164,6 @@ public override string ToLoggableString(object value, ISessionFactoryImplementor
 				NHibernateUtil.Entity(NHibernateProxyHelper.GetClassWithoutInitializingProxy(value)).ToLoggableString(value, factory);
 		}
 
-		public override object FromXMLNode(XmlNode xml, IMapping factory)
-		{
-			// TODO NH: We can implement this method if the XML is the result of a serialization in XML
-			throw new NotSupportedException(); //TODO: is this right??
-		}
-
 		[Serializable]
 		public sealed class ObjectTypeCacheEntry
 		{
@@ -231,11 +224,6 @@ public bool IsEmbedded
 			get { return false; }
 		}
 
-		public virtual bool IsEmbeddedInXML
-		{
-			get { return false; }
-		}
-
 		private static readonly string[] PROPERTY_NAMES = new string[] { "class", "id" };
 
 		public string[] PropertyNames
@@ -396,11 +384,6 @@ private object ResolveAny(string entityName, object id, ISessionImplementor sess
 			return entityName == null || id == null ? null : session.InternalLoad(entityName, id, false, false);
 		}
 
-		public override void SetToXMLNode(XmlNode xml, object value, ISessionFactoryImplementor factory)
-		{
-			throw new NotSupportedException("any types cannot be stringified");
-		}
-
 		public override bool[] ToColumnNullness(object value, IMapping mapping)
 		{
 			bool[] result = new bool[GetColumnSpan(mapping)];