add nullable annotation

Author: wickedmachinator

Directory.Build.props

@@ -3,7 +3,7 @@
 
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
-    <Nullable>disable</Nullable>
+    <Nullable>enable</Nullable>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 
     <Authors>FizzCode Ltd.</Authors>

LightWeight.AdoNet.DbConnection/ConnectionString/ConnectionStringCollection.cs

@@ -5,7 +5,7 @@ public class ConnectionStringCollection
     private readonly Dictionary<string, INamedConnectionString> _connectionStrings = new(StringComparer.InvariantCultureIgnoreCase);
     public IEnumerable<INamedConnectionString> All => _connectionStrings.Values;
 
-    public void LoadFromConfiguration(IConfiguration configuration, string sectionKey = "ConnectionStrings", IConfigurationSecretProtector secretProtector = null)
+    public void LoadFromConfiguration(IConfiguration configuration, string sectionKey = "ConnectionStrings", IConfigurationSecretProtector? secretProtector = null)
     {
         var children = configuration
             .GetSection(sectionKey)
@@ -16,9 +16,12 @@ public void LoadFromConfiguration(IConfiguration configuration, string sectionKe
             var name = child.Key;
             var providerName = ConfigurationReader.GetCurrentValue(configuration, child.Path, "ProviderName", null, secretProtector);
             var connectionString = ConfigurationReader.GetCurrentValue(configuration, child.Path, "ConnectionString", null, secretProtector);
-            var version = ConfigurationReader.GetCurrentValue(configuration, child.Path, "Version", null, secretProtector);
-            var namedConnectionString = NamedConnectionStringFactory.Create(name, providerName, connectionString, version);
-            Add(namedConnectionString);
+            if (providerName != null && connectionString != null)
+            {
+                var version = ConfigurationReader.GetCurrentValue(configuration, child.Path, "Version", null, secretProtector);
+                var namedConnectionString = NamedConnectionStringFactory.Create(name, providerName, connectionString, version);
+                Add(namedConnectionString);
+            }
         }
     }
 
@@ -27,12 +30,12 @@ public void Add(INamedConnectionString connectionString)
         _connectionStrings[connectionString.Name] = connectionString;
     }
 
-    public INamedConnectionString this[string name]
+    public INamedConnectionString? this[string name]
     {
         get
         {
             _connectionStrings.TryGetValue(name, out var value);
             return value;
         }
     }
-}
+}

LightWeight.AdoNet.DbConnection/ConnectionString/IAdoNetConnectionStringHelper.cs

@@ -6,7 +6,7 @@ public interface IAdoNetConnectionStringHelper
     AdoNetEngine Engine { get; }
     AdoNetConnectionStringFields GetKnownConnectionStringFields(GenericNamedConnectionString connectionString);
     bool IsEscaped(string identifier);
-    string Escape(string dbObject, string schema = null);
+    string Escape(string dbObject, string? schema = null);
     string EscapeIdentifier(string identifier);
     string Unescape(string identifier);
 

LightWeight.AdoNet.DbConnection/DatabaseConnection/AdoNetSqlConnectionManager.cs

@@ -2,7 +2,7 @@
 
 public delegate void OnAdoNetSqlConnectionOpening(IAdoNetSqlConnectionString connectionString, IDbConnection connection);
 public delegate void OnAdoNetSqlConnectionOpened(IAdoNetSqlConnectionString connectionString, IDbConnection connection, int retryCount);
-public delegate void OnAdoNetSqlConnectionOpenError(IAdoNetSqlConnectionString connectionString, IDbConnection connection, int retryCount, Exception ex);
+public delegate void OnAdoNetSqlConnectionOpenError(IAdoNetSqlConnectionString connectionString, IDbConnection? connection, int retryCount, Exception ex);
 
 public delegate void OnAdoNetSqlConnectionClosing(DatabaseConnection connection);
 public delegate void OnAdoNetSqlConnectionClosed(DatabaseConnection connection);
@@ -14,17 +14,17 @@ public class AdoNetSqlConnectionManager
 
     private readonly Dictionary<string, DatabaseConnection> _connections = [];
 
-    public DisposableDatabaseConnection GetDisposableConnection(IAdoNetSqlConnectionString connectionString, int maxRetryCount = 5, int retryDelayMilliseconds = 2000, OnAdoNetSqlConnectionOpening onOpening = null, OnAdoNetSqlConnectionOpened onOpened = null, OnAdoNetSqlConnectionOpenError onError = null)
+    public DisposableDatabaseConnection? GetDisposableConnection(IAdoNetSqlConnectionString connectionString, int maxRetryCount = 5, int retryDelayMilliseconds = 2000, OnAdoNetSqlConnectionOpening? onOpening = null, OnAdoNetSqlConnectionOpened? onOpened = null, OnAdoNetSqlConnectionOpenError? onError = null)
     {
         return GetConnection<DisposableDatabaseConnection>(connectionString, maxRetryCount, retryDelayMilliseconds, onOpening, onOpened, onError);
     }
 
-    public DatabaseConnection GetConnection(IAdoNetSqlConnectionString connectionString, int maxRetryCount = 5, int retryDelayMilliseconds = 2000, OnAdoNetSqlConnectionOpening onOpening = null, OnAdoNetSqlConnectionOpened onOpened = null, OnAdoNetSqlConnectionOpenError onError = null)
+    public DatabaseConnection? GetConnection(IAdoNetSqlConnectionString connectionString, int maxRetryCount = 5, int retryDelayMilliseconds = 2000, OnAdoNetSqlConnectionOpening? onOpening = null, OnAdoNetSqlConnectionOpened? onOpened = null, OnAdoNetSqlConnectionOpenError? onError = null)
     {
         return GetConnection<DatabaseConnection>(connectionString, maxRetryCount, retryDelayMilliseconds, onOpening, onOpened, onError);
     }
 
-    public T GetConnection<T>(IAdoNetSqlConnectionString connectionString, int maxRetryCount = 5, int retryDelayMilliseconds = 2000, OnAdoNetSqlConnectionOpening onOpening = null, OnAdoNetSqlConnectionOpened onOpened = null, OnAdoNetSqlConnectionOpenError onError = null)
+    public T? GetConnection<T>(IAdoNetSqlConnectionString connectionString, int maxRetryCount = 5, int retryDelayMilliseconds = 2000, OnAdoNetSqlConnectionOpening? onOpening = null, OnAdoNetSqlConnectionOpened? onOpened = null, OnAdoNetSqlConnectionOpenError? onError = null)
         where T : DatabaseConnection, new()
     {
         var key = connectionString.Name;
@@ -47,7 +47,7 @@ public T GetConnection<T>(IAdoNetSqlConnectionString connectionString, int maxRe
             key += "-";
         }
 
-        List<Exception> exceptions = null;
+        List<Exception>? exceptions = null;
 
         for (var retry = 0; retry <= maxRetryCount; retry++)
         {
@@ -61,7 +61,7 @@ public T GetConnection<T>(IAdoNetSqlConnectionString connectionString, int maxRe
 
                 try
                 {
-                    IDbConnection conn = null;
+                    IDbConnection? conn = null;
 
                     var connectionType = Type.GetType(connectionString.ProviderName);
                     if (connectionType != null)
@@ -80,9 +80,12 @@ public T GetConnection<T>(IAdoNetSqlConnectionString connectionString, int maxRe
                         }
                         catch (Exception ex)
                         {
-                            onError?.Invoke(connectionString, conn, retry, ex);
+                            onError?.Invoke(connectionString, null, retry, ex);
                             throw;
                         }
+
+                        if (conn == null)
+                            return null;
                     }
 
                     conn.ConnectionString = connectionString.ConnectionString;
@@ -132,15 +135,15 @@ public T GetConnection<T>(IAdoNetSqlConnectionString connectionString, int maxRe
         return null;
     }
 
-    public DatabaseConnection GetNewConnection(IAdoNetSqlConnectionString connectionString, int maxRetryCount = 5, int retryDelayMilliseconds = 2000, OnAdoNetSqlConnectionOpening onOpening = null, OnAdoNetSqlConnectionOpened onOpened = null, OnAdoNetSqlConnectionOpenError onError = null)
+    public DatabaseConnection? GetNewConnection(IAdoNetSqlConnectionString connectionString, int maxRetryCount = 5, int retryDelayMilliseconds = 2000, OnAdoNetSqlConnectionOpening? onOpening = null, OnAdoNetSqlConnectionOpened? onOpened = null, OnAdoNetSqlConnectionOpenError? onError = null)
     {
-        Exception lastException = null;
+        Exception? lastException = null;
 
         for (var retry = 0; retry <= maxRetryCount; retry++)
         {
             try
             {
-                IDbConnection conn = null;
+                IDbConnection? conn = null;
 
                 var connectionType = Type.GetType(connectionString.ProviderName);
                 if (connectionType != null)
@@ -162,6 +165,9 @@ public DatabaseConnection GetNewConnection(IAdoNetSqlConnectionString connection
                         onError?.Invoke(connectionString, conn, retry, ex);
                         throw;
                     }
+
+                    if (conn == null)
+                        return null;
                 }
 
                 conn.ConnectionString = connectionString.ConnectionString;
@@ -203,7 +209,7 @@ public DatabaseConnection GetNewConnection(IAdoNetSqlConnectionString connection
         return null;
     }
 
-    private string GetTransactionIdentifierString(Transaction transaction)
+    private string? GetTransactionIdentifierString(Transaction? transaction)
     {
         if (transaction == null)
             return null;
@@ -241,11 +247,8 @@ public void ConnectionFailed(DatabaseConnection connection)
         }
     }
 
-    public void ReleaseConnection(DatabaseConnection connection, OnAdoNetSqlConnectionClosing onClosing = null, OnAdoNetSqlConnectionClosed onClosed = null, OnAdoNetSqlConnectionCloseError onError = null)
+    public void ReleaseConnection(DatabaseConnection connection, OnAdoNetSqlConnectionClosing? onClosing = null, OnAdoNetSqlConnectionClosed? onClosed = null, OnAdoNetSqlConnectionCloseError? onError = null)
     {
-        if (connection == null)
-            return;
-
         lock (_connections)
         {
             connection.ReferenceCount--;
@@ -275,7 +278,7 @@ public void ReleaseConnection(DatabaseConnection connection, OnAdoNetSqlConnecti
 
     public void TestConnection(IAdoNetSqlConnectionString connectionString)
     {
-        IDbConnection conn = null;
+        IDbConnection? conn = null;
 
         var connectionType = Type.GetType(connectionString.ProviderName);
         if (connectionType != null)
@@ -285,10 +288,13 @@ public void TestConnection(IAdoNetSqlConnectionString connectionString)
 
         conn ??= DbProviderFactories.GetFactory(connectionString.ProviderName).CreateConnection();
 
-        conn.ConnectionString = connectionString.ConnectionString;
-        conn.Open();
+        if (conn != null)
+        {
+            conn.ConnectionString = connectionString.ConnectionString;
+            conn.Open();
 
-        conn.Close();
-        conn.Dispose();
+            conn.Close();
+            conn.Dispose();
+        }
     }
-}
+}

LightWeight.AdoNet.DbConnection/DatabaseConnection/DatabaseConnection.cs

@@ -2,11 +2,11 @@
 
 public class DatabaseConnection
 {
-    public AdoNetSqlConnectionManager Manager { get; internal init; }
-    public string Key { get; internal init; }
-    public IAdoNetSqlConnectionString ConnectionString { get; internal init; }
-    public IDbConnection Connection { get; internal init; }
-    public Transaction TransactionWhenCreated { get; internal init; }
+    public AdoNetSqlConnectionManager Manager { get; init; } = null!;
+    public string? Key { get; init; }
+    public IAdoNetSqlConnectionString ConnectionString { get; init; } = null!;
+    public IDbConnection Connection { get; init; } = null!;
+    public Transaction? TransactionWhenCreated { get; init; }
     public object Lock { get; } = new object();
 
     public int ReferenceCount { get; internal set; }

LightWeight.AdoNet.DbConnection/UnitOfWork/TransactionScopeUnitOfWork.cs

@@ -26,7 +26,7 @@ protected virtual void Dispose(bool disposing)
                 _scope.Dispose();
             }
 
-            _scope = null;
+            _scope = null!;
             _disposed = true;
         }
     }
@@ -36,4 +36,4 @@ public void Dispose()
         Dispose(true);
         GC.SuppressFinalize(this);
     }
-}
+}

LightWeight.Configuration/ConfigurationReader.cs

@@ -2,20 +2,20 @@
 
 public static class ConfigurationReader
 {
-    public static T GetCurrentValue<T>(IConfiguration configuration, string section, string key, T defaultValue)
+    public static T? GetCurrentValue<T>(IConfiguration configuration, string section, string key, T? defaultValue)
     {
-        var value = configuration.GetValue<T>(section + ":" + key + "-" + Environment.MachineName, default);
+        var value = configuration.GetValue<T>(section + ":" + key + "-" + Environment.MachineName);
         if (value != null && !value.Equals(default(T)))
             return value;
 
         return configuration.GetValue(section + ":" + key, defaultValue);
     }
 
-    public static string GetCurrentValue(IConfiguration configuration, string section, string key, string defaultValue, IConfigurationSecretProtector protector = null)
+    public static string? GetCurrentValue(IConfiguration configuration, string section, string key, string? defaultValue, IConfigurationSecretProtector? protector = null)
     {
         var isProtected = configuration.GetValue(section + ":" + key + "-protected", false);
 
-        var value = configuration.GetValue<string>(section + ":" + key + "-" + Environment.MachineName, default);
+        var value = configuration.GetValue<string>(section + ":" + key + "-" + Environment.MachineName);
         if (value != null)
         {
             if (isProtected && protector != null)
@@ -35,20 +35,20 @@ public static string GetCurrentValue(IConfiguration configuration, string sectio
         return value;
     }
 
-    public static T GetCurrentValue<T>(IConfigurationSection section, string key, T defaultValue)
+    public static T? GetCurrentValue<T>(IConfigurationSection section, string key, T? defaultValue)
     {
-        var value = section.GetValue<T>(key + "-" + Environment.MachineName, default);
+        var value = section.GetValue<T>(key + "-" + Environment.MachineName);
         if (value != null && !value.Equals(default(T)))
             return value;
 
         return section.GetValue(key, defaultValue);
     }
 
-    public static string GetCurrentValue(IConfigurationSection section, string key, string defaultValue, IConfigurationSecretProtector protector = null)
+    public static string? GetCurrentValue(IConfigurationSection section, string key, string defaultValue, IConfigurationSecretProtector? protector = null)
     {
         var isProtected = section.GetValue(key + "-protected", false);
 
-        var value = section.GetValue<string>(key + "-" + Environment.MachineName, default);
+        var value = section.GetValue<string>(key + "-" + Environment.MachineName);
         if (value != null)
         {
             if (isProtected && protector != null)

LightWeight/ConnectionString/AdoNetConnectionStringFields.cs

@@ -2,10 +2,10 @@
 
 public class AdoNetConnectionStringFields
 {
-    public string Server { get; internal set; }
+    public string? Server { get; internal set; }
     public int? Port { get; internal set; }
-    public string Database { get; internal set; }
-    public string UserId { get; internal set; }
+    public string? Database { get; internal set; }
+    public string? UserId { get; internal set; }
     public bool? IntegratedSecurity { get; internal set; }
     public bool? Encrypt { get; internal set; }
 }

LightWeight/ConnectionString/IAdoNetSqlConnectionString.cs

@@ -3,10 +3,10 @@
 public interface IAdoNetSqlConnectionString : INamedConnectionString
 {
     public AdoNetEngine SqlEngine { get; }
-    public AdoNetConnectionStringFields Fields { get; }
+    public AdoNetConnectionStringFields? Fields { get; }
 
     public bool IsEscaped(string identifier);
-    public string Escape(string dbObject, string schema = null);
+    public string Escape(string dbObject, string? schema = null);
     string EscapeIdentifier(string identifier);
     public string Unescape(string identifier);
 

LightWeight/ConnectionString/INamedConnectionString.cs

@@ -5,5 +5,5 @@ public interface INamedConnectionString
     public string Name { get; }
     public string ConnectionString { get; }
     public string ProviderName { get; }
-    public string Version { get; }
+    public string? Version { get; }
 }