Move CreateConnectionPoolGroupProviderInfo

Author: benrr101

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

@@ -18,12 +18,6 @@ namespace Microsoft.Data.ProviderBase
 {
     internal abstract class DbConnectionFactory
     {
-        internal abstract DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(
-            DbConnectionOptions connectionOptions);
-
-        internal abstract DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(
-            DbConnectionOptions connectionOptions);
-
         protected virtual DbMetaDataFactory CreateMetaDataFactory(DbConnectionInternal internalConnection, out bool cacheMetaDataFactory)
         {
             // providers that support GetSchema must override this with a method that creates a meta data
@@ -46,7 +40,7 @@ protected DbConnectionOptions FindConnectionOptions(DbConnectionPoolKey key)
             }
             return null;
         }
-
+        
         private static Task<DbConnectionInternal> GetCompletedTask()
         {
             Debug.Assert(Monitor.IsEntered(s_pendingOpenNonPooled), $"Expected {nameof(s_pendingOpenNonPooled)} lock to be held.");

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

@@ -104,6 +104,11 @@ internal void ClearPool(DbConnectionPoolKey key)
             }
         }
 
+        internal DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(DbConnectionOptions connectionOptions) =>
+            ((SqlConnectionString)connectionOptions).UserInstance
+                ? new SqlConnectionPoolProviderInfo()
+                : null;
+        
         internal SqlInternalConnectionTds CreateNonPooledConnection(
             DbConnection owningConnection,
             DbConnectionPoolGroup poolGroup,
@@ -164,18 +169,6 @@ protected override DbConnectionOptions CreateConnectionOptions(string connection
             return result;
         }
 
-        internal override DbConnectionPoolProviderInfo CreateConnectionPoolProviderInfo(DbConnectionOptions connectionOptions)
-        {
-            DbConnectionPoolProviderInfo providerInfo = null;
-
-            if (((SqlConnectionString)connectionOptions).UserInstance)
-            {
-                providerInfo = new SqlConnectionPoolProviderInfo();
-            }
-
-            return providerInfo;
-        }
-
         protected override DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions(DbConnectionOptions connectionOptions)
         {
             SqlConnectionString opt = (SqlConnectionString)connectionOptions;
@@ -221,11 +214,9 @@ protected override DbConnectionPoolGroupOptions CreateConnectionPoolGroupOptions
             return poolingOptions;
         }
 
-        internal override DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(
-            DbConnectionOptions connectionOptions)
-        {
-            return new SqlConnectionPoolGroupProviderInfo((SqlConnectionString)connectionOptions);
-        }
+        internal DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProviderInfo(
+            DbConnectionOptions connectionOptions) =>
+            new SqlConnectionPoolGroupProviderInfo((SqlConnectionString)connectionOptions);
 
         internal SqlConnectionString FindSqlConnectionOptions(SqlConnectionPoolKey key)
         {