diff --git a/ConsoleTestApp/ILibraryService.cs b/ConsoleTestApp/ILibraryService.cs index 3ad7d48..6d39ba4 100644 --- a/ConsoleTestApp/ILibraryService.cs +++ b/ConsoleTestApp/ILibraryService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using JsonRpc.Standard.Contracts; +using JsonRpc.Contracts; namespace ConsoleTestApp { diff --git a/ConsoleTestApp/LibraryService.cs b/ConsoleTestApp/LibraryService.cs index bd2663b..575f540 100644 --- a/ConsoleTestApp/LibraryService.cs +++ b/ConsoleTestApp/LibraryService.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using JsonRpc.Standard; -using JsonRpc.Standard.Contracts; -using JsonRpc.Standard.Server; +using JsonRpc.Contracts; +using JsonRpc.Messages; +using JsonRpc.Server; namespace ConsoleTestApp { diff --git a/ConsoleTestApp/LibrarySession.cs b/ConsoleTestApp/LibrarySession.cs index fd4806a..08cab31 100644 --- a/ConsoleTestApp/LibrarySession.cs +++ b/ConsoleTestApp/LibrarySession.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Threading; -using JsonRpc.Standard.Server; namespace ConsoleTestApp { diff --git a/ConsoleTestApp/Program.cs b/ConsoleTestApp/Program.cs index 119f088..9cd8618 100644 --- a/ConsoleTestApp/Program.cs +++ b/ConsoleTestApp/Program.cs @@ -3,12 +3,10 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -using System.Threading.Tasks.Dataflow; +using JsonRpc.Client; +using JsonRpc.Contracts; using JsonRpc.DynamicProxy.Client; -using JsonRpc.Standard; -using JsonRpc.Standard.Client; -using JsonRpc.Standard.Contracts; -using JsonRpc.Standard.Server; +using JsonRpc.Server; using JsonRpc.Streams; using Nerdbank; @@ -40,7 +38,7 @@ static void Main(string[] args) // simplicity, here we just use a concrete class. var session = new LibrarySessionFeature(); serverHandler.DefaultFeatures.Set(session); - // Connect the datablocks + // Connect the MessageReader/Writer to the handler. // If we want server to stop, just stop the source using (var reader = new ByLineTextMessageReader(streams.Item1)) using (var writer = new ByLineTextMessageWriter(streams.Item1)) diff --git a/JsonRpc.AspNetCore/AspNetCoreFeatureCollection.cs b/JsonRpc.AspNetCore/AspNetCoreFeatureCollection.cs index f7faddc..137804f 100644 --- a/JsonRpc.AspNetCore/AspNetCoreFeatureCollection.cs +++ b/JsonRpc.AspNetCore/AspNetCoreFeatureCollection.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using JsonRpc.Standard.Server; +using JsonRpc.Server; using Microsoft.AspNetCore.Http; namespace JsonRpc.AspNetCore diff --git a/JsonRpc.AspNetCore/AspNetCoreRpcServerHandler.cs b/JsonRpc.AspNetCore/AspNetCoreRpcServerHandler.cs index 31b57dc..857fb26 100644 --- a/JsonRpc.AspNetCore/AspNetCoreRpcServerHandler.cs +++ b/JsonRpc.AspNetCore/AspNetCoreRpcServerHandler.cs @@ -3,8 +3,8 @@ using System.IO; using System.Text; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Server; +using JsonRpc.Messages; +using JsonRpc.Server; using Microsoft.AspNetCore.Http; using Newtonsoft.Json; diff --git a/JsonRpc.AspNetCore/HttpContextServiceFactory.cs b/JsonRpc.AspNetCore/HttpContextServiceFactory.cs index 70179f6..5089a55 100644 --- a/JsonRpc.AspNetCore/HttpContextServiceFactory.cs +++ b/JsonRpc.AspNetCore/HttpContextServiceFactory.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Reflection; using System.Text; -using JsonRpc.Standard.Server; +using JsonRpc.Server; using Microsoft.AspNetCore.Http; namespace JsonRpc.AspNetCore diff --git a/JsonRpc.AspNetCore/JsonRpcAspNetExtensions.cs b/JsonRpc.AspNetCore/JsonRpcAspNetExtensions.cs index 2a2e77c..ab7b704 100644 --- a/JsonRpc.AspNetCore/JsonRpcAspNetExtensions.cs +++ b/JsonRpc.AspNetCore/JsonRpcAspNetExtensions.cs @@ -1,9 +1,7 @@ using System; using System.IO; using System.Reflection; -using JsonRpc.Standard; -using JsonRpc.Standard.Contracts; -using JsonRpc.Standard.Server; +using JsonRpc.Server; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; diff --git a/JsonRpc.AspNetCore/JsonRpcBuilder.cs b/JsonRpc.AspNetCore/JsonRpcBuilder.cs index b93e11e..ceee755 100644 --- a/JsonRpc.AspNetCore/JsonRpcBuilder.cs +++ b/JsonRpc.AspNetCore/JsonRpcBuilder.cs @@ -4,7 +4,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -using JsonRpc.Standard.Server; +using JsonRpc.Server; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/JsonRpc.AspNetCore/JsonRpcOptions.cs b/JsonRpc.AspNetCore/JsonRpcOptions.cs index 6426371..9de2802 100644 --- a/JsonRpc.AspNetCore/JsonRpcOptions.cs +++ b/JsonRpc.AspNetCore/JsonRpcOptions.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Text; -using JsonRpc.Standard.Contracts; -using JsonRpc.Standard.Server; +using JsonRpc.Contracts; +using JsonRpc.Server; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/JsonRpc.Commons/Client/Exceptions.cs b/JsonRpc.Commons/Client/Exceptions.cs index 3ba2110..5fb5ea3 100644 --- a/JsonRpc.Commons/Client/Exceptions.cs +++ b/JsonRpc.Commons/Client/Exceptions.cs @@ -1,14 +1,13 @@ using System; -using System.Collections.Generic; -using System.Runtime.ExceptionServices; using System.Security; using System.Text; +using JsonRpc.Messages; using Newtonsoft.Json; #if NET45 using System.Runtime.Serialization; #endif -namespace JsonRpc.Standard.Client +namespace JsonRpc.Client { /// /// The base exception class that indicates the general error of JSON RPC client. diff --git a/JsonRpc.Commons/Client/IJsonRpcClientHandler.cs b/JsonRpc.Commons/Client/IJsonRpcClientHandler.cs index 68bf170..a0ff057 100644 --- a/JsonRpc.Commons/Client/IJsonRpcClientHandler.cs +++ b/JsonRpc.Commons/Client/IJsonRpcClientHandler.cs @@ -1,10 +1,9 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Threading; using System.Threading.Tasks; +using JsonRpc.Messages; -namespace JsonRpc.Standard.Client +namespace JsonRpc.Client { /// /// Provides methods for transmitting the client-side JSON RPC messages. diff --git a/JsonRpc.Commons/Client/JsonRpcClient.cs b/JsonRpc.Commons/Client/JsonRpcClient.cs index a468551..cf88755 100644 --- a/JsonRpc.Commons/Client/JsonRpcClient.cs +++ b/JsonRpc.Commons/Client/JsonRpcClient.cs @@ -1,15 +1,11 @@ using System; -using System.Collections.Generic; -using System.Diagnostics; using System.Runtime.CompilerServices; -using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard.Contracts; -using JsonRpc.Standard.Server; +using JsonRpc.Messages; using Newtonsoft.Json.Linq; -namespace JsonRpc.Standard.Client +namespace JsonRpc.Client { /// diff --git a/JsonRpc.Commons/Contracts/Attributes.cs b/JsonRpc.Commons/Contracts/Attributes.cs index dd2c620..54a325e 100644 --- a/JsonRpc.Commons/Contracts/Attributes.cs +++ b/JsonRpc.Commons/Contracts/Attributes.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Declares a JSON RPC method scope. Defines some common traits of the methods in the scope. diff --git a/JsonRpc.Commons/Contracts/IJsonRpcMethodBinder.cs b/JsonRpc.Commons/Contracts/IJsonRpcMethodBinder.cs index 8f142c7..1ed4d24 100644 --- a/JsonRpc.Commons/Contracts/IJsonRpcMethodBinder.cs +++ b/JsonRpc.Commons/Contracts/IJsonRpcMethodBinder.cs @@ -4,12 +4,10 @@ using System.Linq; using System.Reflection; using System.Threading; -using JsonRpc.Standard.Server; -using Newtonsoft.Json; +using JsonRpc.Server; using Newtonsoft.Json.Linq; -using Newtonsoft.Json.Serialization; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Defines method to choose the best match among a set of RPC methods according to the JSON RPC request. diff --git a/JsonRpc.Commons/Contracts/IJsonRpcRequestMarshaler.cs b/JsonRpc.Commons/Contracts/IJsonRpcRequestMarshaler.cs index de1cb14..4eedaa5 100644 --- a/JsonRpc.Commons/Contracts/IJsonRpcRequestMarshaler.cs +++ b/JsonRpc.Commons/Contracts/IJsonRpcRequestMarshaler.cs @@ -4,7 +4,7 @@ using System.Threading; using Newtonsoft.Json.Linq; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// diff --git a/JsonRpc.Commons/Contracts/IJsonValueConverter.cs b/JsonRpc.Commons/Contracts/IJsonValueConverter.cs index efb3d20..fabdd3b 100644 --- a/JsonRpc.Commons/Contracts/IJsonValueConverter.cs +++ b/JsonRpc.Commons/Contracts/IJsonValueConverter.cs @@ -1,11 +1,9 @@ using System; -using System.Collections.Generic; -using System.Text; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Used to convert value from/to JToken. diff --git a/JsonRpc.Commons/Contracts/IRpcMethodInvoker.cs b/JsonRpc.Commons/Contracts/IRpcMethodInvoker.cs index 62deb5d..d511e99 100644 --- a/JsonRpc.Commons/Contracts/IRpcMethodInvoker.cs +++ b/JsonRpc.Commons/Contracts/IRpcMethodInvoker.cs @@ -1,16 +1,10 @@ using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; using System.Reflection; using System.Runtime.ExceptionServices; -using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard.Server; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using JsonRpc.Server; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Defines method to invoke the specified JSON RPC method. diff --git a/JsonRpc.Commons/Contracts/JsonRpcClientContract.cs b/JsonRpc.Commons/Contracts/JsonRpcClientContract.cs index 9d3de06..34a43b4 100644 --- a/JsonRpc.Commons/Contracts/JsonRpcClientContract.cs +++ b/JsonRpc.Commons/Contracts/JsonRpcClientContract.cs @@ -1,9 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Reflection; -using System.Text; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Contract details used in JSON RPC calls. diff --git a/JsonRpc.Commons/Contracts/JsonRpcContractResolver.cs b/JsonRpc.Commons/Contracts/JsonRpcContractResolver.cs index 45f877f..f0f52be 100644 --- a/JsonRpc.Commons/Contracts/JsonRpcContractResolver.cs +++ b/JsonRpc.Commons/Contracts/JsonRpcContractResolver.cs @@ -2,11 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Text; using System.Threading; -using JsonRpc.Standard.Server; +using JsonRpc.Server; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Provides methods that can build for service and client. diff --git a/JsonRpc.Commons/Contracts/JsonRpcMethod.cs b/JsonRpc.Commons/Contracts/JsonRpcMethod.cs index 87f7835..5ca4b59 100644 --- a/JsonRpc.Commons/Contracts/JsonRpcMethod.cs +++ b/JsonRpc.Commons/Contracts/JsonRpcMethod.cs @@ -1,13 +1,7 @@ using System; -using System.Collections; using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Threading; -using System.Threading.Tasks; -using Newtonsoft.Json.Linq; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Provides information to map a JSON RPC method to a CLR method. diff --git a/JsonRpc.Commons/Contracts/JsonRpcNamingStrategy.cs b/JsonRpc.Commons/Contracts/JsonRpcNamingStrategy.cs index 14d9f06..ea52346 100644 --- a/JsonRpc.Commons/Contracts/JsonRpcNamingStrategy.cs +++ b/JsonRpc.Commons/Contracts/JsonRpcNamingStrategy.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Newtonsoft.Json; +using Newtonsoft.Json; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Used to map JSON RPC method and argument names into CLR counterparts. diff --git a/JsonRpc.Commons/Contracts/JsonRpcParameter.cs b/JsonRpc.Commons/Contracts/JsonRpcParameter.cs index e7bcce3..d182e60 100644 --- a/JsonRpc.Commons/Contracts/JsonRpcParameter.cs +++ b/JsonRpc.Commons/Contracts/JsonRpcParameter.cs @@ -2,9 +2,10 @@ using System.Collections; using System.Reflection; using System.Threading; +using JsonRpc.Messages; using Newtonsoft.Json.Linq; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Provides information to map an argument in JSON RPC method to a CLR method argument. diff --git a/JsonRpc.Commons/Contracts/JsonRpcServerContract.cs b/JsonRpc.Commons/Contracts/JsonRpcServerContract.cs index 38aff0e..b578010 100644 --- a/JsonRpc.Commons/Contracts/JsonRpcServerContract.cs +++ b/JsonRpc.Commons/Contracts/JsonRpcServerContract.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Newtonsoft.Json.Serialization; +using System.Collections.Generic; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { /// /// Contract details used in JSON RPC calls. diff --git a/JsonRpc.Commons/Contracts/MarshaledRequestParameters.cs b/JsonRpc.Commons/Contracts/MarshaledRequestParameters.cs index 067f0fd..9f0dc6d 100644 --- a/JsonRpc.Commons/Contracts/MarshaledRequestParameters.cs +++ b/JsonRpc.Commons/Contracts/MarshaledRequestParameters.cs @@ -1,7 +1,7 @@ using System.Threading; using Newtonsoft.Json.Linq; -namespace JsonRpc.Standard.Contracts +namespace JsonRpc.Contracts { public struct MarshaledRequestParameters diff --git a/JsonRpc.Commons/JsonRpc.Commons.csproj b/JsonRpc.Commons/JsonRpc.Commons.csproj index e2301e1..645bc24 100644 --- a/JsonRpc.Commons/JsonRpc.Commons.csproj +++ b/JsonRpc.Commons/JsonRpc.Commons.csproj @@ -21,6 +21,7 @@ Apache-2.0 true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + JsonRpc diff --git a/JsonRpc.Commons/Message.cs b/JsonRpc.Commons/Messages/Message.cs similarity index 99% rename from JsonRpc.Commons/Message.cs rename to JsonRpc.Commons/Messages/Message.cs index ce399e8..56e86ae 100644 --- a/JsonRpc.Commons/Message.cs +++ b/JsonRpc.Commons/Messages/Message.cs @@ -1,11 +1,9 @@ using System; -using System.Diagnostics; using System.IO; -using System.Threading; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace JsonRpc.Standard +namespace JsonRpc.Messages { /// /// Represents the base abstract JSON-RPC message. diff --git a/JsonRpc.Commons/MessageEventArgs.cs b/JsonRpc.Commons/Messages/MessageEventArgs.cs similarity index 86% rename from JsonRpc.Commons/MessageEventArgs.cs rename to JsonRpc.Commons/Messages/MessageEventArgs.cs index 9dd7ab3..a09e1fb 100644 --- a/JsonRpc.Commons/MessageEventArgs.cs +++ b/JsonRpc.Commons/Messages/MessageEventArgs.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; -namespace JsonRpc.Standard +namespace JsonRpc.Messages { /// /// Contains event arguments for related events. diff --git a/JsonRpc.Commons/ResponseError.cs b/JsonRpc.Commons/Messages/ResponseError.cs similarity index 99% rename from JsonRpc.Commons/ResponseError.cs rename to JsonRpc.Commons/Messages/ResponseError.cs index f512bd9..b9195e6 100644 --- a/JsonRpc.Commons/ResponseError.cs +++ b/JsonRpc.Commons/Messages/ResponseError.cs @@ -1,11 +1,12 @@ using System; using System.Collections; using System.Text; -using JsonRpc.Standard.Client; +using JsonRpc.Client; +using JsonRpc.Server; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace JsonRpc.Standard +namespace JsonRpc.Messages { /// /// Error codes, including those who are defined by the JSON-RPC 2.0 specification. diff --git a/JsonRpc.Commons/RpcSerializer.cs b/JsonRpc.Commons/Messages/RpcSerializer.cs similarity index 98% rename from JsonRpc.Commons/RpcSerializer.cs rename to JsonRpc.Commons/Messages/RpcSerializer.cs index b860bd6..88f1e5c 100644 --- a/JsonRpc.Commons/RpcSerializer.cs +++ b/JsonRpc.Commons/Messages/RpcSerializer.cs @@ -4,7 +4,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace JsonRpc.Standard +namespace JsonRpc.Messages { internal static class RpcSerializer { diff --git a/JsonRpc.Commons/Server/DefaultServiceFactory.cs b/JsonRpc.Commons/Server/DefaultServiceFactory.cs index be6b5c4..f15227b 100644 --- a/JsonRpc.Commons/Server/DefaultServiceFactory.cs +++ b/JsonRpc.Commons/Server/DefaultServiceFactory.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; using System.Reflection; -using System.Text; -using JsonRpc.Standard.Contracts; -namespace JsonRpc.Standard.Server +namespace JsonRpc.Server { /// /// A factory that creates the specified JSON RPC service instance. diff --git a/JsonRpc.Commons/Server/FeatureCollection.cs b/JsonRpc.Commons/Server/FeatureCollection.cs index 0179aa8..ed80b60 100644 --- a/JsonRpc.Commons/Server/FeatureCollection.cs +++ b/JsonRpc.Commons/Server/FeatureCollection.cs @@ -1,11 +1,9 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Reflection; -using System.Text; -namespace JsonRpc.Standard.Server +namespace JsonRpc.Server { /// /// Manages a collection of features. diff --git a/JsonRpc.Commons/Server/Features.cs b/JsonRpc.Commons/Server/Features.cs index 7b08622..08d4e18 100644 --- a/JsonRpc.Commons/Server/Features.cs +++ b/JsonRpc.Commons/Server/Features.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; +using JsonRpc.Messages; -namespace JsonRpc.Standard.Server +namespace JsonRpc.Server { /// /// Provides methods to cancel an arbitrary impending request. diff --git a/JsonRpc.Commons/Server/IJsonRpcServiceHost.cs b/JsonRpc.Commons/Server/IJsonRpcServiceHost.cs index 854f182..ce5432c 100644 --- a/JsonRpc.Commons/Server/IJsonRpcServiceHost.cs +++ b/JsonRpc.Commons/Server/IJsonRpcServiceHost.cs @@ -1,8 +1,9 @@ using System; using System.Threading; using System.Threading.Tasks; +using JsonRpc.Messages; -namespace JsonRpc.Standard.Server +namespace JsonRpc.Server { /// /// Provides methods to dispatch and invoke the specified JSON RPC methods. diff --git a/JsonRpc.Commons/JsonRpcException.cs b/JsonRpc.Commons/Server/JsonRpcException.cs similarity index 94% rename from JsonRpc.Commons/JsonRpcException.cs rename to JsonRpc.Commons/Server/JsonRpcException.cs index a4b683d..5d0ab7b 100644 --- a/JsonRpc.Commons/JsonRpcException.cs +++ b/JsonRpc.Commons/Server/JsonRpcException.cs @@ -1,14 +1,12 @@ using System; -using System.Runtime.CompilerServices; using System.Security; -using JsonRpc.Standard.Server; +using JsonRpc.Messages; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; #if NET45 using System.Runtime.Serialization; #endif -namespace JsonRpc.Standard +namespace JsonRpc.Server { /// /// An exception that is thrown by implementations diff --git a/JsonRpc.Commons/Server/JsonRpcServerHandler.cs b/JsonRpc.Commons/Server/JsonRpcServerHandler.cs index e55fc2b..a14f269 100644 --- a/JsonRpc.Commons/Server/JsonRpcServerHandler.cs +++ b/JsonRpc.Commons/Server/JsonRpcServerHandler.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; -using JsonRpc.Standard.Server; -namespace JsonRpc.Standard.Server +namespace JsonRpc.Server { /// /// Abstract class for receiving request from somewhere, diff --git a/JsonRpc.Commons/Server/JsonRpcService.cs b/JsonRpc.Commons/Server/JsonRpcService.cs index abb81af..a6934e5 100644 --- a/JsonRpc.Commons/Server/JsonRpcService.cs +++ b/JsonRpc.Commons/Server/JsonRpcService.cs @@ -1,6 +1,4 @@ -using JsonRpc.Standard.Contracts; - -namespace JsonRpc.Standard.Server +namespace JsonRpc.Server { public interface IJsonRpcService { diff --git a/JsonRpc.Commons/Server/JsonRpcServiceHost.cs b/JsonRpc.Commons/Server/JsonRpcServiceHost.cs index 5913c4f..fba3a17 100644 --- a/JsonRpc.Commons/Server/JsonRpcServiceHost.cs +++ b/JsonRpc.Commons/Server/JsonRpcServiceHost.cs @@ -1,17 +1,15 @@ using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Reflection; -using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard.Contracts; +using JsonRpc.Contracts; +using JsonRpc.Messages; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; -namespace JsonRpc.Standard.Server +namespace JsonRpc.Server { internal class JsonRpcServiceHost : IJsonRpcServiceHost diff --git a/JsonRpc.Commons/Server/JsonRpcServiceHostBuilder.cs b/JsonRpc.Commons/Server/JsonRpcServiceHostBuilder.cs index 8e41d68..a22f6cb 100644 --- a/JsonRpc.Commons/Server/JsonRpcServiceHostBuilder.cs +++ b/JsonRpc.Commons/Server/JsonRpcServiceHostBuilder.cs @@ -2,13 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Text; using System.Threading.Tasks; -using JsonRpc.Standard.Contracts; +using JsonRpc.Contracts; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -namespace JsonRpc.Standard.Server +namespace JsonRpc.Server { /// /// A builder for . diff --git a/JsonRpc.Commons/Server/RequestContext.cs b/JsonRpc.Commons/Server/RequestContext.cs index 7fdb2af..1531d31 100644 --- a/JsonRpc.Commons/Server/RequestContext.cs +++ b/JsonRpc.Commons/Server/RequestContext.cs @@ -1,7 +1,8 @@ using System; using System.Threading; +using JsonRpc.Messages; -namespace JsonRpc.Standard.Server +namespace JsonRpc.Server { /// /// Provides the context per JSON RPC request. diff --git a/JsonRpc.Commons/Utility.cs b/JsonRpc.Commons/Utility.cs index 71358ea..2ee13bd 100644 --- a/JsonRpc.Commons/Utility.cs +++ b/JsonRpc.Commons/Utility.cs @@ -1,9 +1,7 @@ using System; -using System.Collections.Generic; -using System.Threading; using System.Threading.Tasks; -namespace JsonRpc.Standard +namespace JsonRpc { internal static class Utility { diff --git a/JsonRpc.DynamicProxy/Client/JsonRpcProxyBuilder.cs b/JsonRpc.DynamicProxy/Client/JsonRpcProxyBuilder.cs index 5f014af..2a68617 100644 --- a/JsonRpc.DynamicProxy/Client/JsonRpcProxyBuilder.cs +++ b/JsonRpc.DynamicProxy/Client/JsonRpcProxyBuilder.cs @@ -6,8 +6,8 @@ using System.Reflection; using System.Reflection.Emit; using System.Threading; -using JsonRpc.Standard.Client; -using JsonRpc.Standard.Contracts; +using JsonRpc.Client; +using JsonRpc.Contracts; namespace JsonRpc.DynamicProxy.Client { diff --git a/JsonRpc.DynamicProxy/Client/JsonRpcRealProxy.cs b/JsonRpc.DynamicProxy/Client/JsonRpcRealProxy.cs index d2012f0..6155a14 100644 --- a/JsonRpc.DynamicProxy/Client/JsonRpcRealProxy.cs +++ b/JsonRpc.DynamicProxy/Client/JsonRpcRealProxy.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Client; -using JsonRpc.Standard.Contracts; +using JsonRpc.Client; +using JsonRpc.Contracts; +using JsonRpc.Messages; namespace JsonRpc.DynamicProxy.Client { diff --git a/JsonRpc.Http/HttpRpcClientHandler.cs b/JsonRpc.Http/HttpRpcClientHandler.cs index 0793cab..4d77854 100644 --- a/JsonRpc.Http/HttpRpcClientHandler.cs +++ b/JsonRpc.Http/HttpRpcClientHandler.cs @@ -4,8 +4,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Client; +using JsonRpc.Client; +using JsonRpc.Messages; namespace JsonRpc.Http { diff --git a/JsonRpc.Streams/ByLineTextMessageReader.cs b/JsonRpc.Streams/ByLineTextMessageReader.cs index 7f2f567..1de0876 100644 --- a/JsonRpc.Streams/ByLineTextMessageReader.cs +++ b/JsonRpc.Streams/ByLineTextMessageReader.cs @@ -5,8 +5,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using Newtonsoft.Json.Linq; -using JsonRpc.Standard; +using JsonRpc.Messages; namespace JsonRpc.Streams { diff --git a/JsonRpc.Streams/ByLineTextMessageWriter.cs b/JsonRpc.Streams/ByLineTextMessageWriter.cs index 9ca1554..3a9920b 100644 --- a/JsonRpc.Streams/ByLineTextMessageWriter.cs +++ b/JsonRpc.Streams/ByLineTextMessageWriter.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; +using JsonRpc.Messages; namespace JsonRpc.Streams { diff --git a/JsonRpc.Streams/MessageReader.cs b/JsonRpc.Streams/MessageReader.cs index 952ae24..08247ac 100644 --- a/JsonRpc.Streams/MessageReader.cs +++ b/JsonRpc.Streams/MessageReader.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; +using JsonRpc.Messages; namespace JsonRpc.Streams { diff --git a/JsonRpc.Streams/MessageWriter.cs b/JsonRpc.Streams/MessageWriter.cs index 8acb37f..c233625 100644 --- a/JsonRpc.Streams/MessageWriter.cs +++ b/JsonRpc.Streams/MessageWriter.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; +using JsonRpc.Messages; namespace JsonRpc.Streams { diff --git a/JsonRpc.Streams/PartwiseStreamMessageReader.cs b/JsonRpc.Streams/PartwiseStreamMessageReader.cs index 47ca78c..cae81f4 100644 --- a/JsonRpc.Streams/PartwiseStreamMessageReader.cs +++ b/JsonRpc.Streams/PartwiseStreamMessageReader.cs @@ -1,5 +1,4 @@ -using JsonRpc.Standard; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -7,6 +6,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using JsonRpc.Messages; namespace JsonRpc.Streams { diff --git a/JsonRpc.Streams/PartwiseStreamMessageWriter.cs b/JsonRpc.Streams/PartwiseStreamMessageWriter.cs index 2df4ce5..e9766f7 100644 --- a/JsonRpc.Streams/PartwiseStreamMessageWriter.cs +++ b/JsonRpc.Streams/PartwiseStreamMessageWriter.cs @@ -3,7 +3,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; +using JsonRpc.Messages; namespace JsonRpc.Streams { diff --git a/JsonRpc.Streams/StreamRpcClientHandler.cs b/JsonRpc.Streams/StreamRpcClientHandler.cs index a2c9688..6d179ba 100644 --- a/JsonRpc.Streams/StreamRpcClientHandler.cs +++ b/JsonRpc.Streams/StreamRpcClientHandler.cs @@ -6,8 +6,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Client; +using JsonRpc.Client; +using JsonRpc.Messages; namespace JsonRpc.Streams { diff --git a/JsonRpc.Streams/StreamRpcServerHandler.cs b/JsonRpc.Streams/StreamRpcServerHandler.cs index f54cfc4..28ae235 100644 --- a/JsonRpc.Streams/StreamRpcServerHandler.cs +++ b/JsonRpc.Streams/StreamRpcServerHandler.cs @@ -6,8 +6,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Server; +using JsonRpc.Messages; +using JsonRpc.Server; namespace JsonRpc.Streams { diff --git a/JsonRpc.WebSockets/WebSocketMessageReader.cs b/JsonRpc.WebSockets/WebSocketMessageReader.cs index 9524f83..76c26f6 100644 --- a/JsonRpc.WebSockets/WebSocketMessageReader.cs +++ b/JsonRpc.WebSockets/WebSocketMessageReader.cs @@ -3,8 +3,7 @@ using System.Net.WebSockets; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Server; +using JsonRpc.Messages; using JsonRpc.Streams; namespace JsonRpc.WebSockets diff --git a/JsonRpc.WebSockets/WebSocketMessageWriter.cs b/JsonRpc.WebSockets/WebSocketMessageWriter.cs index 2108c98..19f8158 100644 --- a/JsonRpc.WebSockets/WebSocketMessageWriter.cs +++ b/JsonRpc.WebSockets/WebSocketMessageWriter.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; +using JsonRpc.Messages; using JsonRpc.Streams; namespace JsonRpc.WebSockets diff --git a/UnitTestProject1/ClientTests.cs b/UnitTestProject1/ClientTests.cs index f604c79..63b925b 100644 --- a/UnitTestProject1/ClientTests.cs +++ b/UnitTestProject1/ClientTests.cs @@ -6,10 +6,10 @@ using System.Numerics; using System.Threading; using System.Threading.Tasks; +using JsonRpc.Client; using JsonRpc.DynamicProxy.Client; -using JsonRpc.Standard; -using JsonRpc.Standard.Client; -using JsonRpc.Standard.Server; +using JsonRpc.Messages; +using JsonRpc.Server; using Newtonsoft.Json.Linq; using UnitTestProject1.Helpers; using Xunit; diff --git a/UnitTestProject1/Helpers/JsonRpcDirectHandler.cs b/UnitTestProject1/Helpers/JsonRpcDirectHandler.cs index 7328d4d..d4678b8 100644 --- a/UnitTestProject1/Helpers/JsonRpcDirectHandler.cs +++ b/UnitTestProject1/Helpers/JsonRpcDirectHandler.cs @@ -1,9 +1,9 @@ using System; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Client; -using JsonRpc.Standard.Server; +using JsonRpc.Client; +using JsonRpc.Messages; +using JsonRpc.Server; namespace UnitTestProject1.Helpers { diff --git a/UnitTestProject1/Helpers/JsonRpcHttpMessageDirectHandler.cs b/UnitTestProject1/Helpers/JsonRpcHttpMessageDirectHandler.cs index 1d1ae0f..f71c53f 100644 --- a/UnitTestProject1/Helpers/JsonRpcHttpMessageDirectHandler.cs +++ b/UnitTestProject1/Helpers/JsonRpcHttpMessageDirectHandler.cs @@ -5,8 +5,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Server; +using JsonRpc.Messages; +using JsonRpc.Server; namespace UnitTestProject1.Helpers { diff --git a/UnitTestProject1/Helpers/TestJsonRpcService.cs b/UnitTestProject1/Helpers/TestJsonRpcService.cs index 9745dda..c43d620 100644 --- a/UnitTestProject1/Helpers/TestJsonRpcService.cs +++ b/UnitTestProject1/Helpers/TestJsonRpcService.cs @@ -3,9 +3,9 @@ using System.Numerics; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Contracts; -using JsonRpc.Standard.Server; +using JsonRpc.Contracts; +using JsonRpc.Messages; +using JsonRpc.Server; namespace UnitTestProject1.Helpers { diff --git a/UnitTestProject1/JsonRpcHttpTests.cs b/UnitTestProject1/JsonRpcHttpTests.cs index d3db013..5382e08 100644 --- a/UnitTestProject1/JsonRpcHttpTests.cs +++ b/UnitTestProject1/JsonRpcHttpTests.cs @@ -4,9 +4,9 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using JsonRpc.Client; using JsonRpc.DynamicProxy.Client; using JsonRpc.Http; -using JsonRpc.Standard.Client; using UnitTestProject1.Helpers; using Xunit; using Xunit.Abstractions; diff --git a/UnitTestProject1/JsonRpcStreamsTests.cs b/UnitTestProject1/JsonRpcStreamsTests.cs index 0fdeda1..d773f3f 100644 --- a/UnitTestProject1/JsonRpcStreamsTests.cs +++ b/UnitTestProject1/JsonRpcStreamsTests.cs @@ -6,10 +6,10 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using JsonRpc.Client; using JsonRpc.DynamicProxy.Client; -using JsonRpc.Standard; -using JsonRpc.Standard.Client; -using JsonRpc.Standard.Server; +using JsonRpc.Messages; +using JsonRpc.Server; using JsonRpc.Streams; using Nerdbank.Streams; using Newtonsoft.Json; diff --git a/UnitTestProject1/ServiceHostTests.cs b/UnitTestProject1/ServiceHostTests.cs index db139b3..0ba4911 100644 --- a/UnitTestProject1/ServiceHostTests.cs +++ b/UnitTestProject1/ServiceHostTests.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; +using JsonRpc.Messages; using Newtonsoft.Json.Linq; using Xunit; using Xunit.Abstractions; diff --git a/UnitTestProject1/TestRoutines.cs b/UnitTestProject1/TestRoutines.cs index 76973f8..3a6b2d9 100644 --- a/UnitTestProject1/TestRoutines.cs +++ b/UnitTestProject1/TestRoutines.cs @@ -6,8 +6,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Client; +using JsonRpc.Client; +using JsonRpc.Messages; using UnitTestProject1.Helpers; using Xunit; diff --git a/UnitTestProject1/Utility.cs b/UnitTestProject1/Utility.cs index f7ba522..97d37e3 100644 --- a/UnitTestProject1/Utility.cs +++ b/UnitTestProject1/Utility.cs @@ -7,10 +7,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using JsonRpc.Standard; -using JsonRpc.Standard.Client; -using JsonRpc.Standard.Contracts; -using JsonRpc.Standard.Server; +using JsonRpc.Contracts; +using JsonRpc.Server; using Newtonsoft.Json.Linq; namespace UnitTestProject1 diff --git a/WebTestApplication/Controllers/JsonRpcController.cs b/WebTestApplication/Controllers/JsonRpcController.cs index e2e6efe..3646d70 100644 --- a/WebTestApplication/Controllers/JsonRpcController.cs +++ b/WebTestApplication/Controllers/JsonRpcController.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Threading.Tasks; using JsonRpc.AspNetCore; -using JsonRpc.Standard.Server; +using JsonRpc.Server; using JsonRpc.Streams; using JsonRpc.WebSockets; using Microsoft.AspNetCore.Mvc; diff --git a/WebTestApplication/Services/ValuesService.cs b/WebTestApplication/Services/ValuesService.cs index 64c644c..cdeb014 100644 --- a/WebTestApplication/Services/ValuesService.cs +++ b/WebTestApplication/Services/ValuesService.cs @@ -1,10 +1,10 @@ -using JsonRpc.Standard.Server; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using JsonRpc.AspNetCore; -using JsonRpc.Standard.Contracts; +using JsonRpc.Contracts; +using JsonRpc.Server; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/WebTestApplication/Startup.cs b/WebTestApplication/Startup.cs index 73e9bdc..2082e02 100644 --- a/WebTestApplication/Startup.cs +++ b/WebTestApplication/Startup.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using JsonRpc.AspNetCore; -using JsonRpc.Standard.Contracts; using Microsoft.AspNetCore.Http; namespace WebTestApplication