Update for nullable reference type

usausa · Feb 8, 2021 · d3f3aa0 · d3f3aa0
1 parent b3198cd
commit d3f3aa0
Show file tree

Hide file tree

Showing 39 changed files with 206 additions and 180 deletions.
diff --git a/Example.GenericHost/Example.GenericHost.csproj b/Example.GenericHost/Example.GenericHost.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
-    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta1" />
+    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Example.GenericHost/Settings.cs b/Example.GenericHost/Settings.cs
@@ -2,6 +2,6 @@ namespace Example.GenericHost
 {
     public class Settings
     {
-        public string Data { get; set; }
+        public string? Data { get; set; }
     }
 }
diff --git a/Example.WebApplication/Example.WebApplication.csproj b/Example.WebApplication/Example.WebApplication.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.1" />
-    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta1" />
+    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta2" />
     <PackageReference Include="Usa.Smart.Data" Version="2.0.0-beta1" />
     <PackageReference Include="Usa.Smart.Data.Mapper" Version="2.0.0-beta1" />
   </ItemGroup>

diff --git a/Example.WebApplication/Models/CharacterEntity.cs b/Example.WebApplication/Models/CharacterEntity.cs
@@ -4,7 +4,7 @@ public class CharacterEntity
     {
         public int Id { get; set; }
 
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         public int Level { get; set; }
     }

diff --git a/Example.WebApplication/Models/ErrorViewModel.cs b/Example.WebApplication/Models/ErrorViewModel.cs
@@ -1,9 +1,11 @@
 namespace Example.WebApplication.Models
 {
+    using System;
+
     public class ErrorViewModel
     {
-        public string RequestId { get; set; }
+        public string? RequestId { get; set; }
 
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+        public bool ShowRequestId => !String.IsNullOrEmpty(RequestId);
     }
-}
+}
diff --git a/Example.WebApplication/Models/ItemEntity.cs b/Example.WebApplication/Models/ItemEntity.cs
@@ -4,7 +4,7 @@ public class ItemEntity
     {
         public int Id { get; set; }
 
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         public int Price { get; set; }
     }

diff --git a/Example.WebApplication/Settings/ProfileSettings.cs b/Example.WebApplication/Settings/ProfileSettings.cs
@@ -1,7 +1,10 @@
 namespace Example.WebApplication.Settings
 {
+    using System.Diagnostics.CodeAnalysis;
+
     public class ProfileSettings
     {
+        [AllowNull]
         public string[] Genders { get; set; }
     }
 }
diff --git a/Smart.Resolver.Benchmark/Benchmarks/SmartDefaultBenchmark.cs b/Smart.Resolver.Benchmark/Benchmarks/SmartDefaultBenchmark.cs
@@ -2,7 +2,7 @@ namespace Smart.Resolver.Benchmark.Benchmarks
 {
     using System;
     using System.Collections.Generic;
-
+    using System.Diagnostics.CodeAnalysis;
     using BenchmarkDotNet.Attributes;
 
     using Microsoft.Extensions.DependencyInjection;
@@ -13,8 +13,10 @@ namespace Smart.Resolver.Benchmark.Benchmarks
     [Config(typeof(BenchmarkConfig))]
     public class SmartDefaultBenchmark
     {
+        [AllowNull]
         private SmartResolver resolver;
 
+        [AllowNull]
         private IServiceProvider provider;
 
         [GlobalSetup]
@@ -141,31 +143,31 @@ public void MultipleTransient()
         [Benchmark(OperationsPerInvoke = 5)]
         public void AspNet()
         {
-            var factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory));
+            var factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory))!;
             using (var scope = factory.CreateScope())
             {
                 scope.ServiceProvider.GetService(typeof(Controller));
             }
 
-            factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory));
+            factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory))!;
             using (var scope = factory.CreateScope())
             {
                 scope.ServiceProvider.GetService(typeof(Controller));
             }
 
-            factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory));
+            factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory))!;
             using (var scope = factory.CreateScope())
             {
                 scope.ServiceProvider.GetService(typeof(Controller));
             }
 
-            factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory));
+            factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory))!;
             using (var scope = factory.CreateScope())
             {
                 scope.ServiceProvider.GetService(typeof(Controller));
             }
 
-            factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory));
+            factory = (IServiceScopeFactory)provider.GetService(typeof(IServiceScopeFactory))!;
             using (var scope = factory.CreateScope())
             {
                 scope.ServiceProvider.GetService(typeof(Controller));

diff --git a/Smart.Resolver.Benchmark/Benchmarks/SmartUseReflectionBenchmark.cs b/Smart.Resolver.Benchmark/Benchmarks/SmartUseReflectionBenchmark.cs
@@ -1,7 +1,7 @@
 namespace Smart.Resolver.Benchmark.Benchmarks
 {
     using System.Collections.Generic;
-
+    using System.Diagnostics.CodeAnalysis;
     using BenchmarkDotNet.Attributes;
 
     using Smart.Reflection;
@@ -11,6 +11,7 @@ namespace Smart.Resolver.Benchmark.Benchmarks
     [Config(typeof(BenchmarkConfig))]
     public class SmartUseReflectionBenchmark
     {
+        [AllowNull]
         private SmartResolver resolver;
 
         [GlobalSetup]

diff --git a/Smart.Resolver.Benchmark/Classes/Generic.cs b/Smart.Resolver.Benchmark/Classes/Generic.cs
@@ -2,11 +2,11 @@ namespace Smart.Resolver.Benchmark.Classes
 {
     public interface IGenericObject<T>
     {
-        T Value { get; set; }
+        T? Value { get; set; }
     }
 
     public class GenericObject<T> : IGenericObject<T>
     {
-        public T Value { get; set; }
+        public T? Value { get; set; }
     }
 }
diff --git a/Smart.Resolver.Benchmark/Smart.Resolver.Benchmark.csproj b/Smart.Resolver.Benchmark/Smart.Resolver.Benchmark.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta1" />
+    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Smart.Resolver.Extensions.Configuration/Smart.Resolver.Extensions.Configuration.csproj b/Smart.Resolver.Extensions.Configuration/Smart.Resolver.Extensions.Configuration.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
-    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta1" />
+    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...olver.Extensions.DependencyInjection/Smart.Resolver.Extensions.DependencyInjection.csproj b/...olver.Extensions.DependencyInjection/Smart.Resolver.Extensions.DependencyInjection.csproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta1" />
+    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Smart.Resolver.Tests/Resolver/ConstraintTest.cs b/Smart.Resolver.Tests/Resolver/ConstraintTest.cs
@@ -74,31 +74,6 @@ public bool Match(BindingMetadata metadata)
             {
                 return metadata.Has(Key);
             }
-
-            public bool Equals(IConstraint other)
-            {
-                return other is HasMetadataConstraint constraint && String.Equals(Key, constraint.Key, StringComparison.Ordinal);
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (obj is null)
-                {
-                    return false;
-                }
-
-                if (ReferenceEquals(this, obj))
-                {
-                    return true;
-                }
-
-                return obj is NameConstraint constraint && Equals(constraint);
-            }
-
-            public override int GetHashCode()
-            {
-                return Key?.GetHashCode(StringComparison.Ordinal) ?? 0;
-            }
         }
 
         [AttributeUsage(AttributeTargets.Property | AttributeTargets.Parameter, AllowMultiple = true)]

diff --git a/Smart.Resolver.Tests/Resolver/Mocks/HasPropertyObject.cs b/Smart.Resolver.Tests/Resolver/Mocks/HasPropertyObject.cs
@@ -5,6 +5,6 @@ namespace Smart.Resolver.Mocks
     public class HasPropertyObject
     {
         [Inject]
-        public SimpleObject Injected { get; set; }
+        public SimpleObject? Injected { get; set; }
     }
 }
diff --git a/Smart.Resolver.Tests/Resolver/ProcessorTest.cs b/Smart.Resolver.Tests/Resolver/ProcessorTest.cs
@@ -84,7 +84,7 @@ public sealed class CustomInitializeProcessor : IProcessor
 
             public int Order { get; } = 1;
 
-            public Action<IResolver, object> CreateProcessor(Type type)
+            public Action<IResolver, object>? CreateProcessor(Type type)
             {
                 if (!CustomInitializableType.IsAssignableFrom(type))
                 {

diff --git a/Smart.Resolver.Tests/Resolver/ProviderTest.cs b/Smart.Resolver.Tests/Resolver/ProviderTest.cs
@@ -143,7 +143,7 @@ public class MultiConstructorObject
 
             public SimpleObject SimpleObject { get; }
 
-            public IService Service { get; }
+            public IService? Service { get; }
 
             public MultiConstructorObject(SimpleObject simpleObject)
             {

diff --git a/Smart.Resolver.Tests/Resolver/ResolverTest.cs b/Smart.Resolver.Tests/Resolver/ResolverTest.cs
@@ -2,6 +2,7 @@ namespace Smart.Resolver
 {
     using System;
     using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
     using System.Linq;
 
     using Smart.ComponentModel;
@@ -41,15 +42,14 @@ public void ObjectBindingCreatedByOpenGenericMissingResolver()
 
         public interface IGenericService<out T>
         {
+            [return: MaybeNull]
             T Create();
         }
 
         public class GenericService<T> : IGenericService<T>
         {
-            public T Create()
-            {
-                return default;
-            }
+            [return: MaybeNull]
+            public T Create() => default;
         }
 
         [Fact]

diff --git a/Smart.Resolver.Tests/Resolver/ScopeTest.cs b/Smart.Resolver.Tests/Resolver/ScopeTest.cs
@@ -132,13 +132,13 @@ public Func<IResolver, object> Create(Func<object> factory)
             {
                 return _ =>
                 {
-                    if (Cache.Value.TryGetValue(this, out var value))
+                    if (Cache.Value!.TryGetValue(this, out var value))
                     {
                         return value;
                     }
 
                     value = factory();
-                    Cache.Value[this] = value;
+                    Cache.Value![this] = value;
 
                     return value;
                 };

diff --git a/Smart.Resolver.Tests/Smart.Resolver.Tests.csproj b/Smart.Resolver.Tests/Smart.Resolver.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta1" />
+    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/Smart.Resolver.Xamarin/Resolver/Processors/BindingContextInitializeProcessor.cs b/Smart.Resolver.Xamarin/Resolver/Processors/BindingContextInitializeProcessor.cs
@@ -20,7 +20,7 @@ public BindingContextInitializeProcessor(int order)
             Order = order;
         }
 
-        public Action<IResolver, object> CreateProcessor(Type type)
+        public Action<IResolver, object>? CreateProcessor(Type type)
         {
             if (!BindableObjectType.IsAssignableFrom(type))
             {

diff --git a/Smart.Resolver.Xamarin/Resolver/Processors/BindingContextInjectProcessor.cs b/Smart.Resolver.Xamarin/Resolver/Processors/BindingContextInjectProcessor.cs
@@ -20,7 +20,7 @@ public BindingContextInjectProcessor(int order)
             Order = order;
         }
 
-        public Action<IResolver, object> CreateProcessor(Type type)
+        public Action<IResolver, object>? CreateProcessor(Type type)
         {
             if (!BindableObjectType.IsAssignableFrom(type))
             {

diff --git a/Smart.Resolver.Xamarin/Smart.Resolver.Xamarin.csproj b/Smart.Resolver.Xamarin/Smart.Resolver.Xamarin.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta1" />
+    <PackageReference Include="Usa.Smart.Core" Version="2.0.0-beta2" />
     <PackageReference Include="Xamarin.Forms" Version="4.8.0.1821">
       <NoWarn>NU1701</NoWarn>
     </PackageReference>

diff --git a/Smart.Resolver/Resolver/Bindings/Binding.cs b/Smart.Resolver/Resolver/Bindings/Binding.cs
@@ -14,7 +14,7 @@ public sealed class Binding
 
         public Type Type { get; }
 
-        public IProvider? Provider { get; }
+        public IProvider Provider { get; }
 
         public IScope? Scope { get; }
 
@@ -24,17 +24,12 @@ public sealed class Binding
 
         public ParameterMap PropertyValues { get; }
 
-        public Binding(Type type)
-            : this(type, null, null, null, null, null)
-        {
-        }
-
         public Binding(Type type, IProvider provider)
             : this(type, provider, null, null, null, null)
         {
         }
 
-        public Binding(Type type, IProvider? provider, IScope? scope, BindingMetadata? metadata, ParameterMap? constructorArguments, ParameterMap? propertyValues)
+        public Binding(Type type, IProvider provider, IScope? scope, BindingMetadata? metadata, ParameterMap? constructorArguments, ParameterMap? propertyValues)
         {
             Type = type;
             Provider = provider;

diff --git a/Smart.Resolver/Resolver/Builders/EmitFactoryBuilder.cs b/Smart.Resolver/Resolver/Builders/EmitFactoryBuilder.cs
@@ -14,7 +14,7 @@ public sealed class EmitFactoryBuilder : IFactoryBuilder
         private static readonly HolderBuilder DefaultHolderBuilder = new();
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", Justification = "Ignore")]
-        public Func<IResolver, object> CreateFactory(ConstructorInfo ci, Func<IResolver, object>[] factories, Action<IResolver, object>[] actions)
+        public Func<IResolver, object> CreateFactory(ConstructorInfo ci, Func<IResolver, object?>[] factories, Action<IResolver, object>[] actions)
         {
             var holder = DefaultHolderBuilder.CreateHolder(factories, actions);
             var holderType = holder?.GetType() ?? typeof(object);
@@ -145,7 +145,7 @@ private ModuleBuilder ModuleBuilder
                 }
             }
 
-            public object? CreateHolder(Func<IResolver, object>[] factories, Action<IResolver, object>[] actions)
+            public object? CreateHolder(Func<IResolver, object?>[] factories, Action<IResolver, object>[] actions)
             {
                 if ((factories.Length == 0) && (actions.Length == 0))
                 {

diff --git a/Smart.Resolver/Resolver/Builders/IFactoryBuilder.cs b/Smart.Resolver/Resolver/Builders/IFactoryBuilder.cs
@@ -5,7 +5,7 @@ namespace Smart.Resolver.Builders
 
     public interface IFactoryBuilder
     {
-        Func<IResolver, object> CreateFactory(ConstructorInfo ci, Func<IResolver, object>[] factories, Action<IResolver, object>[] actions);
+        Func<IResolver, object> CreateFactory(ConstructorInfo ci, Func<IResolver, object?>[] factories, Action<IResolver, object>[] actions);
 
         Func<IResolver, object> CreateArrayFactory(Type type, Func<IResolver, object>[] factories);
     }