Merge pull request #50 from ensembleVideo/issue-49

Output is not using camel case
visualeyes · Feb 18, 2017 · cc008f5 · cc008f5
2 parents 5db542d + 94cb457
commit cc008f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Halcyon.Mvc/HAL/Json/JsonHalOutputFormatter.cs b/src/Halcyon.Mvc/HAL/Json/JsonHalOutputFormatter.cs
@@ -7,21 +7,23 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Primitives;
 
 namespace Halcyon.Web.HAL.Json {
     public class JsonHalOutputFormatter : IOutputFormatter {
         public const string HalJsonType = "application/hal+json";
 
         private readonly IEnumerable<string> halJsonMediaTypes;
         private readonly JsonOutputFormatter jsonFormatter;
+        private readonly JsonSerializerSettings serializerSettings;
 
 
         public JsonHalOutputFormatter(IEnumerable<string> halJsonMediaTypes = null) {
             if(halJsonMediaTypes == null) halJsonMediaTypes = new string[] { HalJsonType };
 
-            var serializerSettings = JsonSerializerSettingsProvider.CreateSerializerSettings();
+            this.serializerSettings = JsonSerializerSettingsProvider.CreateSerializerSettings();
 
-            this.jsonFormatter = new JsonOutputFormatter(serializerSettings, ArrayPool<Char>.Create());
+            this.jsonFormatter = new JsonOutputFormatter(this.serializerSettings, ArrayPool<Char>.Create());
 
             this.halJsonMediaTypes = halJsonMediaTypes;
         }
@@ -45,7 +47,7 @@ public class JsonHalOutputFormatter : IOutputFormatter {
             var halResponse = ((HALResponse)context.Object);
 
             // If it is a HAL response but set to application/json - convert to a plain response
-            var serializer = JsonSerializer.Create();
+            var serializer = JsonSerializer.Create(this.serializerSettings);
 
             if(!halResponse.Config.ForceHAL && !halJsonMediaTypes.Contains(mediaType)) {
                 value = halResponse.ToPlainResponse(serializer);

diff --git a/test/Halcyon.Tests.SelfHost.Mvc/Controllers/FooController.cs b/test/Halcyon.Tests.SelfHost.Mvc/Controllers/FooController.cs
@@ -15,7 +15,8 @@ public class FooController : Controller {
             // Any plain old object will do
             var fooModel = new {
                 id,
-                type = "foo"
+                type = "foo",
+                CamelCase = "this should be camelCase"
             };
 
             // Return a simple resource with links to related resources