fix: moves the http client for the reader to settings so it can be passed by client application

Signed-off-by: Vincent Biret <[email protected]>

Author: baywet

src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs

@@ -4,7 +4,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Security;
 using System.Text;
 using System.Threading;
@@ -21,8 +20,6 @@ namespace Microsoft.OpenApi.Reader
     /// </summary>
     public static class OpenApiModelFactory
     {
-        private static readonly HttpClient _httpClient = new();
-
         /// <summary>
         /// Loads the input stream and parses it into an Open API document.
         /// </summary>
@@ -81,7 +78,8 @@ public static T Load<T>(MemoryStream input, OpenApiSpecVersion version, string f
         /// <returns></returns>
         public static async Task<ReadResult> LoadAsync(string url, OpenApiReaderSettings settings = null, CancellationToken token = default)
         {
-            var (stream, format) = await RetrieveStreamAndFormatAsync(url, token).ConfigureAwait(false);
+            settings ??= DefaultReaderSettings.Value;
+            var (stream, format) = await RetrieveStreamAndFormatAsync(url, settings, token).ConfigureAwait(false);
             return await LoadAsync(stream, format, settings, token).ConfigureAwait(false);
         }
 
@@ -98,7 +96,8 @@ public static async Task<ReadResult> LoadAsync(string url, OpenApiReaderSettings
         /// <returns>The OpenAPI element.</returns>
         public static async Task<T> LoadAsync<T>(string url, OpenApiSpecVersion version, OpenApiDocument openApiDocument, OpenApiReaderSettings settings = null, CancellationToken token = default) where T : IOpenApiElement
         {
-            var (stream, format) = await RetrieveStreamAndFormatAsync(url, token).ConfigureAwait(false);
+            settings ??= DefaultReaderSettings.Value;
+            var (stream, format) = await RetrieveStreamAndFormatAsync(url, settings, token).ConfigureAwait(false);
             return await LoadAsync<T>(stream, version, openApiDocument, format, settings, token);
         }
 
@@ -286,7 +285,7 @@ private static ReadResult InternalLoad(MemoryStream input, string format, OpenAp
             return readResult;
         }
 
-        private static async Task<(Stream, string)> RetrieveStreamAndFormatAsync(string url, CancellationToken token = default)
+        private static async Task<(Stream, string)> RetrieveStreamAndFormatAsync(string url, OpenApiReaderSettings settings, CancellationToken token = default)
         {
             if (!string.IsNullOrEmpty(url))
             {
@@ -296,7 +295,7 @@ private static ReadResult InternalLoad(MemoryStream input, string format, OpenAp
                 if (url.StartsWith("http", StringComparison.OrdinalIgnoreCase)
                     || url.StartsWith("https", StringComparison.OrdinalIgnoreCase))
                 {
-                    var response = await _httpClient.GetAsync(url, token).ConfigureAwait(false);
+                    var response = await settings.HttpClient.GetAsync(url, token).ConfigureAwait(false);
                     var mediaType = response.Content.Headers.ContentType.MediaType;
                     var contentType = mediaType.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)[0];
                     format = contentType.Split('/').Last().Split('+').Last().Split('-').Last();

src/Microsoft.OpenApi/Reader/OpenApiReaderSettings.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.MicrosoftExtensions;
@@ -17,6 +18,23 @@ namespace Microsoft.OpenApi.Reader
     /// </summary>
     public class OpenApiReaderSettings
     {
+        private static readonly Lazy<HttpClient> httpClient = new(() => new HttpClient());
+        private HttpClient _httpClient;
+        /// <summary>
+        /// HttpClient to use for making requests and retrieve documents
+        /// </summary>
+        public HttpClient HttpClient
+        { 
+            get
+            {
+                _httpClient ??= httpClient.Value;
+                return _httpClient;
+            }
+            init
+            {
+                _httpClient = value;
+            }
+        }
         /// <summary>
         /// Adds a reader for the specified format
         /// </summary>

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt

@@ -1497,6 +1497,7 @@ namespace Microsoft.OpenApi.Reader
         public Microsoft.OpenApi.Interfaces.IStreamLoader CustomExternalLoader { get; set; }
         public System.Collections.Generic.List<string> DefaultContentType { get; set; }
         public System.Collections.Generic.Dictionary<string, System.Func<System.Text.Json.Nodes.JsonNode, Microsoft.OpenApi.OpenApiSpecVersion, Microsoft.OpenApi.Interfaces.IOpenApiExtension>> ExtensionParsers { get; set; }
+        public System.Net.Http.HttpClient HttpClient { get; init; }
         public bool LeaveStreamOpen { get; set; }
         public bool LoadExternalRefs { get; set; }
         public System.Collections.Generic.Dictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiReader> Readers { get; init; }