Merge pull request #791 from tmenier/dev

sponsorship

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: tmenier

src/Flurl.CodeGen/Program.cs

@@ -178,6 +178,7 @@ private static void WriteHttpExtensionMethod(CodeWriter writer, HttpExtensionMet
 				args.Add("cancellationToken");
 
 				if (xm.RequestBodyType != null) {
+					writer.WriteLine("request.EnsureClient();"); // might need to serialize body, and client might provide custom serializer
 					writer.WriteLine("var content = new Captured@0Content(@1);",
 						xm.RequestBodyType,
 						xm.RequestBodyType == "String" ? "body" : $"request.Settings.{xm.RequestBodyType}Serializer.Serialize(body)");

src/Flurl.Http.Newtonsoft/Flurl.Http.Newtonsoft.csproj

@@ -4,10 +4,10 @@
     <LangVersion>9.0</LangVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Flurl.Http.Newtonsoft</PackageId>
-    <Version>0.9.0</Version>
+    <Version>0.9.1</Version>
     <Authors>Todd Menier</Authors>
     <Description>A Newtonsoft-based JSON serializer for Flurl.Http 4.0 and above.</Description>
-    <Copyright>Copyright (c) Todd Menier 2023.</Copyright>
+    <Copyright>Copyright (c) Todd Menier 2024.</Copyright>
     <PackageProjectUrl>https://flurl.dev</PackageProjectUrl>
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>https://github.com/tmenier/Flurl.git</RepositoryUrl>

src/Flurl.Http/Flurl.Http.csproj

@@ -4,10 +4,10 @@
     <LangVersion>9.0</LangVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Flurl.Http</PackageId>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Authors>Todd Menier</Authors>
-    <Description>4.0 contains breaking changes! See flurl.dev/upgrade</Description>
-    <Copyright>Copyright (c) Todd Menier 2023.</Copyright>
+    <Description>A fluent, testable HTTP client library.</Description>
+    <Copyright>Copyright (c) Todd Menier 2024.</Copyright>
     <PackageProjectUrl>https://flurl.dev</PackageProjectUrl>
     <PackageIcon>icon.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>

src/Flurl.Http/FlurlRequest.cs

@@ -53,6 +53,12 @@ public interface IFlurlRequest : ISettingsContainer, IHeadersContainer, IEventHa
 		/// </summary>
 		FlurlCall RedirectedFrom { get; set; }
 
+		/// <summary>
+		/// If Client property is null, selects (or creates) a FlurlClient from the global FlurlHttp.Clients cache. Called
+		/// automatically just before a request is sent, so in most cases there is no need to call explicitly.
+		/// </summary>
+		IFlurlClient EnsureClient();
+
 		/// <summary>
 		/// Asynchronously sends the HTTP request. Mainly used to implement higher-level extension methods (GetJsonAsync, etc).
 		/// </summary>
@@ -138,12 +144,14 @@ public CookieJar CookieJar {
 			set => ApplyCookieJar(value);
 		}
 
+		/// <inheritdoc />
+		public IFlurlClient EnsureClient() => Client ??= FlurlHttp.GetClientForRequest(this);
+
 		/// <inheritdoc />
 		public Task<IFlurlResponse> SendAsync(HttpMethod verb, HttpContent content = null, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
 			Verb = verb;
 			Content = content;
-			Client ??= FlurlHttp.GetClientForRequest(this);
-			return Client.SendAsync(this, completionOption, cancellationToken);
+			return EnsureClient().SendAsync(this, completionOption, cancellationToken);
 		}
 
 		internal static void SyncHeaders(IFlurlClient client, IFlurlRequest request) {

src/Flurl.Http/GeneratedExtensions.cs

@@ -25,6 +25,7 @@ public static class GeneratedExtensions
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> SendJsonAsync(this IFlurlRequest request, HttpMethod verb, object body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedJsonContent(request.Settings.JsonSerializer.Serialize(body));
 			return request.SendAsync(verb, content, completionOption, cancellationToken);
 		}
@@ -39,6 +40,7 @@ public static Task<IFlurlResponse> SendJsonAsync(this IFlurlRequest request, Htt
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> SendStringAsync(this IFlurlRequest request, HttpMethod verb, string body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedStringContent(body);
 			return request.SendAsync(verb, content, completionOption, cancellationToken);
 		}
@@ -53,6 +55,7 @@ public static Task<IFlurlResponse> SendStringAsync(this IFlurlRequest request, H
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> SendUrlEncodedAsync(this IFlurlRequest request, HttpMethod verb, object body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedUrlEncodedContent(request.Settings.UrlEncodedSerializer.Serialize(body));
 			return request.SendAsync(verb, content, completionOption, cancellationToken);
 		}
@@ -133,6 +136,7 @@ public static Task<IFlurlResponse> PostAsync(this IFlurlRequest request, HttpCon
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> PostJsonAsync(this IFlurlRequest request, object body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedJsonContent(request.Settings.JsonSerializer.Serialize(body));
 			return request.SendAsync(HttpMethod.Post, content, completionOption, cancellationToken);
 		}
@@ -146,6 +150,7 @@ public static Task<IFlurlResponse> PostJsonAsync(this IFlurlRequest request, obj
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> PostStringAsync(this IFlurlRequest request, string body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedStringContent(body);
 			return request.SendAsync(HttpMethod.Post, content, completionOption, cancellationToken);
 		}
@@ -159,6 +164,7 @@ public static Task<IFlurlResponse> PostStringAsync(this IFlurlRequest request, s
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> PostUrlEncodedAsync(this IFlurlRequest request, object body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedUrlEncodedContent(request.Settings.UrlEncodedSerializer.Serialize(body));
 			return request.SendAsync(HttpMethod.Post, content, completionOption, cancellationToken);
 		}
@@ -195,6 +201,7 @@ public static Task<IFlurlResponse> PutAsync(this IFlurlRequest request, HttpCont
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> PutJsonAsync(this IFlurlRequest request, object body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedJsonContent(request.Settings.JsonSerializer.Serialize(body));
 			return request.SendAsync(HttpMethod.Put, content, completionOption, cancellationToken);
 		}
@@ -208,6 +215,7 @@ public static Task<IFlurlResponse> PutJsonAsync(this IFlurlRequest request, obje
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> PutStringAsync(this IFlurlRequest request, string body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedStringContent(body);
 			return request.SendAsync(HttpMethod.Put, content, completionOption, cancellationToken);
 		}
@@ -244,6 +252,7 @@ public static Task<IFlurlResponse> PatchAsync(this IFlurlRequest request, HttpCo
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> PatchJsonAsync(this IFlurlRequest request, object body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedJsonContent(request.Settings.JsonSerializer.Serialize(body));
 			return request.SendAsync(new HttpMethod("PATCH"), content, completionOption, cancellationToken);
 		}
@@ -257,6 +266,7 @@ public static Task<IFlurlResponse> PatchJsonAsync(this IFlurlRequest request, ob
 		/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
 		/// <returns>A Task whose result is the received IFlurlResponse.</returns>
 		public static Task<IFlurlResponse> PatchStringAsync(this IFlurlRequest request, string body, HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead, CancellationToken cancellationToken = default) {
+			request.EnsureClient();
 			var content = new CapturedStringContent(body);
 			return request.SendAsync(new HttpMethod("PATCH"), content, completionOption, cancellationToken);
 		}

src/Flurl/Flurl.csproj

@@ -6,7 +6,7 @@
     <Version>4.0.0</Version>
     <Authors>Todd Menier</Authors>
     <Description>A fluent, portable URL builder. To make HTTP calls off the fluent chain, check out Flurl.Http.</Description>
-    <Copyright>Copyright (c) Todd Menier 2023.</Copyright>
+    <Copyright>Copyright (c) Todd Menier 2024.</Copyright>
     <PackageProjectUrl>https://flurl.dev</PackageProjectUrl>
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>https://github.com/tmenier/Flurl.git</RepositoryUrl>

test/Flurl.Test/Http/HttpTestFixtureBase.cs

@@ -12,14 +12,12 @@ public abstract class HttpTestFixtureBase
 
 		[SetUp]
 		public void SetUp() {
-			HttpTest = CreateHttpTest();
+			HttpTest = new HttpTest();
 		}
 
 		[TearDown]
 		public void TearTown() {
 			HttpTest.Dispose();
 		}
-
-		protected virtual HttpTest CreateHttpTest() => new HttpTest();
 	}
 }