Enable nullable on RestClient

src/RestClient/RestClient/src/ClickView.Extensions.RestClient.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net462</TargetFrameworks>
     <PackageTags>restclient rest http</PackageTags>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

src/RestClient/RestClient/src/ErrorBody.cs

@@ -2,6 +2,6 @@ namespace ClickView.Extensions.RestClient
 {
     public class ErrorBody
     {
-        public string Message { get; set; }
+        public string Message { get; set; } = null!;
     }
 }

src/RestClient/RestClient/src/Extensions/EnumerableExtensions.cs

@@ -5,7 +5,7 @@
 
     public static class EnumerableExtensions
     {
-        public static bool TryGetFirstValue<T>(this IEnumerable<T> source, out T value)
+        public static bool TryGetFirstValue<T>(this IEnumerable<T> source, out T? value)
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source));

src/RestClient/RestClient/src/Extensions/HttpHeadersExtensions.cs

@@ -1,25 +1,24 @@
-namespace ClickView.Extensions.RestClient.Extensions
-{
-    using System.Net.Http.Headers;
+namespace ClickView.Extensions.RestClient.Extensions;
+
+using System.Net.Http.Headers;
 
-    public static class HttpHeadersExtensions
+public static class HttpHeadersExtensions
+{
+    public static bool TryGetFirstHeaderValue(this HttpHeaders headers, string name, out string? value)
     {
-        public static bool TryGetFirstHeaderValue(this HttpHeaders headers, string name, out string value)
+        if (!headers.TryGetValues(name, out var values))
         {
-            if (!headers.TryGetValues(name, out var values))
-            {
-                value = null;
-                return false;
-            }
-
-            if (!values.TryGetFirstValue(out var first))
-            {
-                value = null;
-                return false;
-            }
+            value = null;
+            return false;
+        }
 
-            value = first;
-            return true;
+        if (!values.TryGetFirstValue(out var first))
+        {
+            value = null;
+            return false;
         }
+
+        value = first;
+        return true;
     }
 }

src/RestClient/RestClient/src/Helpers/ErrorHelper.cs

@@ -7,7 +7,7 @@
 
     public static class ErrorHelper
     {
-        public static string GetDefaultErrorMessage(HttpStatusCode httpStatusCode)
+        public static string? GetDefaultErrorMessage(HttpStatusCode httpStatusCode)
         {
             switch (httpStatusCode)
             {

src/RestClient/RestClient/src/Http/CoreRestClientOptions.cs

@@ -5,6 +5,6 @@ namespace ClickView.Extensions.RestClient.Http
     public class CoreRestClientOptions
     {
         public CompressionMethod CompressionMethod { get; set; } = CompressionMethod.None;
-        public IAuthenticator Authenticator { get; set; } = null;
+        public IAuthenticator? Authenticator { get; set; } = null;
     }
 }

src/RestClient/RestClient/src/NotNullWhenAttribute.cs

@@ -0,0 +1,17 @@
+#if NETFRAMEWORK
+namespace System.Diagnostics.CodeAnalysis;
+
+using System;
+
+internal sealed class NotNullWhenAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the specified return value condition.</summary>
+    /// <param name="returnValue">
+    /// The return value condition. If the method returns this value, the associated parameter will not be null.
+    /// </param>
+    public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+    /// <summary>Gets the return value condition.</summary>
+    public bool ReturnValue { get; }
+}
+#endif

src/RestClient/RestClient/src/Requests/BaseRestClientRequest.cs

@@ -2,6 +2,7 @@ namespace ClickView.Extensions.RestClient.Requests
 {
     using System;
     using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
     using System.IO;
     using System.Linq;
     using System.Net;
@@ -28,7 +29,7 @@ protected BaseRestClientRequest(HttpMethod method, string resource)
 
         public ISerializer Serializer { internal get; set; } = NewtonsoftJsonSerializer.Instance;
 
-        internal HttpContent Content { get; set; }
+        internal HttpContent? Content { get; set; }
 
         /// <summary>
         ///     Set to true if we should throw an exception on 404
@@ -119,7 +120,6 @@ internal async Task<TResponse> GetResponseAsync(HttpResponseMessage message)
             if (error != null)
             {
                 HandleError(error);
-
                 response.Error = error;
             }
 
@@ -128,7 +128,7 @@ internal async Task<TResponse> GetResponseAsync(HttpResponseMessage message)
 
         protected abstract Task<TResponse> ParseResponseAsync(HttpResponseMessage message);
 
-        protected virtual bool TryParseErrorBody(string content, out ErrorBody error)
+        protected virtual bool TryParseErrorBody(string content, [NotNullWhen(true)] out ErrorBody? error)
         {
             error = null;
             return false;
@@ -142,7 +142,7 @@ protected virtual ErrorBody GetDefaultErrorBody(HttpStatusCode httpStatusCode, s
             };
         }
 
-        protected async Task<Error> GetErrorAsync(HttpResponseMessage message)
+        protected async Task<Error?> GetErrorAsync(HttpResponseMessage message)
         {
             if (message == null)
                 throw new ArgumentNullException(nameof(message));
@@ -170,7 +170,7 @@ protected virtual void HandleError(Error error)
             throw ErrorHelper.GetErrorException(error);
         }
 
-        protected T Deserialize<T>(string input)
+        protected T? Deserialize<T>(string input)
         {
             try
             {

src/RestClient/RestClient/src/Requests/RestClientRequest.cs

@@ -19,7 +19,7 @@ protected override async Task<RestClientResponse<TData>> ParseResponseAsync(Http
             return new RestClientResponse<TData>(message, Deserialize(str));
         }
 
-        protected TData Deserialize(string input)
+        protected TData? Deserialize(string input)
         {
             return Deserialize<TData>(input);
         }

src/RestClient/RestClient/src/Responses/RestClientResponse.cs

@@ -13,17 +13,17 @@ public RestClientResponse(HttpResponseMessage message)
         }
 
         public HttpStatusCode HttpStatusCode { get; }
-        public Error Error { get; internal set; }
+        public Error? Error { get; internal set; }
         public HttpResponseHeaders Headers { get; }
     }
 
     public class RestClientResponse<T> : RestClientResponse
     {
-        public RestClientResponse(HttpResponseMessage message, T data) : base(message)
+        public RestClientResponse(HttpResponseMessage message, T? data) : base(message)
         {
             Data = data;
         }
 
-        public T Data { get; internal set; }
+        public T? Data { get; internal set; }
     }
 }

src/RestClient/RestClient/src/RestClient.cs

@@ -12,7 +12,7 @@
 
     public class RestClient
     {
-        private readonly Uri _baseAddress;
+        private readonly Uri? _baseAddress;
         private readonly HttpClient _httpClient;
         private readonly CoreRestClientOptions _options;
 
@@ -21,7 +21,7 @@ public class RestClient
         /// </summary>
         /// <param name="baseAddress"></param>
         /// <param name="options"></param>
-        public RestClient(Uri baseAddress, RestClientOptions options = null)
+        public RestClient(Uri baseAddress, RestClientOptions? options = null)
         {
             _baseAddress = baseAddress ?? throw new ArgumentNullException(nameof(baseAddress));
 
@@ -36,10 +36,11 @@ public RestClient(Uri baseAddress, RestClientOptions options = null)
         /// </summary>
         /// <param name="httpClient"></param>
         /// <param name="options"></param>
-        public RestClient(HttpClient httpClient, CoreRestClientOptions options = null)
+        public RestClient(HttpClient httpClient, CoreRestClientOptions? options = null)
         {
             _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
             _options = options ?? RestClientOptions.Default;
+            _baseAddress = null;
         }
 
         /// <summary>
@@ -48,7 +49,7 @@ public RestClient(HttpClient httpClient, CoreRestClientOptions options = null)
         /// <param name="baseAddress"></param>
         /// <param name="httpClient"></param>
         /// <param name="options"></param>
-        public RestClient(Uri baseAddress, HttpClient httpClient, CoreRestClientOptions options = null)
+        public RestClient(Uri baseAddress, HttpClient httpClient, CoreRestClientOptions? options = null)
             : this(httpClient, options)
         {
             _baseAddress = baseAddress ?? throw new ArgumentNullException(nameof(baseAddress));

src/RestClient/RestClient/src/Serialization/ISerializer.cs

@@ -8,7 +8,7 @@ public interface ISerializer
 
         string Serialize(object obj);
 
-        T Deserialize<T>(string input);
-        object Deserialize(string input, Type type);
+        T? Deserialize<T>(string input);
+        object? Deserialize(string input, Type type);
     }
 }

src/RestClient/RestClient/src/Serialization/NewtonsoftJsonSerializer.cs

@@ -7,7 +7,7 @@ public class NewtonsoftJsonSerializer : ISerializer
     {
         public static readonly ISerializer Instance = new NewtonsoftJsonSerializer();
 
-        private readonly JsonSerializerSettings _jsonSerializerSettings;
+        private readonly JsonSerializerSettings? _jsonSerializerSettings;
 
         public NewtonsoftJsonSerializer()
         {
@@ -27,12 +27,12 @@ public string Serialize(object obj)
             return JsonConvert.SerializeObject(obj, _jsonSerializerSettings);
         }
 
-        public T Deserialize<T>(string input)
+        public T? Deserialize<T>(string input)
         {
             return JsonConvert.DeserializeObject<T>(input, _jsonSerializerSettings);
         }
 
-        public object Deserialize(string input, Type type)
+        public object? Deserialize(string input, Type type)
         {
             return JsonConvert.DeserializeObject(input, type, _jsonSerializerSettings);
         }

src/RestClient/RestClient/test/ClickView.Extensions.RestClient.Tests.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

src/RestClient/RestClient/test/RestClientTests.cs

@@ -22,7 +22,7 @@ public async Task ExecuteAsync_UsesBaseAddress()
                 .Setup<Task<HttpResponseMessage>>(
                     "SendAsync",
                     ItExpr.Is<HttpRequestMessage>(message =>
-                        message.RequestUri.Equals(new Uri("http://clickview.com.au/v1/test"))),
+                        message.RequestUri!.Equals(new Uri("http://clickview.com.au/v1/test"))),
                     ItExpr.IsAny<CancellationToken>()
                 )
                 .ReturnsAsync(new HttpResponseMessage
@@ -53,7 +53,7 @@ public async Task ExecuteAsync_UsesBaseAddressOverHttpClientBaseAddress()
                 .Setup<Task<HttpResponseMessage>>(
                     "SendAsync",
                     ItExpr.Is<HttpRequestMessage>(message =>
-                        message.RequestUri.Equals(new Uri("http://clickview.com.au/v1/test"))),
+                        message.RequestUri!.Equals(new Uri("http://clickview.com.au/v1/test"))),
                     ItExpr.IsAny<CancellationToken>()
                 )
                 .ReturnsAsync(new HttpResponseMessage
@@ -87,7 +87,7 @@ public async Task ExecuteAsync_UsesHttpClientBaseAddress()
                 .Setup<Task<HttpResponseMessage>>(
                     "SendAsync",
                     ItExpr.Is<HttpRequestMessage>(message =>
-                        message.RequestUri.Equals(new Uri("https://hello.hello/test"))),
+                        message.RequestUri!.Equals(new Uri("https://hello.hello/test"))),
                     ItExpr.IsAny<CancellationToken>()
                 )
                 .ReturnsAsync(new HttpResponseMessage
@@ -121,7 +121,7 @@ public async Task ExecuteAsync_AbsoluteUriRequest()
                 .Setup<Task<HttpResponseMessage>>(
                     "SendAsync",
                     ItExpr.Is<HttpRequestMessage>(message =>
-                        message.RequestUri.Equals(new Uri("https://clockview.clocks/test"))),
+                        message.RequestUri!.Equals(new Uri("https://clockview.clocks/test"))),
                     ItExpr.IsAny<CancellationToken>()
                 )
                 .ReturnsAsync(new HttpResponseMessage
@@ -159,4 +159,4 @@ public async Task ExecuteAsync_NoBaseAddress_ThrowsInvalidOperationException()
             await Assert.ThrowsAsync<InvalidOperationException>(() => client.ExecuteAsync(request));
         }
     }
-}
+}