Replace SafetyEnumerable<T> with OfType<T> where applicable (#2368)

bahusoid · web-flow · commit 80af768a0a39 · 2020-05-12T23:56:26.000+02:00
diff --git a/src/NHibernate.Test/UtilityTest/SafetyEnumerableFixture.cs b/src/NHibernate.Test/UtilityTest/SafetyEnumerableFixture.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using NHibernate.Util;
 using NUnit.Framework;
@@ -7,6 +8,8 @@ namespace NHibernate.Test.UtilityTest
 	/// <summary>
 	/// Test cases for the <see cref="SafetyEnumerable{T}"/> class.
 	/// </summary>
+	// Since v5.3 
+	[Obsolete("This class has no more usages and will be removed in a future version")]
 	[TestFixture]
 	public class SafetyEnumerableFixture
 	{
diff --git a/src/NHibernate/Async/Engine/Query/HQLQueryPlan.cs b/src/NHibernate/Async/Engine/Query/HQLQueryPlan.cs
@@ -128,7 +128,7 @@ public async Task<IEnumerable> PerformIterateAsync(QueryParameters queryParamete
 		public async Task<IEnumerable<T>> PerformIterateAsync<T>(QueryParameters queryParameters, IEventSource session, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
-			return new SafetyEnumerable<T>(await (PerformIterateAsync(queryParameters, session, cancellationToken)).ConfigureAwait(false));
+			return (await (PerformIterateAsync(queryParameters, session, cancellationToken)).ConfigureAwait(false)).CastOrDefault<T>();
 		}
 
         public async Task<int> PerformExecuteUpdateAsync(QueryParameters queryParameters, ISessionImplementor session, CancellationToken cancellationToken)
diff --git a/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs
@@ -90,7 +90,7 @@ private void BindNaturalId(HbmNaturalId naturalid, PersistentClass rootClass, ID
 						property.IsUpdateable = false;
 					property.IsNaturalIdentifier = true;
 
-					uk.AddColumns(property.ColumnIterator.OfType<Column>());
+					uk.AddColumns(property.ColumnIterator);
 				});
 
 			rootClass.Table.AddUniqueKey(uk);	
diff --git a/src/NHibernate/Engine/Query/HQLQueryPlan.cs b/src/NHibernate/Engine/Query/HQLQueryPlan.cs
@@ -176,7 +176,7 @@ public IEnumerable PerformIterate(QueryParameters queryParameters, IEventSource
 
 		public IEnumerable<T> PerformIterate<T>(QueryParameters queryParameters, IEventSource session)
 		{
-			return new SafetyEnumerable<T>(PerformIterate(queryParameters, session));
+			return PerformIterate(queryParameters, session).CastOrDefault<T>();
 		}
 
         public int PerformExecuteUpdate(QueryParameters queryParameters, ISessionImplementor session)
diff --git a/src/NHibernate/Mapping/Constraint.cs b/src/NHibernate/Mapping/Constraint.cs
@@ -91,11 +91,15 @@ public void AddColumns(IEnumerable<Column> columnIterator)
 		{
 			foreach (Column col in columnIterator)
 			{
-				if (!col.IsFormula)
-					AddColumn(col);
+				AddColumn(col);
 			}
 		}
 
+		public void AddColumns(IEnumerable<ISelectable> columnIterator)
+		{
+			AddColumns(columnIterator.OfType<Column>());
+		}
+
 		/// <summary>
 		/// Gets the number of columns that this Constraint contains.
 		/// </summary>
diff --git a/src/NHibernate/Mapping/IdentifierCollection.cs b/src/NHibernate/Mapping/IdentifierCollection.cs
@@ -1,6 +1,5 @@
 using System;
 using NHibernate.Engine;
-using NHibernate.Util;
 
 namespace NHibernate.Mapping
 {
@@ -40,7 +39,7 @@ public override void CreatePrimaryKey()
 			if (!IsOneToMany)
 			{
 				PrimaryKey pk = new PrimaryKey();
-				pk.AddColumns(new SafetyEnumerable<Column>(Identifier.ColumnIterator));
+				pk.AddColumns(Identifier.ColumnIterator);
 				CollectionTable.PrimaryKey = pk;
 			}
 			//else // Create an index on the key columns?
diff --git a/src/NHibernate/Mapping/IndexedCollection.cs b/src/NHibernate/Mapping/IndexedCollection.cs
@@ -1,6 +1,5 @@
 using System;
 using NHibernate.Engine;
-using NHibernate.Util;
 
 namespace NHibernate.Mapping
 {
@@ -40,7 +39,7 @@ public override void CreatePrimaryKey()
 			if (!IsOneToMany)
 			{
 				PrimaryKey pk = new PrimaryKey();
-				pk.AddColumns(new SafetyEnumerable<Column>(Key.ColumnIterator));
+				pk.AddColumns(Key.ColumnIterator);
 
 				// index should be last column listed
 				bool isFormula = false;
@@ -52,11 +51,11 @@ public override void CreatePrimaryKey()
 				if (isFormula)
 				{
 					//if it is a formula index, use the element columns in the PK
-					pk.AddColumns(new SafetyEnumerable<Column>(Element.ColumnIterator));
+					pk.AddColumns(Element.ColumnIterator);
 				}
 				else
 				{
-					pk.AddColumns(new SafetyEnumerable<Column>(Index.ColumnIterator));
+					pk.AddColumns(Index.ColumnIterator);
 				}
 
 				CollectionTable.PrimaryKey = pk;
diff --git a/src/NHibernate/Mapping/Join.cs b/src/NHibernate/Mapping/Join.cs
@@ -100,7 +100,7 @@ public void CreatePrimaryKey()
 			pk.Name = PK_ALIAS.ToAliasString(table.Name);
 			table.PrimaryKey = pk;
 
-			pk.AddColumns(Key.ColumnIterator.OfType<Column>());
+			pk.AddColumns(Key.ColumnIterator);
 		}
 
 		public int PropertySpan
diff --git a/src/NHibernate/Mapping/ManyToOne.cs b/src/NHibernate/Mapping/ManyToOne.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using NHibernate.Type;
-using NHibernate.Util;
 using System;
+using System.Linq;
 
 namespace NHibernate.Mapping
 {
@@ -77,7 +77,7 @@ public void CreatePropertyRefConstraints(IDictionary<string, PersistentClass> pe
 
 				if (!HasFormula && !"none".Equals(ForeignKeyName, StringComparison.OrdinalIgnoreCase))
 				{
-					IEnumerable<Column> ce = new SafetyEnumerable<Column>(property.ColumnIterator);
+					IEnumerable<Column> ce = property.ColumnIterator.OfType<Column>();
 
 					// NH : Ensure that related columns have same length
 					ForeignKey.AlignColumns(ConstraintColumns, ce);
diff --git a/src/NHibernate/Mapping/OneToOne.cs b/src/NHibernate/Mapping/OneToOne.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NHibernate.Type;
 using NHibernate.Util;
 
@@ -40,10 +41,7 @@ public override void CreateForeignKey()
 		}
 
 		/// <summary></summary>
-		public override IEnumerable<Column> ConstraintColumns
-		{
-			get { return new SafetyEnumerable<Column>(identifier.ColumnIterator); }
-		}
+		public override IEnumerable<Column> ConstraintColumns => identifier.ColumnIterator.OfType<Column>();
 
 		/// <summary></summary>
 		public bool IsConstrained
@@ -103,4 +101,4 @@ public override IType Type
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Mapping/PersistentClass.cs b/src/NHibernate/Mapping/PersistentClass.cs
@@ -761,7 +761,7 @@ public virtual void CreatePrimaryKey(Dialect.Dialect dialect)
 			pk.Name = PKAlias.ToAliasString(table.Name);
 			table.PrimaryKey = pk;
 
-			pk.AddColumns(new SafetyEnumerable<Column>(Key.ColumnIterator));
+			pk.AddColumns(Key.ColumnIterator);
 		}
 
 		/// <summary>
diff --git a/src/NHibernate/Mapping/SimpleValue.cs b/src/NHibernate/Mapping/SimpleValue.cs
@@ -37,10 +37,7 @@ public SimpleValue(Table table)
 			this.table = table;
 		}
 
-		public virtual IEnumerable<Column> ConstraintColumns
-		{
-			get { return new SafetyEnumerable<Column>(columns); }
-		}
+		public virtual IEnumerable<Column> ConstraintColumns => columns.OfType<Column>();
 
 		public string ForeignKeyName
 		{
diff --git a/src/NHibernate/Persister/Entity/JoinedSubclassEntityPersister.cs b/src/NHibernate/Persister/Entity/JoinedSubclassEntityPersister.cs
@@ -140,8 +140,7 @@ public JoinedSubclassEntityPersister(PersistentClass persistentClass, ICacheConc
 					tables.Add(tabname);
 
 					var keyCols = new List<string>(idColumnSpan);
-					var enumerableKCols = new SafetyEnumerable<Column>(key.ColumnIterator);
-					foreach (var kcol in enumerableKCols)
+					foreach (var kcol in key.ColumnIterator.OfType<Column>())
 						keyCols.Add(kcol.GetQuotedName(factory.Dialect));
 
 					keyColumns.Add(keyCols.ToArray());
diff --git a/src/NHibernate/SqlCommand/SqlInsertBuilder.cs b/src/NHibernate/SqlCommand/SqlInsertBuilder.cs
@@ -219,7 +219,7 @@ public SqlCommandInfo ToSqlCommandInfo()
 
 		public SqlType[] GetParametersTypeArray()
 		{
-			return new SafetyEnumerable<SqlType>(columns.Values).ToArray();
+			return columns.Values.OfType<SqlType>().ToArray();
 		}
 	}
 }
diff --git a/src/NHibernate/SqlCommand/SqlUpdateBuilder.cs b/src/NHibernate/SqlCommand/SqlUpdateBuilder.cs
@@ -356,7 +356,8 @@ public SqlString ToSqlString()
 		public SqlCommandInfo ToSqlCommandInfo()
 		{
 			SqlString text = ToSqlString();
-			List<SqlType> parameterTypes = new List<SqlType>(new SafetyEnumerable<SqlType>(columns.Values));
+
+			var parameterTypes = columns.Values.OfType<SqlType>().ToList(); 
 			parameterTypes.AddRange(whereParameterTypes);
 			return new SqlCommandInfo(text, parameterTypes.ToArray());
 		}
diff --git a/src/NHibernate/Util/EnumerableExtensions.cs b/src/NHibernate/Util/EnumerableExtensions.cs
@@ -107,5 +107,15 @@ internal static IReadOnlyList<T> EmptyIfNull<T>(this IReadOnlyList<T> list)
 		{
 			return list ?? Array.Empty<T>();
 		}
+
+		internal static IEnumerable<T> CastOrDefault<T>(this IEnumerable list)
+		{
+			foreach (var obj in list)
+			{
+				yield return obj == null
+					? default(T)
+					: (T) obj;
+			}
+		}
 	}
 }
diff --git a/src/NHibernate/Util/SafetyEnumerable.cs b/src/NHibernate/Util/SafetyEnumerable.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -7,6 +8,8 @@ namespace NHibernate.Util
 	/// Used to ensure a collection filtering a given IEnumerable by a certain type.
 	/// </summary>
 	/// <typeparam name="T">The type used like filter.</typeparam>
+	// Since v5.3 
+	[Obsolete("This class has no more usages and will be removed in a future version")]
 	public class SafetyEnumerable<T> : IEnumerable<T>
 	{
 		/*
@@ -25,8 +28,8 @@ public IEnumerator<T> GetEnumerator()
 			{
 				if (element == null)
 					yield return default(T);
-				else if (element is T)
-					yield return (T) element;
+				else if (element is T elem)
+					yield return elem;
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public async Task<IEnumerable> PerformIterateAsync(QueryParameters queryParamete`
`128`	`128`	`public async Task<IEnumerable<T>> PerformIterateAsync<T>(QueryParameters queryParameters, IEventSource session, CancellationToken cancellationToken)`
`129`	`129`	`{`
`130`	`130`	`cancellationToken.ThrowIfCancellationRequested();`
`131`		`- return new SafetyEnumerable<T>(await (PerformIterateAsync(queryParameters, session, cancellationToken)).ConfigureAwait(false));`
	`131`	`+ return (await (PerformIterateAsync(queryParameters, session, cancellationToken)).ConfigureAwait(false)).CastOrDefault<T>();`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public async Task<int> PerformExecuteUpdateAsync(QueryParameters queryParameters, ISessionImplementor session, CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public IEnumerable PerformIterate(QueryParameters queryParameters, IEventSource`
`176`	`176`
`177`	`177`	`public IEnumerable<T> PerformIterate<T>(QueryParameters queryParameters, IEventSource session)`
`178`	`178`	`{`
`179`		`- return new SafetyEnumerable<T>(PerformIterate(queryParameters, session));`
	`179`	`+ return PerformIterate(queryParameters, session).CastOrDefault<T>();`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`public int PerformExecuteUpdate(QueryParameters queryParameters, ISessionImplementor session)`
Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,15 @@ public void AddColumns(IEnumerable<Column> columnIterator)`
`91`	`91`	`{`
`92`	`92`	`foreach (Column col in columnIterator)`
`93`	`93`	`{`
`94`		`- if (!col.IsFormula)`
`95`		`- AddColumn(col);`
	`94`	`+ AddColumn(col);`
`96`	`95`	`}`
`97`	`96`	`}`
`98`	`97`
	`98`	`+ public void AddColumns(IEnumerable<ISelectable> columnIterator)`
	`99`	`+ {`
	`100`	`+ AddColumns(columnIterator.OfType<Column>());`
	`101`	`+ }`
	`102`	`+`
`99`	`103`	`/// <summary>`
`100`	`104`	`/// Gets the number of columns that this Constraint contains.`
`101`	`105`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using NHibernate.Engine;`
`3`		`-using NHibernate.Util;`
`4`	`3`
`5`	`4`	`namespace NHibernate.Mapping`
`6`	`5`	`{`
`@@ -40,7 +39,7 @@ public override void CreatePrimaryKey()`
`40`	`39`	`if (!IsOneToMany)`
`41`	`40`	`{`
`42`	`41`	`PrimaryKey pk = new PrimaryKey();`
`43`		`- pk.AddColumns(new SafetyEnumerable<Column>(Identifier.ColumnIterator));`
	`42`	`+ pk.AddColumns(Identifier.ColumnIterator);`
`44`	`43`	`CollectionTable.PrimaryKey = pk;`
`45`	`44`	`}`
`46`	`45`	`//else // Create an index on the key columns?`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public void CreatePrimaryKey()`
`100`	`100`	`pk.Name = PK_ALIAS.ToAliasString(table.Name);`
`101`	`101`	`table.PrimaryKey = pk;`
`102`	`102`
`103`		`- pk.AddColumns(Key.ColumnIterator.OfType<Column>());`
	`103`	`+ pk.AddColumns(Key.ColumnIterator);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public int PropertySpan`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using NHibernate.Type;`
`3`		`-using NHibernate.Util;`
`4`	`3`	`using System;`
	`4`	`+using System.Linq;`
`5`	`5`
`6`	`6`	`namespace NHibernate.Mapping`
`7`	`7`	`{`
`@@ -77,7 +77,7 @@ public void CreatePropertyRefConstraints(IDictionary<string, PersistentClass> pe`
`77`	`77`
`78`	`78`	`if (!HasFormula && !"none".Equals(ForeignKeyName, StringComparison.OrdinalIgnoreCase))`
`79`	`79`	`{`
`80`		`- IEnumerable<Column> ce = new SafetyEnumerable<Column>(property.ColumnIterator);`
	`80`	`+ IEnumerable<Column> ce = property.ColumnIterator.OfType<Column>();`
`81`	`81`
`82`	`82`	`// NH : Ensure that related columns have same length`
`83`	`83`	`ForeignKey.AlignColumns(ConstraintColumns, ce);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.Linq;`
`3`	`4`	`using NHibernate.Type;`
`4`	`5`	`using NHibernate.Util;`
`5`	`6`
`@@ -40,10 +41,7 @@ public override void CreateForeignKey()`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`/// <summary></summary>`
`43`		`- public override IEnumerable<Column> ConstraintColumns`
`44`		`- {`
`45`		`- get { return new SafetyEnumerable<Column>(identifier.ColumnIterator); }`
`46`		`- }`
	`44`	`+ public override IEnumerable<Column> ConstraintColumns => identifier.ColumnIterator.OfType<Column>();`
`47`	`45`
`48`	`46`	`/// <summary></summary>`
`49`	`47`	`public bool IsConstrained`
`@@ -103,4 +101,4 @@ public override IType Type`
`103`	`101`	`}`
`104`	`102`	`}`
`105`	`103`	`}`
`106`		`-}`
	`104`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,7 @@ public virtual void CreatePrimaryKey(Dialect.Dialect dialect)`
`761`	`761`	`pk.Name = PKAlias.ToAliasString(table.Name);`
`762`	`762`	`table.PrimaryKey = pk;`
`763`	`763`
`764`		`- pk.AddColumns(new SafetyEnumerable<Column>(Key.ColumnIterator));`
	`764`	`+ pk.AddColumns(Key.ColumnIterator);`
`765`	`765`	`}`
`766`	`766`
`767`	`767`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,7 @@ public SimpleValue(Table table)`
`37`	`37`	`this.table = table;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public virtual IEnumerable<Column> ConstraintColumns`
`41`		`- {`
`42`		`- get { return new SafetyEnumerable<Column>(columns); }`
`43`		`- }`
	`40`	`+ public virtual IEnumerable<Column> ConstraintColumns => columns.OfType<Column>();`
`44`	`41`
`45`	`42`	`public string ForeignKeyName`
`46`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public SqlCommandInfo ToSqlCommandInfo()`
`219`	`219`
`220`	`220`	`public SqlType[] GetParametersTypeArray()`
`221`	`221`	`{`
`222`		`- return new SafetyEnumerable<SqlType>(columns.Values).ToArray();`
	`222`	`+ return columns.Values.OfType<SqlType>().ToArray();`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`	`}`