Move UnwrapUnary to ParameterTypeLocator as it is too specific

Author: hazzik

src/NHibernate/Linq/Visitors/ParameterTypeLocator.cs

@@ -13,7 +13,6 @@
 using Remotion.Linq.Clauses.Expressions;
 using Remotion.Linq.Clauses.ResultOperators;
 using Remotion.Linq.Parsing;
-using static NHibernate.Util.ExpressionsHelper;
 
 namespace NHibernate.Linq.Visitors
 {
@@ -137,7 +136,7 @@ private static HashSet<IType> GetCandidateTypes(
 			// or precision when having a DecimalType.
 			foreach (var relatedExpression in parameterRelatedExpressions)
 			{
-				if (TryGetMappedType(sessionFactory, relatedExpression, out var candidateType, out _, out _, out _))
+				if (ExpressionsHelper.TryGetMappedType(sessionFactory, relatedExpression, out var candidateType, out _, out _, out _))
 				{
 					if (candidateType.IsAssociationType && visitor.SequenceSelectorExpressions.Contains(relatedExpression))
 					{
@@ -434,5 +433,20 @@ private bool IsDynamicMember(Expression expression)
 				}
 			}
 		}
+
+		/// <summary>
+		/// Unwraps <see cref="System.Linq.Expressions.UnaryExpression"/>.
+		/// </summary>
+		/// <param name="expression">The expression to unwrap.</param>
+		/// <returns>The unwrapped expression.</returns>
+		private static Expression UnwrapUnary(Expression expression)
+		{
+			while (expression is UnaryExpression unaryExpression)
+			{
+				expression = unaryExpression.Operand;
+			}
+
+			return expression;
+		}
 	}
 }

src/NHibernate/Util/ExpressionsHelper.cs

@@ -59,21 +59,6 @@ constant.Value is CallSite site &&
 		}
 #endif
 
-		/// <summary>
-		/// Unwraps <see cref="UnaryExpression"/>.
-		/// </summary>
-		/// <param name="expression">The expression to unwrap.</param>
-		/// <returns>The unwrapped expression.</returns>
-		internal static Expression UnwrapUnary(Expression expression)
-		{
-			if (expression is UnaryExpression unaryExpression)
-			{
-				return UnwrapUnary(unaryExpression.Operand);
-			}
-
-			return expression;
-		}
-
 		/// <summary>
 		/// Check whether the given expression represent a variable.
 		/// </summary>