Fix Sonar code smells (#989)

NLog · Sep 28, 2023 · 9eeb664 · 9eeb664
1 parent d4c9181
commit 9eeb664
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 18 deletions.
diff --git a/src/NLog.Web.AspNetCore/NLogRequestPostedBodyMiddlewareOptions.cs b/src/NLog.Web.AspNetCore/NLogRequestPostedBodyMiddlewareOptions.cs
@@ -70,7 +70,7 @@ private bool DefaultCapture(HttpContext context)
 
             if (!context.HasAllowedContentType(AllowContentTypes))
             {
-                InternalLogger.Debug("NLogRequestPostedBodyMiddleware: HttpContext.Request.ContentType={0}", context?.Request?.ContentType);
+                InternalLogger.Debug("NLogRequestPostedBodyMiddleware: HttpContext.Request.ContentType={0}", context.Request.ContentType);
                 return false;
             }
 

diff --git a/src/NLog.Web/NLogRequestPostedBodyModule.cs b/src/NLog.Web/NLogRequestPostedBodyModule.cs
@@ -98,7 +98,7 @@ private bool ShouldCaptureRequestBody(HttpContext context)
 
             if (!context.HasAllowedContentType(AllowContentTypes))
             {
-                InternalLogger.Debug("NLogRequestPostedBodyModule: HttpContext.Request.ContentType={0}", context?.Request?.ContentType);
+                InternalLogger.Debug("NLogRequestPostedBodyModule: HttpContext.Request.ContentType={0}", context.Request.ContentType);
                 return false;
             }
 

diff --git a/src/Shared/LayoutRenderers/AspNetItemValueLayoutRenderer.cs b/src/Shared/LayoutRenderers/AspNetItemValueLayoutRenderer.cs
@@ -94,8 +94,8 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
                 return;
             }
 
-            var context = HttpContextAccessor.HttpContext;
-            if (context is null)
+            var httpContext = HttpContextAccessor.HttpContext;
+            if (httpContext is null)
             {
                 return;
             }
@@ -105,14 +105,14 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
 #pragma warning disable CS0618 // Type or member is obsolete
             if (EvaluateAsNestedProperties)
             {
-                value = PropertyReader.GetValue(item, context?.Items, (items, key) => LookupItemValue(items, key), true);
+                value = PropertyReader.GetValue(item, httpContext.Items, (items, key) => LookupItemValue(items, key), true);
                 if (value is null)
                     return;
             }
 #pragma warning restore CS0618 // Type or member is obsolete
             else
             {
-                value = LookupItemValue(context?.Items, item);
+                value = LookupItemValue(httpContext.Items, item);
                 if (value is null)
                     return;
 

diff --git a/src/Shared/LayoutRenderers/AspNetRequestClientCertificateLayoutRenderer.cs b/src/Shared/LayoutRenderers/AspNetRequestClientCertificateLayoutRenderer.cs
@@ -33,11 +33,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             var httpContext = HttpContextAccessor.HttpContext;
 #if ASP_NET_CORE
             var connection = httpContext.Connection;
-            if (connection == null)
-            {
-                return;
-            }
-            builder.Append(connection.ClientCertificate?.ToString(Verbose));
+            builder.Append(connection?.ClientCertificate?.ToString(Verbose));
 #else
             var certificate = httpContext.Request.ClientCertificate;
             if (certificate == null)
@@ -46,7 +42,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             }
             // Convert to an X509Certificate2, which does have the proper overridden ToString() method.
             // HttpClientCertificate class only use object.ToString() which is useless.
-            builder.Append(new X509Certificate2(certificate.Certificate)?.ToString(Verbose));
+            builder.Append(new X509Certificate2(certificate.Certificate).ToString(Verbose));
 #endif
         }
     }

diff --git a/src/Shared/LayoutRenderers/AspNetRequestFormLayoutRenderer.cs b/src/Shared/LayoutRenderers/AspNetRequestFormLayoutRenderer.cs
@@ -75,7 +75,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
 #if !ASP_NET_CORE
             var formKeys = httpRequest?.Form?.Keys;
 #else
-            var formKeys = httpRequest?.HasFormContentType == true ? httpRequest?.Form?.Keys : null;
+            var formKeys = httpRequest?.HasFormContentType == true ? httpRequest.Form?.Keys : null;
 #endif
             if (formKeys?.Count > 0)
             {

diff --git a/src/Shared/LayoutRenderers/AspNetSessionValueLayoutRenderer.cs b/src/Shared/LayoutRenderers/AspNetSessionValueLayoutRenderer.cs
@@ -134,7 +134,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
             {
 #endif
 
-                var contextSession = context?.TryGetSession();
+                var contextSession = context.TryGetSession();
                 if (contextSession == null)
                 {
                     return;

diff --git a/src/Shared/LayoutRenderers/AspNetUserClaimLayoutRenderer.cs b/src/Shared/LayoutRenderers/AspNetUserClaimLayoutRenderer.cs
@@ -70,10 +70,7 @@ protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
                 else
                 {
                     var claim = GetClaim(claimsPrincipal, ClaimType);
-                    if (claim != null)
-                    {
-                        builder.Append(claim?.Value);
-                    }
+                    builder.Append(claim?.Value);
                 }
             }
             catch (ObjectDisposedException ex)
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
     #endif
-                    var contextSession = context?.TryGetSession();
+                    var contextSession = context.TryGetSession();
                     if (contextSession == null)
                     {
                         return;
@@ Expand Down @@