Simplified ISupportEntityJoinQueryOver interface

Author: bahusoid

src/NHibernate/Criterion/ISupportEntityJoinQueryOver.cs

@@ -4,14 +4,8 @@
 
 namespace NHibernate.Criterion
 {
-	// 6.0 TODO: merge into IQueryOver.
-	public interface ISupportEntityJoinQueryOver
-	{
-		void JoinEntityAlias<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName);
-	}
-
 	// 6.0 TODO: merge into IQueryOver<TRoot,TSubType>.
-	public interface ISupportEntityJoinQueryOver<TRoot>: ISupportEntityJoinQueryOver
+	public interface ISupportEntityJoinQueryOver<TRoot>
 	{
 		IQueryOver<TRoot, U> JoinEntityQueryOver<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName);
 	}

src/NHibernate/Criterion/QueryOver.cs

@@ -670,7 +670,7 @@ public QueryOver<TRoot, U> JoinEntityQueryOver<U>(Expression<Func<U>> alias, Exp
 
 		public QueryOver<TRoot, U> JoinEntityQueryOver<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType = JoinType.InnerJoin, string entityName = null)
 		{
-			return Create<U>(CreateEntityCriteria(alias, joinType, withClause, entityName));
+			return Create<U>(criteria.CreateEntityCriteria(alias, withClause, joinType, entityName));
 		}
 
 		public QueryOver<TRoot,TSubType> JoinAlias(Expression<Func<TSubType, object>> path, Expression<Func<object>> alias)
@@ -773,11 +773,6 @@ private QueryOver<TRoot,TSubType> AddAlias(string path, string alias, JoinType j
 			return this;
 		}
 
-		private ICriteria CreateEntityCriteria<U>(Expression<Func<U>> alias, JoinType joinType, ICriterion withClause, string entityName)
-		{
-			return criteria.CreateEntityCriteria(ExpressionProcessor.FindMemberExpression(alias.Body), withClause, joinType, entityName ?? typeof(U).FullName);
-		}
-
 		private QueryOver<TRoot,TSubType> Add(Expression<Func<TSubType, bool>> expression)
 		{
 			criteria.Add(ExpressionProcessor.ProcessExpression<TSubType>(expression));
@@ -999,11 +994,6 @@ IQueryOver<TRoot, U> ISupportEntityJoinQueryOver<TRoot>.JoinEntityQueryOver<U>(E
 			return JoinEntityQueryOver(alias, withClause, joinType, entityName);
 		}
 
-		void ISupportEntityJoinQueryOver.JoinEntityAlias<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName)
-		{
-			CreateEntityCriteria(alias, joinType, withClause, entityName);
-		}
-
 		IQueryOverJoinBuilder<TRoot,TSubType> IQueryOver<TRoot,TSubType>.Inner
 		{ get { return new IQueryOverJoinBuilder<TRoot,TSubType>(this, JoinType.InnerJoin); } }
 

src/NHibernate/EntityJoinExtensions.cs

@@ -10,8 +10,7 @@ public static class EntityJoinExtensions
 	{
 		public static TThis JoinEntityAlias<TThis, TEntity>(this TThis queryOver, Expression<Func<TEntity>> alias, ICriterion withClause, JoinType joinType = JoinType.InnerJoin, string entityName = null) where TThis : IQueryOver
 		{
-			var q = CastOrThrow<ISupportEntityJoinQueryOver>(queryOver);
-			q.JoinEntityAlias(alias, withClause, joinType, entityName);
+			CreateEntityCriteria(queryOver.UnderlyingCriteria, alias, withClause, joinType, entityName);
 			return queryOver;
 		}
 
@@ -37,12 +36,17 @@ public static ICriteria CreateEntityAlias(this ICriteria criteria, string alias,
 			return criteria;
 		}
 
-		public static ICriteria CreateEntityCriteria(this ICriteria criteria, string alias, ICriterion withClause, JoinType joinType, string entityName)
+		public static ICriteria CreateEntityCriteria(this ICriteria criteria, string alias, ICriterion withClause, JoinType joinType = JoinType.InnerJoin, string entityName = null)
 		{
 			var c = CastOrThrow<ISupportEntityJoinCriteria>(criteria);
 			return c.CreateEntityCriteria(alias, withClause, joinType, entityName);
 		}
 
+		public static ICriteria CreateEntityCriteria<U>(this ICriteria criteria, Expression<Func<U>> alias, ICriterion withClause, JoinType joinType = JoinType.InnerJoin, string entityName = null)
+		{
+			return CreateEntityCriteria(criteria, ExpressionProcessor.FindMemberExpression(alias.Body), withClause, joinType, entityName ?? typeof(U).FullName);
+		}
+
 		private static T CastOrThrow<T>(object obj) where T : class
 		{
 			return obj as T