AddSupportedRequestFormats

Author: halter73

src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs

@@ -429,7 +429,7 @@ private IReadOnlyList<ApiRequestFormat> GetSupportedFormats(MediaTypeCollection
             return results;
         }
 
-        private static MediaTypeCollection GetDeclaredContentTypes(IApiRequestMetadataProvider[]? requestMetadataAttributes)
+        internal static MediaTypeCollection GetDeclaredContentTypes(IReadOnlyList<IApiRequestMetadataProvider>? requestMetadataAttributes)
         {
             // Walk through all 'filter' attributes in order, and allow each one to see or override
             // the results of the previous ones. This is similar to the execution path for content-negotiation.

src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs

@@ -87,14 +87,7 @@ private static ApiDescription CreateApiDescription(RouteEndpoint routeEndpoint,
                 apiDescription.ParameterDescriptions.Add(parameterDescription);
             }
 
-            if (hasJsonBody)
-            {
-                apiDescription.SupportedRequestFormats.Add(new ApiRequestFormat
-                {
-                    MediaType = "application/json",
-                });
-            }
-
+            AddSupportedRequestFormats(apiDescription.SupportedRequestFormats, hasJsonBody, routeEndpoint.Metadata);
             AddSupportedResponseTypes(apiDescription.SupportedResponseTypes, methodInfo.ReturnType, routeEndpoint.Metadata);
 
             return apiDescription;
@@ -160,7 +153,35 @@ private static (BindingSource, string) GetBindingSourceAndName(ParameterInfo par
             }
         }
 
-        private static void AddSupportedResponseTypes(IList<ApiResponseType> supportedResponseTypes, Type returnType, EndpointMetadataCollection endpointMetadata)
+        private static void AddSupportedRequestFormats(
+            IList<ApiRequestFormat> supportedRequestFormats,
+            bool hasJsonBody,
+            EndpointMetadataCollection endpointMetadata)
+        {
+            // If RequestDelegateFactory thinks the API supports a JSON body, it does.
+            if (hasJsonBody)
+            {
+                supportedRequestFormats.Add(new ApiRequestFormat
+                {
+                    MediaType = "application/json",
+                });
+            }
+
+            var requestMetadata = endpointMetadata.GetOrderedMetadata<IApiRequestMetadataProvider>();
+
+            foreach (var contentType in DefaultApiDescriptionProvider.GetDeclaredContentTypes(requestMetadata))
+            {
+                supportedRequestFormats.Add(new ApiRequestFormat
+                {
+                    MediaType = contentType,
+                });
+            }
+        }
+
+        private static void AddSupportedResponseTypes(
+            IList<ApiResponseType> supportedResponseTypes,
+            Type returnType,
+            EndpointMetadataCollection endpointMetadata)
         {
             var responseType = returnType;
 
@@ -180,7 +201,8 @@ private static void AddSupportedResponseTypes(IList<ApiResponseType> supportedRe
             var defaultErrorType = errorMetadata?.Type ?? typeof(void);
             var contentTypes = new MediaTypeCollection();
 
-            var responseMetadataTypes = ApiResponseTypeProvider.ReadResponseMetadata(responseMetadata, responseType, defaultErrorType, contentTypes);
+            var responseMetadataTypes = ApiResponseTypeProvider.ReadResponseMetadata(
+                responseMetadata, responseType, defaultErrorType, contentTypes);
 
             if (responseMetadataTypes.Count > 0)
             {
@@ -236,7 +258,7 @@ private static ApiResponseType CreateDefaultApiResponseType(Type responseType)
 
         private static ApiResponseFormat? CreateDefaultApiResponseFormat(Type responseType)
         {
-            if (responseType == typeof(void) || typeof(IResult).IsAssignableFrom(responseType))
+            if (responseType == typeof(void))
             {
                 return null;
             }