add support for nullable, minor cleanup, improve UrlBuilder

Author: pwelter34

.github/dependabot.yml

@@ -55,3 +55,6 @@ updates:
           - "xunit.core"
           - "xunit.extensibility.*"
           - "xunit.runner.*"
+    ignore:
+      - dependency-name: FluentAssertions
+        versions: [">=8.0.0"]

FluentRest.sln

@@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A4E004F2-9E26-4A47-A509-F8DA024A8436}"
 	ProjectSection(SolutionItems) = preProject
 		coverlet.runsettings = coverlet.runsettings
+		.github\dependabot.yml = .github\dependabot.yml
 		src\Directory.Build.props = src\Directory.Build.props
 		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
 		README.md = README.md

src/FluentRest.Fake/FakeContainerBuilder.cs

@@ -49,7 +49,7 @@ public FakeContainerBuilder(FakeResponseContainer container) : base(container)
     /// <exception cref="System.ArgumentNullException"><paramref name="value" /> is <see langword="null" />.</exception>
     public FakeResponseBuilder Url(string value)
     {
-        if (value == null)
+        if (value is null)
             throw new ArgumentNullException(nameof(value));
 
         Container.RequestUri = new Uri(value, UriKind.Absolute);
@@ -65,7 +65,7 @@ public FakeResponseBuilder Url(string value)
     /// <exception cref="System.ArgumentNullException"><paramref name="value" /> is <see langword="null" />.</exception>
     public FakeResponseBuilder Url(Uri value)
     {
-        if (value == null)
+        if (value is null)
             throw new ArgumentNullException(nameof(value));
 
         Container.RequestUri = value;

src/FluentRest.Fake/FakeContentBuilder.cs

@@ -27,10 +27,10 @@ public FakeContentBuilder(FakeResponseContainer container) : base(container)
     /// <exception cref="ArgumentNullException"><paramref name="name" /> is <see langword="null" />.</exception>
     public FakeContentBuilder Header(string name, string value)
     {
-        if (name == null)
+        if (name is null)
             throw new ArgumentNullException(nameof(name));
 
-        if (value == null)
+        if (value is null)
             Container.ResponseMessage.ContentHeaders.Remove(name);
         else
             Container.ResponseMessage.ContentHeaders[name] = new List<string>(new[] { value });
@@ -60,7 +60,7 @@ public FakeContentBuilder Data<T>(T value, SerializeResponseContentCallback seri
         }
         else
         {
-            if (serializer == null)
+            if (serializer is null)
                 serializer = this.Container.SerializeResponseContentCallback ?? DefaultSerializer;
 
             content = serializer(value, typeof(T));

src/FluentRest.Fake/FakeResponseBuilder.cs

@@ -40,7 +40,7 @@ public FakeResponseBuilder StatusCode(HttpStatusCode value)
     /// <exception cref="ArgumentNullException"><paramref name="value" /> is <see langword="null" />.</exception>
     public FakeResponseBuilder ReasonPhrase(string value)
     {
-        if (value == null)
+        if (value is null)
             throw new ArgumentNullException(nameof(value));
 
         Container.ResponseMessage.ReasonPhrase = value;
@@ -56,10 +56,10 @@ public FakeResponseBuilder ReasonPhrase(string value)
     /// <exception cref="ArgumentNullException"><paramref name="name" /> is <see langword="null" />.</exception>
     public FakeResponseBuilder Header(string name, string value)
     {
-        if (name == null)
+        if (name is null)
             throw new ArgumentNullException(nameof(name));
 
-        if (value == null)
+        if (value is null)
             Container.ResponseMessage.ResponseHeaders.Remove(name);
         else
             Container.ResponseMessage.ResponseHeaders[name] = new List<string>(new[] { value });
@@ -77,7 +77,7 @@ public FakeResponseBuilder Header(string name, string value)
     /// <exception cref="ArgumentNullException"><paramref name="builder" /> is <see langword="null" />.</exception>
     public FakeResponseBuilder Content(Action<FakeContentBuilder> builder)
     {
-        if (builder == null)
+        if (builder is null)
             throw new ArgumentNullException(nameof(builder));
 
         var contentBuilder = new FakeContentBuilder(Container);

src/FluentRest.Fake/FileMessageStore.cs

@@ -80,7 +80,7 @@ public override async Task<HttpResponseMessage> LoadAsync(HttpRequestMessage req
     private async Task SaveContent(HttpResponseMessage response, string contentPath)
     {
         // don't save content if not success
-        if (!response.IsSuccessStatusCode || response.Content == null || response.StatusCode == HttpStatusCode.NoContent)
+        if (!response.IsSuccessStatusCode || response.Content is null || response.StatusCode == HttpStatusCode.NoContent)
             return;
 
         var contents = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
@@ -118,7 +118,7 @@ private async Task<HttpResponseMessage> LoadResponse(HttpContent httpContent, st
             fakeResponse = await JsonSerializer.DeserializeAsync<FakeResponseMessage>(reader);
 
         var httpResponse = Convert(fakeResponse);
-        if (httpContent == null)
+        if (httpContent is null)
             return httpResponse;
 
         // copy headers

src/FluentRest.Fake/MemoryMessageStore.cs

@@ -45,7 +45,7 @@ public class MemoryMessageStore : FakeMessageStore
     public override async Task SaveAsync(HttpRequestMessage request, HttpResponseMessage response)
     {
         // don't save content if not success
-        if (!response.IsSuccessStatusCode || response.Content == null || response.StatusCode == HttpStatusCode.NoContent)
+        if (!response.IsSuccessStatusCode || response.Content is null || response.StatusCode == HttpStatusCode.NoContent)
             return;
 
         var httpContent = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
@@ -93,7 +93,7 @@ public override Task<HttpResponseMessage> LoadAsync(HttpRequestMessage request)
 
         taskSource.SetResult(httpResponse);
 
-        if (container.HttpContent == null)
+        if (container.HttpContent is null)
             return taskSource.Task;
 
         var httpContent = new ByteArrayContent(container.HttpContent);
@@ -116,7 +116,7 @@ public override Task<HttpResponseMessage> LoadAsync(HttpRequestMessage request)
     /// <exception cref="ArgumentNullException"></exception>
     public void Register(Action<FakeContainerBuilder> builder)
     {
-        if (builder == null)
+        if (builder is null)
             throw new ArgumentNullException(nameof(builder));
 
         var container = new FakeResponseContainer

src/FluentRest.NewtonsoftJson/NewtonsoftJsonSerializer.cs

@@ -49,7 +49,7 @@ public NewtonsoftJsonSerializer(JsonSerializerSettings settings = null)
     /// <returns>The <see cref="HttpContent"/> that the data object serialized to.</returns>
     public Task<HttpContent> SerializeAsync(object data)
     {
-        if (data == null)
+        if (data is null)
             return null;
 
         string json;

src/FluentRest/CodeAnalysis/NullableAttributes.cs

@@ -0,0 +1,85 @@
+#if NETSTANDARD2_0
+namespace System.Diagnostics.CodeAnalysis;
+
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
+public sealed class AllowNullAttribute : Attribute
+{ }
+
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
+public sealed class DisallowNullAttribute : Attribute
+{ }
+
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
+public sealed class MaybeNullAttribute : Attribute
+{ }
+
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
+public sealed class NotNullAttribute : Attribute
+{ }
+
+[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+public sealed class MaybeNullWhenAttribute : Attribute
+{
+    public MaybeNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+    public bool ReturnValue { get; }
+}
+
+[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+public sealed class NotNullWhenAttribute : Attribute
+{
+    public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+    public bool ReturnValue { get; }
+}
+
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
+public sealed class NotNullIfNotNullAttribute : Attribute
+{
+    public NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
+
+    public string ParameterName { get; }
+}
+
+[AttributeUsage(AttributeTargets.Method, Inherited = false)]
+public sealed class DoesNotReturnAttribute : Attribute
+{ }
+
+[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+public sealed class DoesNotReturnIfAttribute : Attribute
+{
+    public DoesNotReturnIfAttribute(bool parameterValue) => ParameterValue = parameterValue;
+
+    public bool ParameterValue { get; }
+}
+
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+public sealed class MemberNotNullAttribute : Attribute
+{
+    public MemberNotNullAttribute(string member) => Members = [member];
+
+    public MemberNotNullAttribute(params string[] members) => Members = members;
+
+    public string[] Members { get; }
+}
+
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+public sealed class MemberNotNullWhenAttribute : Attribute
+{
+    public MemberNotNullWhenAttribute(bool returnValue, string member)
+    {
+        ReturnValue = returnValue;
+        Members = [member];
+    }
+
+    public MemberNotNullWhenAttribute(bool returnValue, params string[] members)
+    {
+        ReturnValue = returnValue;
+        Members = members;
+    }
+
+    public bool ReturnValue { get; }
+
+    public string[] Members { get; }
+}
+#endif

src/FluentRest/DictionaryExtensions.cs

@@ -1,3 +1,5 @@
+using System.Diagnostics.CodeAnalysis;
+
 namespace FluentRest;
 
 /// <summary>
@@ -19,16 +21,16 @@ public static class DictionaryExtensions
     /// <exception cref="ArgumentNullException"><paramref name="key" /> is <see langword="null" /></exception>
     public static TValue GetOrAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TValue> valueFactory)
     {
-        if (key == null)
+        if (key is null)
             throw new ArgumentNullException(nameof(key));
 
         if (dictionary.TryGetValue(key, out var value))
             return value;
 
-        value = valueFactory(key);
-        dictionary.Add(key, value);
+        var factoryValue = valueFactory(key);
+        dictionary.Add(key, factoryValue);
 
-        return value;
+        return factoryValue;
     }
 
     /// <summary>
@@ -45,7 +47,7 @@ public static TValue GetOrAdd<TKey, TValue>(this IDictionary<TKey, TValue> dicti
     /// <exception cref="ArgumentNullException"><paramref name="key" /> is <see langword="null" /></exception>
     public static bool TryAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, TValue value)
     {
-        if (key == null)
+        if (key is null)
             throw new ArgumentNullException(nameof(key));
 
         if (dictionary.ContainsKey(key))
@@ -65,9 +67,9 @@ public static bool TryAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionar
     /// <param name="value">When this method returns, value contains the object removed from the Dictionary or the default value if the operation failed.</param>
     /// <returns><c>true</c> if an object was removed successfully; otherwise, <c>false</c>.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="key" /> is <see langword="null" /></exception>
-    public static bool TryRemove<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, out TValue value)
+    public static bool TryRemove<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, [MaybeNullWhen(false)] out TValue? value)
     {
-        if (key == null)
+        if (key is null)
             throw new ArgumentNullException(nameof(key));
 
         if (!dictionary.TryGetValue(key, out value))
@@ -89,7 +91,7 @@ public static bool TryRemove<TKey, TValue>(this IDictionary<TKey, TValue> dictio
     /// <exception cref="System.ArgumentNullException">Thrown if key is a <c>null</c> reference </exception>
     public static bool TryUpdate<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, TValue newValue, TValue comparisonValue)
     {
-        if (key == null)
+        if (key is null)
             throw new ArgumentNullException(nameof(key));
 
         if (!dictionary.TryGetValue(key, out var value))