Making use of LoggerMessage to fix the CA1848 rule violation.

Author: jooni91

src/ReCaptcha/Extensions/LoggerExtensions.cs

@@ -1,11 +1,49 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
+using Griesoft.AspNetCore.ReCaptcha.Localization;
+using Microsoft.Extensions.Logging;
 
 namespace Griesoft.AspNetCore.ReCaptcha.Extensions
 {
     internal static class LoggerExtensions
     {
+        private static readonly Action<ILogger, Exception?> _validationRequestFailed = LoggerMessage.Define(
+            LogLevel.Warning,
+            new EventId(1, nameof(ValidationRequestFailed)),
+            Resources.RequestFailedErrorMessage);
 
+        private static readonly Action<ILogger, Exception?> _validationRequestUnexpectedException = LoggerMessage.Define(
+            LogLevel.Critical,
+            new EventId(2, nameof(ValidationRequestUnexpectedException)),
+            Resources.ValidationUnexpectedErrorMessage);
+
+        private static readonly Action<ILogger, Exception?> _recaptchaResponseTokenMissing = LoggerMessage.Define(
+            LogLevel.Warning,
+            new EventId(3, nameof(RecaptchaResponseTokenMissing)),
+            Resources.RecaptchaResponseTokenMissing);
+
+        private static readonly Action<ILogger, Exception?> _invalidResponseToken = LoggerMessage.Define(
+            LogLevel.Information,
+            new EventId(4, nameof(InvalidResponseToken)),
+            Resources.InvalidResponseTokenMessage);
+
+        public static void ValidationRequestFailed(this ILogger logger)
+        {
+            _validationRequestFailed(logger, null);
+        }
+
+        public static void ValidationRequestUnexpectedException(this ILogger logger, Exception exception)
+        {
+            _validationRequestUnexpectedException(logger, exception);
+        }
+
+        public static void RecaptchaResponseTokenMissing(this ILogger logger)
+        {
+            _recaptchaResponseTokenMissing(logger, null);
+        }
+
+        public static void InvalidResponseToken(this ILogger logger)
+        {
+            _invalidResponseToken(logger, null);
+        }
     }
 }

src/ReCaptcha/Filters/ValidateRecaptchaFilter.cs

@@ -4,6 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Griesoft.AspNetCore.ReCaptcha.Configuration;
+using Griesoft.AspNetCore.ReCaptcha.Extensions;
 using Griesoft.AspNetCore.ReCaptcha.Localization;
 using Griesoft.AspNetCore.ReCaptcha.Services;
 using Microsoft.AspNetCore.Http;
@@ -43,7 +44,7 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
 
             if (!TryGetRecaptchaToken(context.HttpContext.Request, out string? token))
             {
-                _logger.LogWarning(Resources.RecaptchaResponseTokenMissing);
+                _logger.RecaptchaResponseTokenMissing();
 
                 validationResponse = new ValidationResponse()
                 {
@@ -77,7 +78,7 @@ private bool ShouldShortCircuit(ActionExecutingContext context, ValidationRespon
         {
             if (!response.Success || Action != response.Action)
             {
-                _logger.LogInformation(Resources.InvalidResponseTokenMessage);
+                _logger.InvalidResponseToken();
 
                 if (OnValidationFailedAction == ValidationFailedAction.BlockRequest)
                 {

src/ReCaptcha/Services/RecaptchaService.cs

@@ -4,6 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Griesoft.AspNetCore.ReCaptcha.Configuration;
+using Griesoft.AspNetCore.ReCaptcha.Extensions;
 using Griesoft.AspNetCore.ReCaptcha.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -34,7 +35,7 @@ public async Task<ValidationResponse> ValidateRecaptchaResponse(string token, st
 
             try
             {
-                var response = await _httpClient.PostAsync($"?secret={_settings.SecretKey}&response={token}{(remoteIp != null ? $"&remoteip={remoteIp}" : "")}", null)
+                var response = await _httpClient.PostAsync($"?secret={_settings.SecretKey}&response={token}{(remoteIp != null ? $"&remoteip={remoteIp}" : "")}", null!)
                     .ConfigureAwait(true);
 
                 response.EnsureSuccessStatusCode();
@@ -53,7 +54,7 @@ await response.Content.ReadAsStringAsync()
             }
             catch (HttpRequestException)
             {
-                _logger.LogWarning(Resources.RequestFailedErrorMessage);
+                _logger.ValidationRequestFailed();
                 return new ValidationResponse()
                 {
                     Success = false,
@@ -65,7 +66,7 @@ await response.Content.ReadAsStringAsync()
             }
             catch (Exception ex)
             {
-                _logger.LogCritical(ex, Resources.ValidationUnexpectedErrorMessage);
+                _logger.ValidationRequestUnexpectedException(ex);
                 throw;
             }
         }