chore: review

Author: maurei

src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs

@@ -166,9 +166,9 @@ public void ConfigureServices(Type dbContextType)
         /// <summary>
         /// Discovers DI registrable services in the assemblies marked for discovery.
         /// </summary>
-        public void DiscoverServices()
+        public void DiscoverInjectables()
         {
-            _serviceDiscoveryFacade.DiscoverServices();
+            _serviceDiscoveryFacade.DiscoverInjectables();
         }
 
         private void AddRepositoryLayer()

src/JsonApiDotNetCore/Extensions/ServiceCollectionExtensions.cs

@@ -58,7 +58,7 @@ private static void SetupApplicationBuilder(IServiceCollection services, Action<
             applicationBuilder.ConfigureAutoDiscovery(configureAutoDiscovery);
             applicationBuilder.AddResourceGraph(dbContextType, configureResources);
             applicationBuilder.ConfigureMvc();
-            applicationBuilder.DiscoverServices();
+            applicationBuilder.DiscoverInjectables();
             applicationBuilder.ConfigureServices(dbContextType);
         }
 

src/JsonApiDotNetCore/Graph/IServiceDiscoveryFacade.cs

@@ -16,7 +16,7 @@ public interface IServiceDiscoveryFacade
         /// <summary>
         /// Discovers JsonApiDotNetCore services in the registered assemblies and adds them to the DI container.
         /// </summary>
-        internal void DiscoverServices();
+        internal void DiscoverInjectables();
 
         /// <summary>
         /// Discovers JsonApiDotNetCore resources in the registered assemblies and adds them to the resource graph.

src/JsonApiDotNetCore/Graph/ServiceDiscoveryFacade.cs

@@ -83,7 +83,7 @@ void IServiceDiscoveryFacade.DiscoverResources()
         }
 
         /// <inheritdoc/>
-        void IServiceDiscoveryFacade.DiscoverServices()
+        void IServiceDiscoveryFacade.DiscoverInjectables()
         {
             foreach (var (assembly, discoveredResourceDescriptors) in  _resourceDescriptorsPerAssemblyCache.ToArray())
             {

src/JsonApiDotNetCore/Internal/JsonApiRoutingConvention.cs

@@ -95,14 +95,16 @@ private bool RoutingConventionDisabled(ControllerModel controller)
         /// </summary>
         private string TemplateFromResource(ControllerModel model)
         {
-            if (!_registeredResources.TryGetValue(model.ControllerName, out var resourceContext))
+            if (_registeredResources.TryGetValue(model.ControllerName, out var resourceContext))
             {
-                return null;
+                var template = $"{_options.Namespace}/{resourceContext.ResourceName}";
+                if (_registeredTemplates.Add(template))
+                {
+                    return template;
+                }
             }
-            
-            var template = $"{_options.Namespace}/{resourceContext.ResourceName}";
-            
-            return _registeredTemplates.Add(template) ? template : null;
+
+            return null;
         }
 
         /// <summary>

test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs

@@ -96,7 +96,7 @@ public void AddCurrentAssembly_Adds_Services_To_Container()
 
             // Act
             facade.AddCurrentAssembly();
-            facade.DiscoverServices();
+            facade.DiscoverInjectables();
 
             // Assert
             var services = _services.BuildServiceProvider();
@@ -112,7 +112,7 @@ public void AddCurrentAssembly_Adds_Repositories_To_Container()
 
             // Act
             facade.AddCurrentAssembly();
-            facade.DiscoverServices();
+            facade.DiscoverInjectables();
 
             // Assert
             var services = _services.BuildServiceProvider();
@@ -127,7 +127,7 @@ public void AddCurrentAssembly_Adds_ResourceDefinitions_To_Container()
 
             // Act
             facade.AddCurrentAssembly();
-            facade.DiscoverServices();
+            facade.DiscoverInjectables();
 
             // Assert
             var services = _services.BuildServiceProvider();