Minor Touch-ups + consistent naming (#2724)

Author: cheenamalhotra

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -946,9 +946,8 @@
     <Compile Include="Microsoft\Data\SqlClientX\Handlers\NoSuitableHandlerFoundException.cs" />
     <Compile Include="Microsoft\Data\SqlClientX\Handlers\ReturningHandlerChain.cs" />
     <Compile Include="Microsoft\Data\SqlClientX\Handlers\ReturningHandlerChainExceptionBehavior.cs" />
-    <Compile Include="Microsoft\Data\SqlClientX\Handlers\HandlerOrchestrator.cs" />
-    <Compile Include="Microsoft\Data\SqlClientX\Handlers\InternalConnectionContext.cs" />
-    <Compile Include="Microsoft\Data\SqlClientX\Handlers\SqlUtilsX.cs" />
+    <Compile Include="Microsoft\Data\SqlClientX\Handlers\Connection\ConnectionHandlerOrchestrator.cs" />
+    <Compile Include="Microsoft\Data\SqlClientX\SqlUtilsX.cs" />
     <Compile Include="Microsoft\Data\SqlClientX\IO\ITdsReadStream.cs" />
     <Compile Include="Microsoft\Data\SqlClientX\IO\ITdsStream.cs" />
     <Compile Include="Microsoft\Data\SqlClientX\IO\ITdsWriteStream.cs" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClientX/Handlers/Connection/ConnectionHandlerContext.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -58,12 +59,12 @@ internal class ConnectionHandlerContext : HandlerRequest, ICloneable
         /// Whether the connection is capable of MARS
         /// This is negotiated after pre-login.
         /// </summary>
-        public bool MarsCapable { get; internal set; }
+        public bool IsMarsCapable { get; internal set; }
 
         /// <summary>
         /// Indicates if fed auth needed for this connection.
         /// </summary>
-        public bool FedAuthRequired { get; internal set; }
+        public bool IsFedAuthRequired { get; internal set; }
 
         /// <summary>
         /// The access token in bytes.
@@ -110,8 +111,8 @@ public object Clone()
                 SslStream = this.SslStream, 
                 SslOverTdsStream = this.SslOverTdsStream, 
                 TdsStream = this.TdsStream, 
-                MarsCapable = this.MarsCapable,
-                FedAuthRequired = this.FedAuthRequired,
+                IsMarsCapable = this.IsMarsCapable,
+                IsFedAuthRequired = this.IsFedAuthRequired,
                 AccessTokenInBytes = this.AccessTokenInBytes,
                 ServerInfo = this.ServerInfo, 
                 ErrorCollection = this.ErrorCollection, 

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClientX/Handlers/Connection/ConnectionHandlerOrchestrator.cs

@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Data.SqlClientX.Handlers.Connection
+{
+    internal static class ConnectionHandlerOrchestrator
+    {
+        /// <summary>
+        /// Initiates the pre-defined chain of handlers
+        /// </summary>
+        /// <param name="context">Connection Handler Context</param>
+        /// <param name="isAsync">Whether the calling method is executing asynchronously.</param>
+        /// <param name="ct">Cancellation Token</param>
+        /// <returns></returns>
+        public static ValueTask ProcessRequestAsync(ConnectionHandlerContext context, bool isAsync, CancellationToken ct)
+            => new DataSourceParsingHandler()
+            {
+                NextHandler = new TransportCreationHandler()
+                {
+                    NextHandler = new PreloginHandler()
+                }
+            }.Handle(context, isAsync, ct);
+    }
+}

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClientX/Handlers/Connection/DataSourceParsingHandler.cs

@@ -15,7 +15,7 @@ namespace Microsoft.Data.SqlClientX.Handlers.Connection
     internal class DataSourceParsingHandler : ContextHandler<ConnectionHandlerContext>
     {
         /// <inheritdoc />
-        public override async ValueTask Handle(ConnectionHandlerContext request, bool isAsync, CancellationToken ct)
+        public override ValueTask Handle(ConnectionHandlerContext request, bool isAsync, CancellationToken ct)
         {
             ServerInfo serverInfo = request.ServerInfo;
             string fullServerName = serverInfo.ExtendedServerName;
@@ -28,7 +28,7 @@ public override async ValueTask Handle(ConnectionHandlerContext request, bool is
                 collection.Add(new SqlError(0,0,TdsEnums.FATAL_ERROR_CLASS, null, StringsHelper.GetString("LocalDB_UnobtainableMessage"), null, 0));
                 throw SqlException.CreateException(collection, null);
             }
-            
+
             // If a localDB Data source is available, we need to use it.
             fullServerName = localDBDataSource ?? fullServerName;
             DataSource details = DataSource.ParseServerName(fullServerName);
@@ -39,13 +39,15 @@ public override async ValueTask Handle(ConnectionHandlerContext request, bool is
                 collection.Add(new SqlError(0, 0, TdsEnums.FATAL_ERROR_CLASS, null, StringsHelper.GetString("LocalDB_UnobtainableMessage"), null, 0));
                 throw SqlException.CreateException(collection, null);
             }
-            
+
             request.DataSource = details;
-            
+
             if (NextHandler is not null)
             {
-                await NextHandler.Handle(request, isAsync, ct).ConfigureAwait(false);
+                return NextHandler.Handle(request, isAsync, ct);
             }
+
+            return ValueTask.CompletedTask;
         }
 
         //TODO: Refactor function for better handling of error flag and return params
@@ -72,7 +74,7 @@ private static string GetLocalDBDataSource(string fullServerName, out bool error
                     return null;
                 }
             }
-            
+
             error = false;
             return localDBConnectionString;
         }

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClientX/Handlers/Connection/PreloginHandler.cs

@@ -32,7 +32,7 @@ internal class PreloginHandler : ContextHandler<ConnectionHandlerContext>
         private readonly PreloginSubHandlerBuilder _subHandlerChainBuilder;
 
         /// <summary>
-        /// Paraemter-less constructor which creates an authenticator for TLS.
+        /// Parameter-less constructor which creates an authenticator for TLS.
         /// </summary>
         public PreloginHandler() : this(new TlsAuthenticator(), new PreloginSubHandlerBuilder())
         {

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClientX/Handlers/Connection/PreloginSubHandlers/PreloginPacketHandler.cs

@@ -75,8 +75,8 @@ public async ValueTask Handle(PreloginHandlerContext context, bool isAsync, Canc
         /// <returns></returns>
         private async Task ReadPreloginResponse(PreloginHandlerContext context, bool isAsync, CancellationToken ct)
         {
-            context.ConnectionContext.MarsCapable = context.ConnectionContext.ConnectionString.MARS; // Assign default value
-            context.ConnectionContext.FedAuthRequired = false;
+            context.ConnectionContext.IsMarsCapable = context.ConnectionContext.ConnectionString.MARS; // Assign default value
+            context.ConnectionContext.IsFedAuthRequired = false;
 
             TdsStream tdsStream = context.ConnectionContext.TdsStream;
 
@@ -192,7 +192,7 @@ private async Task ReadPreloginResponse(PreloginHandlerContext context, bool isA
                         payloadOffset = BinaryPrimitives.ReadUInt16BigEndian(preloginPayload.AsSpan(offset, 2));
                         offset += PAYLOAD_OFFSET_AND_LENGTH_SIZE_IN_BYTES;
 
-                        context.ConnectionContext.MarsCapable = (preloginPayload[payloadOffset] != 0);
+                        context.ConnectionContext.IsMarsCapable = (preloginPayload[payloadOffset] != 0);
                         Debug.Assert(preloginPayload[payloadOffset] == 0 || preloginPayload[payloadOffset] == 1, "Value for Mars PreLoginHandshake option not equal to 1 or 0!");
                         break;
 
@@ -220,7 +220,7 @@ private async Task ReadPreloginResponse(PreloginHandlerContext context, bool isA
                             && context.ConnectionContext.ConnectionString.Authentication != SqlAuthenticationMethod.NotSpecified)
                             || context.ConnectionContext.AccessTokenInBytes != null || context.ConnectionContext.AccessTokenCallback != null)
                         {
-                            context.ConnectionContext.FedAuthRequired = preloginPayload[payloadOffset] == 0x01;
+                            context.ConnectionContext.IsFedAuthRequired = preloginPayload[payloadOffset] == 0x01;
                         }
                         break;