Code cleanup

Author: hazzik

src/NHibernate/Criterion/ConditionalProjection.cs

@@ -7,60 +7,52 @@
 namespace NHibernate.Criterion
 {
 	/// <summary>
-	/// Defines a "switch" projection which supports multiple "cases" ("when/then's") using <see cref="ConditionalProjectionCase"/>.
-	/// Can be used in Orderby for example.
+	/// Defines a "switch" projection which supports multiple "cases" ("when/then's").
 	/// </summary>
 	/// <seealso cref="SimpleProjection" />
 	/// <seealso cref="ConditionalProjectionCase" />
 	[Serializable]
 	public class ConditionalProjection : SimpleProjection
 	{
-		private readonly ConditionalProjectionCase[] cases;
-		private readonly IProjection elseProjection;
+		private readonly ConditionalProjectionCase[] _cases;
+		private readonly IProjection _elseProjection;
 
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ConditionalProjection"/> class.
+		/// </summary>
+		/// <param name="criterion">The <see cref="ICriterion"/></param>
+		/// <param name="whenTrue">The true <see cref="IProjection"/></param>
+		/// <param name="whenFalse">The else <see cref="IProjection"/>.</param>
 		public ConditionalProjection(ICriterion criterion, IProjection whenTrue, IProjection whenFalse)
 		{
-			elseProjection = whenFalse;
-			cases = new[] {new ConditionalProjectionCase(criterion, whenTrue)};
+			_elseProjection = whenFalse;
+			_cases = new[] {new ConditionalProjectionCase(criterion, whenTrue)};
 		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ConditionalProjection"/> class.
 		/// </summary>
-		/// <param name="cases">The <see cref="ConditionalProjectionCase"/>s containg your <see cref="ICriterion"/> and <see cref="IProjection"/> pairs.</param>
+		/// <param name="cases">The <see cref="ConditionalProjectionCase"/>s containing <see cref="ICriterion"/> and <see cref="IProjection"/> pairs.</param>
 		/// <param name="elseProjection">The else <see cref="IProjection"/>.</param>
-		/// <exception cref="ArgumentNullException"><paramref name="cases"/> is null.</exception>
-		/// <exception cref="ArgumentNullException"><paramref name="elseProjection"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException"><paramref name="cases"/> should not be empty.</exception>
 		public ConditionalProjection(ConditionalProjectionCase[] cases, IProjection elseProjection)
 		{
-			if (elseProjection is null)
-			{
-				throw new ArgumentNullException(nameof(elseProjection));
-			}
-
-			if (cases is null)
-			{
+			if (cases == null)
 				throw new ArgumentNullException(nameof(cases));
-			}
-
 			if (cases.Length == 0)
-			{
-				throw new ArgumentOutOfRangeException(nameof(this.cases), "Array should not be empty.");
-			}
+				throw new ArgumentException("Array should not be empty.", nameof(cases));
 
-			this.cases = cases;
-			this.elseProjection = elseProjection;
+			_cases = cases;
+			_elseProjection = elseProjection;
 		}
 
 		public override bool IsAggregate
 		{
 			get
 			{
-				if (elseProjection.IsAggregate)
+				if (_elseProjection.IsAggregate)
 					return true;
 
-				foreach (var projectionCase in cases)
+				foreach (var projectionCase in _cases)
 				{
 					if (projectionCase.Projection.IsAggregate)
 						return true;
@@ -86,10 +78,10 @@ public override bool IsGrouped
 		{
 			get
 			{
-				if (elseProjection.IsGrouped)
+				if (_elseProjection.IsGrouped)
 					return true;
 
-				foreach (var projectionCase in cases)
+				foreach (var projectionCase in _cases)
 				{
 					if (projectionCase.Projection.IsGrouped)
 						return true;
@@ -111,11 +103,11 @@ public override bool IsGrouped
 
 		public override SqlString ToSqlString(ICriteria criteria, int position, ICriteriaQuery criteriaQuery)
 		{
-			var sqlBuilder = new SqlStringBuilder(5 + cases.Length * 4);
+			var sqlBuilder = new SqlStringBuilder(5 + _cases.Length * 4);
 
 			sqlBuilder.Add("(case");
 
-			foreach (var projectionCase in cases)
+			foreach (var projectionCase in _cases)
 			{
 				sqlBuilder.Add(" when ");
 				sqlBuilder.Add(projectionCase.Criterion.ToSqlString(criteria, criteriaQuery));
@@ -124,7 +116,7 @@ public override SqlString ToSqlString(ICriteria criteria, int position, ICriteri
 			}
 
 			sqlBuilder.Add(" else ");
-			sqlBuilder.AddObject(CriterionUtil.GetColumnNameAsSqlStringPart(elseProjection, criteriaQuery, criteria));
+			sqlBuilder.AddObject(CriterionUtil.GetColumnNameAsSqlStringPart(_elseProjection, criteriaQuery, criteria));
 
 			sqlBuilder.Add(" end) as ");
 			sqlBuilder.Add(GetColumnAlias(position));
@@ -134,11 +126,11 @@ public override SqlString ToSqlString(ICriteria criteria, int position, ICriteri
 
 		public override IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			var elseTypes = elseProjection.GetTypes(criteria, criteriaQuery);
+			var elseTypes = _elseProjection.GetTypes(criteria, criteriaQuery);
 
-			for (var i = 0; i < cases.Length; i++)
+			for (var i = 0; i < _cases.Length; i++)
 			{
-				var subsequentTypes = cases[i].Projection.GetTypes(criteria, criteriaQuery);
+				var subsequentTypes = _cases[i].Projection.GetTypes(criteria, criteriaQuery);
 				if (!AreTypesEqual(elseTypes, subsequentTypes))
 				{
 					string msg = "All projections must return the same types." + Environment.NewLine +
@@ -156,13 +148,13 @@ public override TypedValue[] GetTypedValues(ICriteria criteria, ICriteriaQuery c
 		{
 			var typedValues = new List<TypedValue>();
 
-			foreach (var projectionCase in cases)
+			foreach (var projectionCase in _cases)
 			{
 				typedValues.AddRange(projectionCase.Criterion.GetTypedValues(criteria, criteriaQuery));
 				typedValues.AddRange(projectionCase.Projection.GetTypedValues(criteria, criteriaQuery));
 			}
 
-			typedValues.AddRange(elseProjection.GetTypedValues(criteria, criteriaQuery));
+			typedValues.AddRange(_elseProjection.GetTypedValues(criteria, criteriaQuery));
 
 			return typedValues.ToArray();
 		}
@@ -171,13 +163,13 @@ public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery cr
 		{
 			var sqlBuilder = new SqlStringBuilder();
 
-			foreach (var projection in cases)
+			foreach (var projection in _cases)
 			{
 				AddToGroupedSql(sqlBuilder, projection.Criterion.GetProjections(), criteria, criteriaQuery);
 				AddToGroupedSql(sqlBuilder, projection.Projection, criteria, criteriaQuery);
 			}
 
-			AddToGroupedSql(sqlBuilder, elseProjection, criteria, criteriaQuery);
+			AddToGroupedSql(sqlBuilder, _elseProjection, criteria, criteriaQuery);
 
 			// Remove last comma 
 			if (sqlBuilder.Count >= 2)