Merge pull request #9 from dotarj/refactor/code-smells

fix SonarCloud code smells

Author: dotarj

samples/PartialResponse.AspNetCore.Mvc.Formatters.Json.Samples/Program.cs

@@ -5,7 +5,7 @@
 
 namespace PartialResponse.AspNetCore.Mvc.Formatters.Json.Samples
 {
-    public class Program
+    public static class Program
     {
         public static void Main(string[] args)
         {

src/PartialResponse.AspNetCore.Mvc.Formatters.Json/Internal/MediaTypeHeaderValues.cs

@@ -4,7 +4,7 @@
 
 namespace PartialResponse.AspNetCore.Mvc.Formatters.Json.Internal
 {
-    internal class MediaTypeHeaderValues
+    internal static class MediaTypeHeaderValues
     {
         public static readonly MediaTypeHeaderValue ApplicationJson = MediaTypeHeaderValue.Parse("application/json").CopyAsReadOnly();
 

src/PartialResponse.AspNetCore.Mvc.Formatters.Json/Internal/MvcPartialJsonLoggerExtensions.cs

@@ -7,12 +7,7 @@ namespace PartialResponse.AspNetCore.Mvc.Formatters.Json.Internal
 {
     internal static class MvcPartialJsonLoggerExtensions
     {
-        private static readonly Action<ILogger, string, Exception> LogMessage;
-
-        static MvcPartialJsonLoggerExtensions()
-        {
-            LogMessage = LoggerMessage.Define<string>(LogLevel.Information, 1, "Executing PartialJsonResult, writing value {Value}.");
-        }
+        private static readonly Action<ILogger, string, Exception> LogMessage = LogMessage = LoggerMessage.Define<string>(LogLevel.Information, 1, "Executing PartialJsonResult, writing value {Value}.");
 
         public static void PartialJsonResultExecuting(this ILogger logger, object value)
         {

src/PartialResponse.AspNetCore.Mvc.Formatters.Json/Internal/MvcPartialJsonMvcOptionsSetup.cs

@@ -17,27 +17,18 @@ namespace PartialResponse.AspNetCore.Mvc.Formatters.Json.Internal
     /// </summary>
     public class MvcPartialJsonMvcOptionsSetup : IConfigureOptions<MvcOptions>
     {
-        private readonly ILoggerFactory loggerFactory;
         private readonly IFieldsParser fieldsParser;
         private readonly MvcPartialJsonOptions partialJsonOptions;
         private readonly ArrayPool<char> charPool;
-        private readonly ObjectPoolProvider objectPoolProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MvcPartialJsonMvcOptionsSetup"/> class.
         /// </summary>
-        /// <param name="loggerFactory">The logger factory.</param>
         /// <param name="fieldsParser">The fields parser.</param>
         /// <param name="partialJsonOptions">The options.</param>
         /// <param name="charPool">The character array pool.</param>
-        /// <param name="objectPoolProvider">The object pool provider.</param>
-        public MvcPartialJsonMvcOptionsSetup(ILoggerFactory loggerFactory, IFieldsParser fieldsParser, IOptions<MvcPartialJsonOptions> partialJsonOptions, ArrayPool<char> charPool, ObjectPoolProvider objectPoolProvider)
+        public MvcPartialJsonMvcOptionsSetup(IFieldsParser fieldsParser, IOptions<MvcPartialJsonOptions> partialJsonOptions, ArrayPool<char> charPool)
         {
-            if (loggerFactory == null)
-            {
-                throw new ArgumentNullException(nameof(loggerFactory));
-            }
-
             if (fieldsParser == null)
             {
                 throw new ArgumentNullException(nameof(fieldsParser));
@@ -53,16 +44,9 @@ public MvcPartialJsonMvcOptionsSetup(ILoggerFactory loggerFactory, IFieldsParser
                 throw new ArgumentNullException(nameof(charPool));
             }
 
-            if (objectPoolProvider == null)
-            {
-                throw new ArgumentNullException(nameof(objectPoolProvider));
-            }
-
-            this.loggerFactory = loggerFactory;
             this.fieldsParser = fieldsParser;
             this.partialJsonOptions = partialJsonOptions.Value;
             this.charPool = charPool;
-            this.objectPoolProvider = objectPoolProvider;
         }
 
         /// <summary>

src/PartialResponse.AspNetCore.Mvc.Formatters.Json/PartialJsonOutputFormatter.cs

@@ -83,7 +83,7 @@ public PartialJsonOutputFormatter(JsonSerializerSettings serializerSettings, IFi
         protected JsonSerializerSettings SerializerSettings { get; }
 
         /// <inheritdoc />
-        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
         {
             if (context == null)
             {
@@ -95,31 +95,7 @@ public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext co
                 throw new ArgumentNullException(nameof(selectedEncoding));
             }
 
-            var response = context.HttpContext.Response;
-
-            FieldsParserResult fieldsParserResult = default;
-
-            if (!this.ShouldBypassPartialResponse(context.HttpContext))
-            {
-                fieldsParserResult = this.fieldsParser.Parse(context.HttpContext.Request);
-
-                if (fieldsParserResult.HasError && !this.options.IgnoreParseErrors)
-                {
-                    response.StatusCode = 400;
-
-                    return;
-                }
-            }
-
-            using (var writer = context.WriterFactory(response.Body, selectedEncoding))
-            {
-                this.WriteObject(writer, context.Object, fieldsParserResult);
-
-                // Perf: call FlushAsync to call WriteAsync on the stream with any content left in the TextWriter's
-                // buffers. This is better than just letting dispose handle it (which would result in a synchronous
-                // write).
-                await writer.FlushAsync();
-            }
+            return this.WriteResponseBodyImplAsync(context, selectedEncoding);
         }
 
         /// <summary>
@@ -153,6 +129,35 @@ protected virtual JsonSerializer CreateJsonSerializer()
             return this.serializer;
         }
 
+        private async Task WriteResponseBodyImplAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        {
+            var response = context.HttpContext.Response;
+
+            FieldsParserResult fieldsParserResult = default;
+
+            if (!this.ShouldBypassPartialResponse(context.HttpContext))
+            {
+                fieldsParserResult = this.fieldsParser.Parse(context.HttpContext.Request);
+
+                if (fieldsParserResult.HasError && !this.options.IgnoreParseErrors)
+                {
+                    response.StatusCode = 400;
+
+                    return;
+                }
+            }
+
+            using (var writer = context.WriterFactory(response.Body, selectedEncoding))
+            {
+                this.WriteObject(writer, context.Object, fieldsParserResult);
+
+                // Perf: call FlushAsync to call WriteAsync on the stream with any content left in the TextWriter's
+                // buffers. This is better than just letting dispose handle it (which would result in a synchronous
+                // write).
+                await writer.FlushAsync();
+            }
+        }
+
         private bool ShouldBypassPartialResponse(HttpContext httpContext)
         {
             if (httpContext.Items.ContainsKey(BypassPartialResponseKey))