Merge pull request #1136 from christianhelle/feat/parameter-extraction-consolidation

Consolidate parameter extraction - Remove IParameterTypeExtractor

Author: christianhelle

src/Refitter.Core/BodyParameterExtractor.cs

@@ -5,9 +5,6 @@ namespace Refitter.Core;
 
 internal class BodyParameterExtractor : IParameterTypeExtractor
 {
-    public bool CanExtract(OpenApiParameterKind kind) =>
-        kind == OpenApiParameterKind.Body;
-
     public IEnumerable<string> Extract(
         CSharpOperationModel operationModel,
         OpenApiOperation operation,

src/Refitter.Core/FormParameterExtractor.cs

@@ -6,9 +6,6 @@ namespace Refitter.Core;
 
 internal class FormParameterExtractor : IParameterTypeExtractor
 {
-    public bool CanExtract(OpenApiParameterKind kind) =>
-        kind == OpenApiParameterKind.FormData;
-
     public IEnumerable<string> Extract(
         CSharpOperationModel operationModel,
         OpenApiOperation operation,

src/Refitter.Core/HeaderParameterExtractor.cs

@@ -5,9 +5,6 @@ namespace Refitter.Core;
 
 internal class HeaderParameterExtractor : IParameterTypeExtractor
 {
-    public bool CanExtract(OpenApiParameterKind kind) =>
-        kind == OpenApiParameterKind.Header;
-
     public IEnumerable<string> Extract(
         CSharpOperationModel operationModel,
         OpenApiOperation operation,

src/Refitter.Core/IParameterTypeExtractor.cs

@@ -5,7 +5,6 @@ namespace Refitter.Core;
 
 internal interface IParameterTypeExtractor
 {
-    bool CanExtract(OpenApiParameterKind kind);
     IEnumerable<string> Extract(
         CSharpOperationModel operationModel,
         OpenApiOperation operation,

src/Refitter.Core/ParameterAggregator.cs

@@ -30,16 +30,10 @@ public IEnumerable<string> ExtractParameters(
         allParameters.AddRange(GetExtractor<RouteParameterExtractor>().Extract(operationModel, operation, settings));
 
         // Query parameters (with dynamic querystring support)
-        var queryParameters = operationModel.Parameters
-            .Where(p => p.Kind == OpenApiParameterKind.Query)
-            .ToList();
-
-        allParameters.AddRange(ExtractQueryParameters(
-            operationModel,
-            settings,
-            dynamicQuerystringParameterType,
-            queryParameters,
-            out dynamicQuerystringParameters));
+        var queryExtractor = GetExtractor<QueryParameterExtractor>();
+        queryExtractor.DynamicQuerystringParameterType = dynamicQuerystringParameterType;
+        allParameters.AddRange(queryExtractor.Extract(operationModel, operation, settings));
+        dynamicQuerystringParameters = queryExtractor.DynamicQuerystringCode;
 
         // Body parameters (including binary body)
         allParameters.AddRange(GetExtractor<BodyParameterExtractor>().Extract(operationModel, operation, settings));
@@ -63,55 +57,17 @@ public IEnumerable<string> ExtractParameters(
         return allParameters;
     }
 
-    private IParameterTypeExtractor GetExtractor<T>() where T : IParameterTypeExtractor
+    private T GetExtractor<T>() where T : IParameterTypeExtractor
     {
         return extractors.OfType<T>().First();
     }
 
-    private static List<string> ExtractQueryParameters(
-        CSharpOperationModel operationModel,
-        RefitGeneratorSettings settings,
-        string dynamicQuerystringParameterType,
-        List<CSharpParameterModel> queryParameters,
-        out string? dynamicQuerystringParameters)
-    {
-        List<string>? parameters = null;
-        var dynamicQuerystringParametersCodeBuilder = string.Empty;
-
-        if (settings.UseDynamicQuerystringParameters && queryParameters.Count >= 2)
-        {
-            var allNullable = queryParameters.All(p =>
-                ParameterShared.GetQueryParameterType(p, settings).EndsWith("?"));
-
-            var dynamicQuerystringCode = DynamicQuerystringParameterBuilder.Build(
-                queryParameters,
-                dynamicQuerystringParameterType,
-                settings);
-
-            if (!string.IsNullOrWhiteSpace(dynamicQuerystringCode))
-            {
-                dynamicQuerystringParametersCodeBuilder = dynamicQuerystringCode;
-            }
-
-            var dynamicQuerystringParameter = $"[Query] {dynamicQuerystringParameterType}";
-            if (allNullable)
-                dynamicQuerystringParameter += "?";
-            dynamicQuerystringParameter += " queryParams";
-            parameters = [dynamicQuerystringParameter];
-        }
-
-        dynamicQuerystringParameters = dynamicQuerystringParametersCodeBuilder;
-
-        parameters ??= QueryParameterExtractor.ExtractSimple(operationModel, settings).ToList();
-
-        return parameters;
-    }
-
     private static IReadOnlyList<IParameterTypeExtractor> GetDefaultExtractors()
     {
         return new IParameterTypeExtractor[]
         {
             new RouteParameterExtractor(),
+            new QueryParameterExtractor(),
             new BodyParameterExtractor(),
             new HeaderParameterExtractor(),
             new FormParameterExtractor(),

src/Refitter.Core/ParameterExtractor.cs

@@ -3,14 +3,56 @@
 
 namespace Refitter.Core;
 
-internal static class QueryParameterExtractor
+internal class QueryParameterExtractor : IParameterTypeExtractor
 {
-    public static IEnumerable<string> ExtractSimple(
+    public string? DynamicQuerystringParameterType { get; set; }
+    public string? DynamicQuerystringCode { get; private set; }
+
+    public IEnumerable<string> Extract(
         CSharpOperationModel operationModel,
+        OpenApiOperation operation,
         RefitGeneratorSettings settings)
     {
-        return operationModel.Parameters
+        var queryParameters = operationModel.Parameters
             .Where(p => p.Kind == OpenApiParameterKind.Query)
+            .ToList();
+
+        if (settings.UseDynamicQuerystringParameters && queryParameters.Count >= 2)
+            return ExtractDynamic(queryParameters, settings);
+
+        return ExtractSimple(queryParameters, settings);
+    }
+
+    private List<string> ExtractDynamic(
+        List<CSharpParameterModel> queryParameters,
+        RefitGeneratorSettings settings)
+    {
+        var dynamicQuerystringCode = DynamicQuerystringParameterBuilder.Build(
+            queryParameters,
+            DynamicQuerystringParameterType!,
+            settings);
+
+        DynamicQuerystringCode = !string.IsNullOrWhiteSpace(dynamicQuerystringCode)
+            ? dynamicQuerystringCode
+            : null;
+
+        var allNullable = queryParameters.All(p =>
+            ParameterShared.GetQueryParameterType(p, settings).EndsWith("?"));
+
+        var dynamicQuerystringParameter = $"[Query] {DynamicQuerystringParameterType}";
+        if (allNullable)
+            dynamicQuerystringParameter += "?";
+        dynamicQuerystringParameter += " queryParams";
+        return [dynamicQuerystringParameter];
+    }
+
+    private List<string> ExtractSimple(
+        List<CSharpParameterModel> queryParameters,
+        RefitGeneratorSettings settings)
+    {
+        DynamicQuerystringCode = string.Empty;
+
+        return queryParameters
             .Select(p =>
             {
                 var variableName = ParameterShared.GetVariableName(p);

src/Refitter.Core/QueryParameterExtractor.cs

@@ -5,9 +5,6 @@ namespace Refitter.Core;
 
 internal class RouteParameterExtractor : IParameterTypeExtractor
 {
-    public bool CanExtract(OpenApiParameterKind kind) =>
-        kind == OpenApiParameterKind.Path;
-
     public IEnumerable<string> Extract(
         CSharpOperationModel operationModel,
         OpenApiOperation operation,

src/Refitter.Core/RouteParameterExtractor.cs

@@ -10,23 +10,6 @@ namespace Refitter.Tests;
 
 public class FormParameterExtractorTests
 {
-    [Test]
-    public void CanExtract_Returns_True_For_FormData()
-    {
-        var extractor = new FormParameterExtractor();
-        extractor.CanExtract(OpenApiParameterKind.FormData).Should().BeTrue();
-    }
-
-    [Test]
-    public void CanExtract_Returns_False_For_Non_FormData()
-    {
-        var extractor = new FormParameterExtractor();
-        extractor.CanExtract(OpenApiParameterKind.Query).Should().BeFalse();
-        extractor.CanExtract(OpenApiParameterKind.Path).Should().BeFalse();
-        extractor.CanExtract(OpenApiParameterKind.Header).Should().BeFalse();
-        extractor.CanExtract(OpenApiParameterKind.Body).Should().BeFalse();
-    }
-
     [Test]
     public void Extract_Returns_Empty_When_No_FormData_Parameters()
     {