refactor: simplify writing response headers

Author: Fresa

src/OpenAPI.WebApiGenerator/ApiGenerator.cs

@@ -88,7 +88,7 @@ private static void GenerateCode(SourceProductionContext context, (
             rootNamespace);
         httpRequestExtensionsGenerator.GenerateHttpRequestExtensionsClass().AddTo(context);
 
-        var httpResponseExtensionsGenerator = new HttpResponseExtensionsGenerator(openApiVersion, rootNamespace);
+        var httpResponseExtensionsGenerator = new HttpResponseExtensionsGenerator(rootNamespace);
         httpResponseExtensionsGenerator.GenerateHttpResponseExtensionsClass().AddTo(context);
 
         var apiConfigurationGenerator = new ApiConfigurationGenerator(rootNamespace);
@@ -189,7 +189,7 @@ private static void GenerateCode(SourceProductionContext context, (
                         var responseHeaderSchema = openApiResponseVisitor.GetSchemaReference(header);
                         var typeDeclaration = schemaGenerator.Generate(responseHeaderSchema);
                         return new ResponseHeaderGenerator(name, header, typeDeclaration,
-                            httpResponseExtensionsGenerator);
+                            openApiVersion);
                     }).ToList() ?? [];
 
                     return new ResponseContentGenerator(
@@ -200,8 +200,7 @@ private static void GenerateCode(SourceProductionContext context, (
 
                 var responseGenerator = new ResponseGenerator(
                     responseBodyGenerators, 
-                    httpResponseExtensionsGenerator,
-                    openApiVersion);
+                    httpResponseExtensionsGenerator);
                 var responseSourceCode =
                     responseGenerator.GenerateResponseClass(
                         operationNamespace,

src/OpenAPI.WebApiGenerator/CodeGeneration/HttpResponseExtensionsGenerator.cs

@@ -1,26 +1,12 @@
-using Microsoft.OpenApi;
-using OpenAPI.WebApiGenerator.OpenApi;
-
-namespace OpenAPI.WebApiGenerator.CodeGeneration;
+namespace OpenAPI.WebApiGenerator.CodeGeneration;
 
 internal sealed class HttpResponseExtensionsGenerator(
-    OpenApiSpecVersion openApiVersion,
     string @namespace)
 {
     private const string HttpResponseExtensionsClassName = "HttpResponseExtensions";
     public string Namespace => @namespace;
 
-    internal string GetResponseHeaderSpecificationAsJson(
-        IOpenApiHeader header, 
-        string name) =>
-        // Response header specification is a subset of the parameter specification, so we add the missing properties to be able to use the parameter value parser 
-        $$"""
-          {
-            "name": "{{name}}",
-            "in": "header",
-            {{header.Serialize(openApiVersion).ToString().TrimStart('{').TrimStart()}} 
-          """;
-
+    
     internal static string CreateWriteBodyInvocation(
         string responseVariableName, 
         string contentVariableName) =>

src/OpenAPI.WebApiGenerator/CodeGeneration/ResponseGenerator.cs

@@ -1,15 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi;
 using OpenAPI.WebApiGenerator.Extensions;
-using OpenAPI.WebApiGenerator.OpenApi;
 
 namespace OpenAPI.WebApiGenerator.CodeGeneration;
 
 internal sealed class ResponseGenerator(
     List<ResponseContentGenerator> responseBodyGenerators, 
-    HttpResponseExtensionsGenerator httpResponseExtensionsGenerator,
-    OpenApiSpecVersion openApiSpecVersion)
+    HttpResponseExtensionsGenerator httpResponseExtensionsGenerator)
 {
     public SourceCode GenerateResponseClass(string @namespace, string path)
     {
@@ -23,9 +20,7 @@ public SourceCode GenerateResponseClass(string @namespace, string path)
 namespace {{@namespace}};
 
 internal abstract partial class Response
-{
-    private const string OpenApiVersion = "{{openApiSpecVersion.GetParameterVersion()}}";
-{{Enumerable.Range(1, 5).AggregateToString(i => 
+{{{Enumerable.Range(1, 5).AggregateToString(i => 
 $$"""
     protected int Validate{{i}}xxStatusCode(int code) 
         => (code >= {{i}}00 && code <= {{i}}99) ? code : throw new InvalidOperationException($"Expected {{i}}xx status code, got {code}");

src/OpenAPI.WebApiGenerator/CodeGeneration/ResponseHeaderGenerator.cs

@@ -2,14 +2,15 @@
 using Corvus.Json.CodeGeneration.CSharp;
 using Microsoft.OpenApi;
 using OpenAPI.WebApiGenerator.Extensions;
+using OpenAPI.WebApiGenerator.OpenApi;
 
 namespace OpenAPI.WebApiGenerator.CodeGeneration;
 
 internal sealed class ResponseHeaderGenerator(
     string name, 
     IOpenApiHeader header, 
     TypeDeclaration typeDeclaration, 
-    HttpResponseExtensionsGenerator httpResponseExtensionsGenerator)
+    OpenApiSpecVersion openApiSpecVersion)
 {
     private readonly string _propertyName = name.ToPascalCase();
     private readonly string _requiredDirective = header.Required ? "required" : string.Empty;
@@ -27,11 +28,19 @@ internal string GenerateProperty() =>
 
     internal string GenerateWriteDirective(string responseVariableName)
     {
-        var headerSpecificationAsJson = httpResponseExtensionsGenerator.GetResponseHeaderSpecificationAsJson(header, name);
+        // Response header specification is a subset of the parameter specification, so we add the missing properties to be able to use the parameter value parser 
+        var headerSpecificationAsJson = 
+            $$"""
+              {
+                "name": "{{name}}",
+                "in": "header",
+                {{header.Serialize(openApiSpecVersion).ToString().TrimStart('{').TrimStart()}} 
+              """;
+
         return
             $""""
              {responseVariableName}.WriteResponseHeader(
-                 OpenApiVersion,
+                 "{openApiSpecVersion.GetParameterVersion()}",
                  """
                  {headerSpecificationAsJson.Indent(4).TrimStart()}
                  """,