Code cleanup

Author: hazzik

src/NHibernate/Loader/DefaultEntityAliases.cs

@@ -1,70 +1,58 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using NHibernate.Persister.Entity;
 
 namespace NHibernate.Loader
 {
-	// Based on https://raw.githubusercontent.com/hibernate/hibernate-orm/master/hibernate-core/src/main/java/org/hibernate/loader/DefaultEntityAliases.java
 	/// <summary>
 	/// EntityAliases which handles the logic of selecting user provided aliases (via return-property),
 	/// before using the default aliases.
 	/// </summary>
 	public class DefaultEntityAliases : IEntityAliases
 	{
-		private readonly string[] suffixedKeyColumns;
-		private readonly string[] suffixedVersionColumn;
-		private readonly string[][] suffixedPropertyColumns;
-		private readonly string suffixedDiscriminatorColumn;
-		private readonly string suffix;
-		private string rowIdAlias;
-		private readonly IDictionary<string, string[]> userProvidedAliases;
+		private readonly string _suffix;
+		private readonly IDictionary<string, string[]> _userProvidedAliases;
+		private string _rowIdAlias;
 
 		public DefaultEntityAliases(ILoadable persister, string suffix)
-			: this(null, persister, suffix) {}
+			: this(null, persister, suffix)
+		{
+		}
 
 		/// <summary>
 		/// Calculate and cache select-clause aliases.
 		/// </summary>
 		public DefaultEntityAliases(IDictionary<string, string[]> userProvidedAliases, ILoadable persister, string suffix)
 		{
-			this.suffix = suffix;
-			this.userProvidedAliases = userProvidedAliases?.Count > 0 ? userProvidedAliases : null;
-
-			suffixedKeyColumns = DetermineKeyAliases(persister, suffix);
-			suffixedPropertyColumns = GetSuffixedPropertyAliases(persister);
-			suffixedDiscriminatorColumn = DetermineDiscriminatorAlias(persister, suffix);
+			_suffix = suffix;
+			_userProvidedAliases = userProvidedAliases?.Count > 0 ? userProvidedAliases : null;
 
-			suffixedVersionColumn = persister.IsVersioned ? suffixedPropertyColumns[persister.VersionProperty] : null;
-			//rowIdAlias is generated on demand in property
+			SuffixedKeyAliases = DetermineKeyAliases(persister);
+			SuffixedPropertyAliases = DeterminePropertyAliases(persister);
+			SuffixedDiscriminatorAlias = DetermineDiscriminatorAlias(persister);
+			SuffixedVersionAliases = persister.IsVersioned ? SuffixedPropertyAliases[persister.VersionProperty] : null;
 		}
 
-		private string[] DetermineKeyAliases(ILoadable persister, string suffix)
+		public string[][] GetSuffixedPropertyAliases(ILoadable persister)
 		{
-			if (userProvidedAliases == null)
-				return GetIdentifierAliases(persister, suffix);
-
-			return GetUserProvidedAliases(persister.IdentifierPropertyName)
-					?? GetUserProvidedAliases(EntityPersister.EntityID)
-					?? GetIdentifierAliases(persister, suffix);
+			int size = persister.PropertyNames.Length;
+			string[][] suffixedPropertyAliases = new string[size][];
+			for (int j = 0; j < size; j++)
+			{
+				suffixedPropertyAliases[j] = GetUserProvidedAlias(persister.PropertyNames[j]) ?? GetPropertyAliases(persister, j);
+			}
+			return suffixedPropertyAliases;
 		}
 
-		private string DetermineDiscriminatorAlias(ILoadable persister, string suffix)
-		{
-			if (userProvidedAliases == null)
-				return GetDiscriminatorAlias(persister, suffix);
+		public string[] SuffixedVersionAliases { get; }
 
-			return GetUserProvidedAlias(AbstractEntityPersister.EntityClass)
-					?? GetDiscriminatorAlias(persister, suffix);
-		}
+		public string[][] SuffixedPropertyAliases { get; }
 
-		/// <summary>
-		/// Returns default aliases for all the properties
-		/// </summary>
-		protected string[][] GetPropertiesAliases(ILoadable persister)
-		{
-			return Enumerable.Range(0, persister.PropertyNames.Length).Select(i => GetPropertyAliases(persister, i)).ToArray();
-		}
+		public string SuffixedDiscriminatorAlias { get; }
+
+		public string[] SuffixedKeyAliases { get; }
+
+		// TODO: not visible to the user!
+		public string RowIdAlias => _rowIdAlias ?? (_rowIdAlias = Loadable.RowIdAlias + _suffix);
 
 		protected virtual string GetDiscriminatorAlias(ILoadable persister, string suffix)
 		{
@@ -78,66 +66,40 @@ protected virtual string[] GetIdentifierAliases(ILoadable persister, string suff
 
 		protected virtual string[] GetPropertyAliases(ILoadable persister, int j)
 		{
-			return persister.GetPropertyAliases(suffix, j);
+			return persister.GetPropertyAliases(_suffix, j);
 		}
 
-		private string[] GetUserProvidedAliases(string propertyPath)
+		private string[] DetermineKeyAliases(ILoadable persister)
 		{
-			if (propertyPath == null)
-				return null;
-
-			string[] result;
-			userProvidedAliases.TryGetValue(propertyPath, out result);
-			return result;
+			return
+				GetUserProvidedAlias(persister.IdentifierPropertyName) ??
+				GetUserProvidedAlias(EntityPersister.EntityID) ??
+				GetIdentifierAliases(persister, _suffix);
 		}
 
-		private string GetUserProvidedAlias(string propertyPath)
+		private string[][] DeterminePropertyAliases(ILoadable persister)
 		{
-			return GetUserProvidedAliases(propertyPath)?[0];
-
+			return GetSuffixedPropertyAliases(persister);
 		}
 
-		/// <summary>
-		/// Returns aliases for subclass persister
-		/// </summary>
-		public string[][] GetSuffixedPropertyAliases(ILoadable persister)
+		private string DetermineDiscriminatorAlias(ILoadable persister)
 		{
-			if (userProvidedAliases == null)
-				return GetPropertiesAliases(persister);
-
-			int size = persister.PropertyNames.Length;
-			string[][] suffixedPropertyAliases = new string[size][];
-			for (int j = 0; j < size; j++)
+			string[] columns = GetUserProvidedAlias(AbstractEntityPersister.EntityClass);
+			if (columns != null)
 			{
-				suffixedPropertyAliases[j] = GetUserProvidedAliases(persister.PropertyNames[j]) ?? GetPropertyAliases(persister, j);
+				return columns[0];
 			}
-			return suffixedPropertyAliases;
-		}
-
-		public string[] SuffixedVersionAliases
-		{
-			get { return suffixedVersionColumn; }
-		}
-
-		public string[][] SuffixedPropertyAliases
-		{
-			get { return suffixedPropertyColumns; }
-		}
-
-		public string SuffixedDiscriminatorAlias
-		{
-			get { return suffixedDiscriminatorColumn; }
+			return GetDiscriminatorAlias(persister, _suffix);
 		}
 
-		public string[] SuffixedKeyAliases
+		private string[] GetUserProvidedAlias(string propertyPath)
 		{
-			get { return suffixedKeyColumns; }
-		}
-
-		public string RowIdAlias
-		{
-			// TODO: not visible to the user!
-			get { return rowIdAlias ?? (rowIdAlias = Loadable.RowIdAlias + suffix); }
+			string[] result = null;
+			if (propertyPath != null)
+			{
+				_userProvidedAliases?.TryGetValue(propertyPath, out result);
+			}
+			return result;
 		}
 	}
 }