refactor(writer): move logic into serializer

Author: jaredcnance

src/JsonApiDotNetCore/Formatters/JsonApiWriter.cs

@@ -2,26 +2,20 @@
 using System.Text;
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Internal;
-using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization;
-using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 
 namespace JsonApiDotNetCore.Formatters
 {
     public class JsonApiWriter : IJsonApiWriter
     {
         private readonly ILogger<JsonApiWriter> _logger;
-        private readonly IJsonApiContext _jsonApiContext;
         private readonly IJsonApiSerializer _serializer;
 
-        public JsonApiWriter(IJsonApiContext jsonApiContext, 
-            IJsonApiSerializer serializer, 
+        public JsonApiWriter(IJsonApiSerializer serializer, 
             ILoggerFactory loggerFactory)
         {
-            _jsonApiContext = jsonApiContext;
             _serializer = serializer;
             _logger = loggerFactory.CreateLogger<JsonApiWriter>();
         }
@@ -58,36 +52,7 @@ public async Task WriteAsync(OutputFormatterWriteContext context)
 
         private string GetResponseBody(object responseObject)
         {
-            if (responseObject == null)
-                return GetNullDataResponse();
-
-            if (responseObject.GetType() == typeof(Error) || _jsonApiContext.RequestEntity == null)
-                return GetErrorJson(responseObject, _logger);
-            
             return _serializer.Serialize(responseObject);
-        }
-
-        private string GetNullDataResponse()
-        {
-            return JsonConvert.SerializeObject(new Document
-            {
-                Data = null
-            });
-        }
-
-        private string GetErrorJson(object responseObject, ILogger logger)
-        {
-            if (responseObject.GetType() == typeof(Error))
-            {
-                var errors = new ErrorCollection();
-                errors.Add((Error)responseObject);
-                return errors.GetJson();
-            }
-            else
-            {
-                logger?.LogInformation("Response was not a JSONAPI entity. Serializing as plain JSON.");
-                return JsonConvert.SerializeObject(responseObject);
-            }
-        }
+        }        
     }
 }

src/JsonApiDotNetCore/Serialization/JsonApiSerializer.cs

@@ -1,35 +1,80 @@
 using System.Collections.Generic;
 using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Services;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace JsonApiDotNetCore.Serialization
 {
     public class JsonApiSerializer : IJsonApiSerializer
     {
         private readonly IDocumentBuilder _documentBuilder;
+        private readonly ILogger<JsonApiSerializer> _logger;
+        private readonly IJsonApiContext _jsonApiContext;
 
-        public JsonApiSerializer(IDocumentBuilder documentBuilder)
+        public JsonApiSerializer(
+            IJsonApiContext jsonApiContext,
+            IDocumentBuilder documentBuilder)
         {
+            _jsonApiContext = jsonApiContext;
+            _documentBuilder = documentBuilder;            
+        }
+
+        public JsonApiSerializer(
+            IJsonApiContext jsonApiContext,
+            IDocumentBuilder documentBuilder, 
+            ILoggerFactory loggerFactory)
+        {
+            _jsonApiContext = jsonApiContext;
             _documentBuilder = documentBuilder;
+            _logger = loggerFactory?.CreateLogger<JsonApiSerializer>();
         }
 
         public string Serialize(object entity)
         {
+            if (entity == null)
+                return GetNullDataResponse();
+
+            if (entity.GetType() == typeof(ErrorCollection) || _jsonApiContext.RequestEntity == null)
+                return GetErrorJson(entity, _logger);
+
             if (entity is IEnumerable<IIdentifiable>)
-                return _serializeDocuments(entity);
+                return SerializeDocuments(entity);
+
+            return SerializeDocument(entity);           
+        }
+
+        private string GetNullDataResponse()
+        {
+            return JsonConvert.SerializeObject(new Document
+            {
+                Data = null
+            });
+        }
 
-            return _serializeDocument(entity);           
+        private string GetErrorJson(object responseObject, ILogger logger)
+        {
+            if (responseObject is ErrorCollection errorCollection)
+            {
+                return errorCollection.GetJson();
+            }
+            else
+            {
+                logger?.LogInformation("Response was not a JSONAPI entity. Serializing as plain JSON.");
+                return JsonConvert.SerializeObject(responseObject);
+            }
         }
 
-        private string _serializeDocuments(object entity)
+        private string SerializeDocuments(object entity)
         {
             var entities = entity as IEnumerable<IIdentifiable>;
             var documents = _documentBuilder.Build(entities);
             return _serialize(documents);
         }
 
-        private string _serializeDocument(object entity)
+        private string SerializeDocument(object entity)
         {
             var identifiableEntity = entity as IIdentifiable;
             var document = _documentBuilder.Build(identifiableEntity);