Obsolete JoinedEnumerable (#3543)

Author: hazzik

src/NHibernate.Test/Async/Legacy/FooBarTest.cs

@@ -16,6 +16,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
@@ -1222,10 +1223,7 @@ public async Task BatchLoadAsync()
 				await (s.DeleteAsync(baz2));
 				await (s.DeleteAsync(baz3));
 
-				IEnumerable en = new JoinedEnumerable(
-					new IEnumerable[] {baz.FooSet, baz2.FooSet});
-
-				foreach (object obj in en)
+				foreach (var obj in baz.FooSet.Concat(baz2.FooSet))
 				{
 					await (s.DeleteAsync(obj));
 				}
@@ -5273,16 +5271,13 @@ public async Task TransientOrphanDeleteAsync()
 			Baz baz = new Baz();
 			var bars = new HashSet<BarProxy> { new Bar(), new Bar(), new Bar() };
 			baz.CascadingBars = bars;
-			IList<Foo> foos = new List<Foo>();
-			foos.Add(new Foo());
-			foos.Add(new Foo());
+			var foos = new List<Foo> { new Foo(), new Foo() };
 			baz.FooBag = foos;
 			await (s.SaveAsync(baz));
 
-			IEnumerator enumer = new JoinedEnumerable(new IEnumerable[] {foos, bars}).GetEnumerator();
-			while (enumer.MoveNext())
+			foreach (var foo in foos.Concat(bars.Cast<FooProxy>()))
 			{
-				FooComponent cmp = ((Foo) enumer.Current).Component;
+				var cmp = foo.Component;
 				await (s.DeleteAsync(cmp.Glarch));
 				cmp.Glarch = null;
 			}

src/NHibernate.Test/Legacy/FooBarTest.cs

@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
@@ -1210,10 +1211,7 @@ public void BatchLoad()
 				s.Delete(baz2);
 				s.Delete(baz3);
 
-				IEnumerable en = new JoinedEnumerable(
-					new IEnumerable[] {baz.FooSet, baz2.FooSet});
-
-				foreach (object obj in en)
+				foreach (var obj in baz.FooSet.Concat(baz2.FooSet))
 				{
 					s.Delete(obj);
 				}
@@ -5261,16 +5259,13 @@ public void TransientOrphanDelete()
 			Baz baz = new Baz();
 			var bars = new HashSet<BarProxy> { new Bar(), new Bar(), new Bar() };
 			baz.CascadingBars = bars;
-			IList<Foo> foos = new List<Foo>();
-			foos.Add(new Foo());
-			foos.Add(new Foo());
+			var foos = new List<Foo> { new Foo(), new Foo() };
 			baz.FooBag = foos;
 			s.Save(baz);
 
-			IEnumerator enumer = new JoinedEnumerable(new IEnumerable[] {foos, bars}).GetEnumerator();
-			while (enumer.MoveNext())
+			foreach (var foo in foos.Concat(bars.Cast<FooProxy>()))
 			{
-				FooComponent cmp = ((Foo) enumer.Current).Component;
+				var cmp = foo.Component;
 				s.Delete(cmp.Glarch);
 				cmp.Glarch = null;
 			}

src/NHibernate.Test/UtilityTest/JoinedEnumerableFixture.cs

@@ -8,6 +8,8 @@ namespace NHibernate.Test.UtilityTest
 	/// <summary>
 	/// Test cases for the <see cref="JoinedEnumerable"/> class.
 	/// </summary>
+	// Since v5.6
+	[Obsolete]
 	[TestFixture]
 	public class JoinedEnumerableFixture
 	{

src/NHibernate/Async/Engine/Query/HQLQueryPlan.cs

@@ -122,7 +122,8 @@ public async Task<IEnumerable> PerformIterateAsync(QueryParameters queryParamete
 				var result = await (Translators[i].GetEnumerableAsync(queryParameters, session, cancellationToken)).ConfigureAwait(false);
 				results[i] = result;
 			}
-			return new JoinedEnumerable(results);
+
+			return Enumerate(results);
 		}
 
 		public async Task<IEnumerable<T>> PerformIterateAsync<T>(QueryParameters queryParameters, IEventSource session, CancellationToken cancellationToken)

src/NHibernate/Engine/Query/HQLQueryPlan.cs

@@ -171,7 +171,19 @@ public IEnumerable PerformIterate(QueryParameters queryParameters, IEventSource
 				var result = Translators[i].GetEnumerable(queryParameters, session);
 				results[i] = result;
 			}
-			return new JoinedEnumerable(results);
+
+			return Enumerate(results);
+		}
+
+		private static IEnumerable Enumerate(IEnumerable[] enumerables)
+		{
+			foreach (var enumerable in enumerables)
+			{
+				foreach (var o in enumerable)
+				{
+					yield return o;
+				}
+			}
 		}
 
 		public IEnumerable<T> PerformIterate<T>(QueryParameters queryParameters, IEventSource session)

src/NHibernate/IQueryOver.cs

@@ -362,7 +362,7 @@ public interface IQueryOver<TRoot,TSubType> : IQueryOver<TRoot>
 		/// </summary>
 		/// <param name="path">A lambda expression path (e.g., ChildList[0].Granchildren[0].Pets).</param>
 		/// <returns></returns>
-		// Since 5.2
+		// Since v5.2
 		[Obsolete("Use Fetch(SelectMode mode, Expression<Func<TSubType, object>> path) instead")]
 		IQueryOverFetchBuilder<TRoot,TSubType> Fetch(Expression<Func<TRoot, object>> path);
 

src/NHibernate/Util/JoinedEnumerable.cs

@@ -8,6 +8,8 @@ namespace NHibernate.Util
 	/// <summary>
 	/// Concatenates multiple objects implementing <see cref="IEnumerable"/> into one.
 	/// </summary>
+	// Since v5.6
+	[Obsolete("This class has no more usages in NHibernate and will be removed in a future version.")]
 	public class JoinedEnumerable : IEnumerable
 	{
 		private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(JoinedEnumerable));