Enable nullable (#18)

Author: scottoffen

src/FluentHttpClient/FluentHttpClient.csproj

@@ -4,6 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>10.0</LangVersion>
+    <Nullable>enable</Nullable>
     <PackageId>FluentHttpClient</PackageId>
     <PackageVersion>$(Version)</PackageVersion>
     <Authors>Scott Offen</Authors>
@@ -14,7 +15,7 @@
     <PackageTags>fluent httpclient rest http api web client</PackageTags>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
-    <Version>3.0.3</Version>
+    <Version>3.0.4</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>

src/FluentHttpClient/FluentJsonDeserialization.cs

@@ -4,56 +4,56 @@ namespace FluentHttpClient;
 
 public static class FluentJsonDeserialization
 {
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<Stream> result)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<Stream> result)
     {
         return await result.DeserializeJsonAsync<T>(FluentHttpClient.DefaultJsonSerializerOptions);
     }
 
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<Stream> result, JsonSerializerOptions options)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<Stream> result, JsonSerializerOptions options)
     {
         return await JsonSerializer.DeserializeAsync<T>(await result, options);
     }
 
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<String> result)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<String> result)
     {
         return await result.DeserializeJsonAsync<T>(FluentHttpClient.DefaultJsonSerializerOptions);
     }
 
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<string> result, JsonSerializerOptions options)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<string> result, JsonSerializerOptions options)
     {
         return JsonSerializer.Deserialize<T>(await result, options);
     }
 
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> result)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> result)
     {
         return await result.DeserializeJsonAsync<T>(FluentHttpClient.DefaultJsonSerializerOptions);
     }
 
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> taskResponse, JsonSerializerOptions options)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> taskResponse, JsonSerializerOptions options)
     {
         var response = await taskResponse;
         return JsonSerializer.Deserialize<T>(await response.GetResponseStreamAsync(), options);
     }
 
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> result, Func<HttpResponseMessage, T> defaultAction)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> result, Func<HttpResponseMessage, T> defaultAction)
     {
         return await result.DeserializeJsonAsync<T>(defaultAction, FluentHttpClient.DefaultJsonSerializerOptions);
     }
 
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> taskResponse, Func<HttpResponseMessage, T> defaultAction, JsonSerializerOptions options)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> taskResponse, Func<HttpResponseMessage, T> defaultAction, JsonSerializerOptions options)
     {
         var response = await taskResponse;
         return (response.IsSuccessStatusCode)
             ? JsonSerializer.Deserialize<T>(await response.GetResponseStreamAsync(), options)
             : defaultAction(response);
     }
 
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> result, Func<HttpResponseMessage, Task<T>> defaultAction)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> result, Func<HttpResponseMessage, Task<T>> defaultAction)
     {
         return await result.DeserializeJsonAsync<T>(defaultAction, FluentHttpClient.DefaultJsonSerializerOptions);
     }
 
-    public static async Task<T> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> taskResponse, Func<HttpResponseMessage, Task<T>> defaultAction, JsonSerializerOptions options)
+    public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> taskResponse, Func<HttpResponseMessage, Task<T>> defaultAction, JsonSerializerOptions options)
     {
         var response = await taskResponse;
         return (response.IsSuccessStatusCode)

src/FluentHttpClient/FluentXmlDeserialization.cs

@@ -23,24 +23,24 @@ public static async Task<XElement> DeserializeXmlAsync(this Task<HttpResponseMes
         return await XElement.LoadAsync(await response.GetResponseStreamAsync(), options, token.Value);
     }
 
-    public static async Task<T> DeserializeXmlAsync<T>(this Task<HttpResponseMessage> taskResponse, Func<HttpResponseMessage, Task<T>> defaultAction)
+    public static async Task<T?> DeserializeXmlAsync<T>(this Task<HttpResponseMessage> taskResponse, Func<HttpResponseMessage, Task<T>> defaultAction)
     {
         var response = await taskResponse;
         return (response.IsSuccessStatusCode)
             ? await response.DeserializeXmlAsync<T>()
             : await defaultAction(response);
     }
 
-    public static async Task<T> DeserializeXmlAsync<T>(this Task<HttpResponseMessage> taskResponse)
+    public static async Task<T?> DeserializeXmlAsync<T>(this Task<HttpResponseMessage> taskResponse)
     {
         var response = await taskResponse;
         return await response.DeserializeXmlAsync<T>();
     }
 
-    public static async Task<T> DeserializeXmlAsync<T>(this HttpResponseMessage response)
+    public static async Task<T?> DeserializeXmlAsync<T>(this HttpResponseMessage response)
     {
         using var reader = new StreamReader(await response.GetResponseStreamAsync());
         var serializer = new XmlSerializer(typeof(T));
-        return (T)serializer.Deserialize(reader);
+        return (T?)serializer.Deserialize(reader);
     }
 }

src/FluentHttpClient/HttpClientExtensions.cs

@@ -8,8 +8,18 @@ public static class HttpClientExtensions
     /// <param name="client">HttpClient instance to be used for request</param>
     /// <param name="route">Endpoint URL, can be empty if the base address already targets the endpoint</param>
     /// <returns></returns>
-    public static HttpRequestBuilder UsingRoute(this HttpClient client, string route = null)
+    public static HttpRequestBuilder UsingRoute(this HttpClient client, string route)
     {
         return new HttpRequestBuilder(client).UsingRoute(route);
     }
+
+    /// <summary>
+    /// Returns an <see cref="HttpRequestBuilder"/> with an empty route
+    /// </summary>
+    /// <param name="client">HttpClient instance to be used for request</param>
+    /// <remarks>The request will be sent to the BaseUrl of the <see cref="HttpClient"/> </remarks>
+    public static HttpRequestBuilder WithoutRoute(this HttpClient client)
+    {
+        return new HttpRequestBuilder(client).UsingRoute(string.Empty);
+    }
 }

src/FluentHttpClient/HttpRequestBuilder.cs

@@ -4,7 +4,7 @@ public class HttpRequestBuilder
 {
     private readonly HttpClient _client;
 
-    public HttpContent Content
+    public HttpContent? Content
     {
         get { return Request.Content; }
         set { Request.Content = value; }
@@ -23,7 +23,7 @@ public HttpContent Content
     /// <summary>
     /// Get or set an exception handler for exceptions of type <see cref="HttpRequestException"/>
     /// </summary>
-    public Action<HttpRequestException> HttpRequestExceptionHandler { get; set; }
+    public Action<HttpRequestException>? HttpRequestExceptionHandler { get; set; }
 
     /// <summary>
     /// Get or set request query parameters
@@ -39,7 +39,7 @@ public HttpContent Content
     /// The request route
     /// </summary>
     /// <remarks>If the HttpClient has a base address, this value will be appended to the end of the base address, and extra slashes removed.</remarks>
-    public string Route { get; set; }
+    public string Route { get; set; } = string.Empty;
 
     /// <summary>
     /// Gets or sets the timespan to wait before the request times out
@@ -82,7 +82,7 @@ public async Task<HttpResponseMessage> SendAsync(HttpMethod method, Cancellation
         {
             Request.RequestUri = noBaseAddress
                 ? new Uri($"{Route}{QueryParams}")
-                : new Uri($"{_client.BaseAddress.ToString().TrimEnd('/')}/{Route.TrimStart('/')}{QueryParams}");
+                : new Uri($"{_client.BaseAddress?.ToString().TrimEnd('/')}/{Route.TrimStart('/')}{QueryParams}");
         }
 
         token ??= CancellationToken.None;

src/FluentHttpClient/HttpRequestBuilderExtensions.cs

@@ -11,7 +11,12 @@ namespace FluentHttpClient;
 /// </summary>
 public static partial class HttpRequestBuilderExtensions
 {
-    public static HttpRequestBuilder UsingRoute(this HttpRequestBuilder builder, string route = null)
+    public static HttpRequestBuilder UsingRoute(this HttpRequestBuilder builder)
+    {
+        return builder.UsingRoute(string.Empty);
+    }
+
+    public static HttpRequestBuilder UsingRoute(this HttpRequestBuilder builder, string route)
     {
         builder.Route = route;
         return builder;