Use collection types for private members

Author: bahusoid

src/NHibernate/AdoNet/AbstractBatcher.cs

@@ -37,7 +37,7 @@ public abstract partial class AbstractBatcher : IBatcher
 		private SqlType[] _batchCommandParameterTypes;
 		private readonly HashSet<DbCommand> _commandsToClose = new HashSet<DbCommand>();
 		private readonly HashSet<DbDataReader> _readersToClose = new HashSet<DbDataReader>();
-		private readonly IDictionary<DbDataReader, Stopwatch> _readersDuration = new Dictionary<DbDataReader, Stopwatch>();
+		private readonly Dictionary<DbDataReader, Stopwatch> _readersDuration = new Dictionary<DbDataReader, Stopwatch>();
 		private DbCommand _lastQuery;
 		private bool _releasing;
 

src/NHibernate/AdoNet/HanaBatchingBatcher.cs

@@ -17,7 +17,7 @@ public partial class HanaBatchingBatcher : AbstractBatcher
 		private int _countOfCommands;
 		private int _totalExpectedRowsAffected;
 		private DbCommand _currentBatch;
-		private readonly IList<DbCommand> _currentBatchCommands = new List<DbCommand>();
+		private readonly List<DbCommand> _currentBatchCommands = new List<DbCommand>();
 		private StringBuilder _currentBatchCommandsLog;
 
 		public HanaBatchingBatcher(ConnectionManager connectionManager, IInterceptor interceptor)

src/NHibernate/AdoNet/OracleDataClientBatchingBatcher.cs

@@ -17,8 +17,8 @@ public partial class OracleDataClientBatchingBatcher : AbstractBatcher
 		private int _countOfCommands;
 		private int _totalExpectedRowsAffected;
 		private DbCommand _currentBatch;
-		private IDictionary<string, List<object>> _parameterValueListHashTable;
-		private IDictionary<string, bool> _parameterIsAllNullsHashTable;
+		private Dictionary<string, List<object>> _parameterValueListHashTable;
+		private Dictionary<string, bool> _parameterIsAllNullsHashTable;
 		private StringBuilder _currentBatchCommandsLog;
 
 		public OracleDataClientBatchingBatcher(ConnectionManager connectionManager, IInterceptor interceptor)

src/NHibernate/Async/Collection/Generic/PersistentGenericSet.cs

@@ -169,4 +169,4 @@ public override Task<bool> NeedsUpdatingAsync(object entry, int i, IType elemTyp
 			}
 		}
 	}
-}
+}

src/NHibernate/Cfg/Configuration.cs

@@ -818,7 +818,7 @@ public Configuration AddAssembly(Assembly assembly)
 			return this;
 		}
 
-		private static IList<string> GetAllHbmXmlResourceNames(Assembly assembly)
+		private static List<string> GetAllHbmXmlResourceNames(Assembly assembly)
 		{
 			var result = new List<string>();
 

src/NHibernate/Cfg/ConfigurationSchema/EventConfiguration.cs

@@ -49,7 +49,7 @@ public ListenerType Type
 			get { return type; }
 		}
 
-		private IList<ListenerConfiguration> listeners = new List<ListenerConfiguration>();
+		private List<ListenerConfiguration> listeners = new List<ListenerConfiguration>();
 		/// <summary>
 		/// Listeners for this event.
 		/// </summary>

src/NHibernate/Cfg/MappingSchema/HbmDatabaseObject.cs

@@ -17,7 +17,7 @@ public HbmDefinition FindDefinition()
 
 		public IList<string> FindDialectScopeNames()
 		{
-			IList<string> dialectScopeNames = new List<string>();
+			var dialectScopeNames = new List<string>();
 
 			if (dialectscope != null)
 				foreach (HbmDialectScope dialectScopeSchema in dialectscope)
@@ -37,4 +37,4 @@ public bool HasDefinition()
 			return FindDefinition() != null;
 		}
 	}
-}
+}

src/NHibernate/Cfg/MappingsQueue.cs

@@ -11,7 +11,7 @@ namespace NHibernate.Cfg
 	public class MappingsQueue
 	{
 		private readonly Queue availableEntries = new Queue();
-		private readonly ISet<string> processedClassNames = new HashSet<string>();
+		private readonly HashSet<string> processedClassNames = new HashSet<string>();
 
 		private readonly List<MappingsQueueEntry> unavailableEntries = new List<MappingsQueueEntry>();
 
@@ -109,4 +109,4 @@ private static string FormatExceptionMessage(IEnumerable<MappingsQueueEntry> res
 			return message.ToString();
 		}
 	}
-}
+}

src/NHibernate/Cfg/SessionFactoryConfigurationBase.cs

@@ -6,12 +6,12 @@ namespace NHibernate.Cfg
 	public class SessionFactoryConfigurationBase : ISessionFactoryConfiguration
 	{
 		private string name = string.Empty;
-		private readonly IDictionary<string, string> properties = new Dictionary<string, string>();
-		private readonly IList<MappingConfiguration> mappings = new List<MappingConfiguration>();
-		private readonly IList<ClassCacheConfiguration> classesCache= new List<ClassCacheConfiguration>();
-		private readonly IList<CollectionCacheConfiguration> collectionsCache= new List<CollectionCacheConfiguration>();
-		private readonly IList<EventConfiguration> events= new List<EventConfiguration>();
-		private readonly IList<ListenerConfiguration> listeners= new List<ListenerConfiguration>();
+		private readonly Dictionary<string, string> properties = new Dictionary<string, string>();
+		private readonly List<MappingConfiguration> mappings = new List<MappingConfiguration>();
+		private readonly List<ClassCacheConfiguration> classesCache= new List<ClassCacheConfiguration>();
+		private readonly List<CollectionCacheConfiguration> collectionsCache= new List<CollectionCacheConfiguration>();
+		private readonly List<EventConfiguration> events= new List<EventConfiguration>();
+		private readonly List<ListenerConfiguration> listeners= new List<ListenerConfiguration>();
 
 		/// <summary>
 		/// The session factory name.
@@ -70,4 +70,4 @@ public IList<ListenerConfiguration> Listeners
 			get { return listeners; }
 		}
 	}
-}
+}

src/NHibernate/Cfg/XmlHbmBinding/NamedSQLQueryBinder.cs

@@ -33,8 +33,8 @@ public void AddSqlQuery(HbmSqlQuery querySchema)
 												? querySchema.cachemode.ToCacheMode()
 												: null;
 
-					IDictionary<string,string> parameterTypes = new LinkedHashMap<string,string>();
-					IList<string> synchronizedTables = GetSynchronizedTables(querySchema);
+					var parameterTypes = new LinkedHashMap<string,string>();
+					var synchronizedTables = GetSynchronizedTables(querySchema);
 
 					NamedSQLQueryDefinition namedQuery;
 
@@ -58,9 +58,9 @@ public void AddSqlQuery(HbmSqlQuery querySchema)
 				});
 		}
 
-		private static IList<string> GetSynchronizedTables(HbmSqlQuery querySchema)
+		private static List<string> GetSynchronizedTables(HbmSqlQuery querySchema)
 		{
-			IList<string> synchronizedTables = new List<string>();
+			var synchronizedTables = new List<string>();
 
 			foreach (object item in querySchema.Items ?? Array.Empty<object>())
 			{

src/NHibernate/Collection/Generic/PersistentGenericSet.cs

@@ -38,7 +38,7 @@ public partial class PersistentGenericSet<T> : AbstractPersistentCollection, ISe
 		/// process.
 		/// </remarks>
 		[NonSerialized]
-		private IList<T> _tempList;
+		private List<T> _tempList;
 
 		// needed for serialization
 		public PersistentGenericSet()
@@ -617,4 +617,4 @@ public void Operate()
 
 		#endregion
 	}
-}
+}

src/NHibernate/Criterion/Junction.cs

@@ -16,7 +16,7 @@ namespace NHibernate.Criterion
 	[Serializable]
 	public abstract class Junction : AbstractCriterion
 	{
-		private readonly IList<ICriterion> criteria = new List<ICriterion>();
+		private readonly List<ICriterion> criteria = new List<ICriterion>();
 
 		/// <summary>
 		/// Adds an <see cref="ICriterion"/> to the list of <see cref="ICriterion"/>s

src/NHibernate/Criterion/ProjectionList.cs

@@ -12,7 +12,7 @@ namespace NHibernate.Criterion
 	[Serializable]
 	public class ProjectionList : IProjection
 	{
-		private IList<IProjection> elements = new List<IProjection>();
+		private List<IProjection> elements = new List<IProjection>();
 
 		protected internal ProjectionList()
 		{
@@ -41,7 +41,7 @@ public ProjectionList Add<T>(IProjection projection, Expression<Func<T>> alias)
 
 		public IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			IList<IType> types = new List<IType>(Length);
+			var types = new List<IType>(Length);
 
 			for (int i = 0; i < Length; i++)
 			{

src/NHibernate/Driver/NDataReader.cs

@@ -492,10 +492,10 @@ private partial class NResult
 
 			// key = field name
 			// index = field index
-			private readonly IDictionary<string, int> fieldNameToIndex = new Dictionary<string, int>();
-			private readonly IList<string> fieldIndexToName = new List<string>();
-			private readonly IList<System.Type> fieldTypes = new List<System.Type>();
-			private readonly IList<string> fieldDataTypeNames = new List<string>();
+			private readonly Dictionary<string, int> fieldNameToIndex = new Dictionary<string, int>();
+			private readonly List<string> fieldIndexToName = new List<string>();
+			private readonly List<System.Type> fieldTypes = new List<System.Type>();
+			private readonly List<string> fieldDataTypeNames = new List<string>();
 
 			private NResult() { }
 

src/NHibernate/Driver/SqlStringFormatter.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using NHibernate.SqlCommand;
 using NHibernate.Engine.Query;
@@ -15,7 +14,7 @@ public class SqlStringFormatter : ISqlStringVisitor
 		private readonly string multipleQueriesSeparator;
 		private bool hasReturnParameter;
 		private bool foundReturnParameter = false;
-		private IList<string> assignedParameterNames = new List<string>();
+		private readonly List<string> assignedParameterNames = new List<string>();
 
 		public SqlStringFormatter(ISqlParameterFormatter formatter, string multipleQueriesSeparator)
 		{

src/NHibernate/Engine/BatchFetchQueue.cs

@@ -22,16 +22,16 @@ public partial class BatchFetchQueue
 		/// A Map structure is used to segment the keys by entity type since loading can only be done for a particular entity
 		/// type at a time.
 		/// </remarks>
-		private readonly IDictionary<string, LinkedHashSet<EntityKey>> batchLoadableEntityKeys = new Dictionary<string, LinkedHashSet<EntityKey>>(8);
+		private readonly Dictionary<string, LinkedHashSet<EntityKey>> batchLoadableEntityKeys = new Dictionary<string, LinkedHashSet<EntityKey>>(8);
 
 		/// <summary>
 		/// A map of <see cref="SubselectFetch">subselect-fetch descriptors</see>
 		/// keyed by the <see cref="EntityKey" /> against which the descriptor is
 		/// registered.
 		/// </summary>
-		private readonly IDictionary<EntityKey, SubselectFetch> subselectsByEntityKey = new Dictionary<EntityKey, SubselectFetch>(8);
+		private readonly Dictionary<EntityKey, SubselectFetch> subselectsByEntityKey = new Dictionary<EntityKey, SubselectFetch>(8);
 
-		private readonly IDictionary<string, LinkedHashMap<CollectionEntry, IPersistentCollection>> batchLoadableCollections = new Dictionary<string, LinkedHashMap<CollectionEntry, IPersistentCollection>>(8);
+		private readonly Dictionary<string, LinkedHashMap<CollectionEntry, IPersistentCollection>> batchLoadableCollections = new Dictionary<string, LinkedHashMap<CollectionEntry, IPersistentCollection>>(8);
 		/// <summary>
 		/// The owning persistence context.
 		/// </summary>

src/NHibernate/Engine/FilterDefinition.cs

@@ -13,7 +13,7 @@ public class FilterDefinition
 	{
 		private readonly string filterName;
 		private readonly string defaultFilterCondition;
-		private readonly IDictionary<string, IType> parameterTypes= new Dictionary<string, IType>();
+		private readonly IDictionary<string, IType> parameterTypes;
 		private readonly bool useInManyToOne;
 
 		/// <summary>

src/NHibernate/Engine/Loading/CollectionLoadContext.cs

@@ -25,7 +25,7 @@ public partial class CollectionLoadContext
 		private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(CollectionLoadContext));
 		private readonly LoadContexts loadContexts;
 		private readonly DbDataReader resultSet;
-		private readonly ISet<CollectionKey> localLoadingCollectionKeys = new HashSet<CollectionKey>();
+		private readonly HashSet<CollectionKey> localLoadingCollectionKeys = new HashSet<CollectionKey>();
 
 		/// <summary> 
 		/// Creates a collection load context for the given result set. 

src/NHibernate/Engine/QueryCacheBatchQueue.cs

@@ -16,35 +16,35 @@ internal class QueryCacheBatchQueue
 		/// Used to hold information about the entities that are currently eligible for batch-fetching. Ultimately
 		/// used by <see cref="GetEntityBatch" /> to build entity load batches.
 		/// </summary>
-		private readonly IDictionary<string, HashSet<EntityKey>> _queryEntityKeys;
+		private readonly Dictionary<string, HashSet<EntityKey>> _queryEntityKeys;
 
 		/// <summary>
 		/// Used to hold information about entity keys that were checked in the cache.
 		/// </summary>
-		private readonly IDictionary<string, HashSet<EntityKey>> _queryCheckedEntityKeys;
+		private readonly Dictionary<string, HashSet<EntityKey>> _queryCheckedEntityKeys;
 
 		/// <summary>
 		/// Used to hold information about collection entries that are currently eligible for batch-fetching. Ultimately
 		/// used by <see cref="GetCollectionBatch" /> to build collection load batches.
 		/// </summary>
-		private readonly IDictionary<string, IDictionary<CollectionKey, CollectionEntry>> _queryCollectionKeys;
+		private readonly Dictionary<string, Dictionary<CollectionKey, CollectionEntry>> _queryCollectionKeys;
 
 		/// <summary>
 		/// Used to hold information about collection keys that were checked in the cache.
 		/// </summary>
-		private readonly IDictionary<string, HashSet<CollectionKey>> _queryCheckedCollectionKeys;
+		private readonly Dictionary<string, HashSet<CollectionKey>> _queryCheckedCollectionKeys;
 
 		/// <summary>
 		/// Used to hold information about collection entries that were checked in the cache.
 		/// </summary>
-		private readonly IDictionary<string, HashSet<CollectionEntry>> _queryCheckedCollectionEntries;
+		private readonly Dictionary<string, HashSet<CollectionEntry>> _queryCheckedCollectionEntries;
 
 		internal QueryCacheBatchQueue(IPersistenceContext persistenceContext)
 		{
 			_persistenceContext = persistenceContext;
 			_queryEntityKeys = new Dictionary<string, HashSet<EntityKey>>();
 			_queryCheckedEntityKeys = new Dictionary<string, HashSet<EntityKey>>();
-			_queryCollectionKeys = new Dictionary<string, IDictionary<CollectionKey, CollectionEntry>>();
+			_queryCollectionKeys = new Dictionary<string, Dictionary<CollectionKey, CollectionEntry>>();
 			_queryCheckedCollectionKeys = new Dictionary<string, HashSet<CollectionKey>>();
 			_queryCheckedCollectionEntries = new Dictionary<string, HashSet<CollectionEntry>>();
 		}

src/NHibernate/Engine/StatefulPersistenceContext.cs

@@ -65,10 +65,10 @@ public partial class StatefulPersistenceContext : IPersistenceContext, ISerializ
 		private readonly Dictionary<CollectionKey, IPersistentCollection> collectionsByKey;
 
 		// Set of EntityKeys of deleted objects
-		private readonly ISet<EntityKey> nullifiableEntityKeys;
+		private readonly HashSet<EntityKey> nullifiableEntityKeys;
 
 		// properties that we have tried to load, and not found in the database
-		private ISet<AssociationKey> nullAssociations;
+		private HashSet<AssociationKey> nullAssociations;
 
 		// A list of collection wrappers that were instantiating during result set
 		// processing, that we will need to initialize at the end of the query

src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs

@@ -47,9 +47,9 @@ public partial class HqlSqlWalker
 		//Maps each top-level result variable to its SelectExpression;
 		//(excludes result variables defined in subqueries)
 		//
-		private readonly IDictionary<String, ISelectExpression> selectExpressionsByResultVariable = new Dictionary<string, ISelectExpression>();
+		private readonly Dictionary<String, ISelectExpression> selectExpressionsByResultVariable = new Dictionary<string, ISelectExpression>();
 
-		private readonly ISet<string> _querySpaces = new HashSet<string>();
+		private readonly HashSet<string> _querySpaces = new HashSet<string>();
 
 		private readonly LiteralProcessor _literalProcessor;
 

src/NHibernate/Hql/Util/SessionFactoryHelper.cs

@@ -14,7 +14,7 @@ namespace NHibernate.Hql.Util
 	public class SessionFactoryHelper
 	{
 		private readonly ISessionFactoryImplementor sfi;
-		private readonly IDictionary<string,CollectionPropertyMapping> collectionPropertyMappingByRole = 
+		private readonly Dictionary<string,CollectionPropertyMapping> collectionPropertyMappingByRole = 
 			new Dictionary<string,CollectionPropertyMapping>();
 
 		public SessionFactoryHelper(ISessionFactoryImplementor sfi)
@@ -198,4 +198,4 @@ public IQueryableCollection RequireQueryableCollection(String role)
 			}
 		}
 	}
-}
+}

src/NHibernate/Impl/ExpressionProcessor.cs

@@ -1,7 +1,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -100,11 +99,11 @@ public string AsProperty()
 			}
 		}
 
-		private readonly static IDictionary<ExpressionType, Func<ProjectionInfo, object, ICriterion>> _simpleExpressionCreators;
-		private readonly static IDictionary<ExpressionType, Func<ProjectionInfo, ProjectionInfo, ICriterion>> _propertyExpressionCreators;
-		private readonly static IDictionary<LambdaSubqueryType, IDictionary<ExpressionType, Func<string, DetachedCriteria, AbstractCriterion>>> _subqueryExpressionCreatorTypes;
-		private readonly static IDictionary<string, Func<MethodCallExpression, ICriterion>> _customMethodCallProcessors;
-		private readonly static IDictionary<string, Func<Expression, IProjection>> _customProjectionProcessors;
+		private static readonly Dictionary<ExpressionType, Func<ProjectionInfo, object, ICriterion>> _simpleExpressionCreators;
+		private static readonly Dictionary<ExpressionType, Func<ProjectionInfo, ProjectionInfo, ICriterion>> _propertyExpressionCreators;
+		private static readonly Dictionary<LambdaSubqueryType, IDictionary<ExpressionType, Func<string, DetachedCriteria, AbstractCriterion>>> _subqueryExpressionCreatorTypes;
+		private static readonly Dictionary<string, Func<MethodCallExpression, ICriterion>> _customMethodCallProcessors;
+		private static readonly Dictionary<string, Func<Expression, IProjection>> _customProjectionProcessors;
 
 		static ExpressionProcessor()
 		{

src/NHibernate/Impl/ExpressionQueryImpl.cs

@@ -327,7 +327,7 @@ public static IList<IASTNode> LocateParameters(IASTNode tree, HashSet<string> pa
 			return detector.LocateParameters();
 		}
 
-		private IList<IASTNode> LocateParameters()
+		private List<IASTNode> LocateParameters()
 		{
 			var nodeTraverser = new NodeTraverser(this);
 			nodeTraverser.TraverseDepthFirst(_tree);

src/NHibernate/Impl/FilterImpl.cs

@@ -15,7 +15,7 @@ public class FilterImpl : IFilter
 		[NonSerialized]
 		private FilterDefinition definition;
 
-		private readonly IDictionary<string, object> parameters = new Dictionary<string, object>();
+		private readonly Dictionary<string, object> parameters = new Dictionary<string, object>();
 		private readonly Dictionary<string, int> _parameterSpans = new Dictionary<string, int>();
 
 		public void AfterDeserialize(FilterDefinition factoryDefinition)

src/NHibernate/Impl/MultiCriteriaImpl.cs

@@ -21,8 +21,8 @@ namespace NHibernate.Impl
 	public partial class MultiCriteriaImpl : IMultiCriteria
 	{
 		private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(MultiCriteriaImpl));
-		private readonly IList<ICriteria> criteriaQueries = new List<ICriteria>();
-		private readonly IList<System.Type> resultCollectionGenericType = new List<System.Type>();
+		private readonly List<ICriteria> criteriaQueries = new List<ICriteria>();
+		private readonly List<System.Type> resultCollectionGenericType = new List<System.Type>();
 
 		private readonly SessionImpl session;
 		private readonly ISessionFactoryImplementor factory;