Remove support for persistent non-generic maps.

Author: oskarb

src/NHibernate.DomainModel/Fum.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using NHibernate.Classic;
 
@@ -8,11 +7,11 @@ namespace NHibernate.DomainModel
 	[Serializable]
 	public class MapComponent
 	{
-		private IDictionary _fummap = new Hashtable();
-		private IDictionary _stringmap = new Hashtable();
+		private IDictionary<string, Fum> _fummap = new Dictionary<string, Fum>();
+		private IDictionary<string, string> _stringmap = new Dictionary<string, string>();
 		private int _count;
 
-		public IDictionary Fummap
+		public IDictionary<string, Fum> Fummap
 		{
 			get { return _fummap; }
 			set { _fummap = value; }
@@ -24,7 +23,7 @@ public int Count
 			set { _count = value; }
 		}
 
-		public IDictionary Stringmap
+		public IDictionary<string, string> Stringmap
 		{
 			get { return _stringmap; }
 			set { _stringmap = value; }

src/NHibernate.Test/CollectionTest/NullableValueTypeElementMapFixture.cs

@@ -163,65 +163,5 @@ public void ShouldAddAndRemoveNullElements()
 				Assert.That(parent.TypedDates[2], Is.Null);
 			}
 		}
-
-		[Test]
-		public void AddRemoveUntypedElements()
-		{
-			Guid parentId;
-			var date = new DateTime(2010, 09, 08);
-
-			int toBeRemoved = 0;
-			int toBeUpdatedToNull = 1;
-			int toRemainNull = 2;
-			int toBeUpdatedFromNull = 3;
-			int toBeAddedNull = 4;
-			int toBeAddedNotNull = 5;
-
-			using (var s = OpenSession())
-			using (var tx = s.BeginTransaction())
-			{
-				var parent = new Parent();
-				parent.UntypedDates[toBeRemoved] = null;
-				parent.UntypedDates[toBeUpdatedToNull] = date;
-				parent.UntypedDates[toRemainNull] = null;
-				parent.UntypedDates[toBeUpdatedFromNull] = null;
-
-				s.Save(parent);
-				parentId = parent.Id;
-				tx.Commit();
-			}
-
-			using (var s = OpenSession())
-			using (var tx = s.BeginTransaction())
-			{
-				var parent = s.Load<Parent>(parentId);
-
-				Assert.That(parent.UntypedDates.Count, Is.EqualTo(4));
-				Assert.That(parent.UntypedDates[toBeRemoved], Is.Null);
-				Assert.That(parent.UntypedDates[toBeUpdatedToNull], Is.EqualTo(date));
-				Assert.That(parent.UntypedDates[toRemainNull], Is.Null);
-				Assert.That(parent.UntypedDates[toBeUpdatedFromNull], Is.Null);
-
-				parent.UntypedDates.Remove(toBeRemoved);
-				parent.UntypedDates[toBeUpdatedToNull] = null;
-				parent.UntypedDates[toBeUpdatedFromNull] = date;
-				parent.UntypedDates[toBeAddedNull] = null;
-				parent.UntypedDates[toBeAddedNotNull] = date;
-				tx.Commit();
-			}
-
-			using (var s = OpenSession())
-			using (var tx = s.BeginTransaction())
-			{
-				var parent = s.Load<Parent>(parentId);
-
-				Assert.That(parent.UntypedDates.Count, Is.EqualTo(5));
-				Assert.That(parent.UntypedDates[toBeUpdatedToNull], Is.Null);
-				Assert.That(parent.UntypedDates[toRemainNull], Is.Null);
-				Assert.That(parent.UntypedDates[toBeUpdatedFromNull], Is.EqualTo(date));
-				Assert.That(parent.UntypedDates[toBeAddedNull], Is.Null);
-				Assert.That(parent.UntypedDates[toBeAddedNotNull], Is.EqualTo(date));
-			}
-		}
 	}
 }

src/NHibernate.Test/CollectionTest/NullableValueTypeElementMapFixture.hbm.xml

@@ -9,10 +9,5 @@
 			<index column="Idx" type="int" />
 			<element column="`Value`" />
 		</map>
-		<map name="UntypedDates">
-			<key column="ParentId" />
-			<index column="Idx" type="int" />
-			<element column="`Value`" type="System.Nullable`1[[System.DateTime, mscorlib]]" />
-		</map>
 	</class>
 </hibernate-mapping>

src/NHibernate.Test/CollectionTest/Parent.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace NHibernate.Test.CollectionTest
@@ -8,12 +7,10 @@ public class Parent
 	{
 		public virtual Guid Id { get; set; }
 		public virtual IDictionary<int, DateTime?> TypedDates { get; set; }
-		public virtual IDictionary UntypedDates { get; set; }
 
 		public Parent()
 		{
 			TypedDates = new Dictionary<int, DateTime?>();
-			UntypedDates = new Hashtable();
 		}
 	}
 }

src/NHibernate.Test/Extralazy/ExtraLazyFixture.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Generic;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Extralazy
@@ -134,10 +135,10 @@ public void Get()
 				turin = (User) g.Users["turin"];
 				Assert.That(gavin, Is.Not.Null);
 				Assert.That(turin, Is.Not.Null);
-				Assert.That(g.Users["emmanuel"], Is.Null);
+				Assert.That(g.Users.ContainsKey("emmanuel"), Is.False);
 				Assert.IsFalse(NHibernateUtil.IsInitialized(g.Users));
 				Assert.That(gavin.Session["foo"], Is.Not.Null);
-				Assert.That(turin.Session["foo"], Is.Null);
+				Assert.That(turin.Session.ContainsKey("foo"), Is.False);
 				Assert.IsFalse(NHibernateUtil.IsInitialized(gavin.Session));
 				Assert.IsFalse(NHibernateUtil.IsInitialized(turin.Session));
 				s.Delete(gavin);
@@ -189,7 +190,7 @@ public void RemoveClear()
 				//Assert.IsTrue( g.Users.IsEmpty() );
 				//Assert.IsFalse( NHibernateUtil.IsInitialized( g.getUsers() ) );
 				gavin = s.Get<User>("gavin");
-				Assert.IsFalse(gavin.Session.Contains("foo"));
+				Assert.IsFalse(gavin.Session.ContainsKey("foo"));
 				Assert.IsFalse(NHibernateUtil.IsInitialized(gavin.Session));
 				s.Delete(gavin);
 				s.Delete(turin);
@@ -204,7 +205,7 @@ public void IndexFormulaMap()
 			User gavin = null;
 			User turin = null;
 			Group g = null;
-			IDictionary smap = null;
+			IDictionary<string, SessionAttribute> smap = null;
 
 			using (var s = OpenSession())
 			using (var t = s.BeginTransaction())

src/NHibernate.Test/Extralazy/Group.cs

@@ -1,27 +1,28 @@
-using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Test.Extralazy
 {
 	public class Group
 	{
-		private string name;
-		private IDictionary users = new Hashtable();
+		private string _name;
+		private IDictionary<string, User> _users = new Dictionary<string, User>();
+
 		protected Group() {}
 		public Group(string name)
 		{
-			this.name = name;
+			this._name = name;
 		}
 
 		public virtual string Name
 		{
-			get { return name; }
-			set { name = value; }
+			get { return _name; }
+			set { _name = value; }
 		}
 
-		public virtual IDictionary Users
+		public virtual IDictionary<string, User> Users
 		{
-			get { return users; }
-			set { users = value; }
+			get { return _users; }
+			set { _users = value; }
 		}
 	}
 }

src/NHibernate.Test/Extralazy/User.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Generic;
 
 namespace NHibernate.Test.Extralazy
@@ -7,7 +6,7 @@ public class User
 	{
 		private string name;
 		private string password;
-		private IDictionary session = new Hashtable();
+		private IDictionary<string, SessionAttribute> session = new Dictionary<string, SessionAttribute>();
 		private ISet<Document> documents = new HashSet<Document>();
 		private ISet<Photo> photos = new HashSet<Photo>();
 		protected User() {}
@@ -29,7 +28,7 @@ public virtual string Password
 			set { password = value; }
 		}
 
-		public virtual IDictionary Session
+		public virtual IDictionary<string, SessionAttribute> Session
 		{
 			get { return session; }
 			set { session = value; }

src/NHibernate.Test/Hql/Ast/Animal.hbm.xml

@@ -107,8 +107,8 @@
 		</id>
 		<discriminator column="zooType" type="character"/>
 		<property name="name" type="string"/>
-        <property name="classification"/>
-        <map name="mammals">
+		<property name="classification"/>
+		<map name="mammals">
 			<key column="mammalZoo_id"/>
 			<index type="string" column="name"/>
 			<one-to-many class="Mammal"/>

src/NHibernate.Test/Hql/Ast/Human.cs

@@ -9,7 +9,7 @@ public class Human: Mammal
 		private string nickName;
 		private ICollection friends;
 		private ICollection pets;
-		private IDictionary family;
+		private IDictionary<string, Human> family;
 		private double height;
 
 		private long bigIntegerValue;
@@ -18,7 +18,7 @@ public class Human: Mammal
 		private float floatValue;
 
 		private ISet<string> nickNames;
-		private IDictionary addresses;
+		private IDictionary<string, Address> addresses;
 
 		public virtual Name Name
 		{
@@ -44,7 +44,7 @@ public virtual ICollection Pets
 			set { pets = value; }
 		}
 
-		public virtual IDictionary Family
+		public virtual IDictionary<string, Human> Family
 		{
 			get { return family; }
 			set { family = value; }
@@ -86,7 +86,7 @@ public virtual ISet<string> NickNames
 			set { nickNames = value; }
 		}
 
-		public virtual IDictionary Addresses
+		public virtual IDictionary<string, Address> Addresses
 		{
 			get { return addresses; }
 			set { addresses = value; }

src/NHibernate.Test/Hql/Ast/Zoo.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Test.Hql.Ast
 {
@@ -7,8 +8,8 @@ public class Zoo
 		private long id;
 		private string name;
 		private Classification classification;
-		private IDictionary animals;
-		private IDictionary mammals;
+		private IDictionary<string, Animal> animals;
+		private IDictionary<string, Mammal> mammals;
 		private Address address;
 
 		public virtual long Id
@@ -29,13 +30,13 @@ public virtual Classification Classification
 			set { classification = value; }
 		}
 
-		public virtual IDictionary Animals
+		public virtual IDictionary<string, Animal> Animals
 		{
 			get { return animals; }
 			set { animals = value; }
 		}
 
-		public virtual IDictionary Mammals
+		public virtual IDictionary<string, Mammal> Mammals
 		{
 			get { return mammals; }
 			set { mammals = value; }