Fix QueryResult creation in QueryCacheMiddleware

src/HotChocolate/AspNetCore/src/AspNetCore/Serialization/DefaultHttpResponseFormatter.cs

@@ -4,6 +4,7 @@
 using System.Text.Json;
 using HotChocolate.Execution.Serialization;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Net.Http.Headers;
 #if !NET6_0_OR_GREATER
 using Microsoft.Net.Http.Headers;
 #endif
@@ -168,10 +169,10 @@ public DefaultHttpResponseFormatter(HttpResponseFormatterOptions options)
             response.StatusCode = statusCode;
 
             if (result.ContextData is not null &&
-                result.ContextData.TryGetValue(CacheControlHeaderValue, out var value) &&
-                value is string cacheControlHeaderValue)
+                result.ContextData.TryGetValue(WellKnownContextData.CacheControlHeaderValue, out var value) &&
+                value is CacheControlHeaderValue cacheControlHeaderValue)
             {
-                response.Headers.CacheControl = cacheControlHeaderValue;
+                response.GetTypedHeaders().CacheControl = cacheControlHeaderValue;
             }
 
             OnWriteResponseHeaders(queryResult, format, response.Headers);

src/HotChocolate/Caching/src/Caching/CacheControlConstraintsOptimizer.cs

@@ -1,9 +1,11 @@
+using System;
 using System.Runtime.CompilerServices;
 using HotChocolate.Execution.Processing;
 using HotChocolate.Language;
 using HotChocolate.Types;
 using HotChocolate.Types.Introspection;
 using HotChocolate.Utilities;
+using Microsoft.Net.Http.Headers;
 using IHasDirectives = HotChocolate.Types.IHasDirectives;
 
 namespace HotChocolate.Caching;
@@ -13,10 +15,6 @@ namespace HotChocolate.Caching;
 /// </summary>
 internal sealed class CacheControlConstraintsOptimizer : IOperationOptimizer
 {
-    private const string _cacheControlValueTemplate = "{0}, max-age={1}";
-    private const string _cacheControlPrivateScope = "private";
-    private const string _cacheControlPublicScope = "public";
-
     public void OptimizeOperation(OperationOptimizerContext context)
     {
         if (context.Definition.Operation is not OperationType.Query ||
@@ -31,18 +29,12 @@ public void OptimizeOperation(OperationOptimizerContext context)
 
         if (constraints.MaxAge is not null)
         {
-            var cacheType = constraints.Scope switch
+            var headerValue = new CacheControlHeaderValue
             {
-                CacheControlScope.Private => _cacheControlPrivateScope,
-                CacheControlScope.Public => _cacheControlPublicScope,
-                _ => throw ThrowHelper.UnexpectedCacheControlScopeValue(constraints.Scope),
+                Private = constraints.Scope == CacheControlScope.Private,
+                MaxAge = TimeSpan.FromSeconds(constraints.MaxAge.Value),
             };
 
-            var headerValue = string.Format(
-                _cacheControlValueTemplate,
-                cacheType,
-                constraints.MaxAge);
-
             context.ContextData.Add(
                 WellKnownContextData.CacheControlConstraints,
                 new ImmutableCacheConstraints(

src/HotChocolate/Caching/src/Caching/HotChocolate.Caching.csproj

@@ -37,4 +37,12 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.0" />
+  </ItemGroup>
+
 </Project>

src/HotChocolate/Caching/src/Caching/QueryCacheMiddleware.cs

@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using HotChocolate.Execution;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
 using static HotChocolate.WellKnownContextData;
 
 namespace HotChocolate.Caching;
@@ -9,7 +10,7 @@ internal sealed class QueryCacheMiddleware
 {
     private readonly ICacheControlOptions _options;
     private readonly RequestDelegate _next;
-    
+
     private QueryCacheMiddleware(
         RequestDelegate next,
         [SchemaService] ICacheControlOptionsAccessor optionsAccessor)
@@ -30,8 +31,8 @@ public async ValueTask InvokeAsync(IRequestContext context)
         }
 
         if (context.Operation?.ContextData is null ||
-            !context.Operation.ContextData.TryGetValue(CacheControlHeaderValue, out var value) ||
-            value is not string cacheControlHeaderValue)
+            !context.Operation.ContextData.TryGetValue(WellKnownContextData.CacheControlHeaderValue, out var value) ||
+            value is not CacheControlHeaderValue cacheControlHeaderValue)
         {
             return;
         }
@@ -45,18 +46,21 @@ public async ValueTask InvokeAsync(IRequestContext context)
                     ? new ExtensionData(queryResult.ContextData)
                     : new ExtensionData();
 
-            contextData.Add(CacheControlHeaderValue, cacheControlHeaderValue);
+            contextData.Add(WellKnownContextData.CacheControlHeaderValue, cacheControlHeaderValue);
 
             context.Result = new QueryResult(
-                queryResult.Data,
-                queryResult.Errors,
-                queryResult.Extensions,
-                contextData,
-                queryResult.Items,
-                queryResult.Incremental,
-                queryResult.Label,
-                queryResult.Path,
-                queryResult.HasNext);
+                data: queryResult.Data,
+                errors: queryResult.Errors,
+                extension: queryResult.Extensions,
+                contextData: contextData,
+                items: queryResult.Items,
+                incremental: queryResult.Incremental,
+                label: queryResult.Label,
+                path: queryResult.Path,
+                hasNext: queryResult.HasNext,
+                // TODO: This is probably problematic
+                cleanupTasks: [],
+                isDataSet: queryResult.IsDataSet);
         }
     }
 
@@ -67,4 +71,4 @@ internal static RequestCoreMiddleware Create()
             var middleware = new QueryCacheMiddleware(next, options);
             return context => middleware.InvokeAsync(context);
         };
-}
+}

src/HotChocolate/Caching/test/Caching.Tests/__snapshots__/HttpCachingTests.MaxAgeAndScope_Should_Cache.snap

@@ -15,5 +15,5 @@
       ]
     }
   ],
-  "Body": "{}"
+  "Body": "{\"data\":{\"field\":\"\"}}"
 }

src/HotChocolate/Caching/test/Caching.Tests/__snapshots__/HttpCachingTests.MaxAge_NonZero_Should_Cache.snap

@@ -3,7 +3,7 @@
     {
       "Key": "Cache-Control",
       "Value": [
-        "public, max-age=2000"
+        "max-age=2000"
       ]
     }
   ],
@@ -15,5 +15,5 @@
       ]
     }
   ],
-  "Body": "{}"
+  "Body": "{\"data\":{\"field\":\"\"}}"
 }

src/HotChocolate/Caching/test/Caching.Tests/__snapshots__/HttpCachingTests.MaxAge_Zero_Should_Cache.snap

@@ -3,7 +3,7 @@
     {
       "Key": "Cache-Control",
       "Value": [
-        "public, max-age=0"
+        "max-age=0"
       ]
     }
   ],
@@ -15,5 +15,5 @@
       ]
     }
   ],
-  "Body": "{}"
+  "Body": "{\"data\":{\"field\":\"\"}}"
 }

src/HotChocolate/Core/src/Abstractions/HotChocolate.Abstractions.csproj

@@ -15,6 +15,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="HotChocolate.Caching" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />