Fix most nullable warnings

Author: garath

Benchmarks/LoggerBenchmark.cs

@@ -10,8 +10,8 @@ namespace Benchmarks
     [MarkdownExporterAttribute.GitHub]
     public class LoggerBenchmark
     {
-        private ILogger<Program> logger;
-        private ILoggerFactory loggerFactory;
+        private ILogger<Program> logger = null!;
+        private ILoggerFactory loggerFactory = null!;
 
         [ParamsAllValues]
         public bool UseQueue;

Benchmarks/ScopeBenchmark.cs

@@ -13,8 +13,8 @@ namespace Benchmarks
     [MarkdownExporterAttribute.GitHub]
     public class ScopeBenchmark
     {
-        private ILogger<Program> logger;
-        private ILoggerFactory loggerFactory;
+        private ILogger<Program> logger = null!;
+        private ILoggerFactory loggerFactory = null!;
 
         public static IEnumerable<IReadOnlyCollection<KeyValuePair<string, object?>>> ScopeGenerator()
         {
@@ -46,7 +46,7 @@ public void GlobalCleanup()
         [ArgumentsSource(nameof(ScopeGenerator))]
         public void SqliteLoggerInMemory(IReadOnlyCollection<KeyValuePair<string, object?>> scopeCollection)
         {
-            using IDisposable scope = logger.BeginScope(scopeCollection);
+            using IDisposable? scope = logger.BeginScope(scopeCollection);
             logger.LogInformation("Hello World!");
         }
     }

Console/Program.cs

@@ -64,22 +64,22 @@ public void DoExamples()
             IReadOnlyList<KeyValuePair<string, object?>> mediumScope = new List<KeyValuePair<string, object?>>() { new("medium1", "value1"), new("medium2", "value2") };
             Dictionary<string, object?> largeScope = new() { { "large1", 1000 }, { "large2", 2000 } };
 
-            using IDisposable tinyLoggerScope = _logger.BeginScope("[scope is enabled]");
+            using IDisposable? tinyLoggerScope = _logger.BeginScope("[scope is enabled]");
             _logger.LogInformation("Log with one scope");
 
-            using IDisposable smallLoggerScope = _logger.BeginScope(smallScope);
+            using IDisposable? smallLoggerScope = _logger.BeginScope(smallScope);
             _logger.LogInformation("Log with two scopes");
 
-            using IDisposable mediumLoggerScope = _logger.BeginScope(mediumScope);
+            using IDisposable? mediumLoggerScope = _logger.BeginScope(mediumScope);
             _logger.LogInformation("Each log message is fit in a single line.");
 
-            using IDisposable largeLoggerScope = _logger.BeginScope(largeScope);
+            using IDisposable? largeLoggerScope = _logger.BeginScope(largeScope);
             _logger.LogInformation("This is a structured {message}", "MESSAGE");
 
-            using IDisposable extraLargeLoggerScope = _logger.BeginScope("One more message");
+            using IDisposable? extraLargeLoggerScope = _logger.BeginScope("One more message");
             _logger.LogInformation("Add one more string scope");
 
-            using IDisposable ultraLargeLoggerScope = _logger.BeginScope(1234);
+            using IDisposable? ultraLargeLoggerScope = _logger.BeginScope(1234);
             _logger.LogInformation("Add an integer");
         }
 
@@ -103,7 +103,7 @@ public void DoExamples()
             //  @ will format the object as JSON
             //  $ forces ToString()
 
-            Object o = null;
+            Object? o = null;
 
             _logger.LogDebug("null case. Result:  Test NULL");
             _logger.LogInformation("Test {value1}", o);

ConsoleStress/Program.cs

@@ -51,22 +51,22 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken)
                 IReadOnlyList<KeyValuePair<string, object?>> mediumScope = new List<KeyValuePair<string, object?>>() { new("medium1", "value1"), new("medium2", "value2") };
                 Dictionary<string, object?> largeScope = new() { { "large1", 1000 }, { "large2", 2000 } };
 
-                using IDisposable tinyLoggerScope = _logger.BeginScope("[scope is enabled]");
+                using IDisposable? tinyLoggerScope = _logger.BeginScope("[scope is enabled]");
                 _logger.LogInformation("Log with one scope");
 
-                using IDisposable smallLoggerScope = _logger.BeginScope(smallScope);
+                using IDisposable? smallLoggerScope = _logger.BeginScope(smallScope);
                 _logger.LogInformation("Log with two scopes");
 
-                using IDisposable mediumLoggerScope = _logger.BeginScope(mediumScope);
+                using IDisposable? mediumLoggerScope = _logger.BeginScope(mediumScope);
                 _logger.LogInformation("Each log message is fit in a single line.");
 
-                using IDisposable largeLoggerScope = _logger.BeginScope(largeScope);
+                using IDisposable? largeLoggerScope = _logger.BeginScope(largeScope);
                 _logger.LogInformation("This is a structured {message}", "MESSAGE");
 
-                using IDisposable extraLargeLoggerScope = _logger.BeginScope("One more message");
+                using IDisposable? extraLargeLoggerScope = _logger.BeginScope("One more message");
                 _logger.LogInformation("Add one more string scope");
 
-                using IDisposable ultraLargeLoggerScope = _logger.BeginScope(1234);
+                using IDisposable? ultraLargeLoggerScope = _logger.BeginScope(1234);
                 _logger.LogInformation("Add an integer");
             }
 

SqliteLogger/NullScopeProvider.cs

@@ -17,5 +17,5 @@ public void ForEachScope<TState>(Action<object, TState> callback, TState state)
         // Do nothing
     }
 
-    public IDisposable Push(object state) => NullDisposable.Instance;
+    public IDisposable Push(object? state) => NullDisposable.Instance;
 }

SqliteLogger/SqliteLogger.cs

@@ -18,7 +18,7 @@ internal SqliteLogger(string name, ILoggerConnection connection)
         _connection = connection;
     }
 
-    public IDisposable BeginScope<TState>(TState state)
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull
     {
         return ScopeProvider.Push(state);
     }
@@ -28,7 +28,7 @@ public bool IsEnabled(LogLevel logLevel)
         return true;
     }
 
-    void ILogger.Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+    void ILogger.Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
     {
         if (!IsEnabled(logLevel))
         {
@@ -61,7 +61,7 @@ void ILogger.Log<TState>(LogLevel logLevel, EventId eventId, TState state, Excep
             }
             else
             {
-                string? scopeString = scope.ToString();
+                string? scopeString = scope?.ToString();
                 if (scopeString is not null)
                 {
                     unnamedScopes.Add(scopeString);