fix obsolete code, clean up warning

pwelter34 · pwelter34 · commit 8227a91ef0f9 · 2024-06-05T11:54:22.000-05:00
diff --git a/src/FluentRest/ContentSerializer.cs b/src/FluentRest/ContentSerializer.cs
@@ -1,3 +1,5 @@
+// Ignore Spelling: Serializer
+
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/DictionaryExtensions.cs b/src/FluentRest/DictionaryExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/FluentClient.cs b/src/FluentRest/FluentClient.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Net.Http;
+// Ignore Spelling: Serializer
 
 namespace FluentRest;
 
diff --git a/src/FluentRest/FluentClientExtensions.cs b/src/FluentRest/FluentClientExtensions.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/FluentDispatcher.cs b/src/FluentRest/FluentDispatcher.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace FluentRest;
 
diff --git a/src/FluentRest/FluentProperties.cs b/src/FluentRest/FluentProperties.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/FormBuilder.cs b/src/FluentRest/FormBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Net.Http;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/HeaderBuilder.cs b/src/FluentRest/HeaderBuilder.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Net.Http;
 using System.Net.Http.Headers;
 
 namespace FluentRest;
diff --git a/src/FluentRest/HttpClientExtensions.cs b/src/FluentRest/HttpClientExtensions.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/HttpMessageExtensions.cs b/src/FluentRest/HttpMessageExtensions.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml.Linq;
+// Ignore Spelling: Serializer Deserialize
 
 namespace FluentRest;
 
@@ -13,6 +7,49 @@ namespace FluentRest;
 /// </summary>
 public static class HttpMessageExtensions
 {
+    public static TValue GetOrAddOption<TValue>(this HttpRequestMessage requestMessage, string key, Func<string, TValue> valueFactory)
+    {
+#if NET5_0_OR_GREATER
+        var optionKey = new HttpRequestOptionsKey<TValue>(key);
+        if (requestMessage.Options.TryGetValue(optionKey, out var value))
+            return value;
+
+        value = valueFactory(key);
+        requestMessage.Options.Set(optionKey, value);
+        return value;
+#else
+        if (requestMessage.Properties.TryGetValue(key, out var propertyValue))
+            return (TValue)propertyValue;
+
+        propertyValue = valueFactory(key);
+        requestMessage.Properties.Add(key, propertyValue);
+
+        return (TValue)propertyValue;
+#endif
+    }
+
+    public static bool TryGetOption<TValue>(this HttpRequestMessage requestMessage, string key, out TValue value)
+    {
+#if NET5_0_OR_GREATER
+        var optionKey = new HttpRequestOptionsKey<TValue>(key);
+        return requestMessage.Options.TryGetValue(optionKey, out value);
+#else
+        var found = requestMessage.Properties.TryGetValue(key, out var propertyValue);
+        value  = found ? (TValue)propertyValue : default;
+        return found;
+#endif
+    }
+
+    public static void SetOption<TValue>(this HttpRequestMessage requestMessage, string key, TValue value)
+    {
+#if NET5_0_OR_GREATER
+        var optionKey = new HttpRequestOptionsKey<TValue>(key);
+        requestMessage.Options.Set(optionKey, value);
+#else
+        requestMessage.Properties[key] = value;
+#endif
+    }
+
     /// <summary>
     /// Gets the <see cref="UrlBuilder"/> from the specified <paramref name="requestMessage" /> properties dictionary.
     /// </summary>
@@ -26,13 +63,13 @@ public static UrlBuilder GetUrlBuilder(this HttpRequestMessage requestMessage)
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        var propertyValue = requestMessage.Properties.GetOrAdd(FluentProperties.RequestUrlBuilder, k =>
+        var propertyValue = requestMessage.GetOrAddOption(FluentProperties.RequestUrlBuilder, k =>
             requestMessage.RequestUri == null
                 ? new UrlBuilder()
                 : new UrlBuilder(requestMessage.RequestUri)
         );
 
-        return propertyValue as UrlBuilder;
+        return propertyValue;
     }
 
     /// <summary>
@@ -46,7 +83,7 @@ public static void SetUrlBuilder(this HttpRequestMessage requestMessage, UrlBuil
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        requestMessage.Properties[FluentProperties.RequestUrlBuilder] = urlBuilder;
+        requestMessage.SetOption(FluentProperties.RequestUrlBuilder, urlBuilder);
     }
 
 
@@ -63,7 +100,7 @@ public static object GetContentData(this HttpRequestMessage requestMessage)
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        requestMessage.Properties.TryGetValue(FluentProperties.RequestContentData, out var propertyValue);
+        requestMessage.TryGetOption<object>(FluentProperties.RequestContentData, out var propertyValue);
         return propertyValue;
     }
 
@@ -78,7 +115,7 @@ public static void SetContentData(this HttpRequestMessage requestMessage, object
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        requestMessage.Properties[FluentProperties.RequestContentData] = contentData;
+        requestMessage.SetOption(FluentProperties.RequestContentData, contentData);
     }
 
 
@@ -95,8 +132,8 @@ public static Dictionary<string, ICollection<string>> GetFormData(this HttpReque
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        var propertyValue = requestMessage.Properties.GetOrAdd(FluentProperties.RequestFormData, k => new Dictionary<string, ICollection<string>>());
-        return propertyValue as Dictionary<string, ICollection<string>>;
+        var propertyValue = requestMessage.GetOrAddOption(FluentProperties.RequestFormData, k => new Dictionary<string, ICollection<string>>());
+        return propertyValue;
     }
 
 
@@ -113,8 +150,10 @@ public static HttpCompletionOption GetCompletionOption(this HttpRequestMessage r
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        requestMessage.Properties.TryGetValue(FluentProperties.HttpCompletionOption, out var propertyValue);
-        return (HttpCompletionOption)(propertyValue ?? HttpCompletionOption.ResponseContentRead);
+        if (requestMessage.TryGetOption<HttpCompletionOption>(FluentProperties.HttpCompletionOption, out var value))
+            return value;
+
+        return HttpCompletionOption.ResponseContentRead;
     }
 
     /// <summary>
@@ -128,7 +167,7 @@ public static void SetCompletionOption(this HttpRequestMessage requestMessage, H
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        requestMessage.Properties[FluentProperties.HttpCompletionOption] = completionOption;
+        requestMessage.SetOption(FluentProperties.HttpCompletionOption, completionOption);
     }
 
 
@@ -145,8 +184,10 @@ public static CancellationToken GetCancellationToken(this HttpRequestMessage req
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        requestMessage.Properties.TryGetValue(FluentProperties.CancellationToken, out var propertyValue);
-        return (CancellationToken)(propertyValue ?? CancellationToken.None);
+        if (requestMessage.TryGetOption<CancellationToken>(FluentProperties.CancellationToken, out var propertyValue))
+            return propertyValue;
+
+        return CancellationToken.None;
     }
 
     /// <summary>
@@ -160,7 +201,7 @@ public static void SetCancellationToken(this HttpRequestMessage requestMessage,
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        requestMessage.Properties[FluentProperties.CancellationToken] = cancellationToken;
+        requestMessage.SetOption(FluentProperties.CancellationToken, cancellationToken);
     }
 
 
@@ -177,8 +218,8 @@ public static IContentSerializer GetContentSerializer(this HttpRequestMessage re
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        var propertyValue = requestMessage.Properties.GetOrAdd(FluentProperties.ContentSerializer, k => ContentSerializer.Current);
-        return propertyValue as IContentSerializer;
+        var propertyValue = requestMessage.GetOrAddOption(FluentProperties.ContentSerializer, k => ContentSerializer.Current);
+        return propertyValue;
     }
 
     /// <summary>
@@ -192,7 +233,7 @@ public static void SetContentSerializer(this HttpRequestMessage requestMessage,
         if (requestMessage == null)
             throw new ArgumentNullException(nameof(requestMessage));
 
-        requestMessage.Properties[FluentProperties.ContentSerializer] = contentSerializer ?? ContentSerializer.Current;
+        requestMessage.SetOption(FluentProperties.ContentSerializer, contentSerializer ?? ContentSerializer.Current);
     }
 
 
diff --git a/src/FluentRest/HttpRequestHeaders.cs b/src/FluentRest/HttpRequestHeaders.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/HttpResponseHeaders.cs b/src/FluentRest/HttpResponseHeaders.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/IContentSerializer.cs b/src/FluentRest/IContentSerializer.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/IFluentClient.cs b/src/FluentRest/IFluentClient.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Net.Http;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/JsonContentSerializer.cs b/src/FluentRest/JsonContentSerializer.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Net.Http;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 
 namespace FluentRest;
 
diff --git a/src/FluentRest/PostBuilder.cs b/src/FluentRest/PostBuilder.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
 
@@ -175,7 +171,7 @@ public TBuilder Content<TData>(TData data)
             return Content(httpContent);
 
         // save for later serialization
-        RequestMessage.Properties[FluentProperties.RequestContentData] = data;
+        RequestMessage.SetOption(FluentProperties.RequestContentData, data);
 
         if (RequestMessage.Method == HttpMethod.Get)
             RequestMessage.Method = HttpMethod.Post;
diff --git a/src/FluentRest/ProblemDetails.cs b/src/FluentRest/ProblemDetails.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace FluentRest;
diff --git a/src/FluentRest/ProblemDetailsConverter.cs b/src/FluentRest/ProblemDetailsConverter.cs
@@ -1,12 +1,11 @@
-using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace FluentRest;
 
 internal sealed class ProblemDetailsConverter : JsonConverter<ProblemDetails>
 {
-    private static readonly JsonEncodedText Type = JsonEncodedText.Encode("type");
+    private static readonly JsonEncodedText ProblemType = JsonEncodedText.Encode("type");
     private static readonly JsonEncodedText Title = JsonEncodedText.Encode("title");
     private static readonly JsonEncodedText Status = JsonEncodedText.Encode("status");
     private static readonly JsonEncodedText Detail = JsonEncodedText.Encode("detail");
@@ -37,7 +36,7 @@ public override void Write(Utf8JsonWriter writer, ProblemDetails value, JsonSeri
 
     internal static void ReadValue(ref Utf8JsonReader reader, ProblemDetails value, JsonSerializerOptions options)
     {
-        if (TryReadStringProperty(ref reader, Type, out var propertyValue))
+        if (TryReadStringProperty(ref reader, ProblemType, out var propertyValue))
         {
             value.Type = propertyValue;
         }
@@ -83,7 +82,7 @@ internal static bool TryReadStringProperty(ref Utf8JsonReader reader, JsonEncode
     internal static void WriteProblemDetails(Utf8JsonWriter writer, ProblemDetails value, JsonSerializerOptions options)
     {
         if (value.Type != null)
-            writer.WriteString(Type, value.Type);
+            writer.WriteString(ProblemType, value.Type);
 
         if (value.Title != null)
             writer.WriteString(Title, value.Title);
diff --git a/src/FluentRest/ProblemDetailsJsonContext.cs b/src/FluentRest/ProblemDetailsJsonContext.cs
@@ -1,4 +1,6 @@
-﻿using System.Text.Json;
+// Ignore Spelling: Json
+
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace FluentRest;
diff --git a/src/FluentRest/ProblemException.cs b/src/FluentRest/ProblemException.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Net.Http;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/QueryBuilder.cs b/src/FluentRest/QueryBuilder.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/RequestBuilder.cs b/src/FluentRest/RequestBuilder.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Net.Http;
-using System.Threading;
-
 namespace FluentRest;
 
 /// <summary>
@@ -63,7 +59,7 @@ public TBuilder State(string key, object value)
         if (string.IsNullOrEmpty(key))
             throw new ArgumentException("Argument is null or empty", nameof(key));
 
-        RequestMessage.Properties[key] = value;
+        RequestMessage.SetOption(key, value);
         return this as TBuilder;
     }
 }
diff --git a/src/FluentRest/RequestExtensions.cs b/src/FluentRest/RequestExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Text;
 
 namespace FluentRest;
diff --git a/src/FluentRest/SendBuilder.cs b/src/FluentRest/SendBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Net.Http;
-
 namespace FluentRest;
 
 /// <summary>
diff --git a/src/FluentRest/UrlBuilder.cs b/src/FluentRest/UrlBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace FluentRest;
diff --git a/test/FluentRest.Fake.Tests/FileMessageStoreTests.cs b/test/FluentRest.Fake.Tests/FileMessageStoreTests.cs
diff --git a/test/FluentRest.Fake.Tests/MemoryStoreTests.cs b/test/FluentRest.Fake.Tests/MemoryStoreTests.cs
diff --git a/test/FluentRest.Tests/FluentEchoTests.cs b/test/FluentRest.Tests/FluentEchoTests.cs
diff --git a/test/FluentRest.Tests/GitHub/GitHubFactoryTests.cs b/test/FluentRest.Tests/GitHub/GitHubFactoryTests.cs
diff --git a/test/FluentRest.Tests/GitHub/GitHubTests.cs b/test/FluentRest.Tests/GitHub/GitHubTests.cs
diff --git a/test/FluentRest.Tests/HttpClientEchoTests.cs b/test/FluentRest.Tests/HttpClientEchoTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// Ignore Spelling: Serializer`
	`2`	`+`
`1`	`3`	`namespace FluentRest;`
`2`	`4`
`3`	`5`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System;`
`2`		`-`
`3`	`1`	`namespace FluentRest;`
`4`	`2`
`5`	`3`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System;`
`2`		`-using System.Net.Http;`
`3`	`1`	`using System.Net.Http.Headers;`
`4`	`2`
`5`	`3`	`namespace FluentRest;`