NH-3345 - Remove support for non generic bags

Author: hazzik

src/NHibernate/Bytecode/ICollectionTypeFactory.cs

@@ -23,20 +23,6 @@ public interface ICollectionTypeFactory
 		/// </returns>
 		CollectionType Array(string role, string propertyRef, bool embedded, System.Type elementClass);
 
-		/// <summary>
-		/// Creates a new <see cref="CollectionType"/> for an <see cref="IList"/>
-		/// with bag semantics.
-		/// </summary>
-		/// <param name="role">The role the collection is in.</param>
-		/// <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="BagType"/> for the specified role.
-		/// </returns>
-		CollectionType Bag(string role, string propertyRef, bool embedded);
-
 		/// <summary>
 		/// Creates a new <see cref="CollectionType"/> for an 
 		/// <see cref="System.Collections.Generic.IList{T}"/> with bag semantics.

src/NHibernate/Collection/Generic/PersistentGenericBag.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
+using System.Diagnostics;
+using System.Linq;
 using NHibernate.DebugHelpers;
 using NHibernate.Engine;
 using NHibernate.Persister.Collection;
@@ -37,7 +38,8 @@ public class PersistentGenericBag<T> : PersistentBag, IList<T>
 		public PersistentGenericBag() {}
 		public PersistentGenericBag(ISessionImplementor session) : base(session) {}
 
-		public PersistentGenericBag(ISessionImplementor session, IEnumerable<T> coll) : base(session, coll as ICollection)
+		public PersistentGenericBag(ISessionImplementor session, IEnumerable<T> coll) 
+			: base(session, coll.Cast<object>())
 		{
 			gbag = coll as IList<T>;
 			if (gbag == null)

src/NHibernate/Collection/PersistentBag.cs

@@ -5,11 +5,13 @@
 using System.Diagnostics;
 using NHibernate.DebugHelpers;
 using NHibernate.Engine;
-using NHibernate.Loader;
+using NHibernate.Loader;
+using NHibernate.Mapping;
 using NHibernate.Persister.Collection;
 using NHibernate.Type;
-using NHibernate.Util;
-
+using NHibernate.Util;
+using Array = System.Array;
+
 namespace NHibernate.Collection
 {
 	/// <summary>
@@ -26,17 +28,13 @@ public class PersistentBag : AbstractPersistentCollection, IList
 
 		public PersistentBag() {} // needed for serialization
 
-		public PersistentBag(ISessionImplementor session) : base(session) {}
-
-		public PersistentBag(ISessionImplementor session, ICollection coll) : base(session)
+		public PersistentBag(ISessionImplementor session) : base(session) {}
+
+		public PersistentBag(ISessionImplementor session, IEnumerable<object> coll)
+			: base(session)
 		{
-			bag = coll as IList;
-
-			if (bag == null)
-			{
-				bag = new ArrayList(coll);
-			}
-
+			bag = coll as IList ?? new List<object>(coll);
+
 			SetInitialized();
 			IsDirectlyAccessible = true;
 		}
@@ -62,7 +60,7 @@ public override IEnumerable Entries(ICollectionPersister persister)
 		}
 
 		public override object ReadFrom(IDataReader reader, ICollectionPersister role, ICollectionAliases descriptor,
-		                                object owner)
+										object owner)
 		{
 			// note that if we load this collection from a cartesian product
 			// the multiplicity would be broken ... so use an idbag instead

src/NHibernate/Loader/BasicLoader.cs

@@ -68,7 +68,8 @@ protected override void PostInstantiate()
 
 		private static bool IsBag(ICollectionPersister collectionPersister)
 		{
-			return collectionPersister.CollectionType is BagType;
+			var type = collectionPersister.CollectionType.GetType();
+			return type.IsGenericType && type.GetGenericTypeDefinition() == typeof (GenericBagType<>);
 		}
 
 		/// <summary>

src/NHibernate/Mapping/Bag.cs

@@ -25,15 +25,13 @@ public override CollectionType DefaultCollectionType
 		{
 			get
 			{
+				System.Type elementType = typeof (object);
 				if (IsGeneric)
 				{
 					CheckGenericArgumentsLength(1);
-					return TypeFactory.GenericBag(Role, ReferencedPropertyName, GenericArguments[0]);
-				}
-				else
-				{
-					return TypeFactory.Bag(Role, ReferencedPropertyName, Embedded);
+					elementType = GenericArguments[0];
 				}
+				return TypeFactory.GenericBag(Role, ReferencedPropertyName, elementType);
 			}
 		}
 

src/NHibernate/NHibernate.csproj

@@ -646,7 +646,6 @@
     <Compile Include="Type\AbstractType.cs" />
     <Compile Include="Type\AnsiStringType.cs" />
     <Compile Include="Type\ArrayType.cs" />
-    <Compile Include="Type\BagType.cs" />
     <Compile Include="Type\BinaryBlobType.cs" />
     <Compile Include="Type\BinaryType.cs" />
     <Compile Include="Type\BooleanType.cs" />

src/NHibernate/Type/BagType.cs

@@ -11,11 +11,6 @@ public virtual CollectionType Array(string role, string propertyRef, bool embedd
 			return new ArrayType(role, propertyRef, elementClass, embedded);
 		}
 
-		public virtual CollectionType Bag(string role, string propertyRef, bool embedded)
-		{
-			return new BagType(role, propertyRef, embedded);
-		}
-
 		public virtual CollectionType Bag<T>(string role, string propertyRef, bool embedded)
 		{
 			return new GenericBagType<T>(role, propertyRef);

src/NHibernate/Type/DefaultCollectionTypeFactory.cs

@@ -12,7 +12,7 @@ namespace NHibernate.Type
 	/// to the database using bag semantics.
 	/// </summary>
 	[Serializable]
-	public class GenericBagType<T> : BagType
+	public class GenericBagType<T> : CollectionType
 	{
 		/// <summary>
 		/// Initializes a new instance of a <see cref="GenericBagType{T}"/> class for

src/NHibernate/Type/GenericBagType.cs

@@ -754,11 +754,6 @@ public static CollectionType Array(string role, string propertyRef, bool embedde
 			return Instance.CollectionTypeFactory.Array(role, propertyRef, embedded, elementClass);
 		}
 
-		public static CollectionType Bag(string role, string propertyRef, bool embedded)
-		{
-			return Instance.CollectionTypeFactory.Bag(role, propertyRef, embedded);
-		}
-
 		public static CollectionType IdBag(string role, string propertyRef, bool embedded)
 		{
 			return Instance.CollectionTypeFactory.IdBag(role, propertyRef, embedded);