Enable nullable

src/Directory.Build.props

@@ -18,6 +18,10 @@
         <PackageIconUrl>https://github.com/testcontainers/Docker.DotNet/raw/main/icon.png</PackageIconUrl>
     </PropertyGroup>
 
+    <PropertyGroup>
+      <Nullable>enable</Nullable>
+    </PropertyGroup>
+
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>

src/Docker.DotNet.Handler.Abstractions/Docker.DotNet.Handler.Abstractions.csproj

@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced.Handler.Abstractions</PackageId>
     <Description>An abstraction layer for Docker.DotNet that defines the classes and interfaces for implementing Docker Engine handlers.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>

src/Docker.DotNet.X509/CertificateCredentials.cs

@@ -11,7 +11,7 @@ public CertificateCredentials(X509Certificate2 certificate)
 
     public bool TlsEnabled => true;
 
-    public RemoteCertificateValidationCallback ServerCertificateValidationCallback { get; set; }
+    public RemoteCertificateValidationCallback? ServerCertificateValidationCallback { get; set; }
 
     public HttpMessageHandler ConfigureHandler(HttpMessageHandler handler)
     {
@@ -35,7 +35,10 @@ public HttpMessageHandler ConfigureHandler(HttpMessageHandler handler)
                 httpHandler.ClientCertificates.Add(_certificate);
             }
 
-            httpHandler.ServerCertificateCustomValidationCallback = (message, certificate, chain, sslPolicyErrors) => ServerCertificateValidationCallback(message, certificate, chain, sslPolicyErrors);
+            if (ServerCertificateValidationCallback is { } serverCertificateValidationCallback)
+            {
+                httpHandler.ServerCertificateCustomValidationCallback = (message, certificate, chain, sslPolicyErrors) => serverCertificateValidationCallback(message, certificate, chain, sslPolicyErrors);
+            }
             return httpHandler;
         }
 #endif

src/Docker.DotNet/Docker.DotNet.csproj

@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced</PackageId>
     <Description>A .NET client for the Docker Engine API with fully asynchronous, non-blocking, object-oriented APIs.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>

src/Docker.DotNet/EnumerableQueryStringConverter.cs

@@ -7,7 +7,7 @@ internal class EnumerableQueryStringConverter : IQueryStringConverter
 {
     public bool CanConvert(Type t)
     {
-        return typeof (IEnumerable).GetTypeInfo().IsAssignableFrom(t.GetTypeInfo());
+        return typeof(IEnumerable).GetTypeInfo().IsAssignableFrom(t.GetTypeInfo());
     }
 
     public string[] Convert(object o)
@@ -16,12 +16,12 @@ public string[] Convert(object o)
         Debug.Assert(o is IEnumerable);
 
         var items = new List<string>();
-        foreach (var e in ((IEnumerable) o))
+        foreach (var e in (IEnumerable)o!)
         {
             if (e is ValueType ||
                 e is string)
             {
-                items.Add(e.ToString());
+                items.Add(e.ToString()!);
             }
             else
             {

src/Docker.DotNet/JsonEnumMemberConverter.cs

@@ -5,7 +5,7 @@ internal sealed class JsonEnumMemberConverter<TEnum> : JsonConverter<TEnum> wher
     private readonly Dictionary<string, string> _enumFields = typeof(TEnum).GetFields(BindingFlags.Public | BindingFlags.Static)
         .Select(field => (Name: field.Name, Attribute: field.GetCustomAttribute<EnumMemberAttribute>()))
         .Where(item => item.Attribute != null && item.Attribute.Value != null)
-        .ToDictionary(item => item.Name, item => item.Attribute.Value);
+        .ToDictionary(item => item.Name, item => item.Attribute!.Value!);
 
     public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {

src/Docker.DotNet/JsonSerializer.cs

@@ -48,12 +48,12 @@ public byte[] SerializeToUtf8Bytes<T>(T value)
 
     public T Deserialize<T>(byte[] json)
     {
-        return System.Text.Json.JsonSerializer.Deserialize<T>(json, _options);
+        return System.Text.Json.JsonSerializer.Deserialize<T>(json, _options)!;
     }
 
     public Task<T> DeserializeAsync<T>(HttpContent content, CancellationToken cancellationToken)
     {
-        return content.ReadFromJsonAsync<T>(_options, cancellationToken);
+        return content.ReadFromJsonAsync<T>(_options, cancellationToken)!;
     }
 
     public async IAsyncEnumerable<T> DeserializeAsync<T>(Stream stream, [EnumeratorCancellation] CancellationToken cancellationToken)
@@ -69,7 +69,7 @@ public async IAsyncEnumerable<T> DeserializeAsync<T>(Stream stream, [EnumeratorC
 
             while (!buffer.IsEmpty && TryParseJson(ref buffer, out var jsonDocument))
             {
-                yield return jsonDocument.Deserialize<T>(_options);
+                yield return jsonDocument!.Deserialize<T>(_options)!;
             }
 
             if (result.IsCompleted)
@@ -83,7 +83,7 @@ public async IAsyncEnumerable<T> DeserializeAsync<T>(Stream stream, [EnumeratorC
         await reader.CompleteAsync();
     }
 
-    private static bool TryParseJson(ref ReadOnlySequence<byte> buffer, out JsonDocument jsonDocument)
+    private static bool TryParseJson(ref ReadOnlySequence<byte> buffer, out JsonDocument? jsonDocument)
     {
         var reader = new Utf8JsonReader(buffer, isFinalBlock: false, default);
 

src/Docker.DotNet/Models/ObjectExtensionData.cs

@@ -3,5 +3,5 @@ namespace Docker.DotNet.Models;
 public class ObjectExtensionData
 {
     [JsonExtensionData]
-    public IDictionary<string, object> ExtensionData { get; set; }
+    public IDictionary<string, object>? ExtensionData { get; set; }
 }

src/Docker.DotNet/QueryString.cs

@@ -4,7 +4,7 @@ internal class QueryString<T> : IQueryString where T : class
 {
     private T Object { get; }
 
-    private Tuple<PropertyInfo, QueryStringParameterAttribute>[] AttributedPublicProperties { get; }
+    private Dictionary<PropertyInfo, QueryStringParameterAttribute> AttributedPublicProperties { get; }
 
     private IQueryStringConverterInstanceFactory QueryStringConverterInstanceFactory { get; }
 
@@ -25,8 +25,8 @@ public IDictionary<string, string[]> GetKeyValuePairs()
         var queryParameters = new Dictionary<string, string[]>();
         foreach (var pair in AttributedPublicProperties)
         {
-            var property = pair.Item1;
-            var attribute = pair.Item2;
+            var property = pair.Key;
+            var attribute = pair.Value;
             var value = property.GetValue(Object, null);
 
             // 'Required' check
@@ -43,12 +43,12 @@ public IDictionary<string, string[]> GetKeyValuePairs()
                 string[] valueStr;
                 if (attribute.ConverterType == null)
                 {
-                    valueStr = new[] { value.ToString() };
+                    valueStr = [value!.ToString()!];
                 }
                 else
                 {
                     var converter = QueryStringConverterInstanceFactory.GetConverterInstance(attribute.ConverterType);
-                    valueStr = ConvertValue(converter, value);
+                    valueStr = ConvertValue(converter, value!);
 
                     if (valueStr == null)
                     {
@@ -76,7 +76,7 @@ public string GetQueryString()
                         v => $"{Uri.EscapeDataString(pair.Key)}={Uri.EscapeDataString(v)}"))));
     }
 
-    private string[] ConvertValue(IQueryStringConverter converter, object value)
+    private static string[] ConvertValue(IQueryStringConverter converter, object value)
     {
         if (!converter.CanConvert(value.GetType()))
         {
@@ -86,30 +86,33 @@ private string[] ConvertValue(IQueryStringConverter converter, object value)
         return converter.Convert(value);
     }
 
-    private Tuple<PropertyInfo, TAttribType>[] FindAttributedPublicProperties<TValue, TAttribType>() where TAttribType : Attribute
+    private static Dictionary<PropertyInfo, TAttribType> FindAttributedPublicProperties<TValue, TAttribType>() where TAttribType : Attribute
     {
         var t = typeof(TValue);
-        var ofAttributeType = typeof(TAttribType);
+        Dictionary<PropertyInfo, TAttribType>? attributedPublicProperties = null;
 
-        var properties = t.GetProperties();
-        var publicProperties = properties.Where(p => p.GetGetMethod(false).IsPublic);
-        if (!publicProperties.Any())
+        foreach (var prop in t.GetProperties())
         {
-            throw new InvalidOperationException($"No public property getters found on type {t.FullName}.");
+            if (prop.GetGetMethod(false)?.IsPublic == true)
+            {
+                var attribute = prop.GetCustomAttribute<TAttribType>();
+                if (attribute != null)
+                {
+                    attributedPublicProperties ??= new Dictionary<PropertyInfo, TAttribType>();
+                    attributedPublicProperties.Add(prop, attribute);
+                }
+            }
         }
 
-        var attributedPublicProperties = properties.Where(p => p.GetCustomAttribute<TAttribType>() != null).ToArray();
-        if (!attributedPublicProperties.Any())
+        if (attributedPublicProperties == null)
         {
-            throw new InvalidOperationException(
-                $"No public properties attributed with [{ofAttributeType.FullName}] found on type {t.FullName}.");
+            throw new InvalidOperationException($"No public properties attributed with [{typeof(TAttribType).FullName}] found on type {t.FullName}.");
         }
 
-        return attributedPublicProperties.Select(pi =>
-            new Tuple<PropertyInfo, TAttribType>(pi, pi.GetCustomAttribute<TAttribType>())).ToArray();
+        return attributedPublicProperties;
     }
 
-    private static bool IsDefaultOfType(object o)
+    private static bool IsDefaultOfType(object? o)
     {
         if (o is ValueType)
         {

src/Microsoft.Net.Http.Client/BufferedReadStream.cs

@@ -4,7 +4,7 @@ internal sealed class BufferedReadStream : WriteClosableStream, IPeekableStream
 {
     private readonly Stream _inner;
 
-    private readonly Socket _socket;
+    private readonly Socket? _socket;
 
     private readonly byte[] _buffer;
 
@@ -16,14 +16,14 @@ internal sealed class BufferedReadStream : WriteClosableStream, IPeekableStream
 
     private int _bufferCount;
 
-    private MemoryStream _readLineBuffer;
+    private MemoryStream? _readLineBuffer;
 
-    public BufferedReadStream(Stream inner, Socket socket, ILogger logger)
+    public BufferedReadStream(Stream inner, Socket? socket, ILogger logger)
         : this(inner, socket, 8192, logger)
     {
     }
 
-    public BufferedReadStream(Stream inner, Socket socket, int bufferLength, ILogger logger)
+    public BufferedReadStream(Stream inner, Socket? socket, int bufferLength, ILogger logger)
     {
         _inner = inner ?? throw new ArgumentNullException(nameof(inner));
         _socket = socket;
@@ -146,7 +146,7 @@ public bool Peek(byte[] buffer, uint toPeek, out uint peeked, out uint available
         throw new NotSupportedException("_inner stream isn't a peekable stream");
     }
 
-    public async Task<string> ReadLineAsync(CancellationToken cancellationToken)
+    public async Task<string?> ReadLineAsync(CancellationToken cancellationToken)
     {
         if (_readLineBuffer == null)
         {

src/Microsoft.Net.Http.Client/HttpConnection.cs

@@ -126,7 +126,7 @@ private async Task<List<string>> ReadResponseLinesAsync(CancellationToken cancel
                 break;
             }
 
-            lines.Add(line);
+            lines.Add(line!);
         }
         while (true);
 

src/Microsoft.Net.Http.Client/HttpConnectionResponseContent.cs

@@ -3,7 +3,7 @@ namespace Microsoft.Net.Http.Client;
 public class HttpConnectionResponseContent : HttpContent
 {
     private readonly HttpConnection _connection;
-    private Stream _responseStream;
+    private Stream? _responseStream;
 
     internal HttpConnectionResponseContent(HttpConnection connection)
     {
@@ -40,21 +40,21 @@ public WriteClosableStream HijackStream()
         return _connection.Transport;
     }
 
-    protected override Task SerializeToStreamAsync(Stream stream, TransportContext context)
+    protected override Task SerializeToStreamAsync(Stream stream, TransportContext? context)
     {
-        return _responseStream.CopyToAsync(stream);
+        return _responseStream!.CopyToAsync(stream);
     }
 
 #if NET6_0_OR_GREATER
-    protected override Task SerializeToStreamAsync(Stream stream, TransportContext context, CancellationToken cancellationToken)
+    protected override Task SerializeToStreamAsync(Stream stream, TransportContext? context, CancellationToken cancellationToken)
     {
-        return _responseStream.CopyToAsync(stream, cancellationToken);
+        return _responseStream!.CopyToAsync(stream, cancellationToken);
     }
 #endif
 
     protected override Task<Stream> CreateContentReadStreamAsync()
     {
-        return Task.FromResult(_responseStream);
+        return Task.FromResult(_responseStream!);
     }
 
     protected override bool TryComputeLength(out long length)
@@ -69,7 +69,7 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-                _responseStream.Dispose();
+                _responseStream?.Dispose();
                 _connection.Dispose();
             }
         }