Removed JsonApiInputFormatter workaround

Author: maurei

src/JsonApiDotNetCore.OpenApi/JsonApiInputFormatterWithMetadata.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using JsonApiDotNetCore.Middleware;
+using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Net.Http.Headers;
+
+namespace JsonApiDotNetCore.OpenApi
+{
+    internal sealed class JsonApiRequestFormatMetadataProvider : IInputFormatter, IApiRequestFormatMetadataProvider
+    {
+        private static readonly Type[] JsonApiRequestObjectOpenType =
+        {
+            typeof(ToManyRelationshipRequestData<>),
+            typeof(ToOneRelationshipRequestData<>),
+            typeof(ResourcePostRequestDocument<>),
+            typeof(ResourcePatchRequestDocument<>)
+        };
+
+        /// <inheritdoc />
+        public bool CanRead(InputFormatterContext context)
+        {
+            return false;
+        }
+
+        /// <inheritdoc />
+        public Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
+        {
+            throw new UnreachableCodeException();
+        }
+
+        /// <inheritdoc />
+        public IReadOnlyList<string> GetSupportedContentTypes(string contentType, Type objectType)
+        {
+            ArgumentGuard.NotNullNorEmpty(contentType, nameof(contentType));
+            ArgumentGuard.NotNull(objectType, nameof(objectType));
+
+            if (contentType == HeaderConstants.MediaType && objectType.IsGenericType &&
+                JsonApiRequestObjectOpenType.Contains(objectType.GetGenericTypeDefinition()))
+            {
+                return new MediaTypeCollection
+                {
+                    new MediaTypeHeaderValue(HeaderConstants.MediaType)
+                };
+            }
+
+            return new MediaTypeCollection();
+        }
+    }
+}

src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs

@@ -32,8 +32,6 @@ public static void AddOpenApi(this IServiceCollection services, IMvcCoreBuilder
             AddSwaggerGenerator(scope, services, setupSwaggerGenAction);
             AddSwashbuckleCliCompatibility(scope, mvcBuilder);
             AddOpenApiEndpointConvention(scope, mvcBuilder);
-
-            AddJsonApiInputFormatterWorkaround(mvcBuilder);
         }
 
         private static void AddCustomApiExplorer(IServiceCollection services, IMvcCoreBuilder mvcBuilder)
@@ -52,6 +50,8 @@ private static void AddCustomApiExplorer(IServiceCollection services, IMvcCoreBu
             });
 
             mvcBuilder.AddApiExplorer();
+
+            mvcBuilder.AddMvcOptions(options => options.InputFormatters.Add(new JsonApiRequestFormatMetadataProvider()));
         }
 
         private static void AddSwaggerGenerator(IServiceScope scope, IServiceCollection services, Action<SwaggerGenOptions> setupSwaggerGenAction)
@@ -132,11 +132,5 @@ private static void AddOpenApiEndpointConvention(IServiceScope scope, IMvcCoreBu
 
             mvcBuilder.AddMvcOptions(options => options.Conventions.Add(new OpenApiEndpointConvention(resourceContextProvider, controllerResourceMapping)));
         }
-
-        private static void AddJsonApiInputFormatterWorkaround(IMvcCoreBuilder mvcBuilder)
-        {
-            // See https://github.com/json-api-dotnet/JsonApiDotNetCore/pull/972 for why this is needed.
-            mvcBuilder.AddMvcOptions(options => options.InputFormatters.Add(new JsonApiInputFormatterWithMetadata()));
-        }
     }
 }