Clean up

Author: bahusoid

src/NHibernate/Criterion/EntityProjection.cs

@@ -17,6 +17,7 @@ public class EntityProjection : IProjection
 		private string _entityAlias;
 		private System.Type _rootEntity;
 		private IType[] _types;
+		private string[] _identifierColumnAliases;
 
 		/// <summary>
 		/// Root entity projection
@@ -46,20 +47,15 @@ public EntityProjection(System.Type rootEntity, string entityAlias)
 		/// </summary>
 		public bool Lazy { get; set; }
 
-		internal string[] IdentifierColumnAliases { get; set; }
 		internal IQueryable Persister { get; private set; }
-		
-
-		public string ColumnAliasSuffix { get; private set; }
-		public string TableAlias { get; private set; }
+		internal string ColumnAliasSuffix { get; private set; }
+		internal string TableAlias { get; private set; }
 
 		#region Configuration methods
 
 		/// <summary>
 		/// Lazy load entity
 		/// </summary>
-		/// <param name="lazy"></param>
-		/// <returns></returns>
 		public EntityProjection SetLazy(bool lazy = true)
 		{
 			Lazy = lazy;
@@ -69,8 +65,6 @@ public EntityProjection SetLazy(bool lazy = true)
 		/// <summary>
 		/// Fetch lazy properties
 		/// </summary>
-		/// <param name="fetchLazyProperties"></param>
-		/// <returns></returns>
 		public EntityProjection SetFetchLazyProperties(bool fetchLazyProperties = true)
 		{
 			FetchLazyProperties = fetchLazyProperties;
@@ -81,27 +75,15 @@ public EntityProjection SetFetchLazyProperties(bool fetchLazyProperties = true)
 
 		#region IProjection implementation
 
-		/// <summary>
-		/// Entity alias
-		/// </summary>
-		public string[] Aliases
-		{
-			get { return new[] {_entityAlias}; }
-		}
+		string[] IProjection.Aliases => new[] { _entityAlias };
 
-		bool IProjection.IsAggregate
-		{
-			get { return false; }
-		}
+		bool IProjection.IsAggregate => false;
 
-		bool IProjection.IsGrouped
-		{
-			get { return false; }
-		}
+		bool IProjection.IsGrouped => false;
 
 		IType[] IProjection.GetTypes(string alias, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			return new[] {criteriaQuery.GetType(criteria, alias)};
+			return new[] { criteriaQuery.GetType(criteria, alias) };
 		}
 
 		IType[] IProjection.GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)
@@ -115,19 +97,18 @@ string[] IProjection.GetColumnAliases(int position, ICriteria criteria, ICriteri
 		{
 			SetFields(criteria, criteriaQuery);
 
-			return IdentifierColumnAliases;
+			return _identifierColumnAliases;
 		}
 
 		string[] IProjection.GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
 			SetFields(criteria, criteriaQuery);
 
-			return IdentifierColumnAliases;
+			return _identifierColumnAliases;
 		}
 
 		SqlString IProjection.ToSqlString(ICriteria criteria, int position, ICriteriaQuery criteriaQuery)
 		{
-			//return new SqlString(string.Empty);
 			SetFields(criteria, criteriaQuery);
 
 			string identifierSelectFragment = Persister.IdentifierSelectFragment(TableAlias, ColumnAliasSuffix);
@@ -141,12 +122,12 @@ SqlString IProjection.ToSqlString(ICriteria criteria, int position, ICriteriaQue
 
 		SqlString IProjection.ToGroupSqlString(ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			throw new NotImplementedException();
+			throw new InvalidOperationException("not a grouping projection");
 		}
 
 		TypedValue[] IProjection.GetTypedValues(ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			throw new NotImplementedException();
+			return Array.Empty<TypedValue>();
 		}
 
 		#endregion IProjection implementation
@@ -192,9 +173,9 @@ private void SetFields(ICriteria criteria, ICriteriaQuery criteriaQuery)
 
 			ColumnAliasSuffix = BasicLoader.GenerateSuffix(criteriaQuery.GetIndexForAlias());
 
-			IdentifierColumnAliases = Persister.GetIdentifierAliases(ColumnAliasSuffix);
+			_identifierColumnAliases = Persister.GetIdentifierAliases(ColumnAliasSuffix);
 
-			_types = new IType[] {TypeFactory.ManyToOne(Persister.EntityName, true),};
+			_types = new IType[] { TypeFactory.ManyToOne(Persister.EntityName, true), };
 		}
 	}
 }

src/NHibernate/Criterion/ProjectionsExtensions.cs

@@ -25,7 +25,7 @@ public static IProjection WithAlias(this IProjection			projection,
 		/// Create an alias for a projection
 		/// </summary>
 		/// <param name="projection">the projection instance</param>
-		/// <param name="alias">LambdaExpression returning an alias</param>
+		/// <param name="alias">alias</param>
 		/// <returns>return NHibernate.Criterion.IProjection</returns>
 		public static IProjection WithAlias(this IProjection projection, string alias)
 		{

src/NHibernate/Loader/AbstractEntityJoinWalker.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using NHibernate.Criterion;
 using NHibernate.Engine;
 using NHibernate.Loader.Criteria;
@@ -40,26 +39,37 @@ protected virtual void InitAll(SqlString whereString, SqlString orderByString, L
 			InitStatementString(whereString, orderByString, lockMode);
 		}
 
-		protected void InitProjection(SqlString projectionString, SqlString whereString, SqlString orderByString, SqlString groupByString, SqlString havingString, IDictionary<string, IFilter> enabledFilters, LockMode lockMode, IList<EntityProjection> entityProjections = null)
+		//Since v5.1
+		[Obsolete("Please use InitProjection(SqlString projectionString, SqlString whereString, SqlString orderByString, SqlString groupByString, SqlString havingString, IDictionary<string, IFilter> enabledFilters, LockMode lockMode, IList<EntityProjection> entityProjections) instead")]
+		protected void InitProjection(SqlString projectionString, SqlString whereString, SqlString orderByString, SqlString groupByString, SqlString havingString, IDictionary<string, IFilter> enabledFilters, LockMode lockMode)
+		{
+			InitProjection(projectionString, whereString, orderByString, groupByString, havingString, enabledFilters, lockMode, Array.Empty<EntityProjection>());
+		}
+
+		protected void InitProjection(SqlString projectionString, SqlString whereString, SqlString orderByString, SqlString groupByString, SqlString havingString, IDictionary<string, IFilter> enabledFilters, LockMode lockMode, IList<EntityProjection> entityProjections)
 		{
 			WalkEntityTree(persister, Alias);
-			if (entityProjections?.Count > 0)
+
+			int countEntities = entityProjections.Count;
+			if (countEntities > 0)
 			{
-				var list = new List<OuterJoinableAssociation>();
-				var eagerProps = new bool[entityProjections.Count];
-				for (var i = 0; i < entityProjections.Count; i++)
+				var associations = new OuterJoinableAssociation[countEntities];
+				var eagerProps = new bool[countEntities];
+				var suffixes = new string[countEntities];
+				for (var i = 0; i < countEntities; i++)
 				{
 					var e = entityProjections[i];
-					list.Add(
-						CreateAssociation(e.Persister.EntityMetamodel.EntityType, e.TableAlias));
+					associations[i] = CreateAssociation(e.Persister.EntityMetamodel.EntityType, e.TableAlias);
 					if (e.FetchLazyProperties)
 					{
 						eagerProps[i] = true;
 					}
+					suffixes[i] = e.ColumnAliasSuffix;
 				}
 
-				InitPersisters(list, lockMode);
-				Suffixes = entityProjections.Select(ep => ep.ColumnAliasSuffix).ToArray();
+				InitPersisters(associations, lockMode);
+
+				Suffixes = suffixes;
 				EagerPropertyFetches = eagerProps;
 			}
 			else
@@ -69,7 +79,6 @@ protected void InitProjection(SqlString projectionString, SqlString whereString,
 			}
 
 			InitStatementString(projectionString, whereString, orderByString, groupByString, havingString, lockMode);
-			
 		}
 
 		private OuterJoinableAssociation CreateAssociation(EntityType entityType, string tableAlias)

src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs

@@ -26,7 +26,7 @@ public class CriteriaQueryTranslator : ICriteriaQuery, ISupportEntityProjectionC
 		private readonly string rootEntityName;
 		private readonly string rootSQLAlias;
 		private int indexForAlias = 0;
-		private IList<EntityProjection> _entityProjections = new List<EntityProjection>();
+		private readonly List<EntityProjection> entityProjections = new List<EntityProjection>();
 
 		private readonly IDictionary<ICriteria, ICriteriaInfoProvider> criteriaInfoMap =
 			new Dictionary<ICriteria, ICriteriaInfoProvider>();
@@ -46,7 +46,6 @@ public class CriteriaQueryTranslator : ICriteriaQuery, ISupportEntityProjectionC
 		private readonly ICollection<IParameterSpecification> collectedParameterSpecifications;
 		private readonly ICollection<NamedParameter> namedParameters;
 		private readonly ISet<string> subQuerySpaces = new HashSet<string>();
-		public IList<EntityProjection> entityProjections = new List<EntityProjection>();
 
 
 
@@ -195,12 +194,12 @@ public string[] ProjectedAliases
 
 		public IList<EntityProjection> GetEntityProjections()
 		{
-			return _entityProjections;
+			return entityProjections;
 		}
 
 		public void RegisterEntityProjection(EntityProjection projection)
 		{
-			_entityProjections.Add(projection);
+			entityProjections.Add(projection);
 		}
 
 		public SqlString GetWhereCondition()
@@ -878,6 +877,6 @@ private void CreateSubQuerySpaces()
 				subQuerySpaces.UnionWith(translator.GetQuerySpaces());
 			}
 
-		}
+		}	
 	}
-}
+}

src/NHibernate/Loader/Criteria/ISupportEntityProjectionCriteriaQuery.cs

@@ -2,8 +2,9 @@
 
 namespace NHibernate.Loader.Criteria
 {
+	// 6.0 TODO: merge into 'ICriteriaQuery'.
 	public interface ISupportEntityProjectionCriteriaQuery
 	{
 		void RegisterEntityProjection(EntityProjection projection);
 	}
-}
+}