Routing does not respect custom pluralized resource name

src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs

@@ -5,6 +5,7 @@
 using JsonApiDotNetCoreExample.Data;
 using Microsoft.EntityFrameworkCore;
 using System;
+using System.Linq;
 using JsonApiDotNetCore;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.QueryStrings;
@@ -39,7 +40,7 @@ public override void ConfigureServices(IServiceCollection services)
             }, ServiceLifetime.Transient);
 
             services.AddJsonApi<AppDbContext>(ConfigureJsonApiOptions, discovery => discovery.AddCurrentAssembly());
-            
+
             // once all tests have been moved to WebApplicationFactory format we can get rid of this line below
             services.AddClientSerialization();
         }

src/JsonApiDotNetCore/AssemblyInfo.cs

@@ -1,5 +1,6 @@
 using System.Runtime.CompilerServices;
 [assembly:InternalsVisibleTo("UnitTests")]
+[assembly:InternalsVisibleTo("DiscoveryTests")]
 [assembly:InternalsVisibleTo("JsonApiDotNetCoreExampleTests")]
 [assembly:InternalsVisibleTo("NoEntityFrameworkTests")]
 [assembly:InternalsVisibleTo("Benchmarks")]

src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs

@@ -15,30 +15,30 @@ public interface IResourceGraphBuilder
         /// Add a json:api resource
         /// </summary>
         /// <typeparam name="TResource">The resource model type</typeparam>
-        /// <param name="pluralizedTypeName">
+        /// <param name="pluralizedResourceName">
         /// The pluralized name that should be exposed by the API. 
         /// If nothing is specified, the configured name formatter will be used.
         /// </param>
-        IResourceGraphBuilder AddResource<TResource>(string pluralizedTypeName = null) where TResource : class, IIdentifiable<int>;
+        IResourceGraphBuilder AddResource<TResource>(string pluralizedResourceName = null) where TResource : class, IIdentifiable<int>;
         /// <summary>
         /// Add a json:api resource
         /// </summary>
         /// <typeparam name="TResource">The resource model type</typeparam>
         /// <typeparam name="TId">The resource model identifier type</typeparam>
-        /// <param name="pluralizedTypeName">
+        /// <param name="pluralizedResourceName">
         /// The pluralized name that should be exposed by the API. 
         /// If nothing is specified, the configured name formatter will be used.
         /// </param>
-        IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedTypeName = null) where TResource : class, IIdentifiable<TId>;
+        IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedResourceName = null) where TResource : class, IIdentifiable<TId>;
         /// <summary>
         /// Add a Json:Api resource
         /// </summary>
         /// <param name="resourceType">The resource model type</param>
         /// <param name="idType">The resource model identifier type</param>
-        /// <param name="pluralizedTypeName">
+        /// <param name="pluralizedResourceName">
         /// The pluralized name that should be exposed by the API. 
         /// If nothing is specified, the configured name formatter will be used.
         /// </param>
-        IResourceGraphBuilder AddResource(Type resourceType, Type idType = null, string pluralizedTypeName = null);
+        IResourceGraphBuilder AddResource(Type resourceType, Type idType = null, string pluralizedResourceName = null);
     }
 }

src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs

@@ -36,6 +36,8 @@ internal sealed class JsonApiApplicationBuilder
         private readonly JsonApiOptions _options = new JsonApiOptions();
         private IResourceGraphBuilder _resourceGraphBuilder;
         private Type _dbContextType;
+        private Action<IResourceGraphBuilder> _configureResources;
+        private Action<IServiceDiscoveryFacade> _configureAutoDiscovery;
         private readonly IServiceCollection _services;
         private IServiceDiscoveryFacade _serviceDiscoveryFacade;
         private readonly IMvcCoreBuilder _mvcBuilder;
@@ -54,33 +56,42 @@ public void ConfigureJsonApiOptions(Action<JsonApiOptions> options)
             options?.Invoke(_options);
         }
 
+        public void RegisterResourceSources(Type dbContextType, Action<IServiceDiscoveryFacade> autoDiscovery,
+            Action<IResourceGraphBuilder> resources)
+        {
+            _dbContextType = dbContextType;
+            _configureAutoDiscovery = autoDiscovery;
+            _configureResources = resources;
+        }
+
         /// <summary>
         /// Configures built-in .NET Core MVC (things like middleware, routing). Most of this configuration can be adjusted for the developers' need.
         /// Before calling .AddJsonApi(), a developer can register their own implementation of the following services to customize startup:
         /// <see cref="IResourceGraphBuilder"/>, <see cref="IServiceDiscoveryFacade"/>, <see cref="IJsonApiExceptionFilterProvider"/>,
         /// <see cref="IJsonApiTypeMatchFilterProvider"/> and <see cref="IJsonApiRoutingConvention"/>.
         /// </summary>
-        public void ConfigureMvc(Type dbContextType)
+        public void ConfigureMvc()
         {
             RegisterJsonApiStartupServices();
-
+
+            using (var resourceConfigurationIntermediateProvider = _services.BuildServiceProvider())
+            {
+                _resourceGraphBuilder = resourceConfigurationIntermediateProvider.GetRequiredService<IResourceGraphBuilder>();
+                _serviceDiscoveryFacade = resourceConfigurationIntermediateProvider.GetRequiredService<IServiceDiscoveryFacade>();
+                _services.AddSingleton(BuildResourceGraph(resourceConfigurationIntermediateProvider));
+            }           
+
             IJsonApiExceptionFilterProvider exceptionFilterProvider;
             IJsonApiTypeMatchFilterProvider typeMatchFilterProvider;
             IJsonApiRoutingConvention routingConvention;
-
-            using (var intermediateProvider = _services.BuildServiceProvider())
+            
+            using (var middlewareConfigurationIntermediateProvider = _services.BuildServiceProvider())
             {
-                _resourceGraphBuilder = intermediateProvider.GetRequiredService<IResourceGraphBuilder>();
-                _serviceDiscoveryFacade = intermediateProvider.GetRequiredService<IServiceDiscoveryFacade>();
-                _dbContextType = dbContextType;
-
-                AddResourceTypesFromDbContext(intermediateProvider);
-
-                exceptionFilterProvider = intermediateProvider.GetRequiredService<IJsonApiExceptionFilterProvider>();
-                typeMatchFilterProvider = intermediateProvider.GetRequiredService<IJsonApiTypeMatchFilterProvider>();
-                routingConvention = intermediateProvider.GetRequiredService<IJsonApiRoutingConvention>();
+                exceptionFilterProvider = middlewareConfigurationIntermediateProvider.GetRequiredService<IJsonApiExceptionFilterProvider>();
+                typeMatchFilterProvider = middlewareConfigurationIntermediateProvider.GetRequiredService<IJsonApiTypeMatchFilterProvider>();
+                routingConvention = middlewareConfigurationIntermediateProvider.GetRequiredService<IJsonApiRoutingConvention>();
             }
-
+            
             _mvcBuilder.AddMvcOptions(options =>
             {
                 options.EnableEndpointRouting = true;
@@ -100,42 +111,13 @@ public void ConfigureMvc(Type dbContextType)
             _services.AddSingleton<IControllerResourceMapping>(routingConvention);
         }
 
-        private void AddResourceTypesFromDbContext(ServiceProvider intermediateProvider)
-        {
-            if (_dbContextType != null)
-            {
-                var dbContext = (DbContext) intermediateProvider.GetRequiredService(_dbContextType);
-
-                foreach (var entityType in dbContext.Model.GetEntityTypes())
-                {
-                    _resourceGraphBuilder.AddResource(entityType.ClrType);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Executes auto-discovery of JADNC services.
-        /// </summary>
-        public void AutoDiscover(Action<IServiceDiscoveryFacade> autoDiscover)
-        {
-            autoDiscover?.Invoke(_serviceDiscoveryFacade);
-        }
-
-        /// <summary>
-        /// Executes the action provided by the user to configure the resources using <see cref="IResourceGraphBuilder"/>
-        /// </summary>
-        public void ConfigureResources(Action<IResourceGraphBuilder> resources)
-        {
-            resources?.Invoke(_resourceGraphBuilder);
-        }
-
         /// <summary>
         /// Registers the remaining internals.
         /// </summary>
         public void ConfigureServices()
         {
-            var resourceGraph = _resourceGraphBuilder.Build();
-
+            _serviceDiscoveryFacade.DiscoverServices();
+            
             if (_dbContextType != null)
             {
                 var contextResolverType = typeof(DbContextResolver<>).MakeGenericType(_dbContextType);
@@ -179,10 +161,9 @@ public void ConfigureServices()
 
             _services.AddScoped(typeof(IResourceQueryService<,>), typeof(JsonApiResourceService<,>));
             _services.AddScoped(typeof(IResourceCommandService<,>), typeof(JsonApiResourceService<,>));
-
-            _services.AddSingleton(resourceGraph);
+
             _services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-            _services.AddSingleton<IResourceContextProvider>(resourceGraph);
+            _services.AddSingleton<IResourceContextProvider>(sp => sp.GetRequiredService<IResourceGraph>());
             _services.AddSingleton<IExceptionHandler, ExceptionHandler>();
 
             _services.AddScoped<ICurrentRequest, CurrentRequest>();
@@ -202,7 +183,9 @@ public void ConfigureServices()
             AddServerSerialization();
             AddQueryStringParameterServices();
             if (_options.EnableResourceHooks)
+            {
                 AddResourceHooks();
+            }
 
             _services.AddScoped<IInverseRelationships, InverseRelationships>();
         }
@@ -270,5 +253,44 @@ private void RegisterJsonApiStartupServices()
             _services.TryAddScoped<IJsonApiExceptionFilterProvider, JsonApiExceptionFilterProvider>();
             _services.TryAddScoped<IJsonApiTypeMatchFilterProvider, JsonApiTypeMatchFilterProvider>();
         }
+
+        private IResourceGraph BuildResourceGraph(ServiceProvider intermediateProvider)
+        {
+            AddResourceTypesFromDbContext(intermediateProvider); 
+            AutoDiscoverResources();
+            ConfigureResources();
+
+            return _resourceGraphBuilder.Build();
+        }
+
+        private void AddResourceTypesFromDbContext(ServiceProvider intermediateProvider)
+        {
+            if (_dbContextType != null)
+            {
+                var dbContext = (DbContext) intermediateProvider.GetRequiredService(_dbContextType);
+
+                foreach (var entityType in dbContext.Model.GetEntityTypes())
+                {
+                    _resourceGraphBuilder.AddResource(entityType.ClrType);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Performs auto-discovery of JsonApiDotNetCore services.
+        /// </summary>
+        private void AutoDiscoverResources()
+        {
+            _configureAutoDiscovery?.Invoke(_serviceDiscoveryFacade);
+            _serviceDiscoveryFacade.DiscoverResources();
+        }
+
+        /// <summary>
+        /// Executes the action provided by the user to configure the resources using <see cref="IResourceGraphBuilder"/>
+        /// </summary>
+        private void ConfigureResources()
+        {
+            _configureResources?.Invoke(_resourceGraphBuilder);
+        }
     }
 }

src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs

@@ -44,23 +44,23 @@ private void SetResourceLinksOptions(ResourceContext resourceContext)
         }
 
         /// <inheritdoc />
-        public IResourceGraphBuilder AddResource<TResource>(string pluralizedTypeName = null) where TResource : class, IIdentifiable<int>
-            => AddResource<TResource, int>(pluralizedTypeName);
+        public IResourceGraphBuilder AddResource<TResource>(string pluralizedResourceName = null) where TResource : class, IIdentifiable<int>
+            => AddResource<TResource, int>(pluralizedResourceName);
 
         /// <inheritdoc />
-        public IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedTypeName = null) where TResource : class, IIdentifiable<TId>
-            => AddResource(typeof(TResource), typeof(TId), pluralizedTypeName);
+        public IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedResourceName = null) where TResource : class, IIdentifiable<TId>
+            => AddResource(typeof(TResource), typeof(TId), pluralizedResourceName);
 
         /// <inheritdoc />
-        public IResourceGraphBuilder AddResource(Type resourceType, Type idType = null, string pluralizedTypeName = null)
+        public IResourceGraphBuilder AddResource(Type resourceType, Type idType = null, string pluralizedResourceName = null)
         {
             if (_resources.All(e => e.ResourceType != resourceType))
             {
                 if (resourceType.IsOrImplementsInterface(typeof(IIdentifiable)))
                 {
-                    pluralizedTypeName ??= FormatResourceName(resourceType);
+                    pluralizedResourceName ??= FormatResourceName(resourceType);
                     idType ??= TypeLocator.GetIdType(resourceType);
-                    var resourceContext = CreateResourceContext(pluralizedTypeName, resourceType, idType);
+                    var resourceContext = CreateResourceContext(pluralizedResourceName, resourceType, idType);
                     _resources.Add(resourceContext);
                 }
                 else
@@ -72,9 +72,9 @@ public IResourceGraphBuilder AddResource(Type resourceType, Type idType = null,
             return this;
         }
 
-        private ResourceContext CreateResourceContext(string pluralizedTypeName, Type resourceType, Type idType) => new ResourceContext
+        private ResourceContext CreateResourceContext(string pluralizedResourceName, Type resourceType, Type idType) => new ResourceContext
         {
-            ResourceName = pluralizedTypeName,
+            ResourceName = pluralizedResourceName,
             ResourceType = resourceType,
             IdentityType = idType,
             Attributes = GetAttributes(resourceType),

src/JsonApiDotNetCore/Extensions/ServiceCollectionExtensions.cs

@@ -48,15 +48,14 @@ public static IServiceCollection AddJsonApi<TDbContext>(this IServiceCollection
         }
 
         private static void SetupApplicationBuilder(IServiceCollection services, Action<JsonApiOptions> options,
-            Action<IServiceDiscoveryFacade> discovery,
+            Action<IServiceDiscoveryFacade> autoDiscovery,
             Action<IResourceGraphBuilder> resources, IMvcCoreBuilder mvcBuilder, Type dbContextType)
         {
             var applicationBuilder = new JsonApiApplicationBuilder(services, mvcBuilder ?? services.AddMvcCore());
 
             applicationBuilder.ConfigureJsonApiOptions(options);
-            applicationBuilder.ConfigureMvc(dbContextType);
-            applicationBuilder.AutoDiscover(discovery);
-            applicationBuilder.ConfigureResources(resources);
+            applicationBuilder.RegisterResourceSources(dbContextType, autoDiscovery, resources);
+            applicationBuilder.ConfigureMvc();
             applicationBuilder.ConfigureServices();
         }
 

src/JsonApiDotNetCore/Graph/IServiceDiscoveryFacade.cs

@@ -4,7 +4,23 @@ namespace JsonApiDotNetCore.Graph
 {
     public interface IServiceDiscoveryFacade
     {
+        /// <summary>
+        /// Registers the designated assembly for discovery of JsonApiDotNetCore services and resources.
+        /// </summary>
         ServiceDiscoveryFacade AddAssembly(Assembly assembly);
+        /// <summary>
+        /// Registers the current assembly for discovery of JsonApiDotNetCore services and resources.
+        /// </summary>
         ServiceDiscoveryFacade AddCurrentAssembly();
+
+        /// <summary>
+        /// Discovers JsonApiDotNetCore services in the registered assemblies and adds them to the DI container.
+        /// </summary>
+        internal void DiscoverServices();
+
+        /// <summary>
+        /// Discovers JsonApiDotNetCore resources in the registered assemblies and adds them to the resource graph.
+        /// </summary>
+        internal void DiscoverResources();
     }
-}
+}