feat: #500

Author: maurei

src/Examples/GettingStarted/ResourceDefinitionExample/ModelDefinition.cs

@@ -1,10 +1,15 @@
 using System.Collections.Generic;
+using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Models;
 
 namespace GettingStarted.ResourceDefinitionExample
 {
     public class ModelDefinition : ResourceDefinition<Model>
     {
+        public ModelDefinition(IResourceGraph graph) : base(graph)
+        {
+        }
+
         // this allows POST / PATCH requests to set the value of a
         // property, but we don't include this value in the response
         // this might be used if the incoming value gets hashed or

src/Examples/JsonApiDotNetCoreExample/Resources/ArticleResource.cs

@@ -12,6 +12,8 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class ArticleResource : ResourceDefinition<Article>
     {
+        public ArticleResource(IResourceGraph graph) : base(graph) { }
+
         public override IEnumerable<Article> OnReturn(HashSet<Article> entities, ResourcePipeline pipeline)
         {
             if (pipeline == ResourcePipeline.ReadSingle && entities.Single().Name == "Classified")

src/Examples/JsonApiDotNetCoreExample/Resources/PassportResource.cs

@@ -10,6 +10,10 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class PassportResource : ResourceDefinition<Passport>
     {
+        public PassportResource(IResourceGraph graph) : base(graph)
+        {
+        }
+
         public override void BeforeRead(ResourcePipeline pipeline, bool nestedHook = false, string stringId = null)
         {
             if (pipeline == ResourcePipeline.ReadSingle && nestedHook)

src/Examples/JsonApiDotNetCoreExample/Resources/PersonResource.cs

@@ -10,6 +10,10 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class PersonResource : ResourceDefinition<Person>
     {
+        public PersonResource(IResourceGraph graph) : base(graph)
+        {
+        }
+
         public override IEnumerable<string> BeforeUpdateRelationship(HashSet<string> ids, IAffectedRelationships<Person> resourcesByRelationship, ResourcePipeline pipeline)
         {
             BeforeImplicitUpdateRelationship(resourcesByRelationship, pipeline);

src/Examples/JsonApiDotNetCoreExample/Resources/TagResource.cs

@@ -3,11 +3,16 @@
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Hooks;
 using JsonApiDotNetCoreExample.Models;
+using JsonApiDotNetCore.Internal;
 
 namespace JsonApiDotNetCoreExample.Resources
 {
     public class TagResource : ResourceDefinition<Tag>
     {
+        public TagResource(IResourceGraph graph) : base(graph)
+        {
+        }
+
         public override IEnumerable<Tag> OnReturn(HashSet<Tag> entities, ResourcePipeline pipeline)
         {
             return entities.Where(t => t.Name != "This should be not be included");

src/Examples/JsonApiDotNetCoreExample/Resources/TodoResource.cs

@@ -10,6 +10,10 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class TodoResource : ResourceDefinition<TodoItem>
     {
+        public TodoResource(IResourceGraph graph) : base(graph)
+        {
+        }
+
         public override void BeforeRead(ResourcePipeline pipeline, bool isIncluded = false, string stringId = null)
         {
             if (stringId == "1337")

src/Examples/JsonApiDotNetCoreExample/Resources/UserResource.cs

@@ -3,11 +3,16 @@
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCoreExample.Models;
 using JsonApiDotNetCore.Internal.Query;
+using JsonApiDotNetCore.Internal;
 
 namespace JsonApiDotNetCoreExample.Resources
 {
     public class UserResource : ResourceDefinition<User>
     {
+        public UserResource(IResourceGraph graph) : base(graph)
+        {
+        }
+
         protected override List<AttrAttribute> OutputAttrs()
             => Remove(user => user.Password);
 

src/JsonApiDotNetCore/Models/ResourceDefinition.cs

@@ -25,17 +25,15 @@ public interface IResourceDefinition
     /// <typeparam name="T">The resource type</typeparam>
     public class ResourceDefinition<T> : IResourceDefinition, IResourceHookContainer<T> where T : class, IIdentifiable
     {
-        private readonly IResourceGraph _graph;
         private readonly ContextEntity _contextEntity;
         internal readonly bool _instanceAttrsAreSpecified;
 
         private bool _requestCachedAttrsHaveBeenLoaded = false;
         private List<AttrAttribute> _requestCachedAttrs;
 
-        public ResourceDefinition()
+        public ResourceDefinition(IResourceGraph graph)
         {
-            _graph = ResourceGraph.Instance;
-            _contextEntity = ResourceGraph.Instance.GetContextEntity(typeof(T));
+            _contextEntity = graph.GetContextEntity(typeof(T));
             _instanceAttrsAreSpecified = InstanceOutputAttrsAreSpecified();
         }
 
@@ -214,9 +212,9 @@ public class QueryFilters : Dictionary<string, Func<IQueryable<T>, FilterQuery,
         ///     };
         /// </code>
         /// </example>
-        protected virtual PropertySortOrder GetDefaultSortOrder() => null;
+        public virtual PropertySortOrder GetDefaultSortOrder() => null;
 
-        internal List<(AttrAttribute, SortDirection)> DefaultSort()
+        public List<(AttrAttribute, SortDirection)> DefaultSort()
         {
             var defaultSortOrder = GetDefaultSortOrder();
             if (defaultSortOrder != null && defaultSortOrder.Count > 0)

test/UnitTests/Builders/DocumentBuilder_Tests.cs

@@ -300,6 +300,7 @@ public void Build_Will_Use_Resource_If_Defined_For_Multiple_Documents()
             var scopedServiceProvider = new TestScopedServiceProvider(
                 new ServiceCollection()
                     .AddScoped<ResourceDefinition<User>, UserResource>()
+                    .AddSingleton(resourceGraph)
                     .BuildServiceProvider());
 
             var documentBuilder = new DocumentBuilder(_jsonApiContextMock.Object, scopedServiceProvider: scopedServiceProvider);
@@ -323,6 +324,7 @@ public void Build_Will_Use_Resource_If_Defined_For_Single_Document()
             var scopedServiceProvider = new TestScopedServiceProvider(
                 new ServiceCollection()
                     .AddScoped<ResourceDefinition<User>, UserResource>()
+                    .AddSingleton(resourceGraph)
                     .BuildServiceProvider());
 
             var documentBuilder = new DocumentBuilder(_jsonApiContextMock.Object, scopedServiceProvider: scopedServiceProvider);
@@ -345,6 +347,7 @@ public void Build_Will_Use_Instance_Specific_Resource_If_Defined_For_Multiple_Do
             var scopedServiceProvider = new TestScopedServiceProvider(
                 new ServiceCollection()
                     .AddScoped<ResourceDefinition<User>, InstanceSpecificUserResource>()
+                    .AddSingleton(resourceGraph)
                     .BuildServiceProvider());
 
             var documentBuilder = new DocumentBuilder(_jsonApiContextMock.Object, scopedServiceProvider: scopedServiceProvider);
@@ -368,6 +371,7 @@ public void Build_Will_Use_Instance_Specific_Resource_If_Defined_For_Single_Docu
             var scopedServiceProvider = new TestScopedServiceProvider(
                 new ServiceCollection()
                     .AddScoped<ResourceDefinition<User>, InstanceSpecificUserResource>()
+                    .AddSingleton(resourceGraph)
                     .BuildServiceProvider());
 
             var documentBuilder = new DocumentBuilder(_jsonApiContextMock.Object, scopedServiceProvider: scopedServiceProvider);
@@ -386,12 +390,20 @@ public class User : Identifiable
 
         public class InstanceSpecificUserResource : ResourceDefinition<User>
         {
+            public InstanceSpecificUserResource(IResourceGraph graph) : base(graph)
+            {
+            }
+
             protected override List<AttrAttribute> OutputAttrs(User instance)
                 => Remove(user => user.Password);
         }
 
         public class UserResource : ResourceDefinition<User>
         {
+            public UserResource(IResourceGraph graph) : base(graph)
+            {
+            }
+
             protected override List<AttrAttribute> OutputAttrs()
                 => Remove(user => user.Password);
         }

test/UnitTests/Models/ResourceDefinitionTests.cs

@@ -109,7 +109,7 @@ public class RequestFilteredResource : ResourceDefinition<Model>
 
         // this constructor will be resolved from the container
         // that means you can take on any dependency that is also defined in the container
-        public RequestFilteredResource(bool isAdmin)
+        public RequestFilteredResource(bool isAdmin) : base (new ResourceGraphBuilder().AddResource<Model>().Build())
         {
             _isAdmin = isAdmin;
         }
@@ -133,6 +133,10 @@ protected override PropertySortOrder GetDefaultSortOrder()
 
     public class InstanceFilteredResource : ResourceDefinition<Model>
     {
+        public InstanceFilteredResource() : base(new ResourceGraphBuilder().AddResource<Model>().Build())
+        {
+        }
+
         // Called once per resource instance
         protected override List<AttrAttribute> OutputAttrs(Model model)
             => model.AlwaysExcluded == "Admin"