Merge pull request #188 from IanKemp/bsonwriter-latest

Update code to actually use class from Newtonsoft.Json.Bson package. Update Newtonsoft.Json.Bson to latest version.

Author: filipw

src/WebApiContrib.Core.Formatter.Bson/BsonOutputFormatter.cs

@@ -16,20 +16,16 @@ public class BsonOutputFormatter : TextOutputFormatter
         private readonly JsonSerializerSettings _jsonSerializerSettings;
 
         private JsonSerializer _serializer;
-        
+
         public BsonOutputFormatter(JsonSerializerSettings serializerSettings)
         {
-            if (serializerSettings == null)
-            {
-                throw new ArgumentNullException(nameof(serializerSettings));
-            }
+            _jsonSerializerSettings = serializerSettings ?? throw new ArgumentNullException(nameof(serializerSettings));
 
-
-            _jsonSerializerSettings = serializerSettings;
             SupportedEncodings.Add(Encoding.UTF8);
             SupportedEncodings.Add(Encoding.Unicode);
             SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/bson"));
         }
+
         public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
         {
             if (context == null)
@@ -43,22 +39,17 @@ public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext co
             }
 
             var response = context.HttpContext.Response;
-            using (var bsonWriter = new BsonWriter(response.Body) { CloseOutput = false })
+            using (var bsonWriter = new BsonDataWriter(response.Body) { CloseOutput = false })
             {
                 var jsonSerializer = CreateJsonSerializer();
                 jsonSerializer.Serialize(bsonWriter, context.Object);
                 bsonWriter.Flush();
             }
         }
-        
+
         private JsonSerializer CreateJsonSerializer()
         {
-            if (_serializer == null)
-            {
-                _serializer = JsonSerializer.Create(_jsonSerializerSettings);
-            }
-
-            return _serializer;
+            return _serializer ?? (_serializer = JsonSerializer.Create(_jsonSerializerSettings));
         }
     }
 }

src/WebApiContrib.Core.Formatter.Bson/WebApiContrib.Core.Formatter.Bson.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.3" />
-    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.1" />
+    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
   </ItemGroup>
 
 </Project>