From eb25f56e6411b43c361effe5c93e8ac8a3e48981 Mon Sep 17 00:00:00 2001 From: Benjamin Russell Date: Thu, 21 Jul 2016 13:39:01 -0700 Subject: [PATCH] Renaming all the namespaces for ServiceHost Also wiring up the namespace changes to make the servicehost component build. NOTE: This will not build --- .../ServiceHost/Protocol/Channel/ChannelBase.cs | 2 +- .../Protocol/Channel/StdioClientChannel.cs | 2 +- .../Protocol/Channel/StdioServerChannel.cs | 2 +- src/ServiceHost/ServiceHost/Protocol/Constants.cs | 2 +- .../ServiceHost/Protocol/Contracts/EventType.cs | 2 +- .../ServiceHost/Protocol/Contracts/Message.cs | 2 +- .../ServiceHost/Protocol/Contracts/RequestType.cs | 2 +- src/ServiceHost/ServiceHost/Protocol/EventContext.cs | 3 ++- .../ServiceHost/Protocol/IMessageSender.cs | 3 ++- .../ServiceHost/Protocol/MessageDispatcher.cs | 6 +++--- .../ServiceHost/Protocol/MessageParseException.cs | 2 +- .../ServiceHost/Protocol/MessageProtocolType.cs | 2 +- src/ServiceHost/ServiceHost/Protocol/MessageReader.cs | 10 ++++++---- src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs | 10 ++++++---- .../ServiceHost/Protocol/ProtocolEndpoint.cs | 5 +++-- .../ServiceHost/Protocol/RequestContext.cs | 5 +++-- .../Protocol/Serializers/IMessageSerializer.cs | 2 +- .../Protocol/Serializers/JsonRpcMessageSerializer.cs | 2 +- .../Protocol/Serializers/V8MessageSerializer.cs | 2 +- src/ServiceHost/ServiceHost/ServiceHost.cs | 11 ++++++----- src/ServiceHost/ServiceHost/ServiceHostBase.cs | 6 +++--- 21 files changed, 46 insertions(+), 37 deletions(-) diff --git a/src/ServiceHost/ServiceHost/Protocol/Channel/ChannelBase.cs b/src/ServiceHost/ServiceHost/Protocol/Channel/ChannelBase.cs index 848da39f..622e5826 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Channel/ChannelBase.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Channel/ChannelBase.cs @@ -6,7 +6,7 @@ using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Serializers; using System.Threading.Tasks; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Channel +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel { /// /// Defines a base implementation for servers and their clients over a diff --git a/src/ServiceHost/ServiceHost/Protocol/Channel/StdioClientChannel.cs b/src/ServiceHost/ServiceHost/Protocol/Channel/StdioClientChannel.cs index 5390f52d..e8645d38 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Channel/StdioClientChannel.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Channel/StdioClientChannel.cs @@ -8,7 +8,7 @@ using System.IO; using System.Text; using System.Threading.Tasks; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Channel +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel { /// /// Provides a client implementation for the standard I/O channel. diff --git a/src/ServiceHost/ServiceHost/Protocol/Channel/StdioServerChannel.cs b/src/ServiceHost/ServiceHost/Protocol/Channel/StdioServerChannel.cs index 0b9376d4..46fd5d0f 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Channel/StdioServerChannel.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Channel/StdioServerChannel.cs @@ -7,7 +7,7 @@ using System.IO; using System.Text; using System.Threading.Tasks; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Channel +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel { /// /// Provides a server implementation for the standard I/O channel. diff --git a/src/ServiceHost/ServiceHost/Protocol/Constants.cs b/src/ServiceHost/ServiceHost/Protocol/Constants.cs index 0fae5d8d..81dd58ea 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Constants.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Constants.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { public static class Constants { diff --git a/src/ServiceHost/ServiceHost/Protocol/Contracts/EventType.cs b/src/ServiceHost/ServiceHost/Protocol/Contracts/EventType.cs index dd460817..94612af8 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Contracts/EventType.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Contracts/EventType.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts { /// /// Defines an event type with a particular method name. diff --git a/src/ServiceHost/ServiceHost/Protocol/Contracts/Message.cs b/src/ServiceHost/ServiceHost/Protocol/Contracts/Message.cs index 75dab5cd..2474b094 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Contracts/Message.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Contracts/Message.cs @@ -6,7 +6,7 @@ using System.Diagnostics; using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts { /// /// Defines all possible message types. diff --git a/src/ServiceHost/ServiceHost/Protocol/Contracts/RequestType.cs b/src/ServiceHost/ServiceHost/Protocol/Contracts/RequestType.cs index 29fc11c5..9206cb66 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Contracts/RequestType.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Contracts/RequestType.cs @@ -5,7 +5,7 @@ using System.Diagnostics; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts { [DebuggerDisplay("RequestType MethodName = {MethodName}")] public class RequestType diff --git a/src/ServiceHost/ServiceHost/Protocol/EventContext.cs b/src/ServiceHost/ServiceHost/Protocol/EventContext.cs index eb42ebbb..8754351c 100644 --- a/src/ServiceHost/ServiceHost/Protocol/EventContext.cs +++ b/src/ServiceHost/ServiceHost/Protocol/EventContext.cs @@ -4,8 +4,9 @@ // using System.Threading.Tasks; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { /// /// Provides context for a received event so that handlers diff --git a/src/ServiceHost/ServiceHost/Protocol/IMessageSender.cs b/src/ServiceHost/ServiceHost/Protocol/IMessageSender.cs index 7f331eed..2e0e461e 100644 --- a/src/ServiceHost/ServiceHost/Protocol/IMessageSender.cs +++ b/src/ServiceHost/ServiceHost/Protocol/IMessageSender.cs @@ -4,8 +4,9 @@ // using System.Threading.Tasks; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { internal interface IMessageSender { diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageDispatcher.cs b/src/ServiceHost/ServiceHost/Protocol/MessageDispatcher.cs index 21c179e2..58f541d2 100644 --- a/src/ServiceHost/ServiceHost/Protocol/MessageDispatcher.cs +++ b/src/ServiceHost/ServiceHost/Protocol/MessageDispatcher.cs @@ -3,15 +3,15 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Channel; -using Microsoft.SqlTools.EditorServices.Utility; using System; using System.Collections.Generic; using System.IO; using System.Threading; using System.Threading.Tasks; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel; +using Microsoft.SqlTools.EditorServices.Utility; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { public class MessageDispatcher { diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageParseException.cs b/src/ServiceHost/ServiceHost/Protocol/MessageParseException.cs index 98a17c20..76db24d3 100644 --- a/src/ServiceHost/ServiceHost/Protocol/MessageParseException.cs +++ b/src/ServiceHost/ServiceHost/Protocol/MessageParseException.cs @@ -5,7 +5,7 @@ using System; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { public class MessageParseException : Exception { diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageProtocolType.cs b/src/ServiceHost/ServiceHost/Protocol/MessageProtocolType.cs index 5484ae3c..09655481 100644 --- a/src/ServiceHost/ServiceHost/Protocol/MessageProtocolType.cs +++ b/src/ServiceHost/ServiceHost/Protocol/MessageProtocolType.cs @@ -3,7 +3,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { /// /// Defines the possible message protocol types. diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageReader.cs b/src/ServiceHost/ServiceHost/Protocol/MessageReader.cs index a2df43ba..7722a426 100644 --- a/src/ServiceHost/ServiceHost/Protocol/MessageReader.cs +++ b/src/ServiceHost/ServiceHost/Protocol/MessageReader.cs @@ -3,16 +3,18 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.EditorServices.Utility; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.IO; using System.Text; using System.Threading.Tasks; +using Microsoft.SqlTools.EditorServices.Utility; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { public class MessageReader { diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs b/src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs index 96e13bcd..4098d181 100644 --- a/src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs +++ b/src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs @@ -3,14 +3,16 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.EditorServices.Utility; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using System.IO; using System.Text; using System.Threading.Tasks; +using Microsoft.SqlTools.EditorServices.Utility; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { public class MessageWriter { diff --git a/src/ServiceHost/ServiceHost/Protocol/ProtocolEndpoint.cs b/src/ServiceHost/ServiceHost/Protocol/ProtocolEndpoint.cs index daead186..27601412 100644 --- a/src/ServiceHost/ServiceHost/Protocol/ProtocolEndpoint.cs +++ b/src/ServiceHost/ServiceHost/Protocol/ProtocolEndpoint.cs @@ -3,13 +3,14 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Channel; using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { /// /// Provides behavior for a client or server endpoint that diff --git a/src/ServiceHost/ServiceHost/Protocol/RequestContext.cs b/src/ServiceHost/ServiceHost/Protocol/RequestContext.cs index a35bb136..6d09294e 100644 --- a/src/ServiceHost/ServiceHost/Protocol/RequestContext.cs +++ b/src/ServiceHost/ServiceHost/Protocol/RequestContext.cs @@ -3,10 +3,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Newtonsoft.Json.Linq; using System.Threading.Tasks; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts; +using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol { public class RequestContext { diff --git a/src/ServiceHost/ServiceHost/Protocol/Serializers/IMessageSerializer.cs b/src/ServiceHost/ServiceHost/Protocol/Serializers/IMessageSerializer.cs index 81b23fa6..318955fd 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Serializers/IMessageSerializer.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Serializers/IMessageSerializer.cs @@ -5,7 +5,7 @@ using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers { /// /// Defines a common interface for message serializers. diff --git a/src/ServiceHost/ServiceHost/Protocol/Serializers/JsonRpcMessageSerializer.cs b/src/ServiceHost/ServiceHost/Protocol/Serializers/JsonRpcMessageSerializer.cs index fa1d1518..194f270d 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Serializers/JsonRpcMessageSerializer.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Serializers/JsonRpcMessageSerializer.cs @@ -5,7 +5,7 @@ using Newtonsoft.Json.Linq; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Serializers +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers { /// /// Serializes messages in the JSON RPC format. Used primarily diff --git a/src/ServiceHost/ServiceHost/Protocol/Serializers/V8MessageSerializer.cs b/src/ServiceHost/ServiceHost/Protocol/Serializers/V8MessageSerializer.cs index 941e249a..81af48f5 100644 --- a/src/ServiceHost/ServiceHost/Protocol/Serializers/V8MessageSerializer.cs +++ b/src/ServiceHost/ServiceHost/Protocol/Serializers/V8MessageSerializer.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json.Linq; using System; -namespace Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Serializers +namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers { /// /// Serializes messages in the V8 format. Used primarily for debug adapters. diff --git a/src/ServiceHost/ServiceHost/ServiceHost.cs b/src/ServiceHost/ServiceHost/ServiceHost.cs index e3e47d72..53337392 100644 --- a/src/ServiceHost/ServiceHost/ServiceHost.cs +++ b/src/ServiceHost/ServiceHost/ServiceHost.cs @@ -2,18 +2,19 @@ // 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.EditorServices.Protocol.LanguageServer; -using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol; -using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Channel; -using Microsoft.SqlTools.EditorServices.Session; + using System.Threading.Tasks; -using Microsoft.SqlTools.EditorServices.Utility; using System.Collections.Generic; using System.Text; using System.Threading; using System.Linq; using System; using Microsoft.SqlTools.EditorServices; +using Microsoft.SqlTools.EditorServices.Protocol.LanguageServer; +using Microsoft.SqlTools.EditorServices.Session; +using Microsoft.SqlTools.EditorServices.Utility; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel; namespace Microsoft.SqlTools.ServiceLayer.ServiceHost { diff --git a/src/ServiceHost/ServiceHost/ServiceHostBase.cs b/src/ServiceHost/ServiceHost/ServiceHostBase.cs index f1bc2e73..b89c90eb 100644 --- a/src/ServiceHost/ServiceHost/ServiceHostBase.cs +++ b/src/ServiceHost/ServiceHost/ServiceHostBase.cs @@ -3,10 +3,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // -using Microsoft.SqlTools.EditorServices.Protocol.LanguageServer; -using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol; -using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol.Channel; using System.Threading.Tasks; +using Microsoft.SqlTools.EditorServices.Protocol.LanguageServer; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol; +using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel; namespace Microsoft.SqlTools.ServiceLayer.ServiceHost {