chore: fix NoEntityFrameworkExample project

maurei · maurei · commit 354a1be763dd · 2019-10-22T16:15:18.000+02:00
diff --git a/src/Examples/GettingStarted/Controllers/ArticlesController.cs b/src/Examples/GettingStarted/Controllers/ArticlesController.cs
@@ -1,7 +1,6 @@
 using GettingStarted.Models;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Services;
 
 namespace GettingStarted
diff --git a/src/Examples/GettingStarted/Controllers/PeopleController.cs b/src/Examples/GettingStarted/Controllers/PeopleController.cs
@@ -1,7 +1,6 @@
 using GettingStarted.Models;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Services;
 
 namespace GettingStarted
diff --git a/src/Examples/GettingStarted/Data/SampleDbContext.cs b/src/Examples/GettingStarted/Data/SampleDbContext.cs
@@ -6,10 +6,7 @@ namespace GettingStarted
 {
     public class SampleDbContext : DbContext
     {
-        public SampleDbContext(DbContextOptions<SampleDbContext> options)
-        : base(options)
-        { }
-
+        public SampleDbContext(DbContextOptions<SampleDbContext> options) : base(options) { }
         public DbSet<Article> Articles { get; set; }
         public DbSet<Person> People { get; set; }
         public DbSet<Model> Models { get; set; }
diff --git a/src/Examples/GettingStarted/Models/Person.cs b/src/Examples/GettingStarted/Models/Person.cs
@@ -7,7 +7,6 @@ public class Person : Identifiable
     {
         [Attr] 
         public string Name { get; set; }
-
         [HasMany] 
         public List<Article> Articles { get; set; }
     }
diff --git a/src/Examples/GettingStarted/ResourceDefinitionExample/ModelDefinition.cs b/src/Examples/GettingStarted/ResourceDefinitionExample/ModelDefinition.cs
@@ -6,16 +6,14 @@ namespace GettingStarted.ResourceDefinitionExample
 {
     public class ModelDefinition : ResourceDefinition<Model>
     {
-        public ModelDefinition(IResourceContextProvider provider) : base(provider)
+        public ModelDefinition(IResourceGraph resourceGraph) : base(resourceGraph)
         {
+            // 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
+            // encrypted prior to being persisted and this value should
+            // never be sent back to the client
+            HideFields(model => model.DontExpose);
         }
-
-        // 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
-        // encrypted prior to being persisted and this value should
-        // never be sent back to the client
-        protected override List<AttrAttribute> OutputAttrs()
-            => Remove(model => model.DontExpose);
     }
 }
diff --git a/src/Examples/GettingStarted/ResourceDefinitionExample/ModelsController.cs b/src/Examples/GettingStarted/ResourceDefinitionExample/ModelsController.cs
@@ -1,6 +1,5 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Services;
 
 namespace GettingStarted.ResourceDefinitionExample
diff --git a/src/Examples/GettingStarted/Startup.cs b/src/Examples/GettingStarted/Startup.cs
@@ -1,10 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+﻿using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.EntityFrameworkCore;
 using JsonApiDotNetCore.Extensions;
@@ -23,7 +18,7 @@ public void ConfigureServices(IServiceCollection services)
             var mvcBuilder = services.AddMvcCore();
             services.AddJsonApi(
                 options => options.Namespace = "api", 
-                discover => discover.AddCurrentAssembly(), mvcBuilder);
+                discover => discover.AddCurrentAssembly(), mvcBuilder: mvcBuilder);
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, SampleDbContext context)
diff --git a/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs b/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs
@@ -154,7 +154,7 @@ public void ConfigureServices()
             _services.AddScoped<IScopedServiceProvider, RequestScopedServiceProvider>();
             _services.AddScoped<IJsonApiWriter, JsonApiWriter>();
             _services.AddScoped<IJsonApiReader, JsonApiReader>();
-            _services.AddScoped<IGenericServiceFactory, genericServiceFactory>();
+            _services.AddScoped<IGenericServiceFactory, GenericServiceFactory>();
             _services.AddScoped(typeof(HasManyThroughUpdateHelper<>));
             _services.AddScoped<IQueryParameterDiscovery, QueryParameterDiscovery>();
             _services.AddScoped<ITargetedFields, TargetedFields>();
diff --git a/src/JsonApiDotNetCore/Data/DefaultResourceRepository.cs b/src/JsonApiDotNetCore/Data/DefaultResourceRepository.cs
@@ -423,18 +423,18 @@ public class DefaultResourceRepository<TResource> : DefaultResourceRepository<TR
     {
         public DefaultResourceRepository(ITargetedFields targetedFields,
                                        IDbContextResolver contextResolver,
-                                       IResourceGraph contextEntityProvider,
+                                       IResourceGraph resourceContextProvider,
                                        IGenericServiceFactory genericServiceFactory)
-            : base(targetedFields, contextResolver, contextEntityProvider, genericServiceFactory)
+            : base(targetedFields, contextResolver, resourceContextProvider, genericServiceFactory)
         {
         }
 
         public DefaultResourceRepository(ITargetedFields targetedFields,
                                        IDbContextResolver contextResolver,
-                                       IResourceGraph contextEntityProvider,
+                                       IResourceGraph resourceContextProvider,
                                        IGenericServiceFactory genericServiceFactory,
                                        ILoggerFactory loggerFactory = null)
-            : base(targetedFields, contextResolver, contextEntityProvider, genericServiceFactory, loggerFactory)
+            : base(targetedFields, contextResolver, resourceContextProvider, genericServiceFactory, loggerFactory)
         {
         }
     }
diff --git a/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs b/src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs
@@ -19,12 +19,12 @@ internal class HookExecutorHelper : IHookExecutorHelper
     {
         private readonly IdentifiableComparer _comparer = new IdentifiableComparer();
         private readonly IJsonApiOptions _options;
-        protected readonly IGenericProcessorFactory _genericProcessorFactory;
+        protected readonly IGenericServiceFactory _genericProcessorFactory;
         protected readonly Dictionary<RightType, IResourceHookContainer> _hookContainers;
         protected readonly Dictionary<RightType, IHooksDiscovery> _hookDiscoveries;
         protected readonly List<ResourceHook> _targetedHooksForRelatedEntities;
 
-        public HookExecutorHelper(IGenericProcessorFactory genericProcessorFactory,
+        public HookExecutorHelper(IGenericServiceFactory genericProcessorFactory,
                                   IJsonApiOptions options)
         {
             _options = options;
@@ -43,7 +43,7 @@ public IResourceHookContainer GetResourceHookContainer(RightType rightType, Reso
             /// so we need not even bother.
             if (!_hookContainers.TryGetValue(rightType, out IResourceHookContainer container))
             {
-                container = (_genericProcessorFactory.GetProcessor<IResourceHookContainer>(typeof(ResourceDefinition<>), rightType));
+                container = (_genericProcessorFactory.Get<IResourceHookContainer>(typeof(ResourceDefinition<>), rightType));
                 _hookContainers[rightType] = container;
             }
             if (container == null) return container;
@@ -123,7 +123,7 @@ IHooksDiscovery GetHookDiscovery(Type entityType)
         {
             if (!_hookDiscoveries.TryGetValue(entityType, out IHooksDiscovery discovery))
             {
-                discovery = _genericProcessorFactory.GetProcessor<IHooksDiscovery>(typeof(IHooksDiscovery<>), entityType);
+                discovery = _genericProcessorFactory.Get<IHooksDiscovery>(typeof(IHooksDiscovery<>), entityType);
                 _hookDiscoveries[entityType] = discovery;
             }
             return discovery;
@@ -138,7 +138,7 @@ IEnumerable<TResource> GetWhereAndInclude<TResource, TId>(IEnumerable<TId> ids,
 
         IResourceReadRepository<TResource, TId> GetRepository<TResource, TId>() where TResource : class, IIdentifiable<TId>
         {
-            return _genericProcessorFactory.GetProcessor<IResourceReadRepository<TResource, TId>>(typeof(IResourceReadRepository<,>), typeof(TResource), typeof(TId));
+            return _genericProcessorFactory.Get<IResourceReadRepository<TResource, TId>>(typeof(IResourceReadRepository<,>), typeof(TResource), typeof(TId));
         }
 
 
diff --git a/src/JsonApiDotNetCore/Internal/Generics/GenericServiceFactory.cs b/src/JsonApiDotNetCore/Internal/Generics/GenericServiceFactory.cs
@@ -15,7 +15,7 @@ public interface IGenericServiceFactory
         /// </summary>
         /// <example>
         /// <code>
-        ///     GetProcessor&lt;IGenericProcessor&gt;(typeof(GenericProcessor&lt;&gt;), typeof(TResource));
+        ///     Get&lt;IGenericProcessor&gt;(typeof(GenericProcessor&lt;&gt;), typeof(TResource));
         /// </code>
         /// </example>
         TInterface Get<TInterface>(Type openGenericType, Type resourceType);
@@ -25,7 +25,7 @@ public interface IGenericServiceFactory
         /// </summary>
         /// <example>
         /// <code>
-        ///     GetProcessor&lt;IGenericProcessor&gt;(typeof(GenericProcessor&lt;,&gt;), typeof(TResource), typeof(TId));
+        ///     Get&lt;IGenericProcessor&gt;(typeof(GenericProcessor&lt;,&gt;), typeof(TResource), typeof(TId));
         /// </code>
         /// </example>
         TInterface Get<TInterface>(Type openGenericType, Type resourceType, Type keyType);
diff --git a/src/JsonApiDotNetCore/Middleware/CurrentRequestMiddleware.cs b/src/JsonApiDotNetCore/Middleware/CurrentRequestMiddleware.cs
@@ -12,8 +12,6 @@
 namespace JsonApiDotNetCore.Middleware
 {
     /// <summary>
-    /// Can be overwritten to help you out during testing
-    /// 
     /// This sets all necessary parameters relating to the HttpContext for JADNC
     /// </summary>
     public class CurrentRequestMiddleware
diff --git a/src/JsonApiDotNetCore/Models/ResourceDefinition.cs b/src/JsonApiDotNetCore/Models/ResourceDefinition.cs
@@ -26,15 +26,15 @@ public interface IResourceDefinition
     /// <typeparam name="TResource">The resource type</typeparam>
     public class ResourceDefinition<TResource> : IResourceDefinition, IResourceHookContainer<TResource> where TResource : class, IIdentifiable
     {
-        private readonly ResourceContext _contextEntity;
+        private readonly ResourceContext _resourceContext;
         private readonly IResourceGraph _resourceGraph;
         private List<AttrAttribute> _allowedAttributes;
         private List<RelationshipAttribute> _allowedRelationships;
         public ResourceDefinition(IResourceGraph resourceGraph)
         {
-            _contextEntity = resourceGraph.GetResourceContext(typeof(TResource));
-            _allowedAttributes = _contextEntity.Attributes;
-            _allowedRelationships = _contextEntity.Relationships;
+            _resourceContext = resourceGraph.GetResourceContext(typeof(TResource));
+            _allowedAttributes = _resourceContext.Attributes;
+            _allowedRelationships = _resourceContext.Relationships;
             _resourceGraph = resourceGraph;
         }
 
diff --git a/src/JsonApiDotNetCore/RequestServices/Contracts/ICurrentRequest.cs b/src/JsonApiDotNetCore/RequestServices/Contracts/ICurrentRequest.cs
@@ -33,8 +33,8 @@ public interface ICurrentRequest
         /// <summary>
         /// Sets the current context entity for this entire request
         /// </summary>
-        /// <param name="contextEntityCurrent"></param>
-        void SetRequestResource(ResourceContext contextEntityCurrent);
+        /// <param name="currentResourceContext"></param>
+        void SetRequestResource(ResourceContext currentResourceContext);
 
         ResourceContext GetRequestResource();
     }
diff --git a/src/JsonApiDotNetCore/RequestServices/CurrentRequest.cs b/src/JsonApiDotNetCore/RequestServices/CurrentRequest.cs
@@ -6,7 +6,7 @@ namespace JsonApiDotNetCore.Managers
 {
     class CurrentRequest : ICurrentRequest
     {
-        private ResourceContext _contextEntity;
+        private ResourceContext _resourceContext;
         public string BasePath { get; set; }
         public bool IsRelationshipPath { get; set; }
         public RelationshipAttribute RequestRelationship { get; set; }
@@ -17,12 +17,12 @@ class CurrentRequest : ICurrentRequest
         /// <returns></returns>
         public ResourceContext GetRequestResource()
         {
-            return _contextEntity;
+            return _resourceContext;
         }
 
         public void SetRequestResource(ResourceContext primaryResource)
         {
-            _contextEntity = primaryResource;
+            _resourceContext = primaryResource;
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Client/ResponseDeserializer.cs b/src/JsonApiDotNetCore/Serialization/Client/ResponseDeserializer.cs
@@ -91,12 +91,12 @@ private IIdentifiable ParseIncludedRelationship(RelationshipAttribute relationsh
             if (includedResource == null)
                 return relatedInstance;
 
-            var contextEntity = _provider.GetResourceContext(relatedResourceIdentifier.Type);
-            if (contextEntity == null)
+            var resourceContext = _provider.GetResourceContext(relatedResourceIdentifier.Type);
+            if (resourceContext == null)
                 throw new InvalidOperationException($"Included type '{relationshipAttr.RightType}' is not a registered json:api resource.");
 
-            SetAttributes(relatedInstance, includedResource.Attributes, contextEntity.Attributes);
-            SetRelationships(relatedInstance, includedResource.Relationships, contextEntity.Relationships);
+            SetAttributes(relatedInstance, includedResource.Attributes, resourceContext.Attributes);
+            SetRelationships(relatedInstance, includedResource.Relationships, resourceContext.Relationships);
             return relatedInstance;
         }
 
diff --git a/src/JsonApiDotNetCore/Serialization/Common/BaseDocumentParser.cs b/src/JsonApiDotNetCore/Serialization/Common/BaseDocumentParser.cs
@@ -128,8 +128,8 @@ private JToken LoadJToken(string body)
         /// <returns>The parsed entity</returns>
         private IIdentifiable ParseResourceObject(ResourceObject data)
         {
-            var contextEntity = _provider.GetResourceContext(data.Type);
-            if (contextEntity == null)
+            var resourceContext = _provider.GetResourceContext(data.Type);
+            if (resourceContext == null)
             {
                 throw new JsonApiException(400,
                      message: $"This API does not contain a json:api resource named '{data.Type}'.",
@@ -138,10 +138,10 @@ private IIdentifiable ParseResourceObject(ResourceObject data)
                              + "If you have manually registered the resource, check that the call to AddResource correctly sets the public name.");
             }
 
-            var entity = (IIdentifiable)Activator.CreateInstance(contextEntity.ResourceType);
+            var entity = (IIdentifiable)Activator.CreateInstance(resourceContext.ResourceType);
 
-            entity = SetAttributes(entity, data.Attributes, contextEntity.Attributes);
-            entity = SetRelationships(entity, data.Relationships, contextEntity.Relationships);
+            entity = SetAttributes(entity, data.Attributes, resourceContext.Attributes);
+            entity = SetRelationships(entity, data.Relationships, resourceContext.Relationships);
 
             if (data.Id != null)
                 entity.StringId = data.Id?.ToString();
diff --git a/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs b/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
@@ -5,9 +5,7 @@
 using JsonApiDotNetCore.Data;
 using JsonApiDotNetCore.Graph;
 using JsonApiDotNetCore.Hooks;
-using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Contracts;
-using JsonApiDotNetCore.Managers.Contracts;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 using Microsoft.EntityFrameworkCore;
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs
@@ -18,7 +18,6 @@ public class TestFixture<TStartup> : IDisposable where TStartup : class
     {
         private readonly TestServer _server;
         private IServiceProvider _services;
-
         public TestFixture()
         {
             var builder = new WebHostBuilder()
diff --git a/test/NoEntityFrameworkTests/Acceptance/Extensibility/NoEntityFrameworkTests.cs b/test/NoEntityFrameworkTests/Acceptance/Extensibility/NoEntityFrameworkTests.cs
@@ -35,8 +35,7 @@ public async Task Can_Get_TodoItems()
             // act
             var response = await client.SendAsync(request);
             var responseBody = await response.Content.ReadAsStringAsync();
-            var deserializedBody = _fixture.Server.GetDeserializer()
-                .DeserializeList<TodoItem>(responseBody);
+            var deserializedBody = _fixture.GetDeserializer().DeserializeList<TodoItem>(responseBody).Data;
 
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -62,8 +61,7 @@ public async Task Can_Get_TodoItems_By_Id()
             // act
             var response = await client.SendAsync(request);
             var responseBody = await response.Content.ReadAsStringAsync();
-            var deserializedBody = (TodoItem)_fixture.Server.GetDeserializer()
-                .Deserialize(responseBody);
+            var deserializedBody = _fixture.GetDeserializer().DeserializeSingle<TodoItem>(responseBody).Data;
 
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -99,8 +97,7 @@ public async Task Can_Create_TodoItems()
             // act
             var response = await client.SendAsync(request);
             var responseBody = await response.Content.ReadAsStringAsync();
-            var deserializedBody = (TodoItem)_fixture.Server.GetDeserializer()
-                .Deserialize(responseBody);
+            var deserializedBody = _fixture.GetDeserializer().DeserializeSingle<TodoItem>(responseBody).Data;
 
             // assert
             Assert.Equal(HttpStatusCode.Created, response.StatusCode);
diff --git a/test/NoEntityFrameworkTests/TestFixture.cs b/test/NoEntityFrameworkTests/TestFixture.cs
@@ -1,23 +1,58 @@
+using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Serialization.Client;
 using JsonApiDotNetCoreExample.Data;
+using JsonApiDotNetCoreExample.Models;
 using JsonApiDotNetCoreExampleTests.Helpers.Extensions;
+using JsonApiDotNetCoreExampleTests.Helpers.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using System;
+using System.Linq.Expressions;
 
 namespace NoEntityFrameworkTests
 {
     public class TestFixture : IDisposable
     {
         public AppDbContext Context { get; private set; }
         public TestServer Server { get; private set; }
-
+        private IServiceProvider _services;
         public TestFixture()
         {
             var builder = new WebHostBuilder().UseStartup<TestStartup>();
             Server = new TestServer(builder);
             Context = Server.GetService<AppDbContext>();
             Context.Database.EnsureCreated();
+            _services = Server.Host.Services;
+        }
+
+        public IRequestSerializer GetSerializer<TResource>(Expression<Func<TResource, dynamic>> attributes = null, Expression<Func<TResource, dynamic>> relationships = null) where TResource : class, IIdentifiable
+        {
+            var serializer = GetService<IRequestSerializer>();
+            if (attributes != null)
+                serializer.SetAttributesToSerialize(attributes);
+            if (relationships != null)
+                serializer.SetRelationshipsToSerialize(relationships);
+            return serializer;
         }
+        public IResponseDeserializer GetDeserializer()
+        {
+            var resourceGraph = new ResourceGraphBuilder()
+                .AddResource<PersonRole>()
+                .AddResource<Article>()
+                .AddResource<Tag>()
+                .AddResource<CamelCasedModel>()
+                .AddResource<User>()
+                .AddResource<Person>()
+                .AddResource<Author>()
+                .AddResource<Passport>()
+                .AddResource<TodoItemClient>("todo-items")
+                .AddResource<TodoItemCollectionClient, Guid>().Build();
+            return new ResponseDeserializer(resourceGraph);
+        }
+
+        public T GetService<T>() => (T)_services.GetService(typeof(T));
+
 
         public void Dispose()
         {
diff --git a/test/UnitTests/Extensions/IServiceCollectionExtensionsTests.cs b/test/UnitTests/Extensions/IServiceCollectionExtensionsTests.cs
diff --git a/test/UnitTests/QueryParameters/SparseFieldsServiceTests.cs b/test/UnitTests/QueryParameters/SparseFieldsServiceTests.cs
diff --git a/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs b/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,7 @@ namespace GettingStarted`
`6`	`6`	`{`
`7`	`7`	`public class SampleDbContext : DbContext`
`8`	`8`	`{`
`9`		`- public SampleDbContext(DbContextOptions<SampleDbContext> options)`
`10`		`- : base(options)`
`11`		`- { }`
`12`		`-`
	`9`	`+ public SampleDbContext(DbContextOptions<SampleDbContext> options) : base(options) { }`
`13`	`10`	`public DbSet<Article> Articles { get; set; }`
`14`	`11`	`public DbSet<Person> People { get; set; }`
`15`	`12`	`public DbSet<Model> Models { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ public class Person : Identifiable`
`7`	`7`	`{`
`8`	`8`	`[Attr]`
`9`	`9`	`public string Name { get; set; }`
`10`		`-`
`11`	`10`	`[HasMany]`
`12`	`11`	`public List<Article> Articles { get; set; }`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,14 @@ namespace GettingStarted.ResourceDefinitionExample`
`6`	`6`	`{`
`7`	`7`	`public class ModelDefinition : ResourceDefinition<Model>`
`8`	`8`	`{`
`9`		`- public ModelDefinition(IResourceContextProvider provider) : base(provider)`
	`9`	`+ public ModelDefinition(IResourceGraph resourceGraph) : base(resourceGraph)`
`10`	`10`	`{`
	`11`	`+ // this allows POST / PATCH requests to set the value of a`
	`12`	`+ // property, but we don't include this value in the response`
	`13`	`+ // this might be used if the incoming value gets hashed or`
	`14`	`+ // encrypted prior to being persisted and this value should`
	`15`	`+ // never be sent back to the client`
	`16`	`+ HideFields(model => model.DontExpose);`
`11`	`17`	`}`
`12`		`-`
`13`		`- // this allows POST / PATCH requests to set the value of a`
`14`		`- // property, but we don't include this value in the response`
`15`		`- // this might be used if the incoming value gets hashed or`
`16`		`- // encrypted prior to being persisted and this value should`
`17`		`- // never be sent back to the client`
`18`		`- protected override List<AttrAttribute> OutputAttrs()`
`19`		`- => Remove(model => model.DontExpose);`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -423,18 +423,18 @@ public class DefaultResourceRepository<TResource> : DefaultResourceRepository<TR`
`423`	`423`	`{`
`424`	`424`	`public DefaultResourceRepository(ITargetedFields targetedFields,`
`425`	`425`	`IDbContextResolver contextResolver,`
`426`		`- IResourceGraph contextEntityProvider,`
	`426`	`+ IResourceGraph resourceContextProvider,`
`427`	`427`	`IGenericServiceFactory genericServiceFactory)`
`428`		`- : base(targetedFields, contextResolver, contextEntityProvider, genericServiceFactory)`
	`428`	`+ : base(targetedFields, contextResolver, resourceContextProvider, genericServiceFactory)`
`429`	`429`	`{`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`public DefaultResourceRepository(ITargetedFields targetedFields,`
`433`	`433`	`IDbContextResolver contextResolver,`
`434`		`- IResourceGraph contextEntityProvider,`
	`434`	`+ IResourceGraph resourceContextProvider,`
`435`	`435`	`IGenericServiceFactory genericServiceFactory,`
`436`	`436`	`ILoggerFactory loggerFactory = null)`
`437`		`- : base(targetedFields, contextResolver, contextEntityProvider, genericServiceFactory, loggerFactory)`
	`437`	`+ : base(targetedFields, contextResolver, resourceContextProvider, genericServiceFactory, loggerFactory)`
`438`	`438`	`{`
`439`	`439`	`}`
`440`	`440`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ internal class HookExecutorHelper : IHookExecutorHelper`
`19`	`19`	`{`
`20`	`20`	`private readonly IdentifiableComparer _comparer = new IdentifiableComparer();`
`21`	`21`	`private readonly IJsonApiOptions _options;`
`22`		`- protected readonly IGenericProcessorFactory _genericProcessorFactory;`
	`22`	`+ protected readonly IGenericServiceFactory _genericProcessorFactory;`
`23`	`23`	`protected readonly Dictionary<RightType, IResourceHookContainer> _hookContainers;`
`24`	`24`	`protected readonly Dictionary<RightType, IHooksDiscovery> _hookDiscoveries;`
`25`	`25`	`protected readonly List<ResourceHook> _targetedHooksForRelatedEntities;`
`26`	`26`
`27`		`- public HookExecutorHelper(IGenericProcessorFactory genericProcessorFactory,`
	`27`	`+ public HookExecutorHelper(IGenericServiceFactory genericProcessorFactory,`
`28`	`28`	`IJsonApiOptions options)`
`29`	`29`	`{`
`30`	`30`	`_options = options;`
`@@ -43,7 +43,7 @@ public IResourceHookContainer GetResourceHookContainer(RightType rightType, Reso`
`43`	`43`	`/// so we need not even bother.`
`44`	`44`	`if (!_hookContainers.TryGetValue(rightType, out IResourceHookContainer container))`
`45`	`45`	`{`
`46`		`- container = (_genericProcessorFactory.GetProcessor<IResourceHookContainer>(typeof(ResourceDefinition<>), rightType));`
	`46`	`+ container = (_genericProcessorFactory.Get<IResourceHookContainer>(typeof(ResourceDefinition<>), rightType));`
`47`	`47`	`_hookContainers[rightType] = container;`
`48`	`48`	`}`
`49`	`49`	`if (container == null) return container;`
`@@ -123,7 +123,7 @@ IHooksDiscovery GetHookDiscovery(Type entityType)`
`123`	`123`	`{`
`124`	`124`	`if (!_hookDiscoveries.TryGetValue(entityType, out IHooksDiscovery discovery))`
`125`	`125`	`{`
`126`		`- discovery = _genericProcessorFactory.GetProcessor<IHooksDiscovery>(typeof(IHooksDiscovery<>), entityType);`
	`126`	`+ discovery = _genericProcessorFactory.Get<IHooksDiscovery>(typeof(IHooksDiscovery<>), entityType);`
`127`	`127`	`_hookDiscoveries[entityType] = discovery;`
`128`	`128`	`}`
`129`	`129`	`return discovery;`
`@@ -138,7 +138,7 @@ IEnumerable<TResource> GetWhereAndInclude<TResource, TId>(IEnumerable<TId> ids,`
`138`	`138`
`139`	`139`	`IResourceReadRepository<TResource, TId> GetRepository<TResource, TId>() where TResource : class, IIdentifiable<TId>`
`140`	`140`	`{`
`141`		`- return _genericProcessorFactory.GetProcessor<IResourceReadRepository<TResource, TId>>(typeof(IResourceReadRepository<,>), typeof(TResource), typeof(TId));`
	`141`	`+ return _genericProcessorFactory.Get<IResourceReadRepository<TResource, TId>>(typeof(IResourceReadRepository<,>), typeof(TResource), typeof(TId));`
`142`	`142`	`}`
`143`	`143`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@`
`12`	`12`	`namespace JsonApiDotNetCore.Middleware`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
`15`		`- /// Can be overwritten to help you out during testing`
`16`		`- ///`
`17`	`15`	`/// This sets all necessary parameters relating to the HttpContext for JADNC`
`18`	`16`	`/// </summary>`
`19`	`17`	`public class CurrentRequestMiddleware`
Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@ public interface IResourceDefinition`
`26`	`26`	`/// <typeparam name="TResource">The resource type</typeparam>`
`27`	`27`	`public class ResourceDefinition<TResource> : IResourceDefinition, IResourceHookContainer<TResource> where TResource : class, IIdentifiable`
`28`	`28`	`{`
`29`		`- private readonly ResourceContext _contextEntity;`
	`29`	`+ private readonly ResourceContext _resourceContext;`
`30`	`30`	`private readonly IResourceGraph _resourceGraph;`
`31`	`31`	`private List<AttrAttribute> _allowedAttributes;`
`32`	`32`	`private List<RelationshipAttribute> _allowedRelationships;`
`33`	`33`	`public ResourceDefinition(IResourceGraph resourceGraph)`
`34`	`34`	`{`
`35`		`- _contextEntity = resourceGraph.GetResourceContext(typeof(TResource));`
`36`		`- _allowedAttributes = _contextEntity.Attributes;`
`37`		`- _allowedRelationships = _contextEntity.Relationships;`
	`35`	`+ _resourceContext = resourceGraph.GetResourceContext(typeof(TResource));`
	`36`	`+ _allowedAttributes = _resourceContext.Attributes;`
	`37`	`+ _allowedRelationships = _resourceContext.Relationships;`
`38`	`38`	`_resourceGraph = resourceGraph;`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace JsonApiDotNetCore.Managers`
`6`	`6`	`{`
`7`	`7`	`class CurrentRequest : ICurrentRequest`
`8`	`8`	`{`
`9`		`- private ResourceContext _contextEntity;`
	`9`	`+ private ResourceContext _resourceContext;`
`10`	`10`	`public string BasePath { get; set; }`
`11`	`11`	`public bool IsRelationshipPath { get; set; }`
`12`	`12`	`public RelationshipAttribute RequestRelationship { get; set; }`
`@@ -17,12 +17,12 @@ class CurrentRequest : ICurrentRequest`
`17`	`17`	`/// <returns></returns>`
`18`	`18`	`public ResourceContext GetRequestResource()`
`19`	`19`	`{`
`20`		`- return _contextEntity;`
	`20`	`+ return _resourceContext;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public void SetRequestResource(ResourceContext primaryResource)`
`24`	`24`	`{`
`25`		`- _contextEntity = primaryResource;`
	`25`	`+ _resourceContext = primaryResource;`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ public class TestFixture<TStartup> : IDisposable where TStartup : class`
`18`	`18`	`{`
`19`	`19`	`private readonly TestServer _server;`
`20`	`20`	`private IServiceProvider _services;`
`21`		`-`
`22`	`21`	`public TestFixture()`
`23`	`22`	`{`
`24`	`23`	`var builder = new WebHostBuilder()`