Addressing PR 14 feedback

src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs

@@ -38,17 +38,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
 
         public ConnectionDetails ConnectionDetails { get; private set; }
         
-        public DbConnection SqlConnection { get; private set; }
-
-        public void OpenConnection()
-        {
-            // build the connection string from the input parameters
-            string connectionString = ConnectionService.BuildConnectionString(ConnectionDetails);
-
-            // create a sql connection instance
-            SqlConnection = Factory.CreateSqlConnection(connectionString);
-            SqlConnection.Open();
-        }
+        public DbConnection SqlConnection { get; set; }
     }
 
     /// <summary>
@@ -170,7 +160,12 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
             var response = new ConnectResponse();
             try
             {
-                connectionInfo.OpenConnection();
+                // build the connection string from the input parameters
+                string connectionString = ConnectionService.BuildConnectionString(connectionInfo.ConnectionDetails);
+
+                // create a sql connection instance
+                connectionInfo.SqlConnection = connectionInfo.Factory.CreateSqlConnection(connectionString);
+                connectionInfo.SqlConnection.Open();
             }
             catch(Exception ex)
             {

src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectMessages.cs

@@ -27,31 +27,19 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
     }
 
     /// <summary>
-    /// Parameters for the Disconnect Request.
+    /// Message format for the connection result response
     /// </summary>
-    public class DisconnectParams
+    public class ConnectResponse
     {
         /// <summary>
-        /// A URI identifying the owner of the connection. This will most commonly be a file in the workspace
-        /// or a virtual file representing an object in a database.         
+        /// A GUID representing a unique connection ID
         /// </summary>
-        public string OwnerUri { get; set; }
-    }
+        public string ConnectionId { get; set; }
 
-    /// <summary>
-    /// Parameters for the ConnectionChanged Notification.
-    /// </summary>
-    public class ConnectionChangedParams
-    {
         /// <summary>
-        /// A URI identifying the owner of the connection. This will most commonly be a file in the workspace
-        /// or a virtual file representing an object in a database.         
+        /// Gets or sets any connection error messages
         /// </summary>
-        public string OwnerUri { get; set; }
-        /// <summary>
-        /// Contains the high-level properties about the connection, for display to the user.
-        /// </summary>
-        public ConnectionSummary Connection { get; set; }
+        public string Messages { get; set; }
     }
 
     /// <summary>
@@ -74,6 +62,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
         /// </summary>
         public string UserName { get; set; }
     }
+
     /// <summary>
     /// Message format for the initial connection request
     /// </summary>
@@ -88,22 +77,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
         // TODO Handle full set of properties
     }
 
-    /// <summary>
-    /// Message format for the connection result response
-    /// </summary>
-    public class ConnectResponse
-    {
-        /// <summary>
-        /// A GUID representing a unique connection ID
-        /// </summary>
-        public string ConnectionId { get; set; }
-
-        /// <summary>
-        /// Gets or sets any connection error messages
-        /// </summary>
-        public string Messages { get; set; }
-    }
-
     /// <summary>
     /// Connect request mapping entry 
     /// </summary>
@@ -113,25 +86,4 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
             RequestType<ConnectParams, ConnectResponse> Type =
             RequestType<ConnectParams, ConnectResponse>.Create("connection/connect");
     }
-
-    /// <summary>
-    /// Disconnect request mapping entry 
-    /// </summary>
-    public class DisconnectRequest
-    {
-        public static readonly
-            RequestType<DisconnectParams, bool> Type =
-            RequestType<DisconnectParams, bool>.Create("connection/disconnect");
-    }
-
-    /// <summary>
-    /// ConnectionChanged notification mapping entry 
-    /// </summary>
-    public class ConnectionChangedNotification
-    {
-        public static readonly
-            EventType<ConnectionChangedParams> Type =
-            EventType<ConnectionChangedParams>.Create("connection/connectionchanged");
-    }
-
 }

src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionChangedMessages.cs

@@ -0,0 +1,36 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+
+namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
+{
+    /// <summary>
+    /// Parameters for the ConnectionChanged Notification.
+    /// </summary>
+    public class ConnectionChangedParams
+    {
+        /// <summary>
+        /// A URI identifying the owner of the connection. This will most commonly be a file in the workspace
+        /// or a virtual file representing an object in a database.         
+        /// </summary>
+        public string OwnerUri { get; set; }
+        /// <summary>
+        /// Contains the high-level properties about the connection, for display to the user.
+        /// </summary>
+        public ConnectionSummary Connection { get; set; }
+    }
+
+    /// <summary>
+    /// ConnectionChanged notification mapping entry 
+    /// </summary>
+    public class ConnectionChangedNotification
+    {
+        public static readonly
+            EventType<ConnectionChangedParams> Type =
+            EventType<ConnectionChangedParams>.Create("connection/connectionchanged");
+    }
+
+}

src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/DisconnectMessages.cs

@@ -0,0 +1,31 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+
+namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
+{
+    /// <summary>
+    /// Parameters for the Disconnect Request.
+    /// </summary>
+    public class DisconnectParams
+    {
+        /// <summary>
+        /// A URI identifying the owner of the connection. This will most commonly be a file in the workspace
+        /// or a virtual file representing an object in a database.         
+        /// </summary>
+        public string OwnerUri { get; set; }
+    }
+
+    /// <summary>
+    /// Disconnect request mapping entry 
+    /// </summary>
+    public class DisconnectRequest
+    {
+        public static readonly
+            RequestType<DisconnectParams, bool> Type =
+            RequestType<DisconnectParams, bool>.Create("connection/disconnect");
+    }
+}