Make sur default HttpClient is used as much as possible

Author: louis-z

NGitLab.Tests/Docker/GitLabTestContextRequestOptions.cs

@@ -120,7 +120,7 @@ private void LogRequest(HttpRequestMessage request, HttpResponseMessage response
 
         if (request.Content != null)
         {
-            byte[] requestContent = null;
+            byte[] requestContent;
             if (_requestContents.TryGetValue(request, out requestContent) || TryReadRequestContent(request, out requestContent))
             {
                 sb.AppendLine();
@@ -185,7 +185,7 @@ private async Task LogRequestAsync(HttpRequestMessage request, HttpResponseMessa
 
         if (request.Content != null)
         {
-            byte[] requestContent = null;
+            byte[] requestContent;
             if (_requestContents.TryGetValue(request, out requestContent) || TryReadRequestContent(request, out requestContent))
             {
                 sb.AppendLine();

NGitLab/Http/HttpClientManager.cs

@@ -11,7 +11,14 @@ namespace NGitLab.Http;
 /// </summary>
 internal static class HttpClientManager
 {
-    private static readonly Lazy<HttpClient> s_defaultClient = new(() => CreateHttpClient(null, null));
+    /// <summary>
+    /// Configure the default client-side timeout when calling GitLab.
+    /// Some GitLab endpoints are really slow, so use a much larger value
+    /// than .NET's 100-second default.
+    /// </summary>
+    private static readonly TimeSpan s_defaultHttpClientTimeout = TimeSpan.FromMinutes(5);
+
+    private static readonly Lazy<HttpClient> s_defaultClient = new(() => CreateHttpClient(proxy: null, timeout: null));
 
     /// <summary>
     /// Gets the singleton HttpClient instance for default scenarios.
@@ -31,18 +38,16 @@ public static HttpClient CreateHttpClient(IWebProxy proxy, TimeSpan? timeout)
             AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
         };
 
-        if (proxy != null)
+        if (proxy is not null)
         {
             handler.Proxy = proxy;
             handler.UseProxy = true;
         }
 
-        var client = new HttpClient(handler);
-
-        if (timeout.HasValue)
+        var client = new HttpClient(handler)
         {
-            client.Timeout = timeout.Value;
-        }
+            Timeout = timeout ?? s_defaultHttpClientTimeout,
+        };
 
         return client;
     }
@@ -55,13 +60,13 @@ public static HttpClient CreateHttpClient(IWebProxy proxy, TimeSpan? timeout)
     /// <returns>An HttpClient instance.</returns>
     public static HttpClient GetOrCreateHttpClient(RequestOptions options)
     {
-        if (options.HttpClientFactory != null)
+        if (options.HttpClientFactory is not null)
         {
             return options.HttpClientFactory(options);
         }
 
         // Use singleton if no custom proxy or timeout
-        if (options.Proxy == null && !options.HttpClientTimeout.HasValue)
+        if (options.Proxy is null && !options.HttpClientTimeout.HasValue)
         {
             return DefaultClient;
         }

NGitLab/RequestOptions.cs

@@ -24,11 +24,9 @@ public class RequestOptions
     public string Sudo { get; set; }
 
     /// <summary>
-    /// Configure the default client side timeout when calling GitLab.
-    /// GitLab exposes some end points which are really slow so
-    /// the default we use is larger than the default 100 seconds of .net
+    /// Overrides the default client-side timeout when calling GitLab.
     /// </summary>
-    public TimeSpan? HttpClientTimeout { get; set; } = TimeSpan.FromMinutes(5);
+    public TimeSpan? HttpClientTimeout { get; set; }
 
     public string UserAgent { get; set; }