Move member variables and constructor

Author: benrr101

src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs

@@ -130,7 +130,10 @@ internal static Exception ExceptionWithStackTrace(Exception e)
             }
         }
 
-        internal static Timer UnsafeCreateTimer(TimerCallback callback, object state, int dueTime, int period)
+        internal static Timer UnsafeCreateTimer(TimerCallback callback, object state, int dueTime, int period) =>
+            UnsafeCreateTimer(callback, state, TimeSpan.FromSeconds(dueTime), TimeSpan.FromSeconds(period));
+        
+        internal static Timer UnsafeCreateTimer(TimerCallback callback, object state, TimeSpan dueTime, TimeSpan period)
         {
             // Don't capture the current ExecutionContext and its AsyncLocals onto 
             // a global timer causing them to live forever
@@ -154,6 +157,7 @@ internal static Timer UnsafeCreateTimer(TimerCallback callback, object state, in
                 }
             }
         }
+            
 
 #region COM+ exceptions
         internal static ArgumentException Argument(string error)

src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionFactory.cs

@@ -18,36 +18,8 @@ namespace Microsoft.Data.ProviderBase
 {
     internal abstract class DbConnectionFactory
     {
-        private Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup> _connectionPoolGroups;
-        private readonly List<IDbConnectionPool> _poolsToRelease;
-        private readonly List<DbConnectionPoolGroup> _poolGroupsToRelease;
-        private readonly Timer _pruningTimer;
-
-        private const int PruningDueTime = 4 * 60 * 1000;           // 4 minutes
-        private const int PruningPeriod = 30 * 1000;           // thirty seconds
-
-        private static int _objectTypeCount; // EventSource counter
         internal int ObjectID { get; } = Interlocked.Increment(ref _objectTypeCount);
 
-        // s_pendingOpenNonPooled is an array of tasks used to throttle creation of non-pooled connections to
-        // a maximum of Environment.ProcessorCount at a time.
-        private static uint s_pendingOpenNonPooledNext = 0;
-        private static Task<DbConnectionInternal>[] s_pendingOpenNonPooled = new Task<DbConnectionInternal>[Environment.ProcessorCount];
-        private static Task<DbConnectionInternal> s_completedTask;
-
-        protected DbConnectionFactory()
-        {
-            _connectionPoolGroups = new Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup>();
-            _poolsToRelease = new List<IDbConnectionPool>();
-            _poolGroupsToRelease = new List<DbConnectionPoolGroup>();
-            _pruningTimer = CreatePruningTimer();
-        }
-
-        public abstract DbProviderFactory ProviderFactory
-        {
-            get;
-        }
-
         public void ClearAllPools()
         {
             using (TryEventScope.Create(nameof(SqlConnectionFactory)))
@@ -140,13 +112,6 @@ internal DbConnectionInternal CreatePooledConnection(IDbConnectionPool pool, DbC
         internal abstract DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(
             DbConnectionOptions connectionOptions);
 
-        private Timer CreatePruningTimer() =>
-            ADP.UnsafeCreateTimer(
-                new TimerCallback(PruneConnectionPoolGroups),
-                null,
-                PruningDueTime,
-                PruningPeriod);
-
         protected DbConnectionOptions FindConnectionOptions(DbConnectionPoolKey key)
         {
             Debug.Assert(key != null, "key cannot be null");

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs

@@ -3,10 +3,13 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Data.Common;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Data.Common;
 using Microsoft.Data.Common.ConnectionString;
 using Microsoft.Data.ProviderBase;
@@ -20,22 +23,49 @@ namespace Microsoft.Data.SqlClient
 {
     internal sealed class SqlConnectionFactory : DbConnectionFactory
     {
-        internal static readonly SqlConnectionFactory SingletonInstance = new SqlConnectionFactory();
+        #region Member Variables
 
-        private SqlConnectionFactory() : base()
+        private static readonly TimeSpan PruningDueTime = TimeSpan.FromMinutes(4);
+        private static readonly TimeSpan PruningPeriod = TimeSpan.FromSeconds(30);
+        
+        // s_pendingOpenNonPooled is an array of tasks used to throttle creation of non-pooled
+        // connections to a maximum of Environment.ProcessorCount at a time.
+        private static Task<DbConnectionInternal> s_completedTask;
+        private static int s_objectTypeCount;
+        private static Task<DbConnectionInternal>[] s_pendingOpenNonPooled =
+            new Task<DbConnectionInternal>[Environment.ProcessorCount];
+        private static uint s_pendingOpenNonPooledNext = 0;
+
+        private readonly List<DbConnectionPoolGroup> _poolGroupsToRelease;
+        private readonly List<IDbConnectionPool> _poolsToRelease;
+        private readonly Timer _pruningTimer;
+        private Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup> _connectionPoolGroups;
+
+        #endregion
+        
+        #region Constructors
+        
+        private SqlConnectionFactory()
         {
+            _connectionPoolGroups = new Dictionary<DbConnectionPoolKey, DbConnectionPoolGroup>();
+            _poolsToRelease = new List<IDbConnectionPool>();
+            _poolGroupsToRelease = new List<DbConnectionPoolGroup>();
+            _pruningTimer = ADP.UnsafeCreateTimer(
+                new TimerCallback(PruneConnectionPoolGroups),
+                state: null,
+                PruningDueTime,
+                PruningPeriod);
+            
             #if NET
             SubscribeToAssemblyLoadContextUnload();
             #endif
         }
+        
+        #endregion
 
-        public override DbProviderFactory ProviderFactory
-        {
-            get
-            {
-                return SqlClientFactory.Instance;
-            }
-        }
+        public static readonly SqlConnectionFactory SingletonInstance = new SqlConnectionFactory();
+
+        public DbProviderFactory ProviderFactory => SqlClientFactory.Instance;
 
         protected override DbConnectionInternal CreateConnection(
             DbConnectionOptions options,