++ code analysis cleanup

josephwambura · josephwambura · commit b1e847614c34 · 2025-03-01T02:09:59.000-08:00
diff --git a/src/Skoruba.AuditLogging.EntityFramework/DbContexts/AuditLoggingDbContext.cs b/src/Skoruba.AuditLogging.EntityFramework/DbContexts/AuditLoggingDbContext.cs
@@ -1,18 +1,13 @@
-﻿using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
+﻿using Microsoft.EntityFrameworkCore;
 using Skoruba.AuditLogging.EntityFramework.Entities;
+using System.Threading.Tasks;
 
 namespace Skoruba.AuditLogging.EntityFramework.DbContexts
 {
-    public abstract class AuditLoggingDbContext<TAuditLog> : DbContext, IAuditLoggingDbContext<TAuditLog> 
+    public abstract class AuditLoggingDbContext<TAuditLog>(DbContextOptions options) : DbContext(options), IAuditLoggingDbContext<TAuditLog>
         where TAuditLog : AuditLog
 
     {
-        protected AuditLoggingDbContext(DbContextOptions options)
-            : base(options)
-        {
-        }
-
         public DbSet<TAuditLog> AuditLog { get; set; }
 
         public Task<int> SaveChangesAsync()
diff --git a/src/Skoruba.AuditLogging.EntityFramework/DbContexts/Default/DefaultAuditLoggingDbContext.cs b/src/Skoruba.AuditLogging.EntityFramework/DbContexts/Default/DefaultAuditLoggingDbContext.cs
@@ -3,12 +3,7 @@
 
 namespace Skoruba.AuditLogging.EntityFramework.DbContexts.Default
 {
-    public class DefaultAuditLoggingDbContext : AuditLoggingDbContext<AuditLog>
+    public class DefaultAuditLoggingDbContext(DbContextOptions<DefaultAuditLoggingDbContext> dbContextOptions) : AuditLoggingDbContext<AuditLog>(dbContextOptions)
     {
-        public DefaultAuditLoggingDbContext(DbContextOptions<DefaultAuditLoggingDbContext> dbContextOptions) 
-            : base(dbContextOptions)
-        {
-
-        }
     }
 }
diff --git a/src/Skoruba.AuditLogging.EntityFramework/DbContexts/IAuditLoggingDbContext.cs b/src/Skoruba.AuditLogging.EntityFramework/DbContexts/IAuditLoggingDbContext.cs
@@ -1,6 +1,6 @@
-﻿using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
+﻿using Microsoft.EntityFrameworkCore;
 using Skoruba.AuditLogging.EntityFramework.Entities;
+using System.Threading.Tasks;
 
 namespace Skoruba.AuditLogging.EntityFramework.DbContexts
 {
diff --git a/src/Skoruba.AuditLogging.EntityFramework/Entities/AuditLog.cs b/src/Skoruba.AuditLogging.EntityFramework/Entities/AuditLog.cs
@@ -23,7 +23,7 @@ public class AuditLog
         /// Event category
         /// </summary>
         public string Category { get; set; }
-        
+
         /// <summary>
         /// Subject Identifier - who is responsible for current action
         /// </summary>
diff --git a/src/Skoruba.AuditLogging.EntityFramework/Extensions/AuditLoggingEntityFrameworkExtensions.cs b/src/Skoruba.AuditLogging.EntityFramework/Extensions/AuditLoggingEntityFrameworkExtensions.cs
@@ -1,12 +1,12 @@
-﻿using System;
-using Microsoft.EntityFrameworkCore;
+﻿using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Skoruba.AuditLogging.EntityFramework.DbContexts;
 using Skoruba.AuditLogging.EntityFramework.DbContexts.Default;
 using Skoruba.AuditLogging.EntityFramework.Entities;
 using Skoruba.AuditLogging.EntityFramework.Repositories;
 using Skoruba.AuditLogging.EntityFramework.Services;
 using Skoruba.AuditLogging.Extensions;
+using System;
 
 namespace Skoruba.AuditLogging.EntityFramework.Extensions
 {
diff --git a/src/Skoruba.AuditLogging.EntityFramework/Repositories/AuditLoggingRepository.cs b/src/Skoruba.AuditLogging.EntityFramework/Repositories/AuditLoggingRepository.cs
@@ -1,22 +1,17 @@
-﻿using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
+﻿using Microsoft.EntityFrameworkCore;
 using Skoruba.AuditLogging.EntityFramework.DbContexts;
 using Skoruba.AuditLogging.EntityFramework.Entities;
 using Skoruba.AuditLogging.EntityFramework.Helpers;
 using Skoruba.AuditLogging.EntityFramework.Helpers.Common;
+using System.Threading.Tasks;
 
 namespace Skoruba.AuditLogging.EntityFramework.Repositories
 {
-    public class AuditLoggingRepository<TDbContext, TAuditLog> : IAuditLoggingRepository<TAuditLog>
-    where TDbContext : IAuditLoggingDbContext<TAuditLog> 
+    public class AuditLoggingRepository<TDbContext, TAuditLog>(TDbContext dbContext) : IAuditLoggingRepository<TAuditLog>
+    where TDbContext : IAuditLoggingDbContext<TAuditLog>
     where TAuditLog : AuditLog
     {
-        protected TDbContext DbContext;
-
-        public AuditLoggingRepository(TDbContext dbContext)
-        {
-            DbContext = dbContext;
-        }
+        protected TDbContext DbContext = dbContext;
 
         public virtual async Task<PagedList<TAuditLog>> GetAsync(int page = 1, int pageSize = 10)
         {
diff --git a/src/Skoruba.AuditLogging.EntityFramework/Repositories/IAuditLoggingRepository.cs b/src/Skoruba.AuditLogging.EntityFramework/Repositories/IAuditLoggingRepository.cs
@@ -1,6 +1,6 @@
-﻿using System.Threading.Tasks;
-using Skoruba.AuditLogging.EntityFramework.Entities;
+﻿using Skoruba.AuditLogging.EntityFramework.Entities;
 using Skoruba.AuditLogging.EntityFramework.Helpers.Common;
+using System.Threading.Tasks;
 
 namespace Skoruba.AuditLogging.EntityFramework.Repositories
 {
diff --git a/src/Skoruba.AuditLogging.EntityFramework/Services/DatabaseAuditEventLoggerSink.cs b/src/Skoruba.AuditLogging.EntityFramework/Services/DatabaseAuditEventLoggerSink.cs
@@ -1,26 +1,21 @@
-﻿using System;
-using System.Threading.Tasks;
-using Skoruba.AuditLogging.EntityFramework.Entities;
+﻿using Skoruba.AuditLogging.EntityFramework.Entities;
 using Skoruba.AuditLogging.EntityFramework.Mapping;
 using Skoruba.AuditLogging.EntityFramework.Repositories;
 using Skoruba.AuditLogging.Events;
 using Skoruba.AuditLogging.Services;
+using System;
+using System.Threading.Tasks;
 
 namespace Skoruba.AuditLogging.EntityFramework.Services
 {
-    public class DatabaseAuditEventLoggerSink<TAuditLog> : IAuditEventLoggerSink 
+    public class DatabaseAuditEventLoggerSink<TAuditLog>(IAuditLoggingRepository<TAuditLog> auditLoggingRepository) : IAuditEventLoggerSink
         where TAuditLog : AuditLog, new()
     {
-        private readonly IAuditLoggingRepository<TAuditLog> _auditLoggingRepository;
-
-        public DatabaseAuditEventLoggerSink(IAuditLoggingRepository<TAuditLog> auditLoggingRepository)
-        {
-            _auditLoggingRepository = auditLoggingRepository;
-        }
+        private readonly IAuditLoggingRepository<TAuditLog> _auditLoggingRepository = auditLoggingRepository;
 
         public virtual async Task PersistAsync(AuditEvent auditEvent)
         {
-            if (auditEvent == null) throw new ArgumentNullException(nameof(auditEvent));
+            ArgumentNullException.ThrowIfNull(auditEvent);
 
             var auditLog = auditEvent.MapToEntity<TAuditLog>();
 
diff --git a/src/Skoruba.AuditLogging.Host/Controllers/AuditController.cs b/src/Skoruba.AuditLogging.Host/Controllers/AuditController.cs
@@ -1,28 +1,22 @@
-﻿using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
+﻿using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Skoruba.AuditLogging.Constants;
 using Skoruba.AuditLogging.Host.Dtos;
 using Skoruba.AuditLogging.Host.Events;
 using Skoruba.AuditLogging.Services;
+using System;
+using System.Threading.Tasks;
 
 namespace Skoruba.AuditLogging.Host.Controllers
 {
     [Authorize]
     [Route("api/[controller]")]
     [ApiController]
-    public class AuditController : ControllerBase
+    public class AuditController(IAuditEventLogger auditEventLogger, ILogger<AuditController> logger) : ControllerBase
     {
-        private readonly IAuditEventLogger _auditEventLogger;
-        private readonly ILogger<AuditController> _logger;
-
-        public AuditController(IAuditEventLogger auditEventLogger, ILogger<AuditController> logger)
-        {
-            _auditEventLogger = auditEventLogger;
-            _logger = logger;
-        }
+        private readonly IAuditEventLogger _auditEventLogger = auditEventLogger;
+        private readonly ILogger<AuditController> _logger = logger;
 
         [HttpGet]
         public async Task<ActionResult> Get()
diff --git a/src/Skoruba.AuditLogging.Host/Helpers/Authentication/TestAuthenticationHandler.cs b/src/Skoruba.AuditLogging.Host/Helpers/Authentication/TestAuthenticationHandler.cs
@@ -1,10 +1,10 @@
-﻿using System.Security.Claims;
-using System.Text.Encodings.Web;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
+﻿using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Skoruba.AuditLogging.Host.Consts;
+using System.Security.Claims;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
 
 namespace Skoruba.AuditLogging.Host.Helpers.Authentication
 {
diff --git a/src/Skoruba.AuditLogging.Host/Helpers/Authentication/TestAuthenticationOptions.cs b/src/Skoruba.AuditLogging.Host/Helpers/Authentication/TestAuthenticationOptions.cs
@@ -1,5 +1,5 @@
-﻿using System.Security.Claims;
-using Microsoft.AspNetCore.Authentication;
+﻿using Microsoft.AspNetCore.Authentication;
+using System.Security.Claims;
 
 namespace Skoruba.AuditLogging.Host.Helpers.Authentication
 {
diff --git a/src/Skoruba.AuditLogging.Host/Startup.cs b/src/Skoruba.AuditLogging.Host/Startup.cs
@@ -1,10 +1,6 @@
-﻿using System;
-using System.Reflection;
-using System.Security.Claims;
-using Microsoft.AspNetCore.Builder;
+﻿using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -14,6 +10,9 @@
 using Skoruba.AuditLogging.EntityFramework.Extensions;
 using Skoruba.AuditLogging.Host.Consts;
 using Skoruba.AuditLogging.Host.Helpers.Authentication;
+using System;
+using System.Reflection;
+using System.Security.Claims;
 
 namespace Skoruba.AuditLogging.Host
 {
@@ -67,13 +66,13 @@ public void ConfigureServices(IServiceCollection services)
                 .AddScheme<TestAuthenticationOptions, TestAuthenticationHandler>(AuthenticationConsts.Scheme,
                     options =>
                     {
-                        options.Identity = new ClaimsIdentity(new[]
-                        {
-                        new Claim(AuthenticationConsts.ClaimName, "bob"),
-                        new Claim(AuthenticationConsts.ClaimSub, Guid.NewGuid().ToString()),
-                        new Claim(AuthenticationConsts.ClaimRole, Guid.NewGuid().ToString()),
-                        new Claim(AuthenticationConsts.ClaimRole, Guid.NewGuid().ToString())
-                    }, AuthenticationConsts.AuthenticationType, AuthenticationConsts.ClaimName, AuthenticationConsts.ClaimRole);
+                        options.Identity = new ClaimsIdentity(
+                        [
+                            new Claim(AuthenticationConsts.ClaimName, "bob"),
+                            new Claim(AuthenticationConsts.ClaimSub, Guid.NewGuid().ToString()),
+                            new Claim(AuthenticationConsts.ClaimRole, Guid.NewGuid().ToString()),
+                            new Claim(AuthenticationConsts.ClaimRole, Guid.NewGuid().ToString())
+                        ], AuthenticationConsts.AuthenticationType, AuthenticationConsts.ClaimName, AuthenticationConsts.ClaimRole);
                     });
 
             services.AddControllersWithViews();
diff --git a/src/Skoruba.AuditLogging/Constants/ClaimsConsts.cs b/src/Skoruba.AuditLogging/Constants/ClaimsConsts.cs
@@ -1,6 +1,4 @@
-﻿using System.Data;
-
-namespace Skoruba.AuditLogging.Constants
+﻿namespace Skoruba.AuditLogging.Constants
 {
     public class ClaimsConsts
     {
diff --git a/src/Skoruba.AuditLogging/Events/Http/HttpAuditSubject.cs b/src/Skoruba.AuditLogging/Events/Http/HttpAuditSubject.cs
@@ -1,7 +1,7 @@
-﻿using System.Linq;
-using Microsoft.AspNetCore.Http;
+﻿using Microsoft.AspNetCore.Http;
 using Skoruba.AuditLogging.Configuration;
 using Skoruba.AuditLogging.Constants;
+using System.Linq;
 
 namespace Skoruba.AuditLogging.Events.Http
 {
@@ -15,7 +15,7 @@ public HttpAuditSubject(IHttpContextAccessor accessor, AuditHttpSubjectOptions o
             {
                 RemoteIpAddress = accessor.HttpContext.Connection?.RemoteIpAddress?.ToString(),
                 LocalIpAddress = accessor.HttpContext.Connection?.LocalIpAddress?.ToString(),
-                Claims = accessor.HttpContext.User.Claims?.Select(x=> new { x.Type, x.Value })
+                Claims = accessor.HttpContext.User.Claims?.Select(x => new { x.Type, x.Value })
             };
         }
 
diff --git a/src/Skoruba.AuditLogging/Extensions/AuditLoggingBuilder.cs b/src/Skoruba.AuditLogging/Extensions/AuditLoggingBuilder.cs
@@ -1,15 +1,9 @@
 ﻿using Microsoft.Extensions.DependencyInjection;
-using Skoruba.AuditLogging.EntityFramework.Extensions;
 
 namespace Skoruba.AuditLogging.Extensions
 {
-    public class AuditLoggingBuilder : IAuditLoggingBuilder
+    public class AuditLoggingBuilder(IServiceCollection services) : IAuditLoggingBuilder
     {
-        public AuditLoggingBuilder(IServiceCollection services)
-        {
-            Services = services;
-        }
-
-        public IServiceCollection Services { get; }
+        public IServiceCollection Services { get; } = services;
     }
 }
diff --git a/src/Skoruba.AuditLogging/Extensions/AuditLoggingExtensions.cs b/src/Skoruba.AuditLogging/Extensions/AuditLoggingExtensions.cs
@@ -1,12 +1,12 @@
-﻿using System;
-using Microsoft.Extensions.DependencyInjection;
+﻿using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Skoruba.AuditLogging.Configuration;
 using Skoruba.AuditLogging.Events;
 using Skoruba.AuditLogging.Events.Default;
 using Skoruba.AuditLogging.Events.Http;
 using Skoruba.AuditLogging.Extensions;
 using Skoruba.AuditLogging.Services;
+using System;
 
 namespace Skoruba.AuditLogging.EntityFramework.Extensions
 {
diff --git a/src/Skoruba.AuditLogging/Helpers/HttpContextHelpers/HttpContextHelpers.cs b/src/Skoruba.AuditLogging/Helpers/HttpContextHelpers/HttpContextHelpers.cs
@@ -1,10 +1,10 @@
 ﻿// Original file: https://github.com/thepirat000/Audit.NET/blob/9ee49b5295119ef7cc6648977f90c46ce39cc698/src/Audit.WebApi/AuditApiHelper.cs
 // Modified: Jan Škoruba
 
-using System.Collections.Generic;
-using System.IO;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
+using System.Collections.Generic;
+using System.IO;
 
 namespace Skoruba.AuditLogging.Helpers.HttpContextHelpers
 {
@@ -35,7 +35,7 @@ public static IDictionary<string, string> ToDictionary(IEnumerable<KeyValuePair<
             {
                 return null;
             }
-            IDictionary<string, string> dict = new Dictionary<string, string>();
+            var dict = new Dictionary<string, string>();
             foreach (var k in col)
             {
                 dict.Add(k.Key, string.Join(", ", k.Value));
diff --git a/src/Skoruba.AuditLogging/Helpers/JsonHelpers/AuditLogSerializer.cs b/src/Skoruba.AuditLogging/Helpers/JsonHelpers/AuditLogSerializer.cs
@@ -15,14 +15,14 @@ namespace Skoruba.AuditLogging.Helpers.JsonHelpers
     /// </summary>
     public static class AuditLogSerializer
     {
-        public static readonly JsonSerializerSettings DefaultAuditJsonSettings = new JsonSerializerSettings
+        public static readonly JsonSerializerSettings DefaultAuditJsonSettings = new()
         {
             NullValueHandling = NullValueHandling.Ignore,
             DateFormatHandling = DateFormatHandling.IsoDateFormat,
             Formatting = Formatting.Indented
         };
 
-        public static readonly JsonSerializerSettings BaseAuditEventJsonSettings = new JsonSerializerSettings
+        public static readonly JsonSerializerSettings BaseAuditEventJsonSettings = new()
         {
             NullValueHandling = NullValueHandling.Ignore,
             DateFormatHandling = DateFormatHandling.IsoDateFormat,
diff --git a/src/Skoruba.AuditLogging/Helpers/JsonHelpers/AuditLoggerContractResolver.cs b/src/Skoruba.AuditLogging/Helpers/JsonHelpers/AuditLoggerContractResolver.cs
@@ -1,7 +1,7 @@
-﻿using System.Reflection;
-using Newtonsoft.Json;
+﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Skoruba.AuditLogging.Events;
+using System.Reflection;
 
 namespace Skoruba.AuditLogging.Helpers.JsonHelpers
 {
@@ -16,7 +16,7 @@ public class AuditLoggerContractResolver : DefaultContractResolver
         protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
         {
             var property = base.CreateProperty(member, memberSerialization);
-            if (typeof(AuditEvent).IsAssignableFrom(member.DeclaringType) 
+            if (typeof(AuditEvent).IsAssignableFrom(member.DeclaringType)
                 && (member.Name == nameof(AuditEvent.Category)
                     || member.Name == nameof(AuditEvent.SubjectAdditionalData)
                     || member.Name == nameof(AuditEvent.Action)
diff --git a/src/Skoruba.AuditLogging/Services/AuditEventLogger.cs b/src/Skoruba.AuditLogging/Services/AuditEventLogger.cs
@@ -4,11 +4,11 @@
 // Original file: https://github.com/IdentityServer/IdentityServer4/src/Services/Default/DefaultEventService.cs
 // Modified by Jan Škoruba
 
+using Skoruba.AuditLogging.Configuration;
+using Skoruba.AuditLogging.Events;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Skoruba.AuditLogging.Configuration;
-using Skoruba.AuditLogging.Events;
 
 namespace Skoruba.AuditLogging.Services
 {
diff --git a/src/Skoruba.AuditLogging/Services/IAuditEventLogger.cs b/src/Skoruba.AuditLogging/Services/IAuditEventLogger.cs
@@ -1,11 +1,11 @@
-﻿using System;
-using System.Threading.Tasks;
-using Skoruba.AuditLogging.Configuration;
+﻿using Skoruba.AuditLogging.Configuration;
 using Skoruba.AuditLogging.Events;
+using System;
+using System.Threading.Tasks;
 
 namespace Skoruba.AuditLogging.Services
 {
-    public interface IAuditEventLogger<out TAuditLoggerOptions> 
+    public interface IAuditEventLogger<out TAuditLoggerOptions>
         where TAuditLoggerOptions : AuditLoggerOptions
     {
         /// <summary>
diff --git a/src/Skoruba.AuditLogging/Services/IAuditEventLoggerSink.cs b/src/Skoruba.AuditLogging/Services/IAuditEventLoggerSink.cs
@@ -4,8 +4,8 @@
 // Original file: https://github.com/IdentityServer/IdentityServer4/src/Services/IEventSink.cs
 // Modified by Jan Škoruba
 
-using System.Threading.Tasks;
 using Skoruba.AuditLogging.Events;
+using System.Threading.Tasks;
 
 namespace Skoruba.AuditLogging.Services
 {

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Skoruba.AuditLogging.EntityFramework.DbContexts.Default`
`5`	`5`	`{`
`6`		`- public class DefaultAuditLoggingDbContext : AuditLoggingDbContext<AuditLog>`
	`6`	`+ public class DefaultAuditLoggingDbContext(DbContextOptions<DefaultAuditLoggingDbContext> dbContextOptions) : AuditLoggingDbContext<AuditLog>(dbContextOptions)`
`7`	`7`	`{`
`8`		`- public DefaultAuditLoggingDbContext(DbContextOptions<DefaultAuditLoggingDbContext> dbContextOptions)`
`9`		`- : base(dbContextOptions)`
`10`		`- {`
`11`		`-`
`12`		`- }`
`13`	`8`	`}`
`14`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-using System.Threading.Tasks;`
`2`		`-using Microsoft.EntityFrameworkCore;`
	`1`	`+using Microsoft.EntityFrameworkCore;`
`3`	`2`	`using Skoruba.AuditLogging.EntityFramework.Entities;`
	`3`	`+using System.Threading.Tasks;`
`4`	`4`
`5`	`5`	`namespace Skoruba.AuditLogging.EntityFramework.DbContexts`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-using System.Threading.Tasks;`
`2`		`-using Skoruba.AuditLogging.EntityFramework.Entities;`
	`1`	`+using Skoruba.AuditLogging.EntityFramework.Entities;`
`3`	`2`	`using Skoruba.AuditLogging.EntityFramework.Helpers.Common;`
	`3`	`+using System.Threading.Tasks;`
`4`	`4`
`5`	`5`	`namespace Skoruba.AuditLogging.EntityFramework.Repositories`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using System.Security.Claims;`
`2`		`-using Microsoft.AspNetCore.Authentication;`
	`1`	`+using Microsoft.AspNetCore.Authentication;`
	`2`	`+using System.Security.Claims;`
`3`	`3`
`4`	`4`	`namespace Skoruba.AuditLogging.Host.Helpers.Authentication`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System.Data;`
`2`		`-`
`3`		`-namespace Skoruba.AuditLogging.Constants`
	`1`	`+namespace Skoruba.AuditLogging.Constants`
`4`	`2`	`{`
`5`	`3`	`public class ClaimsConsts`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using System.Linq;`
`2`		`-using Microsoft.AspNetCore.Http;`
	`1`	`+using Microsoft.AspNetCore.Http;`
`3`	`2`	`using Skoruba.AuditLogging.Configuration;`
`4`	`3`	`using Skoruba.AuditLogging.Constants;`
	`4`	`+using System.Linq;`
`5`	`5`
`6`	`6`	`namespace Skoruba.AuditLogging.Events.Http`
`7`	`7`	`{`
`@@ -15,7 +15,7 @@ public HttpAuditSubject(IHttpContextAccessor accessor, AuditHttpSubjectOptions o`
`15`	`15`	`{`
`16`	`16`	`RemoteIpAddress = accessor.HttpContext.Connection?.RemoteIpAddress?.ToString(),`
`17`	`17`	`LocalIpAddress = accessor.HttpContext.Connection?.LocalIpAddress?.ToString(),`
`18`		`- Claims = accessor.HttpContext.User.Claims?.Select(x=> new { x.Type, x.Value })`
	`18`	`+ Claims = accessor.HttpContext.User.Claims?.Select(x => new { x.Type, x.Value })`
`19`	`19`	`};`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,9 @@`
`1`	`1`	`using Microsoft.Extensions.DependencyInjection;`
`2`		`-using Skoruba.AuditLogging.EntityFramework.Extensions;`
`3`	`2`
`4`	`3`	`namespace Skoruba.AuditLogging.Extensions`
`5`	`4`	`{`
`6`		`- public class AuditLoggingBuilder : IAuditLoggingBuilder`
	`5`	`+ public class AuditLoggingBuilder(IServiceCollection services) : IAuditLoggingBuilder`
`7`	`6`	`{`
`8`		`- public AuditLoggingBuilder(IServiceCollection services)`
`9`		`- {`
`10`		`- Services = services;`
`11`		`- }`
`12`		`-`
`13`		`- public IServiceCollection Services { get; }`
	`7`	`+ public IServiceCollection Services { get; } = services;`
`14`	`8`	`}`
`15`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`// Original file: https://github.com/thepirat000/Audit.NET/blob/9ee49b5295119ef7cc6648977f90c46ce39cc698/src/Audit.WebApi/AuditApiHelper.cs`
`2`	`2`	`// Modified: Jan Škoruba`
`3`	`3`
`4`		`-using System.Collections.Generic;`
`5`		`-using System.IO;`
`6`	`4`	`using Microsoft.AspNetCore.Http;`
`7`	`5`	`using Microsoft.Extensions.Primitives;`
	`6`	`+using System.Collections.Generic;`
	`7`	`+using System.IO;`
`8`	`8`
`9`	`9`	`namespace Skoruba.AuditLogging.Helpers.HttpContextHelpers`
`10`	`10`	`{`
`@@ -35,7 +35,7 @@ public static IDictionary<string, string> ToDictionary(IEnumerable<KeyValuePair<`
`35`	`35`	`{`
`36`	`36`	`return null;`
`37`	`37`	`}`
`38`		`- IDictionary<string, string> dict = new Dictionary<string, string>();`
	`38`	`+ var dict = new Dictionary<string, string>();`
`39`	`39`	`foreach (var k in col)`
`40`	`40`	`{`
`41`	`41`	`dict.Add(k.Key, string.Join(", ", k.Value));`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@ namespace Skoruba.AuditLogging.Helpers.JsonHelpers`
`15`	`15`	`/// </summary>`
`16`	`16`	`public static class AuditLogSerializer`
`17`	`17`	`{`
`18`		`- public static readonly JsonSerializerSettings DefaultAuditJsonSettings = new JsonSerializerSettings`
	`18`	`+ public static readonly JsonSerializerSettings DefaultAuditJsonSettings = new()`
`19`	`19`	`{`
`20`	`20`	`NullValueHandling = NullValueHandling.Ignore,`
`21`	`21`	`DateFormatHandling = DateFormatHandling.IsoDateFormat,`
`22`	`22`	`Formatting = Formatting.Indented`
`23`	`23`	`};`
`24`	`24`
`25`		`- public static readonly JsonSerializerSettings BaseAuditEventJsonSettings = new JsonSerializerSettings`
	`25`	`+ public static readonly JsonSerializerSettings BaseAuditEventJsonSettings = new()`
`26`	`26`	`{`
`27`	`27`	`NullValueHandling = NullValueHandling.Ignore,`
`28`	`28`	`DateFormatHandling = DateFormatHandling.IsoDateFormat,`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`// Original file: https://github.com/IdentityServer/IdentityServer4/src/Services/IEventSink.cs`
`5`	`5`	`// Modified by Jan Škoruba`
`6`	`6`
`7`		`-using System.Threading.Tasks;`
`8`	`7`	`using Skoruba.AuditLogging.Events;`
	`8`	`+using System.Threading.Tasks;`
`9`	`9`
`10`	`10`	`namespace Skoruba.AuditLogging.Services`
`11`	`11`	`{`