Cleanup http handler.

Author: byme8

src/ZeroQL.Runtime/GraphQLClient.cs

@@ -12,7 +12,7 @@ namespace ZeroQL;
 
 public interface IGraphQLClient
 {
-    HttpHandler HttpClient { get; }
+    IHttpHandler HttpHandler { get; }
 
     IGraphQLQueryPipeline QueryPipeline { get; }
 
@@ -23,48 +23,23 @@ Task<GraphQLResult<TResult>> Execute<TVariables, TOperationType, TResult>(
         CancellationToken cancellationToken = default);
 }
 
-public interface HttpHandler : IDisposable
-{
-    public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken);
-}
-
-public class HttpClientHandler : HttpHandler
-{
-    private HttpClient _client;
-
-    public HttpClientHandler(HttpClient client)
-    {
-        _client = client;
-    }
-
-    public void Dispose()
-    {
-        _client.Dispose();
-    }
-
-    public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-    {
-        return _client.SendAsync(request, cancellationToken);
-    }
-}
-
 public class ClientOperations
 {
     public ClientOperations(
         Dictionary<string, QueryInfo>? queries,
         Dictionary<string, QueryInfo>? mutations)
     {
-        this.Queries = queries;
-        this.Mutations = mutations;
+        Queries = queries;
+        Mutations = mutations;
     }
 
     public Dictionary<string, QueryInfo>? Queries { get; }
     public Dictionary<string, QueryInfo>? Mutations { get; }
 
     public void Deconstruct(out Dictionary<string, QueryInfo>? queries, out Dictionary<string, QueryInfo>? mutations)
     {
-        queries = this.Queries;
-        mutations = this.Mutations;
+        queries = Queries;
+        mutations = Mutations;
     }
 }
 
@@ -77,17 +52,17 @@ public static ClientOperations GetBakedOperations()
 
     public GraphQLClient(HttpClient httpClient, IGraphQLQueryPipeline? queryPipeline = null)
     {
-        HttpClient = new HttpClientHandler(httpClient);
+        HttpHandler = new HttpHandler(httpClient);
         QueryPipeline = queryPipeline ?? new FullQueryPipeline();
     }
-    
-    public GraphQLClient(HttpHandler httpClient, IGraphQLQueryPipeline? queryPipeline = null)
+
+    public GraphQLClient(IHttpHandler httpClient, IGraphQLQueryPipeline? queryPipeline = null)
     {
-        HttpClient = httpClient;
+        HttpHandler = httpClient;
         QueryPipeline = queryPipeline ?? new FullQueryPipeline();
     }
 
-    public HttpHandler HttpClient { get; }
+    public IHttpHandler HttpHandler { get; }
 
     public IGraphQLQueryPipeline QueryPipeline { get; }
 
@@ -122,6 +97,6 @@ public async Task<GraphQLResult<TResult>> Execute<TVariables, TOperationType, TR
 
     public void Dispose()
     {
-        HttpClient.Dispose();
+        HttpHandler.Dispose();
     }
 }

src/ZeroQL.Runtime/HttpHandler.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace ZeroQL;
+
+public interface IHttpHandler : IDisposable
+{
+    public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken);
+}
+
+public class HttpHandler : IHttpHandler
+{
+    private readonly HttpClient client;
+    private readonly bool disposeClient;
+    
+    public HttpHandler(HttpClient client, bool disposeClient = false)
+    {
+        this.client = client;
+        this.disposeClient = disposeClient;
+    }
+
+    public void Dispose()
+    {
+        if (disposeClient)
+        {
+            client.Dispose();
+        }
+    }
+
+    public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        return client.SendAsync(request, cancellationToken);
+    }
+}

src/ZeroQL.Runtime/Pipelines/FullQueryPipeline.cs

@@ -11,7 +11,7 @@ namespace ZeroQL.Pipelines;
 
 public class FullQueryPipeline : IGraphQLQueryPipeline
 {
-    public async Task<GraphQLResponse<TQuery>> ExecuteAsync<TQuery>(HttpHandler httpClient, string queryKey,
+    public async Task<GraphQLResponse<TQuery>> ExecuteAsync<TQuery>(IHttpHandler httpHandler, string queryKey,
         object? variables, CancellationToken cancellationToken, Func<GraphQLRequest, HttpContent> contentCreator)
     {
         var queryInfo = GraphQLQueryStore<TQuery>.Query[queryKey];
@@ -25,7 +25,7 @@ public async Task<GraphQLResponse<TQuery>> ExecuteAsync<TQuery>(HttpHandler http
         var content = contentCreator(qlRequest);
         var request = new HttpRequestMessage(HttpMethod.Post, new Uri("", UriKind.Relative));
         request.Content = content;
-        var response = await httpClient.SendAsync(request, cancellationToken);
+        var response = await httpHandler.SendAsync(request, cancellationToken);
 #if DEBUG && !NETSTANDARD
         var responseJson = await response.Content.ReadAsStringAsync(cancellationToken);
         var qlResponse =

src/ZeroQL.Runtime/Pipelines/IGraphQLQueryPipeline.cs

@@ -8,5 +8,5 @@ namespace ZeroQL.Pipelines;
 
 public interface IGraphQLQueryPipeline
 {
-    Task<GraphQLResponse<TQuery>> ExecuteAsync<TQuery>(HttpHandler httpClient, string queryKey, object? variables, CancellationToken cancellationToken, Func<GraphQLRequest, HttpContent> contentCreator);
+    Task<GraphQLResponse<TQuery>> ExecuteAsync<TQuery>(IHttpHandler httpHandler, string queryKey, object? variables, CancellationToken cancellationToken, Func<GraphQLRequest, HttpContent> contentCreator);
 }

src/ZeroQL.Runtime/Pipelines/PersistedQueryPipeline.cs

@@ -19,7 +19,7 @@ public PersistedQueryPipeline(bool tryToAddPersistedQueryOnFail = true)
 
     public bool TryToAddPersistedQueryOnFail { get; }
 
-    public async Task<GraphQLResponse<TQuery>> ExecuteAsync<TQuery>(HttpHandler httpClient, string queryKey, object? variables, CancellationToken cancellationToken, Func<GraphQLRequest, HttpContent> contentCreator)
+    public async Task<GraphQLResponse<TQuery>> ExecuteAsync<TQuery>(IHttpHandler httpHandler, string queryKey, object? variables, CancellationToken cancellationToken, Func<GraphQLRequest, HttpContent> contentCreator)
     {
         var queryInfo = GraphQLQueryStore<TQuery>.Query[queryKey];
         var qlRequest = new GraphQLRequest
@@ -38,7 +38,7 @@ public async Task<GraphQLResponse<TQuery>> ExecuteAsync<TQuery>(HttpHandler http
         var content = contentCreator(qlRequest);
         var request = new HttpRequestMessage(HttpMethod.Post, new Uri("", UriKind.Relative));
         request.Content = content;
-        var response = await httpClient.SendAsync(request, cancellationToken);
+        var response = await httpHandler.SendAsync(request, cancellationToken);
         var qlResponse = await ReadResponse<TQuery>(response);
 
         if (qlResponse.Errors is null)
@@ -60,7 +60,7 @@ public async Task<GraphQLResponse<TQuery>> ExecuteAsync<TQuery>(HttpHandler http
         content = contentCreator(qlRequest);
         request = new HttpRequestMessage(HttpMethod.Post, new Uri("", UriKind.Relative));
         request.Content = content;
-        response = await httpClient.SendAsync(request, cancellationToken);
+        response = await httpHandler.SendAsync(request, cancellationToken);
         qlResponse = await ReadResponse<TQuery>(response);
 
         return qlResponse with { Query = FormatPersistedQuery(queryInfo) };

src/ZeroQL.SourceGenerators/Resolver/GraphQLSourceResolver.cs

@@ -51,7 +51,7 @@ public static void Init()
         {{
             var qlClient = context.Client; 
             var variables = ({context.RequestExecutorInputSymbol.ToGlobalName()})context.Variables!;
-            var qlResponse = await qlClient.QueryPipeline.ExecuteAsync<{context.QueryTypeName}>(qlClient.HttpClient, context.QueryKey, context.Variables, context.CancellationToken, queryRequest => 
+            var qlResponse = await qlClient.QueryPipeline.ExecuteAsync<{context.QueryTypeName}>(qlClient.HttpHandler, context.QueryKey, context.Variables, context.CancellationToken, queryRequest => 
             {{
                 {GraphQLUploadResolver.GenerateRequestPreparations(inputTypeName, context.ExecutionStrategy, typeInfo)}
                 return content;

src/ZeroQL.Tests/SourceGeneration/FileUploadTests.UploadFileGenerates.verified.txt

@@ -37,7 +37,7 @@ namespace ZeroQL.TestApp
         {
             var qlClient = context.Client; 
             var variables = (object?)context.Variables!;
-            var qlResponse = await qlClient.QueryPipeline.ExecuteAsync<global::GraphQL.TestServer.Mutation>(qlClient.HttpClient, context.QueryKey, context.Variables, context.CancellationToken, queryRequest => 
+            var qlResponse = await qlClient.QueryPipeline.ExecuteAsync<global::GraphQL.TestServer.Mutation>(qlClient.HttpHandler, context.QueryKey, context.Variables, context.CancellationToken, queryRequest => 
             {
 
                 var context = new MultipartFormDataContentContext();

src/ZeroQL.Tests/SourceGeneration/QueryTests.LambdaModuleInitializerGenerated.verified.txt

@@ -1,4 +1,4 @@
-[  
+[  
 // This file generated for ZeroQL.
 // <auto-generated/>
 using System;
@@ -37,7 +37,7 @@ namespace ZeroQL.TestApp
         {
             var qlClient = context.Client; 
             var variables = (global::System.Collections.Generic.Dictionary<string, object>)context.Variables!;
-            var qlResponse = await qlClient.QueryPipeline.ExecuteAsync<global::GraphQL.TestServer.Query>(qlClient.HttpClient, context.QueryKey, context.Variables, context.CancellationToken, queryRequest => 
+            var qlResponse = await qlClient.QueryPipeline.ExecuteAsync<global::GraphQL.TestServer.Query>(qlClient.HttpHandler, context.QueryKey, context.Variables, context.CancellationToken, queryRequest => 
             {
 
                 var requestJson = JsonSerializer.Serialize(queryRequest, ZeroQLJsonOptions.Options);