Move Create*Connection methods over

Author: benrr101

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

@@ -18,11 +18,8 @@ namespace Microsoft.Data.ProviderBase
 {
     internal abstract class DbConnectionFactory
     {
-        
-
-        
-
-        
+        internal abstract DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(
+            DbConnectionOptions connectionOptions);
 
         internal abstract DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(
             DbConnectionOptions connectionOptions);
@@ -34,45 +31,7 @@ protected virtual DbMetaDataFactory CreateMetaDataFactory(DbConnectionInternal i
             cacheMetaDataFactory = false;
             throw ADP.NotSupported();
         }
-
-        internal DbConnectionInternal CreateNonPooledConnection(DbConnection owningConnection, DbConnectionPoolGroup poolGroup, DbConnectionOptions userOptions)
-        {
-            Debug.Assert(owningConnection != null, "null owningConnection?");
-            Debug.Assert(poolGroup != null, "null poolGroup?");
-
-            DbConnectionOptions connectionOptions = poolGroup.ConnectionOptions;
-            DbConnectionPoolGroupProviderInfo poolGroupProviderInfo = poolGroup.ProviderInfo;
-            DbConnectionPoolKey poolKey = poolGroup.PoolKey;
-
-            DbConnectionInternal newConnection = CreateConnection(connectionOptions, poolKey, poolGroupProviderInfo, null, owningConnection, userOptions);
-            if (newConnection != null)
-            {
-                SqlClientEventSource.Metrics.HardConnectRequest();
-                newConnection.MakeNonPooledObject(owningConnection);
-            }
-            SqlClientEventSource.Log.TryTraceEvent("<prov.DbConnectionFactory.CreateNonPooledConnection|RES|CPOOL> {0}, Non-pooled database connection created.", ObjectID);
-            return newConnection;
-        }
-
-        internal DbConnectionInternal CreatePooledConnection(IDbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions)
-        {
-            Debug.Assert(pool != null, "null pool?");
-            DbConnectionPoolGroupProviderInfo poolGroupProviderInfo = pool.PoolGroup.ProviderInfo;
-            DbConnectionInternal newConnection = CreateConnection(options, poolKey, poolGroupProviderInfo, pool, owningObject, userOptions);
-
-            if (newConnection != null)
-            {
-                SqlClientEventSource.Metrics.HardConnectRequest();
-
-                newConnection.MakePooledConnection(pool);
-            }
-            SqlClientEventSource.Log.TryTraceEvent("<prov.DbConnectionFactory.CreatePooledConnection|RES|CPOOL> {0}, Pooled database connection created.", ObjectID);
-            return newConnection;
-        }
-
-        internal abstract DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(
-            DbConnectionOptions connectionOptions);
-
+        
         protected DbConnectionOptions FindConnectionOptions(DbConnectionPoolKey key)
         {
             Debug.Assert(key != null, "key cannot be null");
@@ -568,14 +527,6 @@ internal void QueuePoolGroupForRelease(DbConnectionPoolGroup poolGroup)
             SqlClientEventSource.Metrics.ExitActiveConnectionPoolGroup();
         }
 
-        protected abstract DbConnectionInternal CreateConnection(
-            DbConnectionOptions options,
-            DbConnectionPoolKey poolKey,
-            DbConnectionPoolGroupProviderInfo poolGroupProviderInfo,
-            IDbConnectionPool pool,
-            DbConnection owningConnection,
-            DbConnectionOptions userOptions);
-
         abstract protected DbConnectionOptions CreateConnectionOptions(string connectionString, DbConnectionOptions previous);
 
         abstract protected DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(DbConnectionOptions options);

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs

@@ -746,7 +746,12 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
 
             try
             {
-                newObj = _connectionFactory.CreatePooledConnection(this, owningObject, _connectionPoolGroup.ConnectionOptions, _connectionPoolGroup.PoolKey, userOptions);
+                newObj = _connectionFactory.CreatePooledConnection(
+                    owningObject,
+                    this,
+                    _connectionPoolGroup.PoolKey,
+                    _connectionPoolGroup.ConnectionOptions,
+                    userOptions);
                 if (newObj == null)
                 {
                     throw ADP.InternalError(ADP.InternalErrorCode.CreateObjectReturnedNull);    // CreateObject succeeded, but null object