Remove compatibility clases

Author: hazzik

src/NHibernate.Test/Linq/CustomQueryModelRewriterTests.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
-using NHibernate.Linq;
 using NHibernate.Linq.Visitors;
 using NUnit.Framework;
 using Remotion.Linq;
@@ -48,7 +47,7 @@ public override void VisitWhereClause(WhereClause whereClause, QueryModel queryM
 				whereClause.TransformExpressions(new Visitor().Visit);
 			}
 
-			private class Visitor : ExpressionTreeVisitor
+			private class Visitor : RelinqExpressionVisitor
 			{
 				protected override Expression VisitBinary(BinaryExpression expression)
 				{

src/NHibernate/Linq/ExpressionTreeVisitor.cs

@@ -1,34 +1,36 @@
 using System.Linq.Expressions;
-using Remotion.Linq.Clauses.Expressions;
-using Remotion.Linq.Parsing;
 
 namespace NHibernate.Linq.Expressions
 {
-	public abstract class NhAggregatedExpression : ExtensionExpression
+	public abstract class NhAggregatedExpression : Expression
 	{
-		public Expression Expression { get; set; }
-
-		protected NhAggregatedExpression(Expression expression, NhExpressionType type)
-			: base(expression.Type, (ExpressionType)type)
+		protected NhAggregatedExpression(Expression expression, NhExpressionType nodeType)
+			: this(expression, expression.Type, nodeType)
 		{
-			Expression = expression;
 		}
 
-		protected NhAggregatedExpression(Expression expression, System.Type expressionType, NhExpressionType type)
-			: base(expressionType, (ExpressionType)type)
+		protected NhAggregatedExpression(Expression expression, System.Type type, NhExpressionType nodeType)
 		{
 			Expression = expression;
+			NodeType = (ExpressionType) nodeType;
+			Type = type;
 		}
 
+		public override ExpressionType NodeType { get; }
+
+		public override System.Type Type { get; }
+
+		public Expression Expression { get; }
+
 		protected override Expression VisitChildren(ExpressionVisitor visitor)
 		{
 			var newExpression = visitor.Visit(Expression);
 
 			return newExpression != Expression
-					   ? CreateNew(newExpression)
-					   : this;
+				? CreateNew(newExpression)
+				: this;
 		}
 
 		public abstract Expression CreateNew(Expression expression);
 	}
-}
+}

src/NHibernate/Linq/Expressions/NhAggregatedExpression.cs

@@ -1,64 +1,32 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq.Expressions;
-using Remotion.Linq.Clauses.Expressions;
-using Remotion.Linq.Parsing;
 
 namespace NHibernate.Linq.Expressions
 {
-	public class NhNewExpression : ExtensionExpression
+	public class NhNewExpression : Expression
 	{
-		private readonly ReadOnlyCollection<string> _members;
-		private readonly ReadOnlyCollection<Expression> _arguments;
-
 		public NhNewExpression(IList<string> members, IList<Expression> arguments)
-			: base(typeof(object), (ExpressionType)NhExpressionType.New)
-		{
-			_members = new ReadOnlyCollection<string>(members);
-			_arguments = new ReadOnlyCollection<Expression>(arguments);
-		}
-
-		public ReadOnlyCollection<Expression> Arguments
-		{
-			get { return _arguments; }
-		}
-
-		public ReadOnlyCollection<string> Members
 		{
-			get { return _members; }
+			Members = new ReadOnlyCollection<string>(members);
+			Arguments = new ReadOnlyCollection<Expression>(arguments);
 		}
 
-		protected override Expression VisitChildren(ExpressionVisitor visitor)
-		{
-			var arguments = visitor.VisitAndConvert(Arguments, "VisitNhNew");
+		public override System.Type Type => typeof(object);
 
-			return arguments != Arguments
-					   ? new NhNewExpression(Members, arguments)
-					   : this;
-		}
-	}
+		public override ExpressionType NodeType => (ExpressionType) NhExpressionType.New;
 
-	public class NhStarExpression : ExtensionExpression
-	{
-		public NhStarExpression(Expression expression)
-			: base(expression.Type, (ExpressionType)NhExpressionType.Star)
-		{
-			Expression = expression;
-		}
+		public ReadOnlyCollection<Expression> Arguments { get; }
 
-		public Expression Expression
-		{
-			get;
-			private set;
-		}
+		public ReadOnlyCollection<string> Members { get; }
 
 		protected override Expression VisitChildren(ExpressionVisitor visitor)
 		{
-			var newExpression = visitor.Visit(Expression);
+			var arguments = visitor.VisitAndConvert(Arguments, "VisitNhNew");
 
-			return newExpression != Expression
-					   ? new NhStarExpression(newExpression)
-					   : this;
+			return arguments != Arguments
+				? new NhNewExpression(Members, arguments)
+				: this;
 		}
 	}
-}
+}

src/NHibernate/Linq/Expressions/NhNewExpression.cs

@@ -1,27 +1,29 @@
 using System.Linq.Expressions;
-using Remotion.Linq.Clauses.Expressions;
-using Remotion.Linq.Parsing;
 
 namespace NHibernate.Linq.Expressions
 {
 	/// <summary>
-	/// Represents an expression that has been nominated for direct inclusion in the SELECT clause.
-	/// This bypasses the standard nomination process and assumes that the expression can be converted 
-	/// directly to SQL.
+	///     Represents an expression that has been nominated for direct inclusion in the SELECT clause.
+	///     This bypasses the standard nomination process and assumes that the expression can be converted
+	///     directly to SQL.
 	/// </summary>
 	/// <remarks>
-	/// Used in the nomination of GroupBy key expressions to ensure that matching select clauses
-	/// are generated the same way.
+	///     Used in the nomination of GroupBy key expressions to ensure that matching select clauses
+	///     are generated the same way.
 	/// </remarks>
-	internal class NhNominatedExpression : ExtensionExpression
+	internal class NhNominatedExpression : Expression
 	{
-		public Expression Expression { get; private set; }
-
-		public NhNominatedExpression(Expression expression) : base(expression.Type, (ExpressionType)NhExpressionType.Nominator)
+		public NhNominatedExpression(Expression expression)
 		{
 			Expression = expression;
 		}
 
+		public override ExpressionType NodeType => (ExpressionType) NhExpressionType.Nominator;
+
+		public override System.Type Type => Expression.Type;
+
+		public Expression Expression { get; }
+
 		protected override Expression VisitChildren(ExpressionVisitor visitor)
 		{
 			var newExpression = visitor.Visit(Expression);
@@ -31,4 +33,4 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
 				: this;
 		}
 	}
-}
+}

src/NHibernate/Linq/Expressions/NhNominatedExpression.cs

@@ -0,0 +1,27 @@
+using System.Linq.Expressions;
+
+namespace NHibernate.Linq.Expressions
+{
+	public class NhStarExpression : Expression
+	{
+		public NhStarExpression(Expression expression)
+		{
+			Expression = expression;
+		}
+
+		public Expression Expression { get; }
+
+		public override ExpressionType NodeType => (ExpressionType) NhExpressionType.Star;
+
+		public override System.Type Type => Expression.Type;
+
+		protected override Expression VisitChildren(ExpressionVisitor visitor)
+		{
+			var newExpression = visitor.Visit(Expression);
+
+			return newExpression != Expression
+				? new NhStarExpression(newExpression)
+				: this;
+		}
+	}
+}

src/NHibernate/Linq/Expressions/NhStarExpression.cs

@@ -6,12 +6,13 @@
 using Remotion.Linq.Clauses;
 using Remotion.Linq.Clauses.Expressions;
 using Remotion.Linq.Clauses.ResultOperators;
+using Remotion.Linq.Parsing;
 using Remotion.Linq.Parsing.ExpressionVisitors;
 
 namespace NHibernate.Linq.GroupBy
 {
 	//This should be renamed. It handles entire querymodels, not just select clauses
-	internal class GroupBySelectClauseRewriter : ExpressionTreeVisitor
+	internal class GroupBySelectClauseRewriter : RelinqExpressionVisitor
 	{
 		public static Expression ReWrite(Expression expression, GroupResultOperator groupBy, QueryModel model)
 		{

src/NHibernate/Linq/GroupBy/GroupBySelectClauseRewriter.cs

@@ -12,7 +12,7 @@ namespace NHibernate.Linq.GroupBy
 	/// This class nominates sub-expression trees on the GroupBy Key expression
 	/// for inclusion in the Select clause.
 	/// </summary>
-	internal class GroupKeyNominator : ExpressionTreeVisitor
+	internal class GroupKeyNominator : RelinqExpressionVisitor
 	{
 		private GroupKeyNominator() { }
 

src/NHibernate/Linq/GroupBy/GroupKeyNominator.cs

@@ -4,7 +4,7 @@
 
 namespace NHibernate.Linq.GroupBy
 {
-	internal class KeySelectorVisitor : ExpressionTreeVisitor
+	internal class KeySelectorVisitor : RelinqExpressionVisitor
 	{
 		private readonly GroupResultOperator _groupBy;
 

src/NHibernate/Linq/GroupBy/KeySelectorVisitor.cs

@@ -7,7 +7,7 @@
 
 namespace NHibernate.Linq.GroupJoin
 {
-	public class GroupJoinSelectClauseRewriter : ExpressionTreeVisitor
+	public class GroupJoinSelectClauseRewriter : RelinqExpressionVisitor
 	{
 		private readonly IsAggregatingResults _results;
 

src/NHibernate/Linq/GroupJoin/GroupJoinSelectClauseRewriter.cs

@@ -5,7 +5,7 @@
 
 namespace NHibernate.Linq.GroupJoin
 {
-	public class LocateGroupJoinQuerySource : ExpressionTreeVisitor
+	public class LocateGroupJoinQuerySource : RelinqExpressionVisitor
 	{
 		private readonly IsAggregatingResults _results;
 		private GroupJoinClause _groupJoin;

src/NHibernate/Linq/GroupJoin/LocateGroupJoinQuerySource.cs

@@ -154,7 +154,7 @@ private IsAggregatingResults GetGroupJoinInformation(IEnumerable<GroupJoinClause
 
 	}
 
-	internal class QuerySourceUsageLocator : ExpressionTreeVisitor
+	internal class QuerySourceUsageLocator : RelinqExpressionVisitor
 	{
 		private readonly IQuerySource _querySource;
 		private bool _references;