use nullable (#484)

src/Framework.AutomationCore.ServiceEnvironment.LegacyContext/Framework.AutomationCore.ServiceEnvironment.LegacyContext.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <PackageId>Luxoft.Framework.AutomationCore.ServiceEnvironment.LegacyContext</PackageId>
     <RootNamespace>Automation.ServiceEnvironmen</RootNamespace>
+    <nullable>enable</nullable>
   </PropertyGroup>
 
   <ItemGroup>

src/Framework.AutomationCore.ServiceEnvironment.LegacyContext/RootServiceProviderContainer/IRootServiceProviderContainer.cs

@@ -10,7 +10,7 @@ public interface IRootServiceProviderContainer<out TBLLContext> : IRootServicePr
 {
     async Task<TResult> IServiceEvaluator<TBLLContext>.EvaluateAsync<TResult>(
             DBSessionMode sessionMode,
-            string customPrincipalName,
+            string? customPrincipalName,
             Func<TBLLContext, Task<TResult>> getResult)
     {
         return await this.RootServiceProvider.GetRequiredService<IServiceEvaluator<TBLLContext>>().EvaluateAsync(sessionMode, customPrincipalName, getResult);
@@ -21,7 +21,7 @@ public interface IRootServiceProviderContainer<TBLLContext, TMappingService> : I
 {
     async Task<TResult> IContextEvaluator<TBLLContext, TMappingService>.EvaluateAsync<TResult>(
             DBSessionMode sessionMode,
-            string customPrincipalName,
+            string? customPrincipalName,
             Func<EvaluatedData<TBLLContext, TMappingService>, Task<TResult>> getResult)
     {
         return await this.RootServiceProvider.GetRequiredService<IContextEvaluator<TBLLContext, TMappingService>>().EvaluateAsync(sessionMode, customPrincipalName, getResult);

src/Framework.AutomationCore.ServiceEnvironment/Framework.AutomationCore.ServiceEnvironment.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <PackageId>Luxoft.Framework.AutomationCore.ServiceEnvironment</PackageId>
     <RootNamespace>Automation.ServiceEnvironment</RootNamespace>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

src/Framework.AutomationCore.ServiceEnvironment/Helpers/AuthHelperBase.cs

@@ -24,7 +24,7 @@ public string GetCurrentUserLogin()
         return this.ManagerEvaluator.Evaluate(DBSessionMode.Read, manager => manager.GetCurrentUserLogin());
     }
 
-    public void LoginAs(string principalName = null)
+    public void LoginAs(string? principalName = null)
     {
         this.UserAuthenticationService.SetUserName(principalName);
     }
@@ -40,28 +40,23 @@ public async Task<Guid> SavePrincipalAsync(string name, CancellationToken cancel
         return await this.ManagerEvaluator.EvaluateAsync(DBSessionMode.Write, async manger => await manger.SavePrincipalAsync(name, cancellationToken));
     }
 
-    public void AddUserRole(string principalName, params TestPermission[] permissions)
+    public void AddUserRole(string? principalName, params TestPermission[] permissions)
     {
         this.AddUserRoleAsync(principalName, permissions).GetAwaiter().GetResult();
     }
 
-    public async Task AddUserRoleAsync(string principalName, TestPermission[] permissions, CancellationToken cancellationToken = default)
+    public async Task AddUserRoleAsync(string? principalName, TestPermission[] permissions, CancellationToken cancellationToken = default)
     {
         await this.ManagerEvaluator.EvaluateAsync(DBSessionMode.Write, async manger => await manger.AddUserRoleAsync(principalName, permissions, cancellationToken));
     }
 
-    public virtual void AddUserToAdmin(string principalName)
+    public virtual void AddUserToAdmin(string? principalName)
     {
         this.SetUserRole(principalName, SecurityRole.Administrator, SecurityRole.SystemIntegration);
     }
 
-    public void SetUserRole(string principalName, params TestPermission[] permissions)
+    public void SetUserRole(string? principalName, params TestPermission[] permissions)
     {
-        if (permissions == null)
-        {
-            throw new ArgumentNullException(nameof(permissions));
-        }
-
         this.RemovePermissions(principalName);
 
         this.AddUserRole(principalName, permissions);
@@ -78,12 +73,12 @@ public void SetCurrentUserRole(params TestPermission[] permissions)
         this.SetUserRole(default, permissions);
     }
 
-    public void RemovePermissions(string principalName)
+    public void RemovePermissions(string? principalName)
     {
         this.RemovePermissionsAsync(principalName).GetAwaiter().GetResult();
     }
 
-    public async Task RemovePermissionsAsync(string principalName, CancellationToken cancellationToken = default)
+    public async Task RemovePermissionsAsync(string? principalName, CancellationToken cancellationToken = default)
     {
         await this.ManagerEvaluator.EvaluateAsync(DBSessionMode.Write, async manager => await manager.RemovePermissionsAsync(principalName, cancellationToken));
     }

src/Framework.AutomationCore.ServiceEnvironment/Helpers/AuthManager.cs

@@ -29,7 +29,7 @@ public async Task<Guid> SavePrincipalAsync(string name, CancellationToken cancel
         return principal.Id;
     }
 
-    public async Task AddUserRoleAsync(string principalName, TestPermission[] testPermissions, CancellationToken cancellationToken = default)
+    public async Task AddUserRoleAsync(string? principalName, TestPermission[] testPermissions, CancellationToken cancellationToken = default)
     {
         var principal = await principalDomainService.GetOrCreateAsync(principalName ?? this.GetCurrentUserLogin(), cancellationToken);
 
@@ -62,7 +62,7 @@ public async Task AddUserRoleAsync(string principalName, TestPermission[] testPe
         await principalDomainService.SaveAsync(principal, cancellationToken);
     }
 
-    public async Task RemovePermissionsAsync(string principalName, CancellationToken cancellationToken = default)
+    public async Task RemovePermissionsAsync(string? principalName, CancellationToken cancellationToken = default)
     {
         var currentUserName = principalName ?? this.GetCurrentUserLogin();
 

src/Framework.AutomationCore.ServiceEnvironment/RootServiceProviderContainer/RootServiceProviderContainer.cs

@@ -8,14 +8,9 @@
 
 namespace Automation.ServiceEnvironment;
 
-public abstract class RootServiceProviderContainer : IRootServiceProviderContainer
+public abstract class RootServiceProviderContainer(IServiceProvider rootServiceProvider) : IRootServiceProviderContainer
 {
-    public RootServiceProviderContainer(IServiceProvider rootServiceProvider)
-    {
-        this.RootServiceProvider = rootServiceProvider;
-    }
-
-    public virtual IServiceProvider RootServiceProvider { get; }
+    public virtual IServiceProvider RootServiceProvider { get; } = rootServiceProvider;
 
     public AutomationFrameworkSettings AutomationFrameworkSettings => this.GetAutomationFrameworkSettings();
 
@@ -25,7 +20,7 @@ public RootServiceProviderContainer(IServiceProvider rootServiceProvider)
 
     public IDatabaseContext DatabaseContext => this.GetDatabaseContext();
 
-    public virtual ControllerEvaluator<TController> GetControllerEvaluator<TController>(string principalName = null)
+    public virtual ControllerEvaluator<TController> GetControllerEvaluator<TController>(string? principalName = null)
             where TController : ControllerBase
     {
         return this.RootServiceProvider.GetDefaultControllerEvaluator<TController>(principalName);

src/Framework.AutomationCore.ServiceEnvironment/ServiceEnvironment/ControllerEvaluator.cs

@@ -12,27 +12,12 @@
 
 namespace Automation.ServiceEnvironment;
 
-public class ControllerEvaluator<TController>
-        where TController : ControllerBase
+public class ControllerEvaluator<TController>(IServiceProvider rootServiceProvider, string? customPrincipalName = null)
+    where TController : ControllerBase
 {
-    private readonly IServiceProvider rootServiceProvider;
-
-    private readonly string customPrincipalName;
-
-    public ControllerEvaluator(IServiceProvider rootServiceProvider)
-            : this(rootServiceProvider, null)
-    {
-    }
-
-    private ControllerEvaluator(IServiceProvider rootServiceProvider, string customPrincipalName)
-    {
-        this.rootServiceProvider = rootServiceProvider ?? throw new ArgumentNullException(nameof(rootServiceProvider));
-        this.customPrincipalName = customPrincipalName;
-    }
-
     public void Evaluate(Expression<Action<TController>> actionExpr)
     {
-        this.InternalEvaluateAsync<object>(actionExpr, async c =>
+        this.InternalEvaluateAsync<object?>(actionExpr, async c =>
         {
             actionExpr.Eval(c);
             return default;
@@ -48,7 +33,7 @@ public T Evaluate<T>(Expression<Func<TController, T>> funcExpr)
 
     public async Task EvaluateAsync(Expression<Func<TController, Task>> actionExpr)
     {
-        await this.InternalEvaluateAsync<object>(actionExpr, async c =>
+        await this.InternalEvaluateAsync<object?>(actionExpr, async c =>
         {
             await actionExpr.Eval(c);
             return default;
@@ -62,18 +47,18 @@ public async Task<T> EvaluateAsync<T>(Expression<Func<TController, Task<T>>> fun
 
     private async Task<T> InternalEvaluateAsync<T>(LambdaExpression invokeExpr, Func<TController, Task<T>> func)
     {
-        await using var scope = this.rootServiceProvider.CreateAsyncScope();
+        await using var scope = rootServiceProvider.CreateAsyncScope();
 
         var c = new DefaultHttpContext { RequestServices = scope.ServiceProvider };
 
         await new WebApiInvoker(c, context => InvokeController(context, func))
-              .WithMiddleware(next => new ImpersonateMiddleware(next), (middleware, httpContext) => middleware.Invoke(httpContext, this.customPrincipalName))
+              .WithMiddleware(next => new ImpersonateMiddleware(next), (middleware, httpContext) => middleware.Invoke(httpContext, customPrincipalName))
               .WithMiddleware(next => new TryProcessDbSessionMiddleware(next), (middleware, httpContext) => middleware.Invoke(httpContext, httpContext.RequestServices.GetRequiredService<IDBSessionManager>(), httpContext.RequestServices.GetRequiredService<IWebApiDBSessionModeResolver>()))
               .WithMiddleware(next => new InitCurrentMethodMiddleware(next), (middleware, httpContext) => middleware.Invoke(httpContext, invokeExpr))
               .WithMiddleware(next => new WebApiExceptionExpanderMiddleware(next), (middleware, httpContext) => middleware.Invoke(httpContext, httpContext.RequestServices.GetRequiredService<IWebApiExceptionExpander>()))
               .Invoke();
 
-        return (T)c.Items["Result"];
+        return (T)c.Items["Result"]!;
     }
 
     private static async Task InvokeController<T>(HttpContext context, Func<TController, Task<T>> func)
@@ -89,44 +74,30 @@ private static async Task InvokeController<T>(HttpContext context, Func<TControl
 
     public ControllerEvaluator<TController> WithImpersonate(string newCustomPrincipalName)
     {
-        return new ControllerEvaluator<TController>(this.rootServiceProvider, newCustomPrincipalName);
+        return new ControllerEvaluator<TController>(rootServiceProvider, newCustomPrincipalName);
     }
 
-    private class ImpersonateMiddleware
+    private class ImpersonateMiddleware(RequestDelegate next)
     {
-        private readonly RequestDelegate next;
-
-        public ImpersonateMiddleware(RequestDelegate next)
-        {
-            this.next = next;
-        }
-
-        public async Task Invoke(HttpContext context, string customPrincipalName)
+        public async Task Invoke(HttpContext context, string? customPrincipalName)
         {
             if (customPrincipalName == null)
             {
-                await this.next(context);
+                await next(context);
             }
             else
             {
                 await context.RequestServices.GetRequiredService<IIntegrationTestUserAuthenticationService>().WithImpersonateAsync(customPrincipalName, async () =>
                 {
-                    await this.next(context);
+                    await next(context);
                     return default(object);
                 });
             }
         }
     }
 
-    private class InitCurrentMethodMiddleware
+    private class InitCurrentMethodMiddleware(RequestDelegate next)
     {
-        private readonly RequestDelegate next;
-
-        public InitCurrentMethodMiddleware(RequestDelegate next)
-        {
-            this.next = next;
-        }
-
         public async Task Invoke(HttpContext context, LambdaExpression invokeExpr)
         {
             var currentMethod = invokeExpr.UpdateBodyBase(ExpandConstVisitor.Value)
@@ -135,30 +106,20 @@ public async Task Invoke(HttpContext context, LambdaExpression invokeExpr)
 
             context.RequestServices.GetRequiredService<TestWebApiCurrentMethodResolver>().SetCurrentMethod(currentMethod);
 
-            await this.next(context);
+            await next(context);
         }
     }
 
-    private class WebApiInvoker
+    private class WebApiInvoker(HttpContext context, RequestDelegate next)
     {
-        private readonly HttpContext context;
-
-        private readonly RequestDelegate next;
-
-        public WebApiInvoker(HttpContext context, RequestDelegate next)
-        {
-            this.context = context;
-            this.next = next;
-        }
-
         public WebApiInvoker WithMiddleware<TMiddleware>(Func<RequestDelegate, TMiddleware> createFunc, Func<TMiddleware, HttpContext, Task> invokeDelegate)
         {
-            return new WebApiInvoker(this.context, c => invokeDelegate(createFunc(this.next), c));
+            return new WebApiInvoker(context, c => invokeDelegate(createFunc(next), c));
         }
 
         public async Task Invoke()
         {
-            await this.next(this.context);
+            await next(context);
         }
     }
 }

src/Framework.AutomationCore.ServiceEnvironment/ServiceEnvironment/ServiceProviderExtensions.cs

@@ -28,7 +28,7 @@ public static async Task RunJob<TJob>(this IServiceProvider rootServiceProvider,
 
     public static ControllerEvaluator<TController> GetDefaultControllerEvaluator<TController>(
         this IServiceProvider rootServiceProvider,
-        string principalName = null)
+        string? principalName = null)
         where TController : ControllerBase
     {
         var controllerEvaluator = rootServiceProvider.GetRequiredService<ControllerEvaluator<TController>>();

src/Framework.AutomationCore.ServiceEnvironment/ServiceEnvironment/Services/IIntegrationTestUserAuthenticationService.cs

@@ -6,7 +6,7 @@ namespace Automation.ServiceEnvironment.Services;
 
 public interface IIntegrationTestUserAuthenticationService : IDefaultUserAuthenticationService, IAuditRevisionUserAuthenticationService, IUserAuthenticationService
 {
-    void SetUserName(string customUserName);
+    void SetUserName(string? customUserName);
 
     void Reset();
 

src/Framework.AutomationCore.ServiceEnvironment/ServiceEnvironment/Services/IntegrationTestUserAuthenticationService.cs

@@ -8,9 +8,9 @@ public class IntegrationTestUserAuthenticationService(IOptions<AutomationFramewo
 {
     private string IntegrationTestUserName => settings.Value.IntegrationTestUserName;
 
-    public string CustomUserName { get; internal set; }
+    public string? CustomUserName { get; internal set; }
 
-    public void SetUserName(string customUserName) => this.CustomUserName = customUserName ?? this.IntegrationTestUserName;
+    public void SetUserName(string? customUserName) => this.CustomUserName = customUserName ?? this.IntegrationTestUserName;
 
     public void Reset() => this.CustomUserName = this.IntegrationTestUserName;
 

src/Framework.AutomationCore.ServiceEnvironment/WebApi/IntegrationWebApiBase.cs

@@ -1,14 +1,9 @@
 namespace Automation.ServiceEnvironment;
 
-public abstract class IntegrationWebApiBase : WebApiBase
+public abstract class IntegrationWebApiBase(IServiceProvider rootServiceProvider) : WebApiBase(rootServiceProvider)
 {
-    protected IntegrationWebApiBase(IServiceProvider rootServiceProvider)
-            : base(rootServiceProvider)
-    {
-    }
-
     protected abstract string IntegrationUserName { get; }
 
-    public override ControllerEvaluator<TController> GetControllerEvaluator<TController>(string principalName = null) =>
+    public override ControllerEvaluator<TController> GetControllerEvaluator<TController>(string? principalName = null) =>
             base.GetControllerEvaluator<TController>(principalName ?? this.IntegrationUserName);
 }

src/Framework.AutomationCore/Environment/TestEnvironmentBuilder.cs

@@ -14,11 +14,15 @@ namespace Automation;
 
 public class TestEnvironmentBuilder
 {
-    private IConfiguration withConfiguration;
-    private Func<IConfiguration, IServiceCollection, IServiceCollection> withServiceProviderBuildFunc;
-    private Action<IServiceProvider> withServiceProvAfterBuildAction;
-    private Action<AutomationFrameworkSettings> withAutomationFrameworkSettings;
-    private Type withDatabaseGenerator;
+    private IConfiguration? withConfiguration;
+
+    private Func<IConfiguration, IServiceCollection, IServiceCollection>? withServiceProviderBuildFunc;
+
+    private Action<IServiceProvider> withServiceProvAfterBuildAction = _ => { };
+
+    private Action<AutomationFrameworkSettings> withAutomationFrameworkSettings = _ => { };
+
+    private Type? withDatabaseGenerator;
 
     public TestEnvironmentBuilder WithConfiguration(IConfiguration rootConfiguration)
     {
@@ -87,7 +91,7 @@ public TestEnvironment Build()
         }
 
         var serviceProviderPool = this.GetServiceProviderPool(
-            this.withConfiguration,
+            this.withConfiguration!,
             this.withServiceProviderBuildFunc,
             this.withServiceProvAfterBuildAction,
             this.withDatabaseGenerator,
@@ -151,7 +155,7 @@ private IServiceProvider ServiceProviderGenerationFunc(
 
         var environmentServiceProvider = this.BuildServiceProvider(environmentServices);
 
-        serviceProviderAfterBuildAction?.Invoke(environmentServiceProvider);
+        serviceProviderAfterBuildAction(environmentServiceProvider);
 
         return environmentServiceProvider;
     }
@@ -160,7 +164,7 @@ private static IOptions<AutomationFrameworkSettings> GetSettings(IConfiguration
     {
         var settings = new AutomationFrameworkSettings();
         configuration.GetSection(nameof(AutomationFrameworkSettings)).Bind(settings);
-        action?.Invoke(settings);
+        action(settings);
 
         return Options.Create(settings);
     }

src/Framework.AutomationCore/Framework.AutomationCore.csproj

@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PackageId>Luxoft.Framework.AutomationCore</PackageId>
     <RootNamespace>Automation</RootNamespace>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\__SolutionItems\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />

src/Framework.AutomationCore/Settings/AutomationFrameworkSettings.cs

@@ -14,7 +14,7 @@ public class AutomationFrameworkSettings
 
     public string DatabaseCollation { get; set; } = "";
 
-    public string TestRunServerRootFolder { get; set; }
+    public string TestRunServerRootFolder { get; set; } = default!;
 
     public string DbDataDirectory => Path.Combine(this.TestRunServerRootFolder, "data");