Merge pull request #39 from autofac/feature/nullable-fix

tillig · web-flow · commit 1a7a9eb0d49b · 2024-03-12T09:45:34.000-07:00
Update nullable annotations to correct handling of tenant ID
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,9 +3,8 @@
     "bierner.markdown-emoji",
     "davidanson.vscode-markdownlint",
     "editorconfig.editorconfig",
-    "formulahendry.dotnet-test-explorer",
     "gruntfuggly.todo-tree",
-    "ms-dotnettools.csharp",
+    "ms-dotnettools.csdevkit",
     "ryanluker.vscode-coverage-gutters",
     "stkb.rewrap",
     "travisillig.vscode-json-stable-stringify"
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,9 @@
 image: Ubuntu
 
-version: '8.0.1.{build}'
+version: '8.0.2.{build}'
 
 dotnet_csproj:
-  version_prefix: '8.0.1'
+  version_prefix: '8.0.2'
   patch: true
   file: 'src\**\*.csproj'
 
diff --git a/src/Autofac.Multitenant/ITenantIdentificationStrategy.cs b/src/Autofac.Multitenant/ITenantIdentificationStrategy.cs
@@ -20,5 +20,5 @@ public interface ITenantIdentificationStrategy
     /// if not.
     /// </returns>
     [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Tenant identifiers are objects.")]
-    bool TryIdentifyTenant(out object tenantId);
+    bool TryIdentifyTenant(out object? tenantId);
 }
diff --git a/src/Autofac.Multitenant/MultitenantContainer.cs b/src/Autofac.Multitenant/MultitenantContainer.cs
@@ -320,7 +320,7 @@ public ILifetimeScope BeginLoadContextLifetimeScope(object tag, AssemblyLoadCont
     /// </exception>
     /// <seealso cref="ConfigurationActionBuilder"/>
     /// <seealso cref="ReconfigureTenant(object, Action{ContainerBuilder})"/>
-    public void ConfigureTenant(object tenantId, Action<ContainerBuilder> configuration)
+    public void ConfigureTenant(object? tenantId, Action<ContainerBuilder> configuration)
     {
         if (configuration == null)
         {
diff --git a/src/Autofac.Multitenant/TenantIdentificationStrategyExtensions.cs b/src/Autofac.Multitenant/TenantIdentificationStrategyExtensions.cs
@@ -31,9 +31,9 @@ public static class TenantIdentificationStrategyExtensions
             throw new ArgumentNullException(nameof(strategy));
         }
 
-        if (strategy.TryIdentifyTenant(out object id))
+        if (strategy.TryIdentifyTenant(out var id))
         {
-            return (T)id;
+            return (T?)id;
         }
 
         return default;
diff --git a/test/Autofac.Multitenant.AspNetCore.Test/Autofac.Multitenant.AspNetCore.Test.csproj b/test/Autofac.Multitenant.AspNetCore.Test/Autofac.Multitenant.AspNetCore.Test.csproj
@@ -12,6 +12,7 @@
     <LangVersion>latest</LangVersion>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,22 +30,22 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/test/Autofac.Multitenant.AspNetCore.Test/Stubs/StubTenantIdentificationStrategy.cs b/test/Autofac.Multitenant.AspNetCore.Test/Stubs/StubTenantIdentificationStrategy.cs
@@ -12,9 +12,9 @@ public StubTenantIdentificationStrategy()
 
     public bool IdentificationSuccess { get; set; }
 
-    public object TenantId { get; set; }
+    public object? TenantId { get; set; }
 
-    public bool TryIdentifyTenant(out object tenantId)
+    public bool TryIdentifyTenant(out object? tenantId)
     {
         tenantId = TenantId;
         return IdentificationSuccess;
diff --git a/test/Autofac.Multitenant.Test/Autofac.Multitenant.Test.csproj b/test/Autofac.Multitenant.Test/Autofac.Multitenant.Test.csproj
@@ -12,6 +12,7 @@
     <LangVersion>latest</LangVersion>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,21 +29,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/test/Autofac.Multitenant.Test/MultitenantContainerFixture.cs b/test/Autofac.Multitenant.Test/MultitenantContainerFixture.cs
@@ -123,7 +123,7 @@ public void ConfigureTenant_RequiresConfiguration()
             TenantId = "tenant1",
         };
         using var mtc = new MultitenantContainer(strategy, builder.Build());
-        Assert.Throws<ArgumentNullException>(() => mtc.ConfigureTenant("tenant1", null));
+        Assert.Throws<ArgumentNullException>(() => mtc.ConfigureTenant("tenant1", null!));
     }
 
     [Fact]
@@ -142,13 +142,13 @@ public void ConfigureTenant_ThrowsAfterDisposal()
     [Fact]
     public void Ctor_NullApplicationContainer()
     {
-        Assert.Throws<ArgumentNullException>(() => new MultitenantContainer(new StubTenantIdentificationStrategy(), null));
+        Assert.Throws<ArgumentNullException>(() => new MultitenantContainer(new StubTenantIdentificationStrategy(), null!));
     }
 
     [Fact]
     public void Ctor_NullTenantIdentificationStrategy()
     {
-        Assert.Throws<ArgumentNullException>(() => new MultitenantContainer(null, new ContainerBuilder().Build()));
+        Assert.Throws<ArgumentNullException>(() => new MultitenantContainer(null!, new ContainerBuilder().Build()));
     }
 
     [Fact]
@@ -578,7 +578,7 @@ public void ReconfigureTenant_RequiresConfiguration()
         using var mtc = new MultitenantContainer(strategy, builder.Build());
         mtc.ConfigureTenant("tenant1", b => b.RegisterType<StubDependency1Impl2>().AsImplementedInterfaces().SingleInstance());
 
-        Assert.Throws<ArgumentNullException>(() => mtc.ReconfigureTenant("tenant1", null));
+        Assert.Throws<ArgumentNullException>(() => mtc.ReconfigureTenant("tenant1", null!));
     }
 
     [Fact]
diff --git a/test/Autofac.Multitenant.Test/RegistrationExtensionsFixture.cs b/test/Autofac.Multitenant.Test/RegistrationExtensionsFixture.cs
@@ -11,7 +11,7 @@ public class RegistrationExtensionsFixture
     [Fact]
     public void InstancePerTenant_NullRegistration()
     {
-        IRegistrationBuilder<StubDependency1Impl1, ConcreteReflectionActivatorData, SingleRegistrationStyle> registration = null;
+        IRegistrationBuilder<StubDependency1Impl1, ConcreteReflectionActivatorData, SingleRegistrationStyle> registration = null!;
         Assert.Throws<ArgumentNullException>(() => registration.InstancePerTenant());
     }
 
diff --git a/test/Autofac.Multitenant.Test/Stubs/StubTenantIdentificationStrategy.cs b/test/Autofac.Multitenant.Test/Stubs/StubTenantIdentificationStrategy.cs
@@ -12,9 +12,9 @@ public StubTenantIdentificationStrategy()
 
     public bool IdentificationSuccess { get; set; }
 
-    public object TenantId { get; set; }
+    public object? TenantId { get; set; }
 
-    public bool TryIdentifyTenant(out object tenantId)
+    public bool TryIdentifyTenant(out object? tenantId)
     {
         tenantId = TenantId;
         return IdentificationSuccess;
diff --git a/test/Autofac.Multitenant.Test/TenantIdentificationStrategyExtensionsFixture.cs b/test/Autofac.Multitenant.Test/TenantIdentificationStrategyExtensionsFixture.cs
@@ -30,7 +30,7 @@ public void IdentifyTenant_FailedRetrieval()
     [Fact]
     public void IdentifyTenant_NullStrategy()
     {
-        ITenantIdentificationStrategy strategy = null;
+        ITenantIdentificationStrategy strategy = null!;
         Assert.Throws<ArgumentNullException>(() => strategy.IdentifyTenant<Guid>());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ public interface ITenantIdentificationStrategy`
`20`	`20`	`/// if not.`
`21`	`21`	`/// </returns>`
`22`	`22`	`[SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Tenant identifiers are objects.")]`
`23`		`- bool TryIdentifyTenant(out object tenantId);`
	`23`	`+ bool TryIdentifyTenant(out object? tenantId);`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ public ILifetimeScope BeginLoadContextLifetimeScope(object tag, AssemblyLoadCont`
`320`	`320`	`/// </exception>`
`321`	`321`	`/// <seealso cref="ConfigurationActionBuilder"/>`
`322`	`322`	`/// <seealso cref="ReconfigureTenant(object, Action{ContainerBuilder})"/>`
`323`		`- public void ConfigureTenant(object tenantId, Action<ContainerBuilder> configuration)`
	`323`	`+ public void ConfigureTenant(object? tenantId, Action<ContainerBuilder> configuration)`
`324`	`324`	`{`
`325`	`325`	`if (configuration == null)`
`326`	`326`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public static class TenantIdentificationStrategyExtensions`
`31`	`31`	`throw new ArgumentNullException(nameof(strategy));`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (strategy.TryIdentifyTenant(out object id))`
	`34`	`+ if (strategy.TryIdentifyTenant(out var id))`
`35`	`35`	`{`
`36`		`- return (T)id;`
	`36`	`+ return (T?)id;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`return default;`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ public StubTenantIdentificationStrategy()`
`12`	`12`
`13`	`13`	`public bool IdentificationSuccess { get; set; }`
`14`	`14`
`15`		`- public object TenantId { get; set; }`
	`15`	`+ public object? TenantId { get; set; }`
`16`	`16`
`17`		`- public bool TryIdentifyTenant(out object tenantId)`
	`17`	`+ public bool TryIdentifyTenant(out object? tenantId)`
`18`	`18`	`{`
`19`	`19`	`tenantId = TenantId;`
`20`	`20`	`return IdentificationSuccess;`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public void ConfigureTenant_RequiresConfiguration()`
`123`	`123`	`TenantId = "tenant1",`
`124`	`124`	`};`
`125`	`125`	`using var mtc = new MultitenantContainer(strategy, builder.Build());`
`126`		`- Assert.Throws<ArgumentNullException>(() => mtc.ConfigureTenant("tenant1", null));`
	`126`	`+ Assert.Throws<ArgumentNullException>(() => mtc.ConfigureTenant("tenant1", null!));`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`[Fact]`
`@@ -142,13 +142,13 @@ public void ConfigureTenant_ThrowsAfterDisposal()`
`142`	`142`	`[Fact]`
`143`	`143`	`public void Ctor_NullApplicationContainer()`
`144`	`144`	`{`
`145`		`- Assert.Throws<ArgumentNullException>(() => new MultitenantContainer(new StubTenantIdentificationStrategy(), null));`
	`145`	`+ Assert.Throws<ArgumentNullException>(() => new MultitenantContainer(new StubTenantIdentificationStrategy(), null!));`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`[Fact]`
`149`	`149`	`public void Ctor_NullTenantIdentificationStrategy()`
`150`	`150`	`{`
`151`		`- Assert.Throws<ArgumentNullException>(() => new MultitenantContainer(null, new ContainerBuilder().Build()));`
	`151`	`+ Assert.Throws<ArgumentNullException>(() => new MultitenantContainer(null!, new ContainerBuilder().Build()));`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`[Fact]`
`@@ -578,7 +578,7 @@ public void ReconfigureTenant_RequiresConfiguration()`
`578`	`578`	`using var mtc = new MultitenantContainer(strategy, builder.Build());`
`579`	`579`	`mtc.ConfigureTenant("tenant1", b => b.RegisterType<StubDependency1Impl2>().AsImplementedInterfaces().SingleInstance());`
`580`	`580`
`581`		`- Assert.Throws<ArgumentNullException>(() => mtc.ReconfigureTenant("tenant1", null));`
	`581`	`+ Assert.Throws<ArgumentNullException>(() => mtc.ReconfigureTenant("tenant1", null!));`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class RegistrationExtensionsFixture`
`11`	`11`	`[Fact]`
`12`	`12`	`public void InstancePerTenant_NullRegistration()`
`13`	`13`	`{`
`14`		`- IRegistrationBuilder<StubDependency1Impl1, ConcreteReflectionActivatorData, SingleRegistrationStyle> registration = null;`
	`14`	`+ IRegistrationBuilder<StubDependency1Impl1, ConcreteReflectionActivatorData, SingleRegistrationStyle> registration = null!;`
`15`	`15`	`Assert.Throws<ArgumentNullException>(() => registration.InstancePerTenant());`
`16`	`16`	`}`
`17`	`17`