Skip to content

Commit 04784ef

Browse files
committed
Add initial nullable annotations.
1 parent e71ef68 commit 04784ef

35 files changed

+80
-84
lines changed

src/MySqlConnector/Authentication/AuthenticationPlugins.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#nullable disable
21
using System;
32
using System.Collections.Generic;
3+
using System.Diagnostics.CodeAnalysis;
44

55
namespace MySqlConnector.Authentication
66
{
@@ -24,7 +24,7 @@ public static void Register(IAuthenticationPlugin plugin)
2424
s_plugins.Add(plugin.Name, plugin);
2525
}
2626

27-
internal static bool TryGetPlugin(string name, out IAuthenticationPlugin plugin)
27+
internal static bool TryGetPlugin(string name, [NotNullWhen(true)] out IAuthenticationPlugin? plugin)
2828
{
2929
lock (s_lock)
3030
return s_plugins.TryGetValue(name, out plugin);

src/MySqlConnector/Authentication/IAuthenticationPlugin.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
using System;
32

43
namespace MySqlConnector.Authentication

src/MySqlConnector/Logging/ConsoleLoggerProvider.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
using System;
32
using System.Globalization;
43
using System.Text;
@@ -28,7 +27,7 @@ public ConsoleLogger(ConsoleLoggerProvider provider, string name)
2827

2928
public bool IsEnabled(MySqlConnectorLogLevel level) => level >= m_provider.m_minimumLevel && level <= MySqlConnectorLogLevel.Fatal;
3029

31-
public void Log(MySqlConnectorLogLevel level, string message, object[] args = null, Exception exception = null)
30+
public void Log(MySqlConnectorLogLevel level, string message, object?[]? args = null, Exception? exception = null)
3231
{
3332
if (!IsEnabled(level))
3433
return;

src/MySqlConnector/Logging/IMySqlConnectorLogger.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
using System;
32

43
namespace MySqlConnector.Logging
@@ -28,6 +27,6 @@ public interface IMySqlConnectorLogger
2827
/// <remarks>This method may be called from multiple threads and must be thread-safe. This method may be called
2928
/// even if <see cref="IsEnabled"/> would return <c>false</c> for <paramref name="level"/>; the implementation must
3029
/// check if logging is enabled for that level.</remarks>
31-
void Log(MySqlConnectorLogLevel level, string message, object[] args = null, Exception exception = null);
30+
void Log(MySqlConnectorLogLevel level, string message, object?[]? args = null, Exception? exception = null);
3231
}
3332
}

src/MySqlConnector/Logging/IMySqlConnectorLoggerProvider.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
namespace MySqlConnector.Logging
32
{
43
/// <summary>
Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
using System;
32

43
namespace MySqlConnector.Logging
@@ -12,18 +11,18 @@ internal static class LoggerExtensions
1211
public static bool IsErrorEnabled(this IMySqlConnectorLogger log) => log.IsEnabled(MySqlConnectorLogLevel.Error);
1312
public static bool IsFatalEnabled(this IMySqlConnectorLogger log) => log.IsEnabled(MySqlConnectorLogLevel.Fatal);
1413

15-
public static void Trace(this IMySqlConnectorLogger log, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Trace, message, args, null);
16-
public static void Debug(this IMySqlConnectorLogger log, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Debug, message, args, null);
17-
public static void Info(this IMySqlConnectorLogger log, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Info, message, args, null);
18-
public static void Warn(this IMySqlConnectorLogger log, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Warn, message, args, null);
19-
public static void Error(this IMySqlConnectorLogger log, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Error, message, args, null);
20-
public static void Fatal(this IMySqlConnectorLogger log, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Fatal, message, args, null);
14+
public static void Trace(this IMySqlConnectorLogger log, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Trace, message, args, null);
15+
public static void Debug(this IMySqlConnectorLogger log, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Debug, message, args, null);
16+
public static void Info(this IMySqlConnectorLogger log, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Info, message, args, null);
17+
public static void Warn(this IMySqlConnectorLogger log, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Warn, message, args, null);
18+
public static void Error(this IMySqlConnectorLogger log, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Error, message, args, null);
19+
public static void Fatal(this IMySqlConnectorLogger log, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Fatal, message, args, null);
2120

22-
public static void Trace(this IMySqlConnectorLogger log, Exception exception, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Trace, message, args, exception);
23-
public static void Debug(this IMySqlConnectorLogger log, Exception exception, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Debug, message, args, exception);
24-
public static void Info(this IMySqlConnectorLogger log, Exception exception, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Info, message, args, exception);
25-
public static void Warn(this IMySqlConnectorLogger log, Exception exception, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Warn, message, args, exception);
26-
public static void Error(this IMySqlConnectorLogger log, Exception exception, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Error, message, args, exception);
27-
public static void Fatal(this IMySqlConnectorLogger log, Exception exception, string message, params object[] args) => log.Log(MySqlConnectorLogLevel.Fatal, message, args, exception);
21+
public static void Trace(this IMySqlConnectorLogger log, Exception exception, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Trace, message, args, exception);
22+
public static void Debug(this IMySqlConnectorLogger log, Exception exception, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Debug, message, args, exception);
23+
public static void Info(this IMySqlConnectorLogger log, Exception exception, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Info, message, args, exception);
24+
public static void Warn(this IMySqlConnectorLogger log, Exception exception, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Warn, message, args, exception);
25+
public static void Error(this IMySqlConnectorLogger log, Exception exception, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Error, message, args, exception);
26+
public static void Fatal(this IMySqlConnectorLogger log, Exception exception, string message, params object?[] args) => log.Log(MySqlConnectorLogLevel.Fatal, message, args, exception);
2827
}
2928
}

src/MySqlConnector/Logging/MySqlConnectorLogManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
using System;
32

43
namespace MySqlConnector.Logging

src/MySqlConnector/Logging/NoOpLogger.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
using System;
32

43
namespace MySqlConnector.Logging
@@ -17,7 +16,7 @@ public sealed class NoOpLogger : IMySqlConnectorLogger
1716
/// <summary>
1817
/// Ignores the specified log message.
1918
/// </summary>
20-
public void Log(MySqlConnectorLogLevel level, string message, object[] args = null, Exception exception = null)
19+
public void Log(MySqlConnectorLogLevel level, string message, object?[]? args = null, Exception? exception = null)
2120
{
2221
}
2322

src/MySqlConnector/Logging/NoOpLoggerProvider.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
namespace MySqlConnector.Logging
32
{
43
/// <summary>

src/MySqlConnector/Protocol/PayloadData.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#nullable disable
21
using System;
32
using System.Buffers;
43

@@ -20,12 +19,12 @@ public PayloadData(ArraySegment<byte> data, bool isPooled = false)
2019

2120
public ArraySegment<byte> ArraySegment { get; }
2221
public ReadOnlySpan<byte> AsSpan() => ArraySegment.AsSpan();
23-
public byte HeaderByte => ArraySegment.Array[ArraySegment.Offset];
22+
public byte HeaderByte => ArraySegment.Array![ArraySegment.Offset];
2423

2524
public void Dispose()
2625
{
2726
if (m_isPooled)
28-
ArrayPool<byte>.Shared.Return(ArraySegment.Array);
27+
ArrayPool<byte>.Shared.Return(ArraySegment.Array!);
2928
}
3029

3130
readonly bool m_isPooled;

0 commit comments

Comments
 (0)