Feat/serializer context decoupling

benchmarks/Program.cs

@@ -9,7 +9,7 @@ namespace Benchmarks {
     class Program {
         static void Main(string[] args) {
             var switcher = new BenchmarkSwitcher(new[] {
-                typeof(JsonApiDeserializer_Benchmarks),
+                typeof(JsonApideserializer_Benchmarks),
                 //typeof(JsonApiSerializer_Benchmarks),
                 typeof(QueryParser_Benchmarks),
                 typeof(LinkBuilder_GetNamespaceFromPath_Benchmarks),

benchmarks/Query/QueryParser_Benchmarks.cs

@@ -22,8 +22,8 @@ public class QueryParser_Benchmarks {
         private const string DESCENDING_SORT = "-" + ATTRIBUTE;
 
         public QueryParser_Benchmarks() {
-            var requestMock = new Mock<IRequestManager>();
-            requestMock.Setup(m => m.GetContextEntity()).Returns(new ContextEntity {
+            var requestMock = new Mock<IRequestContext>();
+            requestMock.Setup(m => m.GetRequestResource()).Returns(new ContextEntity {
                 Attributes = new List<AttrAttribute> {
                     new AttrAttribute(ATTRIBUTE, ATTRIBUTE)
                 }
@@ -59,8 +59,8 @@ private void Run(int iterations, Action action) {
         // this facade allows us to expose and micro-benchmark protected methods
         private class BenchmarkFacade : QueryParser {
             public BenchmarkFacade(
-                IRequestManager requestManager,
-                JsonApiOptions options) : base(requestManager, options) { }
+                IRequestContext currentRequest,
+                JsonApiOptions options) : base(currentRequest, options) { }
 
             public void _ParseSortParameters(string value) => base.ParseSortParameters(value);
         }

benchmarks/Serialization/JsonApiDeserializer_Benchmarks.cs

@@ -7,6 +7,8 @@
 using JsonApiDotNetCore.Managers.Contracts;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization;
+using JsonApiDotNetCore.Serialization.Contracts;
+
 using JsonApiDotNetCore.Services;
 using Moq;
 using Newtonsoft.Json;
@@ -15,7 +17,7 @@
 namespace Benchmarks.Serialization
 {
     [MarkdownExporter]
-    public class JsonApiDeserializer_Benchmarks {
+    public class JsonApideserializer_Benchmarks {
         private const string TYPE_NAME = "simple-types";
         private static readonly string Content = JsonConvert.SerializeObject(new Document {
             Data = new ResourceObject {
@@ -30,15 +32,15 @@ public class JsonApiDeserializer_Benchmarks {
             }
         });
 
-        private readonly JsonApiDeSerializer _jsonApiDeSerializer;
+        private readonly JsonApideserializer _jsonApideserializer;
 
-        public JsonApiDeserializer_Benchmarks() {
+        public JsonApideserializer_Benchmarks() {
             var resourceGraphBuilder = new ResourceGraphBuilder();
             resourceGraphBuilder.AddResource<SimpleType>(TYPE_NAME);
             var resourceGraph = resourceGraphBuilder.Build();
-            var  requestManagerMock = new Mock<IRequestManager>();
+            var  currentRequestMock = new Mock<IRequestContext>();
 
-            requestManagerMock.Setup(m => m.GetUpdatedAttributes()).Returns(new Dictionary<AttrAttribute, object>());
+            currentRequestMock.Setup(m => m.GetUpdatedAttributes()).Returns(new Dictionary<AttrAttribute, object>());
 
             var jsonApiContextMock = new Mock<IJsonApiContext>();
             jsonApiContextMock.SetupAllProperties();
@@ -50,11 +52,11 @@ public JsonApiDeserializer_Benchmarks() {
             jsonApiContextMock.Setup(m => m.Options).Returns(jsonApiOptions);
 
 
-            _jsonApiDeSerializer = new JsonApiDeSerializer(jsonApiContextMock.Object, requestManagerMock.Object);
+            _jsonApideserializer = new JsonApideserializer(jsonApiContextMock.Object, currentRequestMock.Object);
         }
 
         [Benchmark]
-        public object DeserializeSimpleObject() => _jsonApiDeSerializer.Deserialize<SimpleType>(Content);
+        public object DeserializeSimpleObject() => _jsonApideserializer.Deserialize<SimpleType>(Content);
 
         private class SimpleType : Identifiable {
             [Attr("name")]

benchmarks/Serialization/JsonApiSerializer_Benchmarks.cs

@@ -6,6 +6,8 @@
 //using JsonApiDotNetCore.Internal.Generics;
 //using JsonApiDotNetCore.Models;
 //using JsonApiDotNetCore.Serialization;
+using JsonApiDotNetCore.Serialization.Contracts;
+
 //using JsonApiDotNetCore.Services;
 //using Moq;
 //using Newtonsoft.Json.Serialization;
@@ -34,7 +36,7 @@
 
 //            var genericProcessorFactoryMock = new Mock<IGenericProcessorFactory>();
 
-//            var documentBuilder = new DocumentBuilder(jsonApiContextMock.Object);
+//            var documentBuilder = new BaseDocumentBuilder(jsonApiContextMock.Object);
 //            _jsonApiSerializer = new JsonApiSerializer(jsonApiContextMock.Object, documentBuilder);
 //        }
 

src/Examples/GettingStarted/Models/Article.cs

@@ -6,7 +6,6 @@ public class Article : Identifiable
     {
         [Attr]
         public string Title { get; set; }
-
         [HasOne]
         public Person Author { get; set; }
         public int AuthorId { get; set; }

src/Examples/JsonApiDotNetCoreExample/Controllers/PassportsController.cs

@@ -1,15 +1,16 @@
+using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample.Models;
+using Microsoft.Extensions.Logging;
 
 namespace JsonApiDotNetCoreExample.Controllers
 {
     public class PassportsController : JsonApiController<Passport>
     {
-        public PassportsController(
-            IJsonApiContext jsonApiContext,
-            IResourceService<Passport> resourceService)
-            : base(jsonApiContext, resourceService)
-        { }
+        public PassportsController(IJsonApiOptions jsonApiOptions, IResourceGraph resourceGraph, IResourceService<Passport, int> resourceService, ILoggerFactory loggerFactory = null) : base(jsonApiOptions, resourceGraph, resourceService, loggerFactory)
+        {
+        }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsCustomController.cs

@@ -13,21 +13,19 @@ namespace JsonApiDotNetCoreExample.Controllers
     public class TodoItemsCustomController : CustomJsonApiController<TodoItem>
     {
         public TodoItemsCustomController(
-            IJsonApiContext jsonApiContext,
             IResourceService<TodoItem> resourceService,
             ILoggerFactory loggerFactory) 
-            : base(jsonApiContext, resourceService, loggerFactory)
+            : base(resourceService, loggerFactory)
         { }
     }
 
     public class CustomJsonApiController<T>
     : CustomJsonApiController<T, int> where T : class, IIdentifiable<int>
     {
         public CustomJsonApiController(
-            IJsonApiContext jsonApiContext,
             IResourceService<T, int> resourceService,
             ILoggerFactory loggerFactory)
-            : base(jsonApiContext, resourceService, loggerFactory)
+            : base(resourceService, loggerFactory)
         { }
     }
 
@@ -36,28 +34,23 @@ public class CustomJsonApiController<T, TId>
     {
         private readonly ILogger _logger;
         private readonly IResourceService<T, TId> _resourceService;
-        private readonly IJsonApiContext _jsonApiContext;
 
         protected IActionResult Forbidden()
         {
             return new StatusCodeResult(403);
         }
 
         public CustomJsonApiController(
-            IJsonApiContext jsonApiContext,
             IResourceService<T, TId> resourceService,
             ILoggerFactory loggerFactory)
         {
-            _jsonApiContext = jsonApiContext.ApplyContext<T>(this);
             _resourceService = resourceService;
             _logger = loggerFactory.CreateLogger<JsonApiDotNetCore.Controllers.JsonApiController<T, TId>>();
         }
 
         public CustomJsonApiController(
-            IJsonApiContext jsonApiContext,
             IResourceService<T, TId> resourceService)
         {
-            _jsonApiContext = jsonApiContext.ApplyContext<T>(this);
             _resourceService = resourceService;
         }
 
@@ -102,8 +95,8 @@ public virtual async Task<IActionResult> PostAsync([FromBody] T entity)
             if (entity == null)
                 return UnprocessableEntity();
 
-            if (!_jsonApiContext.Options.AllowClientGeneratedIds && !string.IsNullOrEmpty(entity.StringId))
-                return Forbidden();
+            //if (!_jsonApiContext.Options.AllowClientGeneratedIds && !string.IsNullOrEmpty(entity.StringId))
+            //    return Forbidden();
 
             entity = await _resourceService.CreateAsync(entity);
 

src/Examples/JsonApiDotNetCoreExample/Models/Person.cs

@@ -1,7 +1,6 @@
-using System;
 using System.Collections.Generic;
 using JsonApiDotNetCore.Models;
-using JsonApiDotNetCore.Services;
+using JsonApiDotNetCore.Models.Links;
 
 namespace JsonApiDotNetCoreExample.Models
 {
@@ -11,7 +10,7 @@ public class PersonRole : Identifiable
         public Person Person { get; set; }
     }
 
-    public class Person : Identifiable, IHasMeta, IIsLockable
+    public class Person : Identifiable, IIsLockable
     {
         public bool IsLocked { get; set; }
 
@@ -45,21 +44,13 @@ public class Person : Identifiable, IHasMeta, IIsLockable
         public virtual TodoItem StakeHolderTodo { get; set; }
         public virtual int? StakeHolderTodoId { get; set; }
 
-        [HasOne("unincludeable-item", documentLinks: Link.All, canInclude: false)]
+        [HasOne("unincludeable-item", links: Link.All, canInclude: false)]
         public virtual TodoItem UnIncludeableItem { get; set; }
 
         public int? PassportId { get; set; }
 
         [HasOne("passport")]
         public virtual Passport Passport { get; set; }
 
-        public Dictionary<string, object> GetMeta(IJsonApiContext context)
-        {
-            return new Dictionary<string, object> {
-                { "copyright", "Copyright 2015 Example Corp." },
-                { "authors", new string[] { "Jared Nance" } }
-            };
-        }
-
     }
 }

src/Examples/JsonApiDotNetCoreExample/Models/TodoItemCollection.cs

@@ -9,12 +9,12 @@ public class TodoItemCollection : Identifiable<Guid>
     {
         [Attr("name")]
         public string Name { get; set; }
-        public int OwnerId { get; set; }
 
         [HasMany("todo-items")]
         public virtual List<TodoItem> TodoItems { get; set; }
 
         [HasOne("owner")]
         public virtual Person Owner { get; set; }
+        public int? OwnerId { get; set; }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Models/User.cs

@@ -1,10 +1,11 @@
+using System;
 using JsonApiDotNetCore.Models;
 
 namespace JsonApiDotNetCoreExample.Models
 {
     public class User : Identifiable
     {
-        [Attr("username")] public string Username { get; set; }
-        [Attr("password")] public string Password { get; set; }
+        [Attr] public string Username { get; set; }
+        [Attr] public string Password { get; set; }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Resources/LockableResource.cs

@@ -4,6 +4,7 @@
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample.Models;
 
 namespace JsonApiDotNetCoreExample.Resources

src/Examples/JsonApiDotNetCoreExample/Resources/PersonResource.cs

@@ -3,13 +3,19 @@
 using JsonApiDotNetCore.Hooks;
 using JsonApiDotNetCoreExample.Models;
 using JsonApiDotNetCore.Internal.Contracts;
+using JsonApiDotNetCore.Models;
 
 namespace JsonApiDotNetCoreExample.Resources
 {
-    public class PersonResource : LockableResource<Person>
+    public class PersonResource : LockableResource<Person>, IHasMeta
     {
         public PersonResource(IResourceGraph graph) : base(graph) { }
 
+        public override IEnumerable<Person> BeforeUpdate(IDiffableEntityHashSet<Person> entities, ResourcePipeline pipeline)
+        {
+            return base.BeforeUpdate(entities, pipeline);
+        }
+
         public override IEnumerable<string> BeforeUpdateRelationship(HashSet<string> ids, IRelationshipsDictionary<Person> entitiesByRelationship, ResourcePipeline pipeline)
         {
             BeforeImplicitUpdateRelationship(entitiesByRelationship, pipeline);
@@ -20,5 +26,13 @@ public override void BeforeImplicitUpdateRelationship(IRelationshipsDictionary<P
         {
             entitiesByRelationship.GetByRelationship<Passport>().ToList().ForEach(kvp => DisallowLocked(kvp.Value));
         }
+
+        public Dictionary<string, object> GetMeta()
+        {
+            return new Dictionary<string, object> {
+                { "copyright", "Copyright 2015 Example Corp." },
+                { "authors", new string[] { "Jared Nance", "Maurits Moeys" } }
+            };
+        }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Resources/UserResource.cs

@@ -1,19 +1,18 @@
-using System.Collections.Generic;
 using System.Linq;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCoreExample.Models;
 using JsonApiDotNetCore.Internal.Query;
 using JsonApiDotNetCore.Internal.Contracts;
-
+using JsonApiDotNetCore.Services;
 
 namespace JsonApiDotNetCoreExample.Resources
 {
     public class UserResource : ResourceDefinition<User>
     {
-        public UserResource(IResourceGraph graph) : base(graph) { }
-
-        protected override List<AttrAttribute> OutputAttrs()
-            => Remove(user => user.Password);
+        public UserResource(IResourceGraph graph, IFieldsExplorer fieldExplorer) : base(fieldExplorer, graph)
+        {
+            HideFields(u => u.Password);
+        }
 
         public override QueryFilters GetQueryFilters()
         {

src/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs

@@ -4,6 +4,9 @@
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Managers.Contracts;
+using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Query;
+using JsonApiDotNetCore.Serialization;
 using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample.Models;
 using Microsoft.Extensions.Logging;
@@ -13,16 +16,9 @@ namespace JsonApiDotNetCoreExample.Services
 {
     public class CustomArticleService : EntityResourceService<Article>
     {
-        public CustomArticleService(
-            IEntityRepository<Article> repository,
-            IJsonApiOptions jsonApiOptions,
-            IRequestManager queryManager,
-            IPageManager pageManager,
-            IResourceGraph resourceGraph,
-            IResourceHookExecutor resourceHookExecutor = null,
-            ILoggerFactory loggerFactory = null
-        ) : base(repository: repository, jsonApiOptions, queryManager, pageManager, resourceGraph:resourceGraph, loggerFactory, resourceHookExecutor)
-        { }
+        public CustomArticleService(IEntityRepository<Article, int> repository, IJsonApiOptions options, ITargetedFields updatedFields, ICurrentRequest currentRequest, IIncludeService includeService, ISparseFieldsService sparseFieldsService, IPageQueryService pageManager, IResourceGraph resourceGraph, IResourceHookExecutor hookExecutor = null, IResourceMapper mapper = null, ILoggerFactory loggerFactory = null) : base(repository, options, updatedFields, currentRequest, includeService, sparseFieldsService, pageManager, resourceGraph, hookExecutor, mapper, loggerFactory)
+        {
+        }
 
         public override async Task<Article> GetAsync(int id)
         {

src/Examples/JsonApiDotNetCoreExample/Startup.cs

@@ -37,7 +37,7 @@ public virtual IServiceProvider ConfigureServices(IServiceCollection services)
                     options.DefaultPageSize = 5;
                     options.IncludeTotalRecordCount = true;
                     options.EnableResourceHooks = true;
-                    options.LoadDatabaseValues = true;
+                    options.LoaDatabaseValues = true;
                 }, 
                 discovery => discovery.AddCurrentAssembly());
 

src/Examples/NoEntityFrameworkExample/Services/TodoItemService.cs

@@ -59,7 +59,7 @@ public Task<object> GetRelationshipAsync(int id, string relationshipName)
             throw new NotImplementedException();
         }
 
-        public Task<object> GetRelationshipsAsync(int id, string relationshipName)
+        public Task<TodoItem> GetRelationshipsAsync(int id, string relationshipName)
         {
             throw new NotImplementedException();
         }
@@ -84,7 +84,7 @@ public Task<TodoItem> UpdateAsync(int id, TodoItem entity)
             throw new NotImplementedException();
         }
 
-        public Task UpdateRelationshipsAsync(int id, string relationshipName, List<ResourceObject> relationships)
+        public Task UpdateRelationshipsAsync(int id, string relationshipName, object relationships)
         {
             throw new NotImplementedException();
         }