chore: remove redundant injections of IResourceGraph

Author: maurei

src/Examples/GettingStarted/Controllers/ArticlesController.cs

@@ -10,9 +10,8 @@ public class ArticlesController : JsonApiController<Article>
     {
         public ArticlesController(
             IJsonApiOptions jsonApiOptions,
-            IResourceGraph resourceGraph,
             IResourceService<Article> resourceService)
-            : base(jsonApiOptions, resourceGraph, resourceService)
+            : base(jsonApiOptions, resourceService)
         { }
     }
 }

src/Examples/GettingStarted/Controllers/PeopleController.cs

@@ -10,9 +10,8 @@ public class PeopleController : JsonApiController<Person>
     {
         public PeopleController(
             IJsonApiOptions jsonApiOptions,
-            IResourceGraph resourceGraph,
             IResourceService<Person> resourceService)
-          : base(jsonApiOptions, resourceGraph, resourceService)
+          : base(jsonApiOptions, resourceService)
         { }
     }
 }

src/Examples/GettingStarted/ResourceDefinitionExample/ModelDefinition.cs

@@ -6,7 +6,7 @@ namespace GettingStarted.ResourceDefinitionExample
 {
     public class ModelDefinition : ResourceDefinition<Model>
     {
-        public ModelDefinition(IResourceGraph graph) : base(graph)
+        public ModelDefinition(IContextEntityProvider provider) : base(provider)
         {
         }
 

src/Examples/GettingStarted/ResourceDefinitionExample/ModelsController.cs

@@ -9,9 +9,8 @@ public class ModelsController : JsonApiController<Model>
     {
         public ModelsController(
             IJsonApiOptions jsonApiOptions,
-            IResourceGraph resourceGraph,
             IResourceService<Model> resourceService)
-          : base(jsonApiOptions, resourceGraph, resourceService)
+          : base(jsonApiOptions, resourceService)
         { }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Resources/ArticleResource.cs

@@ -11,7 +11,7 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class ArticleResource : ResourceDefinition<Article>
     {
-        public ArticleResource(IResourceGraph graph) : base(graph) { }
+        public ArticleResource(IContextEntityProvider provider) : base(provider) { }
 
         public override IEnumerable<Article> OnReturn(HashSet<Article> entities, ResourcePipeline pipeline)
         {

src/Examples/JsonApiDotNetCoreExample/Resources/LockableResource.cs

@@ -11,7 +11,7 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public abstract class LockableResource<T> : ResourceDefinition<T> where T : class, IIsLockable, IIdentifiable
     {
-        protected LockableResource(IResourceGraph graph) : base(graph) { }
+        protected LockableResource(IContextEntityProvider provider) : base(provider) { }
 
         protected void DisallowLocked(IEnumerable<T> entities)
         {

src/Examples/JsonApiDotNetCoreExample/Resources/PassportResource.cs

@@ -11,7 +11,7 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class PassportResource : ResourceDefinition<Passport>
     {
-        public PassportResource(IResourceGraph graph) : base(graph)
+        public PassportResource(IContextEntityProvider provider) : base(provider)
         {
         }
 

src/Examples/JsonApiDotNetCoreExample/Resources/PersonResource.cs

@@ -9,7 +9,7 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class PersonResource : LockableResource<Person>, IHasMeta
     {
-        public PersonResource(IResourceGraph graph) : base(graph) { }
+        public PersonResource(IContextEntityProvider provider) : base(provider) { }
 
         public override IEnumerable<Person> BeforeUpdate(IDiffableEntityHashSet<Person> entities, ResourcePipeline pipeline)
         {

src/Examples/JsonApiDotNetCoreExample/Resources/TagResource.cs

@@ -10,7 +10,7 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class TagResource : ResourceDefinition<Tag>
     {
-        public TagResource(IResourceGraph graph) : base(graph) { }
+        public TagResource(IContextEntityProvider provider) : base(provider) { }
 
         public override IEnumerable<Tag> BeforeCreate(IEntityHashSet<Tag> affected, ResourcePipeline pipeline)
         {

src/Examples/JsonApiDotNetCoreExample/Resources/TodoResource.cs

@@ -10,7 +10,7 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class TodoResource : LockableResource<TodoItem>
     {
-        public TodoResource(IResourceGraph graph) : base(graph) { }
+        public TodoResource(IContextEntityProvider provider) : base(provider) { }
 
         public override void BeforeRead(ResourcePipeline pipeline, bool isIncluded = false, string stringId = null)
         {

src/Examples/JsonApiDotNetCoreExample/Resources/UserResource.cs

@@ -9,7 +9,7 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class UserResource : ResourceDefinition<User>
     {
-        public UserResource(IResourceGraph graph, IFieldsExplorer fieldExplorer) : base(fieldExplorer, graph)
+        public UserResource(IContextEntityProvider provider, IFieldsExplorer fieldExplorer) : base(fieldExplorer, provider)
         {
             HideFields(u => u.Password);
         }

src/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs

@@ -20,11 +20,11 @@ public CustomArticleService(ISortService sortService,
                                     IIncludeService includeService,
                                     ISparseFieldsService sparseFieldsService,
                                     IPageService pageService,
-                                    IResourceGraph resourceGraph,
+                                    IContextEntityProvider provider,
                                     IResourceHookExecutor hookExecutor = null,
                                     ILoggerFactory loggerFactory = null)
             : base(sortService, filterService, repository, options, includeService, sparseFieldsService,
-                   pageService, resourceGraph, hookExecutor, loggerFactory)
+                   pageService, provider, hookExecutor, loggerFactory)
         {
         }
 

src/Examples/ReportsExample/Controllers/ReportsController.cs

@@ -12,9 +12,8 @@ public class ReportsController : BaseJsonApiController<Report, int>
     {
         public ReportsController(
             IJsonApiOptions jsonApiOptions,
-            IResourceGraph resourceGraph, 
             IGetAllService<Report> getAll)
-        : base(jsonApiOptions, resourceGraph, getAll: getAll)
+        : base(jsonApiOptions, getAll: getAll)
         { }
 
         [HttpGet]

src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs

@@ -13,7 +13,7 @@ public interface IResourceGraphBuilder
         /// <summary>
         /// Construct the <see cref="ResourceGraph"/>
         /// </summary>
-        IResourceGraph Build();
+        IContextEntityProvider Build();
 
         /// <summary>
         /// Add a json:api resource

src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs

@@ -32,27 +32,10 @@ public ResourceGraphBuilder(IResourceNameFormatter formatter)
         }
 
         /// <inheritdoc />
-        public IResourceGraph Build()
+        public IContextEntityProvider Build()
         {
             _entities.ForEach(SetResourceLinksOptions);
-
-            List<ControllerResourceMap> controllerContexts = new List<ControllerResourceMap>() { };
-            foreach (var cm in _controllerMapper)
-            {
-                var model = cm.Key;
-                foreach (var controller in cm.Value)
-                {
-                    var controllerName = controller.Name.Replace("Controller", "");
-
-                    controllerContexts.Add(new ControllerResourceMap
-                    {
-                        Resource = model,
-                        ControllerName = controllerName,
-                    });
-
-                }
-            }
-            var graph = new ResourceGraph(_entities, _usesDbContext, _validationResults, controllerContexts);
+            var graph = new ResourceGraph(_entities, _validationResults);
             return graph;
         }
 

src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs

@@ -133,7 +133,6 @@ public class JsonApiOptions : IJsonApiOptions
         public void EnableExtension(JsonApiExtension extension)
             => EnabledExtensions.Add(extension);
 
-        internal IResourceGraphBuilder ResourceGraphBuilder { get; } = new ResourceGraphBuilder();
         internal List<JsonApiExtension> EnabledExtensions { get; set; } = new List<JsonApiExtension>();
     }
 }

src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs

@@ -419,18 +419,18 @@ public class DefaultEntityRepository<TEntity> : DefaultEntityRepository<TEntity,
     {
         public DefaultEntityRepository(ITargetedFields targetedFields,
                                        IDbContextResolver contextResolver,
-                                       IResourceGraph resourceGraph,
+                                       IContextEntityProvider contextEntityProvider,
                                        IGenericProcessorFactory genericProcessorFactory)
-            : base(targetedFields, contextResolver, resourceGraph, genericProcessorFactory)
+            : base(targetedFields, contextResolver, contextEntityProvider, genericProcessorFactory)
         {
         }
 
         public DefaultEntityRepository(ITargetedFields targetedFields,
                                        IDbContextResolver contextResolver,
-                                       IResourceGraph resourceGraph,
+                                       IContextEntityProvider contextEntityProvider,
                                        IGenericProcessorFactory genericProcessorFactory,
                                        ILoggerFactory loggerFactory = null)
-            : base(targetedFields, contextResolver, resourceGraph, genericProcessorFactory, loggerFactory)
+            : base(targetedFields, contextResolver, contextEntityProvider, genericProcessorFactory, loggerFactory)
         {
         }
     }

src/JsonApiDotNetCore/Extensions/IApplicationBuilderExtensions.cs

@@ -49,7 +49,7 @@ private static void DisableDetailedErrorsIfProduction(IApplicationBuilder app)
         private static void LogResourceGraphValidations(IApplicationBuilder app)
         {
             var logger = app.ApplicationServices.GetService(typeof(ILogger<ResourceGraphBuilder>)) as ILogger;
-            var resourceGraph = app.ApplicationServices.GetService(typeof(IResourceGraph)) as ResourceGraph;
+            var resourceGraph = app.ApplicationServices.GetService(typeof(IContextEntityProvider)) as ResourceGraph;
 
             if (logger != null && resourceGraph != null)
             {

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -80,8 +80,8 @@ public static IServiceCollection AddClientSerialization(this IServiceCollection
 
             services.AddScoped<IRequestSerializer>(sp =>
             {
-                var resourceObjectBuilder = new ResourceObjectBuilder(sp.GetService<IResourceGraph>(), sp.GetService<IContextEntityProvider>(), sp.GetService<IResourceObjectBuilderSettingsProvider>().Get());
-                return new RequestSerializer(sp.GetService<IFieldsExplorer>(), sp.GetService<IResourceGraph>(), resourceObjectBuilder);
+                var resourceObjectBuilder = new ResourceObjectBuilder(sp.GetService<IContextEntityProvider>(), sp.GetService<IResourceObjectBuilderSettingsProvider>().Get());
+                return new RequestSerializer(sp.GetService<IFieldsExplorer>(), sp.GetService<IContextEntityProvider>(), resourceObjectBuilder);
             });
            return services;
         }

src/JsonApiDotNetCore/Internal/Contracts/IResourceGraph.cs

@@ -7,9 +7,6 @@ namespace JsonApiDotNetCore.Internal.Contracts
     /// </summary>
     public interface IResourceGraph : IContextEntityProvider
     {
-        /// <summary>
-        /// Was built against an EntityFrameworkCore DbContext ?
-        /// </summary>
-        bool UsesDbContext { get; }
+
     }
 }

src/JsonApiDotNetCore/Internal/ResourceGraph.cs

@@ -6,57 +6,36 @@
 
 namespace JsonApiDotNetCore.Internal
 {
-    public class ControllerResourceMap
-    {
-        public string ControllerName { get; set; }
-        public Type Resource { get; set; }
-    }
-
     /// <summary>
     ///  keeps track of all the models/resources defined in JADNC
     /// </summary>
-    public class ResourceGraph : IResourceGraph
+    public class ResourceGraph : IContextEntityProvider
     {
-        internal List<ContextEntity> Entities { get; }
         internal List<ValidationResult> ValidationResults { get; }
+        private List<ContextEntity> _entities { get; }
 
-        public List<ControllerResourceMap> ControllerResourceMap { get; internal set; }
-
-        [Obsolete("please instantiate properly, dont use the static constructor")]
-        internal static IResourceGraph Instance { get; set; }
-
-        public ResourceGraph() { }
-        [Obsolete("Use new one")]
-        public ResourceGraph(List<ContextEntity> entities, bool usesDbContext)
+        public ResourceGraph(List<ContextEntity> entities)
         {
-            Entities = entities;
-            UsesDbContext = usesDbContext;
+            _entities = entities;
             ValidationResults = new List<ValidationResult>();
-            Instance = this;
         }
 
-        internal ResourceGraph(List<ContextEntity> entities, bool usesDbContext, List<ValidationResult> validationResults, List<ControllerResourceMap> controllerContexts)
+        public ResourceGraph(List<ContextEntity> entities, List<ValidationResult> validationResults)
         {
-            ControllerResourceMap = controllerContexts;
-            Entities = entities;
-            UsesDbContext = usesDbContext;
+            _entities = entities;
             ValidationResults = validationResults;
-            Instance = this;
         }
 
         /// <inheritdoc />
-        public bool UsesDbContext { get; }
-
-        /// <inheritdoc />
-        public ContextEntity[] GetContextEntities() => Entities.ToArray();
+        public ContextEntity[] GetContextEntities() => _entities.ToArray();
 
         /// <inheritdoc />
         public ContextEntity GetContextEntity(string entityName)
-            => Entities.SingleOrDefault(e => string.Equals(e.EntityName, entityName, StringComparison.OrdinalIgnoreCase));
+            => _entities.SingleOrDefault(e => string.Equals(e.EntityName, entityName, StringComparison.OrdinalIgnoreCase));
 
         /// <inheritdoc />
         public ContextEntity GetContextEntity(Type entityType)
-            => Entities.SingleOrDefault(e => e.EntityType == entityType);
+            => _entities.SingleOrDefault(e => e.EntityType == entityType);
         /// <inheritdoc />
         public ContextEntity GetContextEntity<TResource>() where TResource : class, IIdentifiable
             => GetContextEntity(typeof(TResource));

src/JsonApiDotNetCore/Internal/ValidationResults.cs

@@ -2,7 +2,7 @@
 
 namespace JsonApiDotNetCore.Internal
 {
-    internal class ValidationResult
+    public class ValidationResult
     {
         public ValidationResult(LogLevel logLevel, string message)
         {

src/JsonApiDotNetCore/Models/ResourceDefinition.cs

@@ -32,15 +32,15 @@ public class ResourceDefinition<TResource> : IResourceDefinition, IResourceHookC
         private readonly IFieldsExplorer _fieldExplorer;
         private List<AttrAttribute> _allowedAttributes;
         private List<RelationshipAttribute> _allowedRelationships;
-        public ResourceDefinition(IFieldsExplorer fieldExplorer, IResourceGraph graph)
+        public ResourceDefinition(IFieldsExplorer fieldExplorer, IContextEntityProvider graph)
         {
             _contextEntity = graph.GetContextEntity(typeof(TResource));
             _allowedAttributes = _contextEntity.Attributes;
             _allowedRelationships = _contextEntity.Relationships;
             _fieldExplorer = fieldExplorer;
         }
 
-        public ResourceDefinition(IResourceGraph graph)
+        public ResourceDefinition(IContextEntityProvider graph)
         {
             _contextEntity = graph.GetContextEntity(typeof(TResource));
             _allowedAttributes = _contextEntity.Attributes;

src/JsonApiDotNetCore/Serialization/Common/ResourceObjectBuilder.cs

@@ -12,14 +12,12 @@ namespace JsonApiDotNetCore.Serialization
     /// <inheritdoc/> 
     public class ResourceObjectBuilder : IResourceObjectBuilder
     {
-        protected readonly IResourceGraph _resourceGraph;
         protected readonly IContextEntityProvider _provider;
         private readonly ResourceObjectBuilderSettings _settings;
         private const string _identifiablePropertyName = nameof(Identifiable.Id);
 
-        public ResourceObjectBuilder(IResourceGraph resourceGraph, IContextEntityProvider provider, ResourceObjectBuilderSettings settings)
+        public ResourceObjectBuilder(IContextEntityProvider provider, ResourceObjectBuilderSettings settings)
         {
-            _resourceGraph = resourceGraph;
             _provider = provider;
             _settings = settings;
         }

src/JsonApiDotNetCore/Serialization/Server/Builders/IncludedResourceObjectBuilder.cs

@@ -16,10 +16,9 @@ public class IncludedResourceObjectBuilder : ResourceObjectBuilder, IIncludedRes
 
         public IncludedResourceObjectBuilder(IFieldsToSerialize fieldsToSerialize,
                                              ILinkBuilder linkBuilder,
-                                             IResourceGraph resourceGraph,
                                              IContextEntityProvider provider,
                                              IResourceObjectBuilderSettingsProvider settingsProvider)
-            : base(resourceGraph, provider, settingsProvider.Get())
+            : base(provider, settingsProvider.Get())
         {
             _included = new HashSet<ResourceObject>(new ResourceObjectComparer());
             _fieldsToSerialize = fieldsToSerialize;

src/JsonApiDotNetCore/Serialization/Server/Builders/ResponseResourceObjectBuilder.cs

@@ -17,10 +17,9 @@ public class ResponseResourceObjectBuilder : ResourceObjectBuilder, IResourceObj
         public ResponseResourceObjectBuilder(ILinkBuilder linkBuilder,
                                              IIncludedResourceObjectBuilder includedBuilder,
                                              IIncludeService includeService,
-                                             IResourceGraph resourceGraph,
                                              IContextEntityProvider provider,
                                              IResourceObjectBuilderSettingsProvider settingsProvider)
-            : base(resourceGraph, provider, settingsProvider.Get())
+            : base(provider, settingsProvider.Get())
         {
             _linkBuilder = linkBuilder;
             _includedBuilder = includedBuilder;

src/JsonApiDotNetCore/Serialization/Server/RequestDeserializer.cs

@@ -11,8 +11,8 @@ public class RequestDeserializer : BaseDocumentParser, IJsonApiDeserializer
     {
         private readonly ITargetedFields  _targetedFields;
 
-        public RequestDeserializer(IResourceGraph resourceGraph,
-                                  ITargetedFields  targetedFields) : base(resourceGraph)
+        public RequestDeserializer(IContextEntityProvider provider,
+                                  ITargetedFields  targetedFields) : base(provider)
         {
             _targetedFields = targetedFields;
         }