Remove overloads that were not api-approved

halter73 · halter73 · commit 7e814438bd3c · 2022-05-31T17:11:44.000-07:00
diff --git a/src/Http/Routing/src/Builder/OpenApiRouteHandlerBuilderExtensions.cs b/src/Http/Routing/src/Builder/OpenApiRouteHandlerBuilderExtensions.cs
@@ -34,38 +34,6 @@ public static TBuilder ExcludeFromDescription<TBuilder>(this TBuilder builder) w
     public static RouteHandlerBuilder ExcludeFromDescription(this RouteHandlerBuilder builder)
         => ExcludeFromDescription<RouteHandlerBuilder>(builder);
 
-    /// <summary>
-    /// Adds an <see cref="IProducesResponseTypeMetadata"/> to <see cref="EndpointBuilder.Metadata"/> for all endpoints
-    /// produced by <paramref name="builder"/>.
-    /// </summary>
-    /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
-    /// <param name="responseType">The type of the response. Defaults to null.</param>
-    /// <param name="statusCode">The response status code.</param>
-    /// <param name="contentType">The response content type. Defaults to "application/json" if responseType is not null, otherwise defaults to null.</param>
-    /// <param name="additionalContentTypes">Additional response content types the endpoint produces for the supplied status code.</param>
-    /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the endpoint.</returns>
-#pragma warning disable RS0026
-    public static TBuilder Produces<TBuilder>(
-#pragma warning restore RS0026
-        this TBuilder builder,
-        Type? responseType = null,
-        int statusCode = StatusCodes.Status200OK,
-        string? contentType = null,
-        params string[] additionalContentTypes) where TBuilder : IEndpointConventionBuilder
-    {
-        if (responseType is Type && string.IsNullOrEmpty(contentType))
-        {
-            contentType = "application/json";
-        }
-
-        if (contentType is null)
-        {
-            return builder.WithMetadata(new ProducesResponseTypeMetadata(responseType ?? typeof(void), statusCode));
-        }
-
-        return builder.WithMetadata(new ProducesResponseTypeMetadata(responseType ?? typeof(void), statusCode, contentType, additionalContentTypes));
-    }
-
     /// <summary>
     /// Adds an <see cref="IProducesResponseTypeMetadata"/> to <see cref="EndpointBuilder.Metadata"/> for all endpoints
     /// produced by <paramref name="builder"/>.
@@ -84,7 +52,7 @@ public static RouteHandlerBuilder Produces<TResponse>(
         string? contentType = null,
         params string[] additionalContentTypes)
     {
-        return Produces(builder, typeof(TResponse), statusCode, contentType, additionalContentTypes);
+        return Produces(builder, statusCode, typeof(TResponse), contentType, additionalContentTypes);
     }
 
     /// <summary>
@@ -106,30 +74,17 @@ public static RouteHandlerBuilder Produces(
         string? contentType = null,
         params string[] additionalContentTypes)
     {
-        return Produces(builder, responseType, statusCode, contentType, additionalContentTypes);
-    }
+        if (responseType is Type && string.IsNullOrEmpty(contentType))
+        {
+            contentType = "application/json";
+        }
 
-    /// <summary>
-    /// Adds an <see cref="IProducesResponseTypeMetadata"/> with a <see cref="ProblemDetails"/> type
-    /// to <see cref="EndpointBuilder.Metadata"/> for all endpoints produced by <paramref name="builder"/>.
-    /// </summary>
-    /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
-    /// <param name="statusCode">The response status code.</param>
-    /// <param name="contentType">The response content type. Defaults to "application/problem+json".</param>
-    /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the endpoint.</returns>
-#pragma warning disable RS0026
-    public static TBuilder ProducesProblem<TBuilder>(
-#pragma warning restore RS0026
-        this TBuilder builder,
-        int statusCode,
-        string? contentType = null) where TBuilder : IEndpointConventionBuilder
-    {
-        if (string.IsNullOrEmpty(contentType))
+        if (contentType is null)
         {
-            contentType = "application/problem+json";
+            return builder.WithMetadata(new ProducesResponseTypeMetadata(responseType ?? typeof(void), statusCode));
         }
 
-        return Produces(builder, typeof(ProblemDetails), statusCode, contentType);
+        return builder.WithMetadata(new ProducesResponseTypeMetadata(responseType ?? typeof(void), statusCode, contentType, additionalContentTypes));
     }
 
     /// <summary>
@@ -141,45 +96,27 @@ public static TBuilder ProducesProblem<TBuilder>(
     /// <param name="contentType">The response content type. Defaults to "application/problem+json".</param>
     /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the endpoint.</returns>
     public static RouteHandlerBuilder ProducesProblem(this RouteHandlerBuilder builder, int statusCode, string? contentType = null)
-        => ProducesProblem<RouteHandlerBuilder>(builder, statusCode, contentType);
+        => ProducesProblem(builder, statusCode, contentType);
 
     /// <summary>
     /// Adds an <see cref="IProducesResponseTypeMetadata"/> with a <see cref="HttpValidationProblemDetails"/> type
     /// to <see cref="EndpointBuilder.Metadata"/> for all endpoints produced by <paramref name="builder"/>.
     /// </summary>
-    /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
+    /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
     /// <param name="statusCode">The response status code. Defaults to <see cref="StatusCodes.Status400BadRequest"/>.</param>
     /// <param name="contentType">The response content type. Defaults to "application/problem+json".</param>
     /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the endpoint.</returns>
-#pragma warning disable RS0026
-    public static TBuilder ProducesValidationProblem<TBuilder>(
-#pragma warning restore RS0026
-        this TBuilder builder,
+    public static RouteHandlerBuilder ProducesValidationProblem(
+        this RouteHandlerBuilder builder,
         int statusCode = StatusCodes.Status400BadRequest,
-        string? contentType = null) where TBuilder : IEndpointConventionBuilder
+        string? contentType = null)
     {
         if (string.IsNullOrEmpty(contentType))
         {
             contentType = "application/problem+json";
         }
 
-        return Produces(builder, typeof(HttpValidationProblemDetails), statusCode, contentType);
-    }
-
-    /// <summary>
-    /// Adds an <see cref="IProducesResponseTypeMetadata"/> with a <see cref="HttpValidationProblemDetails"/> type
-    /// to <see cref="EndpointBuilder.Metadata"/> for all endpoints produced by <paramref name="builder"/>.
-    /// </summary>
-    /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
-    /// <param name="statusCode">The response status code. Defaults to <see cref="StatusCodes.Status400BadRequest"/>.</param>
-    /// <param name="contentType">The response content type. Defaults to "application/problem+json".</param>
-    /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the endpoint.</returns>
-    public static RouteHandlerBuilder ProducesValidationProblem(
-        this RouteHandlerBuilder builder,
-        int statusCode = StatusCodes.Status400BadRequest,
-        string? contentType = null)
-    {
-        return ProducesValidationProblem<RouteHandlerBuilder>(builder, statusCode, contentType);
+        return Produces(builder, statusCode, typeof(HttpValidationProblemDetails), contentType);
     }
 
     /// <summary>
@@ -212,45 +149,6 @@ public static TBuilder WithTags<TBuilder>(this TBuilder builder, params string[]
     public static RouteHandlerBuilder WithTags(this RouteHandlerBuilder builder, params string[] tags)
         => WithTags<RouteHandlerBuilder>(builder, tags);
 
-    /// <summary>
-    /// Adds <see cref="IAcceptsMetadata"/> to <see cref="EndpointBuilder.Metadata"/> for all endpoints
-    /// produced by <paramref name="builder"/>.
-    /// </summary>
-    /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
-    /// <param name="requestType">The type of the request body.</param>
-    /// <param name="isOptional">Sets a value that determines if the request body is optional.</param>
-    /// <param name="contentType">The request content type that the endpoint accepts.</param>
-    /// <param name="additionalContentTypes">The list of additional request content types that the endpoint accepts.</param>
-    /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the endpoint.</returns>
-    public static TBuilder Accepts<TBuilder>(
-        this TBuilder builder,
-        Type requestType,
-        bool isOptional,
-        string contentType,
-        params string[] additionalContentTypes) where TBuilder : IEndpointConventionBuilder
-    {
-        var contentTypes = GetAllContentTypes(contentType, additionalContentTypes);
-        return builder.WithMetadata(new AcceptsMetadata(requestType, isOptional, contentTypes));
-    }
-
-    /// <summary>
-    /// Adds <see cref="IAcceptsMetadata"/> to <see cref="EndpointBuilder.Metadata"/> for all endpoints
-    /// produced by <paramref name="builder"/>.
-    /// </summary>
-    /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
-    /// <param name="requestType">The type of the request body.</param>
-    /// <param name="contentType">The request content type that the endpoint accepts.</param>
-    /// <param name="additionalContentTypes">The list of additional request content types that the endpoint accepts.</param>
-    /// <returns>A <see cref="RouteHandlerBuilder"/> that can be used to further customize the endpoint.</returns>
-    public static TBuilder Accepts<TBuilder>(
-        this TBuilder builder,
-        Type requestType,
-        string contentType,
-        params string[] additionalContentTypes) where TBuilder : IEndpointConventionBuilder
-    {
-        return Accepts(builder, requestType, isOptional: false, contentType, additionalContentTypes);
-    }
-
     /// <summary>
     /// Adds <see cref="IAcceptsMetadata"/> to <see cref="EndpointBuilder.Metadata"/> for all endpoints
     /// produced by <paramref name="builder"/>.
@@ -265,7 +163,7 @@ public static RouteHandlerBuilder Accepts<TRequest>(
         string contentType,
         params string[] additionalContentTypes) where TRequest : notnull
     {
-        return Accepts<RouteHandlerBuilder>(builder, typeof(TRequest), contentType, additionalContentTypes);
+        return Accepts(builder, typeof(TRequest), contentType, additionalContentTypes);
     }
 
     /// <summary>
@@ -284,7 +182,7 @@ public static RouteHandlerBuilder Accepts<TRequest>(
         string contentType,
         params string[] additionalContentTypes) where TRequest : notnull
     {
-        return Accepts<RouteHandlerBuilder>(builder, typeof(TRequest), isOptional, contentType, additionalContentTypes);
+        return Accepts(builder, typeof(TRequest), isOptional, contentType, additionalContentTypes);
     }
 
     /// <summary>
@@ -302,7 +200,7 @@ public static RouteHandlerBuilder Accepts(
         string contentType,
         params string[] additionalContentTypes)
     {
-        return Accepts<RouteHandlerBuilder>(builder, requestType, contentType, additionalContentTypes);
+        return Accepts(builder, requestType, isOptional: false, contentType, additionalContentTypes);
     }
 
     /// <summary>
@@ -322,7 +220,8 @@ public static RouteHandlerBuilder Accepts(
         string contentType,
         params string[] additionalContentTypes)
     {
-        return Accepts<RouteHandlerBuilder>(builder, requestType, isOptional, contentType, additionalContentTypes);
+        var contentTypes = GetAllContentTypes(contentType, additionalContentTypes);
+        return builder.WithMetadata(new AcceptsMetadata(requestType, isOptional, contentTypes));
     }
 
     /// <summary>
diff --git a/src/Http/Routing/src/PublicAPI.Unshipped.txt b/src/Http/Routing/src/PublicAPI.Unshipped.txt
@@ -11,12 +11,7 @@ static Microsoft.AspNetCore.Builder.EndpointRouteBuilderExtensions.MapPatch(this
 override Microsoft.AspNetCore.Routing.RouteValuesAddress.ToString() -> string?
 *REMOVED*~Microsoft.AspNetCore.Routing.DefaultInlineConstraintResolver.DefaultInlineConstraintResolver(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Routing.RouteOptions!>! routeOptions, System.IServiceProvider! serviceProvider) -> void
 Microsoft.AspNetCore.Routing.DefaultInlineConstraintResolver.DefaultInlineConstraintResolver(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Routing.RouteOptions!>! routeOptions, System.IServiceProvider! serviceProvider) -> void
-static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.Accepts<TBuilder>(this TBuilder builder, System.Type! requestType, bool isOptional, string! contentType, params string![]! additionalContentTypes) -> TBuilder
-static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.Accepts<TBuilder>(this TBuilder builder, System.Type! requestType, string! contentType, params string![]! additionalContentTypes) -> TBuilder
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ExcludeFromDescription<TBuilder>(this TBuilder builder) -> TBuilder
-static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.Produces<TBuilder>(this TBuilder builder, System.Type? responseType = null, int statusCode = 200, string? contentType = null, params string![]! additionalContentTypes) -> TBuilder
-static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ProducesProblem<TBuilder>(this TBuilder builder, int statusCode, string? contentType = null) -> TBuilder
-static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.ProducesValidationProblem<TBuilder>(this TBuilder builder, int statusCode = 400, string? contentType = null) -> TBuilder
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.WithDescription<TBuilder>(this TBuilder builder, string! description) -> TBuilder
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.WithSummary<TBuilder>(this TBuilder builder, string! summary) -> TBuilder
 static Microsoft.AspNetCore.Http.OpenApiRouteHandlerBuilderExtensions.WithTags<TBuilder>(this TBuilder builder, params string![]! tags) -> TBuilder
diff --git a/src/Http/Routing/test/UnitTests/Builder/OpenApiRouteHandlerBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/Builder/OpenApiRouteHandlerBuilderExtensionsTest.cs
