Rename namespace: JsonRpc.Standard.xxx -> JsonRpc.xxx

Moved RPC message related classes into JsonRpc.Messages.

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
 {

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
 {

ConsoleTestApp/LibrarySession.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Threading;
-using JsonRpc.Standard.Server;
 
 namespace ConsoleTestApp
 {

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))

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

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;
 

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

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;

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;
 

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;
 

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
 {
     /// <summary>
     /// The base exception class that indicates the general error of JSON RPC client.

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
 {
     /// <summary>
     /// Provides methods for transmitting the client-side JSON RPC messages.

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
 {
 
     /// <summary>

JsonRpc.Commons/Contracts/Attributes.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Reflection;
 
-namespace JsonRpc.Standard.Contracts
+namespace JsonRpc.Contracts
 {
     /// <summary>
     /// Declares a JSON RPC method scope. Defines some common traits of the methods in the scope.

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
 {
     /// <summary>
     /// Defines method to choose the best match among a set of RPC methods according to the JSON RPC request.

JsonRpc.Commons/Contracts/IJsonRpcRequestMarshaler.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using Newtonsoft.Json.Linq;
 
-namespace JsonRpc.Standard.Contracts
+namespace JsonRpc.Contracts
 {
 
     /// <summary>

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
 {
     /// <summary>
     /// Used to convert value from/to JToken.

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
 {
     /// <summary>
     /// Defines method to invoke the specified JSON RPC method.

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
 {
     /// <summary>
     /// Contract details used in JSON RPC calls.

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
 {
     /// <summary>
     /// Provides methods that can build <see cref="JsonRpcServerContract"/> for service and client.

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
 {
     /// <summary>
     /// Provides information to map a JSON RPC method to a CLR method.

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
 {
     /// <summary>
     /// Used to map JSON RPC method and argument names into CLR counterparts.

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
 {
     /// <summary>
     /// Provides information to map an argument in JSON RPC method to a CLR method argument.

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
 {
     /// <summary>
     /// Contract details used in JSON RPC calls.

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

JsonRpc.Commons/JsonRpc.Commons.csproj

@@ -21,6 +21,7 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <RootNamespace>JsonRpc</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

JsonRpc.Commons/Message.cs → 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
 {
     /// <summary>
     /// Represents the base abstract JSON-RPC message.

JsonRpc.Commons/MessageEventArgs.cs → JsonRpc.Commons/Messages/MessageEventArgs.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
-namespace JsonRpc.Standard
+namespace JsonRpc.Messages
 {
     /// <summary>
     /// Contains event arguments for <see cref="Message"/> related events.

JsonRpc.Commons/ResponseError.cs → 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
 {
     /// <summary>
     /// Error codes, including those who are defined by the JSON-RPC 2.0 specification.

JsonRpc.Commons/RpcSerializer.cs → 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
     {

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
 {
     /// <summary>
     /// A factory that creates the specified JSON RPC service instance.

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
 {
     /// <summary>
     /// Manages a collection of features.