Make persistent collection classes implement the IReadOnly* interfaces (#2284)

Author: marcelltoth

src/NHibernate.Test/CollectionTest/PersistentCollectionsFixture.cs

@@ -36,5 +36,22 @@ public void AddRangeWorksCorrectly()
 
 			Assert.That(items, Is.EqualTo(new[] {"A", "B", "C", "D", "E"}));
 		}
+
+		[Test]
+		public void SelectManyWorksCorrectlyWithIReadOnlyCollection()
+		{
+			var bags = new IReadOnlyCollection<string>[]
+			{
+				new List<string> {"A"},
+				new PersistentGenericBag<string>(null, new[] {"B"}),
+				new PersistentIdentifierBag<string>(null, new[] {"C"}),
+				(IReadOnlyList<string>)new PersistentGenericList<string>(null, new[] {"D"}),
+				new PersistentGenericSet<string>(null, new HashSet<string> {"E"})
+			};
+			
+			var items = bags.SelectMany(b => b).ToArray();
+
+			Assert.That(items, Is.EqualTo(new[] {"A", "B", "C", "D", "E"}));
+		}
 	}
 }

src/NHibernate/Async/Collection/Generic/PersistentGenericBag.cs

@@ -27,7 +27,7 @@ namespace NHibernate.Collection.Generic
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class PersistentGenericBag<T> : AbstractPersistentCollection, IList<T>, IList, IQueryable<T>
+	public partial class PersistentGenericBag<T> : AbstractPersistentCollection, IList<T>, IReadOnlyList<T>, IList, IQueryable<T>
 	{
 
 		public override async Task<object> DisassembleAsync(ICollectionPersister persister, CancellationToken cancellationToken)

src/NHibernate/Async/Collection/Generic/PersistentGenericIdentifierBag.cs

@@ -28,7 +28,7 @@ namespace NHibernate.Collection.Generic
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class PersistentIdentifierBag<T> : AbstractPersistentCollection, IList<T>, IList, IQueryable<T>
+	public partial class PersistentIdentifierBag<T> : AbstractPersistentCollection, IList<T>, IReadOnlyList<T>, IList, IQueryable<T>
 	{
 
 		/// <summary>

src/NHibernate/Async/Collection/Generic/PersistentGenericList.cs

@@ -27,7 +27,7 @@ namespace NHibernate.Collection.Generic
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class PersistentGenericList<T> : AbstractPersistentCollection, IList<T>, IList, IQueryable<T>
+	public partial class PersistentGenericList<T> : AbstractPersistentCollection, IList<T>, IReadOnlyList<T>, IList, IQueryable<T>
 	{
 
 		//Since 5.3

src/NHibernate/Async/Collection/Generic/PersistentGenericMap.cs

@@ -27,7 +27,7 @@ namespace NHibernate.Collection.Generic
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class PersistentGenericMap<TKey, TValue> : AbstractPersistentCollection, IDictionary<TKey, TValue>, ICollection
+	public partial class PersistentGenericMap<TKey, TValue> : AbstractPersistentCollection, IDictionary<TKey, TValue>, IReadOnlyDictionary<TKey, TValue>, ICollection
 	{
 
 		//Since 5.3

src/NHibernate/Async/Collection/Generic/PersistentGenericSet.cs

@@ -28,7 +28,7 @@ namespace NHibernate.Collection.Generic
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class PersistentGenericSet<T> : AbstractPersistentCollection, ISet<T>, IQueryable<T>
+	public partial class PersistentGenericSet<T> : AbstractPersistentCollection, ISet<T>, IReadOnlyCollection<T>, IQueryable<T>
 	{
 
 		//Since 5.3

src/NHibernate/Collection/Generic/PersistentGenericBag.cs

@@ -25,7 +25,7 @@ namespace NHibernate.Collection.Generic
 	/// <remarks>The underlying collection used is an <see cref="List{T}"/></remarks>
 	[Serializable]
 	[DebuggerTypeProxy(typeof (CollectionProxy<>))]
-	public partial class PersistentGenericBag<T> : AbstractPersistentCollection, IList<T>, IList, IQueryable<T>
+	public partial class PersistentGenericBag<T> : AbstractPersistentCollection, IList<T>, IReadOnlyList<T>, IList, IQueryable<T>
 	{
 		// TODO NH: find a way to writeonce (no duplicated code from PersistentBag)
 

src/NHibernate/Collection/Generic/PersistentGenericIdentifierBag.cs

@@ -33,7 +33,7 @@ namespace NHibernate.Collection.Generic
 	/// </remarks>
 	[Serializable]
 	[DebuggerTypeProxy(typeof (CollectionProxy<>))]
-	public partial class PersistentIdentifierBag<T> : AbstractPersistentCollection, IList<T>, IList, IQueryable<T>
+	public partial class PersistentIdentifierBag<T> : AbstractPersistentCollection, IList<T>, IReadOnlyList<T>, IList, IQueryable<T>
 	{
 		/* NH considerations:
 		 * For various reason we know that the underlining type will be a List<T> or a 

src/NHibernate/Collection/Generic/PersistentGenericList.cs

@@ -22,7 +22,7 @@ namespace NHibernate.Collection.Generic
 	/// <remarks>The underlying collection used is a <see cref="List{T}"/></remarks>
 	[Serializable]
 	[DebuggerTypeProxy(typeof (CollectionProxy<>))]
-	public partial class PersistentGenericList<T> : AbstractPersistentCollection, IList<T>, IList, IQueryable<T>
+	public partial class PersistentGenericList<T> : AbstractPersistentCollection, IList<T>, IReadOnlyList<T>, IList, IQueryable<T>
 	{
 		protected IList<T> WrappedList;
 

src/NHibernate/Collection/Generic/PersistentGenericMap.cs

@@ -23,7 +23,7 @@ namespace NHibernate.Collection.Generic
 	/// <typeparam name="TValue">The type of the elements in the IDictionary.</typeparam>
 	[Serializable]
 	[DebuggerTypeProxy(typeof(DictionaryProxy<,>))]
-	public partial class PersistentGenericMap<TKey, TValue> : AbstractPersistentCollection, IDictionary<TKey, TValue>, ICollection
+	public partial class PersistentGenericMap<TKey, TValue> : AbstractPersistentCollection, IDictionary<TKey, TValue>, IReadOnlyDictionary<TKey, TValue>, ICollection
 	{
 		protected IDictionary<TKey, TValue> WrappedMap;
 		private readonly ICollection<TValue> _wrappedValues;
@@ -360,6 +360,16 @@ public ICollection<TValue> Values
 			}
 		}
 
+		IEnumerable<TKey> IReadOnlyDictionary<TKey, TValue>.Keys
+		{
+			get { return Keys; }
+		}
+
+		IEnumerable<TValue> IReadOnlyDictionary<TKey, TValue>.Values
+		{
+			get { return Values; }
+		}
+
 		#endregion
 
 		#region ICollection<KeyValuePair<TKey,TValue>> Members

src/NHibernate/Collection/Generic/PersistentGenericSet.cs

@@ -21,7 +21,7 @@ namespace NHibernate.Collection.Generic
 	/// </summary>
 	[Serializable]
 	[DebuggerTypeProxy(typeof(CollectionProxy<>))]
-	public partial class PersistentGenericSet<T> : AbstractPersistentCollection, ISet<T>, IQueryable<T>
+	public partial class PersistentGenericSet<T> : AbstractPersistentCollection, ISet<T>, IReadOnlyCollection<T>, IQueryable<T>
 	{
 		/// <summary>
 		/// The <see cref="ISet{T}"/> that NHibernate is wrapping.

src/NHibernate/Collection/Generic/SetHelpers/ISetSnapshot.cs

@@ -3,8 +3,8 @@
 
 namespace NHibernate.Collection.Generic.SetHelpers
 {
-	internal interface ISetSnapshot<T> : ICollection<T>, ICollection
+	internal interface ISetSnapshot<T> : ICollection<T>, IReadOnlyCollection<T>, ICollection
 	{
 		bool TryGetValue(T element, out T value);
 	}
-}
+}

src/NHibernate/Collection/Generic/SetHelpers/SetSnapShot.cs

@@ -83,6 +83,11 @@ int ICollection<T>.Count
 			get { return _elements.Count; }
 		}
 
+		int IReadOnlyCollection<T>.Count
+		{
+			get { return _elements.Count; }
+		}
+
 		public bool IsReadOnly
 		{
 			get { return ((ICollection<T>)_elements).IsReadOnly; }
@@ -101,4 +106,4 @@ public bool TryGetValue(T element, out T value)
 			return false;
 		}
 	}
-}
+}