Added ability to pass custom IFlurlClientFactory instance

src/Flurl.CodeGen/CodeWriter.cs

@@ -18,7 +18,7 @@ public CodeWriter(string filePath)
         }
 
         /// <summary>
-        /// use @0, @1, @2, etc for tokens. ({0} would be a pain because you'd alway need to escape "{" and "}")
+        /// use @0, @1, @2, etc. for tokens. ({0} would be a pain because you'd always need to escape "{" and "}")
         /// </summary>
         public CodeWriter WriteLine(string line, params object[] args)
         {
@@ -30,7 +30,7 @@ public CodeWriter WriteLine(string line, params object[] args)
                 line = line.Replace("@" + i, val);
             }
 
-            if (line == "}" || line == "{")
+            if (line is "}" or "{")
             {
                 _indent--;
             }

src/Flurl.CodeGen/HttpExtensionMethod.cs

@@ -40,7 +40,7 @@ public HttpExtensionMethod(string verb, bool isGeneric, string reqBodyType, stri
 			" an asynchronous ",
 			(HttpVerb == null) ? "request." : $"{HttpVerb.ToUpperInvariant()} request.");
 
-		public bool HasRequestBody => (HttpVerb == "Post" || HttpVerb == "Put" || HttpVerb == "Patch" || HttpVerb == null);
+		public bool HasRequestBody => HttpVerb is "Post" or "Put" or "Patch" or null;
 
 		public string HttpVerb { get; }
 		public string RequestBodyType { get; }

src/Flurl.CodeGen/Metadata.cs

@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Flurl.CodeGen
 {

src/Flurl.Http.Newtonsoft/ExtensionMethods.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Dynamic;
 using System.Threading.Tasks;
 using Flurl.Http.Configuration;

src/Flurl.Http/Configuration/FlurlClientBuilder.cs

@@ -1,9 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using System.Runtime.Versioning;
 using Flurl.Util;
+#if NET
+using System.Runtime.Versioning;
+#endif
 
 namespace Flurl.Http.Configuration
 {
@@ -42,6 +44,11 @@ public interface IFlurlClientBuilder : ISettingsContainer, IHeadersContainer, IE
 		/// Builds an instance of IFlurlClient based on configurations specified.
 		/// </summary>
 		IFlurlClient Build();
+
+		/// <summary>
+		/// Configure factory
+		/// </summary>
+		void WithFactory(Func<IFlurlClientFactory> create);
 	}
 
 	/// <summary>
@@ -72,6 +79,9 @@ public FlurlClientBuilder(string baseUrl = null) {
 			_baseUrl = baseUrl;
 		}
 
+		/// <inheritdoc />
+		public void WithFactory(Func<IFlurlClientFactory> create) => _factory = create();
+
 		/// <inheritdoc />
 		public IFlurlClientBuilder AddMiddleware(Func<DelegatingHandler> create) {
 			_addMiddleware.Add(create);
@@ -103,7 +113,7 @@ public IFlurlClientBuilder UseSocketsHttpHandler(Action<SocketsHttpHandler> conf
 			if (_factory is DefaultFlurlClientFactory && _handlerConfigs.Any())
 				throw new FlurlConfigurationException("ConfigureInnerHandler and UseSocketsHttpHandler cannot be used together. The former configures and instance of HttpClientHandler and would be ignored when switching to SocketsHttpHandler.");
 
-			if (!(_factory is SocketsHandlerFlurlClientFactory))
+			if (_factory is not SocketsHandlerFlurlClientFactory)
 				_factory = new SocketsHandlerFlurlClientFactory();
 
 			_handlerConfigs.Add(h => configure(h as SocketsHttpHandler));

src/Flurl.Http/Configuration/ISerializer.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using System.IO;
 
 namespace Flurl.Http.Configuration
 {

src/Flurl.Http/Configuration/RedirectSettings.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Flurl.Http.Configuration
+namespace Flurl.Http.Configuration
 {
 	/// <summary>
 	/// A set of properties that affect Flurl.Http behavior specific to auto-redirecting.

src/Flurl.Http/Content/CapturedJsonContent.cs

@@ -1,6 +1,4 @@
-using System.Text;
-
-namespace Flurl.Http.Content
+namespace Flurl.Http.Content
 {
 	/// <summary>
 	/// Provides HTTP content based on a serialized JSON object, with the JSON string captured to a property

src/Flurl.Http/Content/CapturedStringContent.cs

@@ -1,6 +1,4 @@
 using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
 
 namespace Flurl.Http.Content
 {

src/Flurl.Http/FlurlClient.cs

@@ -253,7 +253,7 @@ private async Task<IFlurlResponse> ProcessRedirectAsync(FlurlCall call, HttpComp
 
 		// partially lifted from https://github.com/dotnet/runtime/blob/master/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/RedirectHandler.cs
 		private static FlurlRedirect GetRedirect(FlurlCall call) {
-			if (call.Response.StatusCode < 300 || call.Response.StatusCode > 399)
+			if (call.Response.StatusCode is < 300 or > 399)
 				return null;
 
 			if (!call.Response.Headers.TryGetFirst("Location", out var location))

src/Flurl.Http/FlurlEventHandler.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Flurl.Http

src/Flurl.Http/FlurlRequest.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
@@ -184,7 +183,7 @@ private void ApplyCookieJar(CookieJar jar) {
 
 			this.WithCookies(
 				from c in CookieJar
-				where c.ShouldSendTo(this.Url, out _)
+				where c.ShouldSendTo(Url, out _)
 				// sort by longest path, then earliest creation time, per #2: https://tools.ietf.org/html/rfc6265#section-5.4
 				orderby (c.Path ?? c.OriginUrl.Path).Length descending, c.DateReceived
 				select (c.Name, c.Value));

src/Flurl.Http/GeneratedExtensions.cs

@@ -1,7 +1,6 @@
 // This file was auto-generated by Flurl.CodeGen. Do not edit directly.
 using System;
 using System.IO;
-using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

src/Flurl.Http/HttpMessageExtensions.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Net.Http;
+using System.Net.Http;
 using System.Net.Http.Headers;
 using Flurl.Http.Content;
 using Flurl.Util;

src/Flurl.Http/IHeadersContainer.cs

@@ -48,7 +48,7 @@ public static T WithHeaders<T>(this T obj, object headers, bool replaceUnderscor
 			    return obj;
 
 			// underscore replacement only applies when object properties are parsed to kv pairs
-		    replaceUnderscoreWithHyphen = replaceUnderscoreWithHyphen && !(headers is string) && !(headers is IEnumerable);
+		    replaceUnderscoreWithHyphen = replaceUnderscoreWithHyphen && headers is not string && headers is not IEnumerable;
 
 		    foreach (var kv in headers.ToKeyValuePairs()) {
 			    var key = replaceUnderscoreWithHyphen ? kv.Key.Replace("_", "-") : kv.Key;

src/Flurl.Http/ISettingsContainer.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Linq;
-using System.Net;
 using Flurl.Http.Configuration;
 
 namespace Flurl.Http

src/Flurl.Http/Testing/Util.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections;
 using System.Linq;
 using System.Net.Http;
 using System.Text.RegularExpressions;
@@ -39,7 +37,7 @@ internal static bool HasQueryParam(this FlurlCall call, string name, object valu
 
 			if (!paramVals.Any())
 				return false;
-			if (!(value is string) && value is IEnumerable en) {
+			if (value is not string && value is IEnumerable en) {
 				var values = en.Cast<object>().Select(o => o.ToInvariantString()).ToList();
 				return values.Intersect(paramVals).Count() == values.Count;
 			}

src/Flurl/NullValueHandling.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Flurl
+namespace Flurl
 {
 	/// <summary>
 	/// Describes how to handle null values in query parameters.

src/Flurl/Url.cs

@@ -633,12 +633,12 @@ public string ToString(bool encodeSpaceAsPlus) {
 		/// </summary>
 		/// <param name="obj">The object to compare to this instance.</param>
 		/// <returns></returns>
-		public override bool Equals(object obj) => obj is Url url && this.ToString().OrdinalEquals(url.ToString());
+		public override bool Equals(object obj) => obj is Url url && ToString().OrdinalEquals(url.ToString());
 
 		/// <summary>
 		/// Returns the hashcode for this Url.
 		/// </summary>
-		public override int GetHashCode() => this.ToString().GetHashCode();
+		public override int GetHashCode() => ToString().GetHashCode();
 		#endregion
 
 		#region static utility methods

src/Flurl/Util/NameValueList.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Flurl.Util
@@ -96,11 +95,11 @@ public NameValueList(IEnumerable<(string Name, TValue Value)> items, bool caseSe
 		public void AddOrReplace(string name, TValue value) {
 			var i = 0;
 			var replaced = false;
-			while (i < this.Count) {
+			while (i < Count) {
 				if (!this[i].Name.OrdinalEquals(name, !_caseSensitiveNames))
 					i++;
 				else if (replaced)
-					this.RemoveAt(i);
+					RemoveAt(i);
 				else {
 					this[i] = (name, value);
 					replaced = true;
@@ -109,7 +108,7 @@ public void AddOrReplace(string name, TValue value) {
 			}
 
 			if (!replaced)
-				this.Add(name, value);
+				Add(name, value);
 		}
 
 		/// <inheritdoc />