Cleanup.

Author: jscarle

src/GeneratedEndpoints/MinimalApiGenerator.cs

@@ -99,6 +99,7 @@ public sealed class MinimalApiGenerator : IIncrementalGenerator
     private const string UseEndpointHandlersMethodName = "MapEndpointHandlers";
     private const string UseEndpointHandlersMethodHint = $"{RoutingNamespace}.{UseEndpointHandlersMethodName}.g.cs";
 
+    private const string ConfigureMethodName = "Configure";
     private const string AsyncSuffix = "Async";
 
     private static readonly string FileHeader = $"""
@@ -852,7 +853,7 @@ ref List<ProducesValidationProblemMetadata>? producesValidationProblem
                         ? GetStringArrayValues(attribute.ConstructorArguments[2])
                         : null;
 
-                    var producesProblemList = producesProblem ??= new List<ProducesProblemMetadata>();
+                    var producesProblemList = producesProblem ??= [];
                     producesProblemList.Add(new ProducesProblemMetadata(statusCode, contentType, additionalContentTypes));
                     break;
                 }
@@ -868,7 +869,7 @@ ref List<ProducesValidationProblemMetadata>? producesValidationProblem
                         ? GetStringArrayValues(attribute.ConstructorArguments[2])
                         : null;
 
-                    var producesValidationProblemList = producesValidationProblem ??= new List<ProducesValidationProblemMetadata>();
+                    var producesValidationProblemList = producesValidationProblem ??= [];
                     producesValidationProblemList.Add(new ProducesValidationProblemMetadata(statusCode, contentType, additionalContentTypes));
                     break;
                 }
@@ -923,12 +924,12 @@ private static void TryAddAcceptsMetadata(
         INamedTypeSymbol attributeClass,
         ref List<AcceptsMetadata>? accepts)
     {
-        string? requestType = null;
+        string? requestType;
         string contentType;
         EquatableImmutableArray<string>? additionalContentTypes;
         var isOptional = GetNamedBoolValue(attribute, IsOptionalAttributeNamedParameter);
 
-        if (attributeClass.IsGenericType && attributeClass.TypeArguments.Length == 1)
+        if (attributeClass is { IsGenericType: true, TypeArguments.Length: 1 })
         {
             requestType = attributeClass.TypeArguments[0].ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
             contentType = attribute.ConstructorArguments.Length > 0
@@ -953,7 +954,7 @@ private static void TryAddAcceptsMetadata(
             return;
         }
 
-        var acceptsList = accepts ??= new List<AcceptsMetadata>();
+        var acceptsList = accepts ??= [];
         acceptsList.Add(new AcceptsMetadata(requestType, contentType, additionalContentTypes, isOptional));
     }
 
@@ -962,12 +963,12 @@ private static void TryAddProducesMetadata(
         INamedTypeSymbol attributeClass,
         ref List<ProducesMetadata>? produces)
     {
-        string? responseType = null;
+        string? responseType;
         int statusCode;
         string? contentType;
         EquatableImmutableArray<string>? additionalContentTypes;
 
-        if (attributeClass.IsGenericType && attributeClass.TypeArguments.Length == 1)
+        if (attributeClass is { IsGenericType: true, TypeArguments.Length: 1 })
         {
             responseType = attributeClass.TypeArguments[0].ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
             statusCode = attribute.ConstructorArguments.Length > 0 && attribute.ConstructorArguments[0].Value is int producesStatusCode
@@ -998,7 +999,7 @@ private static void TryAddProducesMetadata(
             return;
         }
 
-        var producesList = produces ??= new List<ProducesMetadata>();
+        var producesList = produces ??= [];
         producesList.Add(new ProducesMetadata(responseType, statusCode, contentType, additionalContentTypes));
     }
 
@@ -1102,7 +1103,7 @@ CancellationToken cancellationToken
         var hasConfigureMethod = false;
         var acceptsServiceProvider = false;
 
-        foreach (var member in classSymbol.GetMembers("Configure"))
+        foreach (var member in classSymbol.GetMembers(ConfigureMethodName))
         {
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -1426,7 +1427,9 @@ private static void GenerateMapRequestHandler(StringBuilder source, RequestHandl
         {
             source.Append("        ");
             source.Append(requestHandler.Class.Name);
-            source.AppendLine(".Configure(");
+            source.Append('.');
+            source.Append(ConfigureMethodName);
+            source.AppendLine("(");
         }
 
         source.Append(indent);

tests/GeneratedEndpoints.Tests.Lab/GetUserEndpoint.cs

@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Generated.Attributes;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Mvc;
 
 namespace GeneratedEndpoints.Tests.Lab;
 
@@ -15,13 +16,13 @@ internal static class GetUserEndpoint
     [Tags("Featured")]
     [AllowAnonymous]
     [Accepts("application/json", "application/xml", RequestType = typeof(GetUserRequest))]
-    [Accepts<GetUserMetadata>("application/json", "application/xml")]
+    [Accepts<GetUserMetadata>("application/json", "application/xml", IsOptional = true)]
     [ProducesResponse( StatusCodes.Status200OK, "application/json", ResponseType = typeof(UserProfile))]
     [ProducesResponse<UserProfile>(StatusCodes.Status202Accepted, "application/json")]
     [ProducesProblem(StatusCodes.Status500InternalServerError, "application/problem+json")]
     [ProducesValidationProblem(StatusCodes.Status400BadRequest, "application/problem+json")]
     [MapGet("/users/{id:int}", Name = nameof(GetUser), Summary = "Gets a user by ID.", Description = "Gets a user by ID when the ID is greater than zero.")]
-    public static Results<Ok<UserProfile>, NotFound, ValidationProblem, ProblemHttpResult> GetUser(int id)
+    public static Results<Ok<UserProfile>, NotFound, ValidationProblem, ProblemHttpResult> GetUser([FromQuery] int id)
     {
         if (id <= 0)
         {