fix: merge I

Author: maurei

src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs

@@ -1,4 +1,3 @@
-using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Formatters;
 using JsonApiDotNetCore.Middleware;
 using Microsoft.AspNetCore.Builder;
@@ -34,6 +33,8 @@ public static void UseJsonApi(this IApplicationBuilder builder)
                 options.OutputFormatters.Insert(0, builder.ApplicationServices.GetRequiredService<IJsonApiOutputFormatter>());
                 options.Conventions.Insert(0, builder.ApplicationServices.GetRequiredService<IJsonApiRoutingConvention>());
             };
+
+            builder.UseMiddleware<JsonApiMiddleware>();
         }
     }
 }

src/JsonApiDotNetCore/Configuration/IJsonApiApplicationBuilder.cs

@@ -1,7 +1,7 @@
 using System;
 using Microsoft.AspNetCore.Mvc;
 
-namespace JsonApiDotNetCore.Builders
+namespace JsonApiDotNetCore.Configuration
 {
     internal interface IJsonApiApplicationBuilder
     {

src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs

@@ -1,4 +1,3 @@
-
 using System;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Formatters;
@@ -23,7 +22,7 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Builders
+namespace JsonApiDotNetCore.Configuration
 {
     /// <summary>
     /// A utility class that builds a JsonApi application. It registers all required services

src/JsonApiDotNetCore/Configuration/ResourceGraph.cs

@@ -24,15 +24,21 @@ public ResourceGraph(IReadOnlyCollection<ResourceContext> resources)
         /// <inheritdoc />
         public ResourceContext GetResourceContext(string resourceName)
         {
-            if (resourceName == null) throw new ArgumentNullException(nameof(resourceName));
+            if (resourceName == null)
+            {
+                throw new ArgumentNullException(nameof(resourceName));
+            }
 
             return _resources.SingleOrDefault(e => e.ResourceName == resourceName);
         }
 
         /// <inheritdoc />
         public ResourceContext GetResourceContext(Type resourceType)
         {
-            if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));
+            if (resourceType == null)
+            {
+                throw new ArgumentNullException(nameof(resourceType));
+            }
 
             return IsLazyLoadingProxyForResourceType(resourceType)
                 ? _resources.SingleOrDefault(e => e.ResourceType == resourceType.BaseType)

src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs

@@ -1,9 +1,7 @@
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Errors;
 using JsonApiDotNetCore.Serialization.Building;
 using JsonApiDotNetCore.Serialization.Client.Internal;

src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs

@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,7 +7,6 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Services;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 

src/JsonApiDotNetCore/Middleware/JsonApiRoutingConvention.cs

@@ -62,11 +62,15 @@ public void Apply(ApplicationModel application)
             foreach (var controller in application.Controllers)
             {
                 var resourceType = ExtractResourceTypeFromController(controller.ControllerType);
-                var resourceContext = _resourceGraph.GetResourceContext(resourceType);
 
-                if (resourceContext != null)
+                if (resourceType != null)
                 {
-                    _registeredResources.Add(controller.ControllerName, resourceContext);
+                    var resourceContext = _resourceGraph.GetResourceContext(resourceType);
+    
+                    if (resourceContext != null)
+                    {
+                        _registeredResources.Add(controller.ControllerName, resourceContext);
+                    }
                 }
 
                 if (RoutingConventionDisabled(controller) == false)