Use json.net (#96)

* Use json.net

* clean up

* update changelog

* use newtonsoft in main library

* serialize enums

* ability to create interfaces

* no more jsonnet serializer

* clean up

* tidY

* sln

* remove thing

Author: jonnii

CHANGELOG.md

@@ -3,6 +3,8 @@
 # Next
 
   * Bug fix for memory leak with ad-hoc publishing
+  * Move to netstandard 1.6
+  * Chinchilla and Chinchilla.Api now takes a dependency on Newtonsoft.Json
 
 # 0.3.12
 

src/Chinchilla.Api/Chinchilla.Api.csproj

@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
 </Project>

src/Chinchilla.Api/RabbitAdmin.cs

@@ -55,7 +55,7 @@ public async Task<bool> CreateAsync(VirtualHost virtualHost)
                     {"name", virtualHost.Name}
                 });
 
-            return response.StatusCode == HttpStatusCode.NoContent;
+            return response.StatusCode == HttpStatusCode.Created;
         }
 
         public Task<bool> CreateAsync(VirtualHost virtualHost, Queue queue)

src/Chinchilla.Api/RabbitHttpClient.cs

@@ -6,6 +6,8 @@
 using Chinchilla.Api.Extensions;
 using System;
 using System.IO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 
 namespace Chinchilla.Api
 {
@@ -19,13 +21,20 @@ public class RabbitHttpClient
 
         private readonly HttpClient client;
 
+        private readonly JsonSerializer serializer;
+
         public RabbitHttpClient(string root, string username, string password)
         {
             this.root = root;
             this.username = username;
             this.password = password;
 
             client = new HttpClient();
+
+            serializer = new JsonSerializer
+            {
+                ContractResolver = LowercasePropertyContractResolver.Instance
+            };
         }
 
         public Task<HttpResponseMessage> Execute(
@@ -89,12 +98,12 @@ private async Task<T> DeserializeResponse<T>(HttpResponseMessage response)
         {
             var content = await response.Content.ReadAsStreamAsync();
 
-            using (var sr = new StreamReader(content))
+            using (var streamReader = new StreamReader(content))
             {
-                var body = await sr.ReadToEndAsync();
-
-                SimpleJson.CurrentJsonSerializerStrategy = new RabbitJsonSerializerStrategy();
-                return SimpleJson.DeserializeObject<T>(body);
+                using (var jsonTextReader = new JsonTextReader(streamReader))
+                {
+                    return serializer.Deserialize<T>(jsonTextReader);
+                }
             }
         }
 
@@ -115,7 +124,12 @@ private HttpRequestMessage CreateRequest(
 
             if (body != null)
             {
-                var serializedBody = SimpleJson.SerializeObject(body, new RabbitJsonSerializerStrategy());
+                var serializedBody = JsonConvert.SerializeObject(body,
+                    new JsonSerializerSettings
+                    {
+                        ContractResolver = LowercasePropertyContractResolver.Instance
+                    });
+
                 request.Content = new StringContent(serializedBody, Encoding.UTF8, "application/json");
             }
             else if (method != HttpMethod.Get)
@@ -150,5 +164,15 @@ private string BuildAuthHeader(string user, string password)
             authInfo = Convert.ToBase64String(Encoding.UTF8.GetBytes(authInfo));
             return "Basic " + authInfo;
         }
+
+        public class LowercasePropertyContractResolver : DefaultContractResolver
+        {
+            public static readonly LowercasePropertyContractResolver Instance = new LowercasePropertyContractResolver();
+
+            protected override string ResolvePropertyName(string propertyName)
+            {
+                return propertyName.ToLowerInvariant();
+            }
+        }
     }
 }