feat: Add Nullable support

.github/workflows/release.yml

@@ -14,9 +14,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v1.8.2
+        uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.x'
+          dotnet-version: 6.0.x
 
       - name: Publish package to NuGet
         run: |

.github/workflows/test.yml

@@ -21,9 +21,9 @@ jobs:
           fetch-depth: 0
 
       - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v1.8.2
+        uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.x'
+          dotnet-version: 6.0.x
 
       - run: dotnet build -c Release
       - name: Build & Test

src/SendGrid.Extensions.DependencyInjection/InjectableSendGridClient.cs

@@ -13,7 +13,7 @@ namespace SendGrid.Extensions.DependencyInjection
     /// </summary>
     internal class InjectableSendGridClient : BaseClient
     {
-        public InjectableSendGridClient(HttpClient httpClient, IOptions<SendGridClientOptions> options)
+        public InjectableSendGridClient(HttpClient? httpClient, IOptions<SendGridClientOptions> options)
             : base(httpClient, options.Value)
         {
         }

src/SendGrid.Extensions.DependencyInjection/SendGrid.Extensions.DependencyInjection.csproj

@@ -7,6 +7,9 @@
     <SignAssembly>true</SignAssembly>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <CodeAnalysisRuleset>..\SendGrid\SendGrid.ruleset</CodeAnalysisRuleset>
+	<Nullable>enable</Nullable>
+	<WarningsAsErrors>nullable</WarningsAsErrors>
+	<LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>

src/SendGrid/BaseClient.cs

@@ -30,7 +30,7 @@ public abstract class BaseClient : ISendGridClient
         /// <summary>
         /// The client assembly version to send in request User-Agent header.
         /// </summary>
-        private static readonly string ClientVersion = typeof(BaseClient).GetTypeInfo().Assembly.GetName().Version.ToString();
+        private static readonly string ClientVersion = typeof(BaseClient).GetTypeInfo().Assembly.GetName().Version!.ToString();
 
         /// <summary>
         /// The configuration to use with current client instance.
@@ -47,7 +47,7 @@ public abstract class BaseClient : ISendGridClient
         /// </summary>
         /// <param name="options">A <see cref="BaseClientOptions"/> instance that defines the configuration settings to use with the client.</param>
         /// <returns>Interface to the Twilio SendGrid REST API.</returns>
-        protected BaseClient(BaseClientOptions options)
+        protected BaseClient(BaseClientOptions? options)
             : this(httpClient: null, options)
         {
         }
@@ -58,7 +58,7 @@ protected BaseClient(BaseClientOptions options)
         /// <param name="webProxy">Web proxy.</param>
         /// <param name="options">A <see cref="BaseClientOptions"/> instance that defines the configuration settings to use with the client.</param>
         /// <returns>Interface to the Twilio SendGrid REST API.</returns>
-        protected BaseClient(IWebProxy webProxy, BaseClientOptions options)
+        protected BaseClient(IWebProxy? webProxy, BaseClientOptions options)
             : this(CreateHttpClientWithWebProxy(webProxy, options), options)
         {
         }
@@ -69,7 +69,7 @@ protected BaseClient(IWebProxy webProxy, BaseClientOptions options)
         /// <param name="httpClient">An optional HTTP client which may me injected in order to facilitate testing.</param>
         /// <param name="options">A <see cref="BaseClientOptions"/> instance that defines the configuration settings to use with the client.</param>
         /// <returns>Interface to the Twilio SendGrid REST API.</returns>
-        protected BaseClient(HttpClient httpClient, BaseClientOptions options)
+        protected BaseClient(HttpClient? httpClient, BaseClientOptions? options)
         {
             this.options = options ?? throw new ArgumentNullException(nameof(options));
 
@@ -123,7 +123,7 @@ public string UrlPath
         /// <summary>
         /// The API version.
         /// </summary>
-        public string Version
+        public string? Version
         {
             get => this.options.Version;
             set => this.options.Version = value;
@@ -151,7 +151,7 @@ public virtual AuthenticationHeaderValue AddAuthorization(KeyValuePair<string, s
         /// <param name="request">The parameters for the API call.</param>
         /// <param name="cancellationToken">Cancel the asynchronous call.</param>
         /// <returns>Response object.</returns>
-        public virtual async Task<Response> MakeRequest(HttpRequestMessage request, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<Response> MakeRequest(HttpRequestMessage request, CancellationToken cancellationToken = default)
         {
             HttpResponseMessage response = await this.client.SendAsync(request, cancellationToken).ConfigureAwait(false);
 
@@ -182,10 +182,10 @@ public virtual AuthenticationHeaderValue AddAuthorization(KeyValuePair<string, s
         /// In particular, this means that you may expect a TimeoutException if you are not connected to the Internet.</exception>
         public async Task<Response> RequestAsync(
             SendGridClient.Method method,
-            string requestBody = null,
-            string queryParams = null,
-            string urlPath = null,
-            CancellationToken cancellationToken = default(CancellationToken))
+            string? requestBody = null,
+            string? queryParams = null,
+            string? urlPath = null,
+            CancellationToken cancellationToken = default)
         {
             var baseAddress = new Uri(this.options.Host);
             if (!baseAddress.OriginalString.EndsWith("/"))
@@ -204,7 +204,7 @@ public async Task<Response> RequestAsync(
             // Drop the default UTF-8 content type charset for JSON payloads since some APIs may not accept it.
             if (request.Content != null && this.MediaType == DefaultMediaType)
             {
-                request.Content.Headers.ContentType.CharSet = null;
+                request.Content.Headers.ContentType!.CharSet = null;
             }
 
             // set header overrides
@@ -229,7 +229,7 @@ public async Task<Response> RequestAsync(
         /// <param name="msg">A SendGridMessage object with the details for the request.</param>
         /// <param name="cancellationToken">Cancel the asynchronous call.</param>
         /// <returns>A Response object.</returns>
-        public async Task<Response> SendEmailAsync(SendGridMessage msg, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<Response> SendEmailAsync(SendGridMessage msg, CancellationToken cancellationToken = default)
         {
             return await this.RequestAsync(
                 Method.POST,
@@ -249,7 +249,7 @@ private static HttpClient CreateHttpClientWithRetryHandler(BaseClientOptions opt
         /// <param name="webProxy">the WebProxy.</param>
         /// <param name="options">A <see cref="BaseClientOptions"/> instance that defines the configuration settings to use with the client.</param>
         /// <returns>HttpClient with RetryDelegatingHandler and WebProxy if set.</returns>
-        private static HttpClient CreateHttpClientWithWebProxy(IWebProxy webProxy, BaseClientOptions options)
+        private static HttpClient CreateHttpClientWithWebProxy(IWebProxy? webProxy, BaseClientOptions options)
         {
             if (webProxy != null)
             {
@@ -276,13 +276,12 @@ private static HttpClient CreateHttpClientWithWebProxy(IWebProxy webProxy, BaseC
         /// <param name="urlPath">The URL path.</param>
         /// <param name="queryParams">A string of JSON formatted query parameters (e.g. {'param': 'param_value'}).</param>
         /// <returns>Final URL.</returns>
-        private string BuildUrl(string urlPath, string queryParams = null)
+        private string BuildUrl(string? urlPath, string? queryParams = null)
         {
-            string url = null;
-
             // create urlPAth - from parameter if overridden on call or from constructor parameter
             var urlpath = urlPath ?? this.options.UrlPath;
 
+            string url;
             if (this.options.Version != null)
             {
                 url = this.options.Version + "/" + urlpath;
@@ -338,7 +337,7 @@ private Dictionary<string, List<object>> ParseJson(string json)
                     {
                         case JsonToken.PropertyName:
                             {
-                                propertyName = reader.Value.ToString();
+                                propertyName = reader.Value.ToString()!;
                                 if (!dict.ContainsKey(propertyName))
                                 {
                                     dict.Add(propertyName, new List<object>());

src/SendGrid/BaseClientOptions.cs

@@ -10,7 +10,7 @@ namespace SendGrid
     /// </summary>
     public class BaseClientOptions
     {
-        private ReliabilitySettings reliabilitySettings = new ReliabilitySettings();
+        private ReliabilitySettings reliabilitySettings = new();
 
         /// <summary>
         /// The reliability settings to use on HTTP Requests.
@@ -24,27 +24,27 @@ public ReliabilitySettings ReliabilitySettings
         /// <summary>
         /// The request headers to use on HTTP Requests.
         /// </summary>
-        public Dictionary<string, string> RequestHeaders { get; set; } = new Dictionary<string, string>();
+        public Dictionary<string, string> RequestHeaders { get; set; } = new();
 
         /// <summary>
         /// The base URL.
         /// </summary>
-        public string Host { get; set; }
+        public string Host { get; set; } = string.Empty;
 
         /// <summary>
         /// The API version (defaults to "v3").
         /// </summary>
-        public string Version { get; set; } = "v3";
+        public string? Version { get; set; } = "v3";
 
         /// <summary>
         /// The path to the API endpoint.
         /// </summary>
-        public string UrlPath { get; set; }
+        public string UrlPath { get; set; } = string.Empty;
 
         /// <summary>
         /// The Auth header value.
         /// </summary>
-        public AuthenticationHeaderValue Auth { get; set; }
+        public AuthenticationHeaderValue? Auth { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether HTTP error responses should be raised as exceptions. Default is false.

src/SendGrid/Helpers/Errors/ErrorHandler.cs

@@ -90,9 +90,9 @@ private static async Task<string> GetErrorMessage(HttpResponseMessage message)
             var errorStatusCode = (int)message.StatusCode;
             var errorReasonPhrase = message.ReasonPhrase;
 
-            string errorValue = null;
-            string fieldValue = null;
-            string helpValue = null;
+            string? errorValue = null;
+            string? fieldValue = null;
+            string? helpValue = null;
 
             if (message.Content != null)
             {
@@ -139,7 +139,7 @@ private static async Task<string> GetErrorMessage(HttpResponseMessage message)
                 }
             }
 
-            SendGridErrorResponse errorResponse = new SendGridErrorResponse
+            SendGridErrorResponse errorResponse = new()
             {
                 ErrorHttpStatusCode = errorStatusCode,
                 ErrorReasonPhrase = errorReasonPhrase,

src/SendGrid/Helpers/Errors/Model/SendGridErrorResponse.cs

@@ -13,21 +13,21 @@ public class SendGridErrorResponse
         /// <summary>
         /// Gets or sets the error Reason Phrase
         /// </summary>
-        public string ErrorReasonPhrase { get; set; }
+        public string? ErrorReasonPhrase { get; set; }
 
         /// <summary>
         /// Gets or sets the SendGrid error message
         /// </summary>
-        public string SendGridErrorMessage { get; set; }
+        public string? SendGridErrorMessage { get; set; }
 
         /// <summary>
         /// Gets or sets the field that has the error
         /// </summary>
-        public string FieldWithError { get; set; }
+        public string? FieldWithError { get; set; }
 
         /// <summary>
         /// Gets or sets the error default help
         /// </summary>
-        public string HelpLink { get; set; }
+        public string? HelpLink { get; set; }
     }
 }