NH-3488 - Fix required by rebase, to be squashed

Author: fredericDelaporte

src/NHibernate/Linq/Assignments.cs

@@ -5,7 +5,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using NHibernate.Linq.Visitors;
-using Remotion.Linq.Utilities;
 
 namespace NHibernate.Linq
 {
@@ -16,7 +15,7 @@ public abstract class Assignments
 	}
 
 	/// <summary>
-	/// Class to hold assigments used in updates and inserts
+	/// Class to hold assignments used in updates and inserts
 	/// </summary>
 	/// <typeparam name="TInput">The type of the input.</typeparam>
 	/// <typeparam name="TOutput">The type of the output.</typeparam>
@@ -33,14 +32,13 @@ public class Assignments<TInput, TOutput> : Assignments
 		/// <returns></returns>
 		public Assignments<TInput, TOutput> Set<TProp>(Expression<Func<TOutput, TProp>> property, Expression<Func<TInput, TProp>> expression)
 		{
-			ArgumentUtility.CheckNotNull("property", property);
-			ArgumentUtility.CheckNotNull("expression", expression);
-			var member = property.Body as MemberExpression;
+			if (property == null)
+				throw new ArgumentNullException(nameof(property));
+			if (expression == null)
+				throw new ArgumentNullException(nameof(expression));
 			var param = property.Parameters.Single();
-			if (member == null)
-			{
-				throw new ArgumentException("The property expression must refer to a property of " + param.Name + "("+ param.Type.Name + ")", "property");
-			}
+			var member = property.Body as MemberExpression ?? 
+				throw new ArgumentException("The property expression must refer to a property of " + param.Name + "("+ param.Type.Name + ")", nameof(property));
 			_sets.Add(new Assignment(member.GetMemberPath(), expression));
 			return this;
 		}
@@ -54,13 +52,11 @@ public Assignments<TInput, TOutput> Set<TProp>(Expression<Func<TOutput, TProp>>
 		/// <returns></returns>
 		public Assignments<TInput, TOutput> Set<TProp>(Expression<Func<TOutput, TProp>> property, TProp value)
 		{
-			ArgumentUtility.CheckNotNull("property", property);
-			var member = property.Body as MemberExpression;
+			if (property == null)
+				throw new ArgumentNullException(nameof(property));
 			var param = property.Parameters.Single();
-			if (member == null)
-			{
-				throw new ArgumentException("The property expression must refer to a property of " + param.Name + "(" + param.Type.Name + ")", "property");
-			}
+			var member = property.Body as MemberExpression ??
+				throw new ArgumentException("The property expression must refer to a property of " + param.Name + "(" + param.Type.Name + ")", nameof(property));
 			_sets.Add(new Assignment(member.GetMemberPath(), Expression.Constant(value, typeof(TProp))));
 			return this;
 		}
@@ -76,8 +72,7 @@ public LambdaExpression ConvertToDictionaryExpression()
 			foreach (var set in _sets)
 			{
 				var setter = set.Expression;
-				var setterLambda = setter as LambdaExpression;
-				if (setterLambda != null)
+				if (setter is LambdaExpression setterLambda)
 				{
 					setter = setterLambda.Body.Replace(setterLambda.Parameters.First(), param);
 				}
@@ -108,14 +103,11 @@ public LambdaExpression ConvertToDictionaryExpression()
 
 		public static Assignments<TInput, TOutput> FromExpression(Expression<Func<TInput, TOutput>> expression)
 		{
-			ArgumentUtility.CheckNotNull("expression", expression);
+			if (expression == null)
+				throw new ArgumentNullException(nameof(expression));
 			var instance = new Assignments<TInput, TOutput>();
-			var memberInitExpression = expression.Body as MemberInitExpression;
-			
-			if (memberInitExpression == null)
-			{
+			var memberInitExpression = expression.Body as MemberInitExpression ??
 				throw new ArgumentException("The expression must be member initialization, e.g. x => new Dog{Name = x.Name,Age = x.Age + 5}");
-			}
 
 			AddSetsFromBindings(memberInitExpression.Bindings, instance, "", expression.Parameters);
 
@@ -139,8 +131,8 @@ private static void AddSetsFromBindings(IEnumerable<MemberBinding> bindings, Ass
 
 		private static void AddSetsFromAssignment(MemberAssignment assignment, Assignments<TInput, TOutput> instance, string path, ReadOnlyCollection<ParameterExpression> parameters)
 		{
-			var memberInit = assignment.Expression as MemberInitExpression; // {Property=new Instance{SubProperty="Value"}}
-			if (memberInit!=null)
+			// {Property=new Instance{SubProperty="Value"}}
+			if (assignment.Expression is MemberInitExpression memberInit)
 			{
 				AddSetsFromBindings(memberInit.Bindings, instance, path, parameters);
 			}

src/NHibernate/Linq/InsertSyntax.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using Remotion.Linq;
-using Remotion.Linq.Utilities;
 
 namespace NHibernate.Linq
 {
@@ -23,7 +22,8 @@ internal InsertSyntax(IQueryable<TInput> query)
 		/// <returns></returns>
 		public int Into<TOutput>(Action<Assignments<TInput, TOutput>> assignmentActions)
 		{
-			ArgumentUtility.CheckNotNull("assignments", assignmentActions);
+			if (assignmentActions == null)
+				throw new ArgumentNullException(nameof(assignmentActions));
 			var assignments = new Assignments<TInput, TOutput>();
 			assignmentActions.Invoke(assignments);
 			return InsertInto(_query, assignments);
@@ -43,8 +43,7 @@ public int As<TOutput>(Expression<Func<TInput, TOutput>> expression)
 
 		internal int InsertInto<TOutput>(IQueryable<TInput> query, Assignments<TInput, TOutput> assignments)
 		{
-			var nhQueryable = query as QueryableBase<TInput>;
-			if (nhQueryable == null)
+			var nhQueryable = query as QueryableBase<TInput> ??
 				throw new NotSupportedException("Query needs to be of type QueryableBase<T>");
 
 			var provider = (DefaultQueryProvider)query.Provider;

src/NHibernate/Linq/UpdateSyntax.cs

@@ -32,8 +32,6 @@ public int Assign(Action<Assignments<T, T>> assignments, bool versioned = false)
 		/// <summary>
 		/// Specify the assignments and execute the update.
 		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="query">The query.</param>
 		/// <param name="expression">The assignments expressed as a member initialization, e.g. x => new Dog{Name = x.Name,Age = x.Age + 5}.</param>
 		/// <param name="versioned">if set to <c>true</c> [versioned].</param>
 		/// <returns></returns>
@@ -44,10 +42,9 @@ public int As(Expression<Func<T, T>> expression, bool versioned = false)
 			return ExecuteUpdate(versioned, assignments);
 		}
 
-		private int ExecuteUpdate<T>(bool versioned, Assignments<T, T> assignments)
+		private int ExecuteUpdate(bool versioned, Assignments<T, T> assignments)
 		{
-			var nhQueryable = _query as QueryableBase<T>;
-			if (nhQueryable == null)
+			var nhQueryable = _query as QueryableBase<T> ??
 				throw new NotSupportedException("Query needs to be of type QueryableBase<T>");
 
 			var provider = (DefaultQueryProvider)nhQueryable.Provider;