Merge pull request #102 from OmniSharp/bug/gh-98

Bug/gh #98

Author: david-driscoll

src/Client/Protocol/ServerMessage.cs

@@ -14,6 +14,7 @@ public class ServerMessage
         /// <summary>
         ///     The JSON-RPC protocol version.
         /// </summary>
+        [JsonProperty("jsonrpc")]
         public string ProtocolVersion { get; set; } = "2.0";
 
         /// <summary>

src/JsonRpc/Client/Notification.cs

@@ -6,6 +6,7 @@ namespace OmniSharp.Extensions.JsonRpc.Client
     [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
     public class Notification
     {
+        [JsonProperty("jsonrpc")]
         public string ProtocolVersion { get; } = "2.0";
 
         public string Method { get; set; }

src/JsonRpc/Client/Request.cs

@@ -8,6 +8,7 @@ public class Request
     {
         public object Id { get; set; }
 
+        [JsonProperty("jsonrpc")]
         public string ProtocolVersion { get; } = "2.0";
 
         public string Method { get; set; }

src/JsonRpc/Client/Response.cs

@@ -17,6 +17,7 @@ public Response(object id, object result)
             Result = result;
         }
 
+        [JsonProperty("jsonrpc")]
         public string ProtocolVersion { get; set; } = "2.0";
 
         public object Id { get; set; }

src/JsonRpc/RpcError.cs

@@ -20,6 +20,7 @@ public RpcError(object id, ErrorMessage<T> message, string protocolVersion)
             ProtocolVersion = protocolVersion;
         }
 
+        [JsonProperty("jsonrpc")]
         public string ProtocolVersion { get; set; }
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]

src/JsonRpc/RpcErrorConverter.cs

@@ -36,7 +36,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 data = dataToken.ToObject(errorMessageType, serializer);
             }
 
-            return Activator.CreateInstance(objectType, requestId, data, obj["protocolVersion"].ToString());
+            return Activator.CreateInstance(objectType, requestId, data, obj["jsonrpc"].ToString());
         }
 
         public override bool CanConvert(Type objectType)

src/JsonRpc/Server/Notification.cs

@@ -18,6 +18,7 @@ internal Notification(
 
         internal Notification(string method, JToken @params) : this(method, @params, "2.0") { }
 
+        [JsonProperty("jsonrpc")]
         public string ProtocolVersion { get; }
 
         public string Method { get; }

src/JsonRpc/Server/Request.cs

@@ -22,6 +22,7 @@ internal Request(
 
         public object Id { get; }
 
+        [JsonProperty("jsonrpc")]
         public string ProtocolVersion { get; }
 
         public string Method { get; }

src/JsonRpc/Server/ResponseBase.cs

@@ -1,3 +1,7 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
+
 namespace OmniSharp.Extensions.JsonRpc.Server
 {
     public class ResponseBase
@@ -7,8 +11,9 @@ public ResponseBase(object id)
             Id = id;
         }
 
+        [JsonProperty("jsonrpc")]
         public string ProtocolVersion { get; set; } = "2.0";
 
         public object Id { get; set; }
     }
-}
+}

test/JsonRpc.Tests/OutputHandlerTests.cs

@@ -50,7 +50,7 @@ public async Task ShouldSerializeValues()
 
                 handler.Send(value);
                 await wait();
-                const string send = "Content-Length: 43\r\n\r\n{\"protocolVersion\":\"2.0\",\"id\":1,\"result\":1}";
+                const string send = "Content-Length: 35\r\n\r\n{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":1}";
                 received.Should().Be(send);
                 var b = System.Text.Encoding.UTF8.GetBytes(send);
                 w.Received().Write(Arg.Any<byte[]>(), 0, b.Length); // can't compare b here, because it is only value-equal and this test tests reference equality