From 1f8fb381e0d53f7b4d30d707a9bd59c73dfdd5ba Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Sat, 2 Nov 2019 14:07:27 +0100
Subject: [PATCH 1/9] feat: remove inability to use request serializer with
 unknown type at runtime

---
 .../JsonApiDotNetCore.csproj                  |  1 -
 .../Client/IRequestSerializer.cs              | 37 ++++++++++-------
 .../Serialization/Client/RequestSerializer.cs | 41 ++++++-------------
 .../ResourceDefinitionTests.cs                |  1 +
 .../Acceptance/TestFixture.cs                 | 14 +++----
 test/NoEntityFrameworkTests/TestFixture.cs    |  8 ++--
 .../Client/RequestSerializerTests.cs          | 14 +++----
 7 files changed, 53 insertions(+), 63 deletions(-)

diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
index b747656b40..7fadf92c6f 100644
--- a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
+++ b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -27,7 +27,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftLoggingVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="System.ValueTuple" Version="$(TuplesVersion)" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All" />
   </ItemGroup>
 
   <!-- 
diff --git a/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs b/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs
index 168eb1e393..869587786a 100644
--- a/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs
+++ b/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs
@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq.Expressions;
 using JsonApiDotNetCore.Models;
 
@@ -22,20 +23,26 @@ public interface IRequestSerializer
         /// <param name="entities">Entities to serialize</param>
         /// <returns>The serialized content</returns>
         string Serialize(IEnumerable entities);
-        /// <summary>
-        /// Sets the <see cref="AttrAttribute"/>s to serialize for resources of type <typeparamref name="TResource"/>.
-        /// If no <see cref="AttrAttribute"/>s are specified, by default all attributes are included in the serialized result.
-        /// </summary>
-        /// <typeparam name="TResource">Type of the resource to serialize</typeparam>
-        /// <param name="filter">Should be of the form: (TResource e) => new { e.Attr1, e.Attr2 }</param>
-        void SetAttributesToSerialize<TResource>(Expression<System.Func<TResource, dynamic>> filter) where TResource : class, IIdentifiable;
-        /// <summary>
-        /// Sets the <see cref="RelationshipAttribute"/>s to serialize for resources of type <typeparamref name="TResource"/>.
-        /// If no <see cref="RelationshipAttribute"/>s are specified, by default no relationships are included in the serialization result.
-        /// The <paramref name="filter"/>should be of the form: (TResource e) => new { e.Attr1, e.Attr2 }
-        /// </summary>
-        /// <typeparam name="TResource">Type of the resource to serialize</typeparam>
-        /// <param name="filter">Should be of the form: (TResource e) => new { e.Attr1, e.Attr2 }</param>
-        void SetRelationshipsToSerialize<TResource>(Expression<System.Func<TResource, dynamic>> filter) where TResource : class, IIdentifiable;
+        ///// <summary>
+        ///// Sets the <see cref="AttrAttribute"/>s to serialize for resources of type <typeparamref name="TResource"/>.
+        ///// If no <see cref="AttrAttribute"/>s are specified, by default all attributes are included in the serialized result.
+        ///// </summary>
+        ///// <typeparam name="TResource">Type of the resource to serialize</typeparam>
+        ///// <param name="filter">Should be of the form: (TResource e) => new { e.Attr1, e.Attr2 }</param>
+        //void  AAttributesToSerialize(IEnumerable<AttrAttribute> attributes);
+        ///// <summary>
+        ///// Sets the <see cref="RelationshipAttribute"/>s to serialize for resources of type <typeparamref name="TResource"/>.
+        ///// If no <see cref="RelationshipAttribute"/>s are specified, by default no relationships are included in the serialization result.
+        ///// The <paramref name="filter"/>should be of the form: (TResource e) => new { e.Attr1, e.Attr2 }
+        ///// </summary>
+        ///// <typeparam name="TResource">Type of the resource to serialize</typeparam>
+        ///// <param name="filter">Should be of the form: (TResource e) => new { e.Attr1, e.Attr2 }</param>
+        //void SetRelationshipsToSerialize(IEnumerable<RelationshipAttribute> attributes);
+
+        /// <inheritdoc/>
+        public IEnumerable<AttrAttribute> AttributesToSerialize { set; }
+
+        /// <inheritdoc/>
+        public IEnumerable<RelationshipAttribute> RelationshipsToSerialize { set; }
     }
 }
\ No newline at end of file
diff --git a/src/JsonApiDotNetCore/Serialization/Client/RequestSerializer.cs b/src/JsonApiDotNetCore/Serialization/Client/RequestSerializer.cs
index 7f5d827dbe..178fb7c2d4 100644
--- a/src/JsonApiDotNetCore/Serialization/Client/RequestSerializer.cs
+++ b/src/JsonApiDotNetCore/Serialization/Client/RequestSerializer.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq.Expressions;
+using System.Linq;
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
-using JsonApiDotNetCore.Services;
 using Newtonsoft.Json;
 
 namespace JsonApiDotNetCore.Serialization.Client
@@ -14,8 +13,6 @@ namespace JsonApiDotNetCore.Serialization.Client
     /// </summary>
     public class RequestSerializer : BaseDocumentBuilder, IRequestSerializer
     {
-        private readonly Dictionary<Type, List<AttrAttribute>> _attributesToSerializeCache;
-        private readonly Dictionary<Type, List<RelationshipAttribute>> _relationshipsToSerializeCache;
         private Type _currentTargetedResource;
         private readonly IResourceGraph _resourceGraph;
         public RequestSerializer(IResourceGraph resourceGraph,
@@ -23,8 +20,6 @@ public RequestSerializer(IResourceGraph resourceGraph,
             : base(resourceObjectBuilder, resourceGraph)
         {
             _resourceGraph = resourceGraph;
-            _attributesToSerializeCache = new Dictionary<Type, List<AttrAttribute>>();
-            _relationshipsToSerializeCache = new Dictionary<Type, List<RelationshipAttribute>>();
         }
 
         /// <inheritdoc/>
@@ -60,44 +55,34 @@ public string Serialize(IEnumerable entities)
         }
 
         /// <inheritdoc/>
-        public void SetAttributesToSerialize<TResource>(Expression<Func<TResource, dynamic>> filter)
-            where TResource : class, IIdentifiable
-        {
-            var allowedAttributes = _resourceGraph.GetAttributes(filter);
-            _attributesToSerializeCache[typeof(TResource)] = allowedAttributes;
-        }
+        public IEnumerable<AttrAttribute> AttributesToSerialize { private get; set; }
 
         /// <inheritdoc/>
-        public void SetRelationshipsToSerialize<TResource>(Expression<Func<TResource, dynamic>> filter)
-            where TResource : class, IIdentifiable
-        {
-            var allowedRelationships = _resourceGraph.GetRelationships(filter);
-            _relationshipsToSerializeCache[typeof(TResource)] = allowedRelationships;
-        }
+        public IEnumerable<RelationshipAttribute> RelationshipsToSerialize { private get; set; }
 
         /// <summary>
         /// By default, the client serializer includes all attributes in the result,
-        /// unless a list of allowed attributes was supplied using the <see cref="SetAttributesToSerialize"/>
+        /// unless a list of allowed attributes was supplied using the <see cref="AttributesToSerialize"/>
         /// method. For any related resources, attributes are never exposed.
         /// </summary>
         private List<AttrAttribute> GetAttributesToSerialize(IIdentifiable entity)
         {
-            var resourceType = entity.GetType();
-            if (_currentTargetedResource != resourceType)
+            var currentResourceType = entity.GetType();
+            if (_currentTargetedResource != currentResourceType)
                 // We're dealing with a relationship that is being serialized, for which
                 // we never want to include any attributes in the payload.
                 return new List<AttrAttribute>();
 
-            if (!_attributesToSerializeCache.TryGetValue(resourceType, out var attributes))
-                return _resourceGraph.GetAttributes(resourceType);
+            if (AttributesToSerialize == null)
+                return _resourceGraph.GetAttributes(currentResourceType);
 
-            return attributes;
+            return AttributesToSerialize.ToList();
         }
 
         /// <summary>
         /// By default, the client serializer does not include any relationships
         /// for entities in the primary data unless explicitly included using
-        /// <see cref="SetRelationshipsToSerialize{T}(Expression{Func{T, dynamic}})"/>.
+        /// <see cref="RelationshipsToSerialize"/>.
         /// </summary>
         private List<RelationshipAttribute> GetRelationshipsToSerialize(IIdentifiable entity)
         {
@@ -105,10 +90,10 @@ private List<RelationshipAttribute> GetRelationshipsToSerialize(IIdentifiable en
             /// only allow relationship attributes to be serialized if they were set using
             /// <see cref="RelationshipsToInclude{T}(Expression{Func{T, dynamic}})"/>
             /// and the current <paramref name="entity"/> is a main entry in the primary data.
-            if (!_relationshipsToSerializeCache.TryGetValue(currentResourceType, out var relationships))
-                return new List<RelationshipAttribute>();
+            if (RelationshipsToSerialize == null)
+                return _resourceGraph.GetRelationships(currentResourceType);
 
-            return relationships;
+            return RelationshipsToSerialize.ToList();
         }
     }
 }
\ No newline at end of file
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/ResourceDefinitions/ResourceDefinitionTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/ResourceDefinitions/ResourceDefinitionTests.cs
index 0ae0806574..a29ece9344 100644
--- a/test/JsonApiDotNetCoreExampleTests/Acceptance/ResourceDefinitions/ResourceDefinitionTests.cs
+++ b/test/JsonApiDotNetCoreExampleTests/Acceptance/ResourceDefinitions/ResourceDefinitionTests.cs
@@ -72,6 +72,7 @@ public async Task Can_Create_User_With_Password()
         {
             // Arrange
             var user = _userFaker.Generate();
+
             var serializer = _fixture.GetSerializer<User>(p => new { p.Password, p.Username });
 
             
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs
index a24bf58208..300d904da3 100644
--- a/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs
+++ b/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs
@@ -11,6 +11,7 @@
 using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCoreExampleTests.Helpers.Models;
 using JsonApiDotNetCoreExample.Models;
+using JsonApiDotNetCore.Internal.Contracts;
 
 namespace JsonApiDotNetCoreExampleTests.Acceptance
 {
@@ -31,17 +32,14 @@ public TestFixture()
 
         public HttpClient Client { get; set; }
         public AppDbContext Context { get; private set; }
+
+
         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);
-            }
+            var graph =  GetService<IResourceGraph>();
+            serializer.AttributesToSerialize = graph.GetAttributes(attributes);
+            serializer.RelationshipsToSerialize = graph.GetRelationships(attributes);
             return serializer;
         }
         public IResponseDeserializer GetDeserializer()
diff --git a/test/NoEntityFrameworkTests/TestFixture.cs b/test/NoEntityFrameworkTests/TestFixture.cs
index 82836a8a06..8b2946f383 100644
--- a/test/NoEntityFrameworkTests/TestFixture.cs
+++ b/test/NoEntityFrameworkTests/TestFixture.cs
@@ -1,4 +1,5 @@
 using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization.Client;
 using Microsoft.AspNetCore.Hosting;
@@ -28,10 +29,9 @@ public TestFixture()
         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);
+            var graph = GetService<IResourceGraph>();
+            serializer.AttributesToSerialize = graph.GetAttributes(attributes);
+            serializer.RelationshipsToSerialize = graph.GetRelationships(attributes);
             return serializer;
         }
         public IResponseDeserializer GetDeserializer()
diff --git a/test/UnitTests/Serialization/Client/RequestSerializerTests.cs b/test/UnitTests/Serialization/Client/RequestSerializerTests.cs
index 549b769962..7938cae1ea 100644
--- a/test/UnitTests/Serialization/Client/RequestSerializerTests.cs
+++ b/test/UnitTests/Serialization/Client/RequestSerializerTests.cs
@@ -56,7 +56,7 @@ public void SerializeSingle_ResourceWithTargetedSetAttributes_CanBuild()
         {
             // Arrange
             var entity = new TestResource() { Id = 1, StringField = "value", NullableIntField = 123 };
-            _serializer.SetAttributesToSerialize<TestResource>(tr => tr.StringField);
+            _serializer.AttributesToSerialize = _resourceGraph.GetAttributes<TestResource>(tr => tr.StringField);
 
             // Act
             string serialized = _serializer.Serialize(entity);
@@ -81,7 +81,7 @@ public void SerializeSingle_NoIdWithTargetedSetAttributes_CanBuild()
         {
             // Arrange
             var entityNoId = new TestResource() { Id = 0, StringField = "value", NullableIntField = 123 };
-            _serializer.SetAttributesToSerialize<TestResource>(tr => tr.StringField);
+            _serializer.AttributesToSerialize = _resourceGraph.GetAttributes<TestResource>(tr => tr.StringField);
 
             // Act
             string serialized = _serializer.Serialize(entityNoId);
@@ -106,7 +106,7 @@ public void SerializeSingle_ResourceWithoutTargetedAttributes_CanBuild()
         {
             // Arrange
             var entity = new TestResource() { Id = 1, StringField = "value", NullableIntField = 123 };
-            _serializer.SetAttributesToSerialize<TestResource>(tr => new { });
+            _serializer.AttributesToSerialize = _resourceGraph.GetAttributes<TestResource>(tr => new { });
 
             // Act
             string serialized = _serializer.Serialize(entity);
@@ -133,7 +133,7 @@ public void SerializeSingle_ResourceWithTargetedRelationships_CanBuild()
                 PopulatedToOne = new OneToOneDependent { Id = 10 },
                 PopulatedToManies = new List<OneToManyDependent> { new OneToManyDependent { Id = 20 } }
             };
-            _serializer.SetRelationshipsToSerialize<MultipleRelationshipsPrincipalPart>(tr => new { tr.EmptyToOne, tr.EmptyToManies, tr.PopulatedToOne, tr.PopulatedToManies });
+            _serializer.RelationshipsToSerialize = _resourceGraph.GetRelationships<MultipleRelationshipsPrincipalPart>(tr => new { tr.EmptyToOne, tr.EmptyToManies, tr.PopulatedToOne, tr.PopulatedToManies });
 
             // Act
             string serialized = _serializer.Serialize(entityWithRelationships);
@@ -182,7 +182,7 @@ public void SerializeMany_ResourcesWithTargetedAttributes_CanBuild()
                 new TestResource() { Id = 1, StringField = "value1", NullableIntField = 123 },
                 new TestResource() { Id = 2, StringField = "value2", NullableIntField = 123 }
             };
-            _serializer.SetAttributesToSerialize<TestResource>(tr => tr.StringField);
+            _serializer.AttributesToSerialize = _resourceGraph.GetAttributes<TestResource>(tr => tr.StringField);
 
             // Act
             string serialized = _serializer.Serialize(entities);
@@ -215,7 +215,7 @@ public void SerializeMany_ResourcesWithTargetedAttributes_CanBuild()
         public void SerializeSingle_Null_CanBuild()
         {
             // Arrange
-            _serializer.SetAttributesToSerialize<TestResource>(tr => tr.StringField);
+            _serializer.AttributesToSerialize = _resourceGraph.GetAttributes<TestResource>(tr => tr.StringField);
 
             // Act
             IIdentifiable obj = null;
@@ -235,7 +235,7 @@ public void SerializeMany_EmptyList_CanBuild()
         {
             // Arrange
             var entities = new List<TestResource> { };
-            _serializer.SetAttributesToSerialize<TestResource>(tr => tr.StringField);
+            _serializer.AttributesToSerialize = _resourceGraph.GetAttributes<TestResource>(tr => tr.StringField);
 
             // Act
             string serialized = _serializer.Serialize(entities);

From 304758485adc44b6b6681c8891560147feeac6ef Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Sat, 2 Nov 2019 15:43:00 +0100
Subject: [PATCH 2/9] fix: typo in test setup

---
 .../Acceptance/TestFixture.cs                              | 6 ++++--
 test/NoEntityFrameworkTests/TestFixture.cs                 | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs
index 300d904da3..39655eeb8b 100644
--- a/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs
+++ b/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs
@@ -38,8 +38,10 @@ public IRequestSerializer GetSerializer<TResource>(Expression<Func<TResource, dy
         {
             var serializer =  GetService<IRequestSerializer>();
             var graph =  GetService<IResourceGraph>();
-            serializer.AttributesToSerialize = graph.GetAttributes(attributes);
-            serializer.RelationshipsToSerialize = graph.GetRelationships(attributes);
+            if (attributes != null)
+                serializer.AttributesToSerialize = graph.GetAttributes(attributes);
+            if (relationships != null)
+                serializer.RelationshipsToSerialize = graph.GetRelationships(relationships);
             return serializer;
         }
         public IResponseDeserializer GetDeserializer()
diff --git a/test/NoEntityFrameworkTests/TestFixture.cs b/test/NoEntityFrameworkTests/TestFixture.cs
index 8b2946f383..c76e37e9bb 100644
--- a/test/NoEntityFrameworkTests/TestFixture.cs
+++ b/test/NoEntityFrameworkTests/TestFixture.cs
@@ -30,10 +30,13 @@ public IRequestSerializer GetSerializer<TResource>(Expression<Func<TResource, dy
         {
             var serializer = GetService<IRequestSerializer>();
             var graph = GetService<IResourceGraph>();
-            serializer.AttributesToSerialize = graph.GetAttributes(attributes);
-            serializer.RelationshipsToSerialize = graph.GetRelationships(attributes);
+            if (attributes != null)
+                serializer.AttributesToSerialize = graph.GetAttributes(attributes);
+            if (relationships != null)
+                serializer.RelationshipsToSerialize = graph.GetRelationships(relationships);
             return serializer;
         }
+
         public IResponseDeserializer GetDeserializer()
         {
             var resourceGraph = new ResourceGraphBuilder().AddResource<TodoItem>("todo-items").Build();

From 5b4eee6c0a70533376666b5c9170d9ac365dfec5 Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Mon, 4 Nov 2019 14:03:33 +0100
Subject: [PATCH 3/9] chore: spacing

---
 .../RequestServices/Contracts/IUpdatedFields.cs   |  1 -
 .../Serialization/Client/IRequestSerializer.cs    | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/src/JsonApiDotNetCore/RequestServices/Contracts/IUpdatedFields.cs b/src/JsonApiDotNetCore/RequestServices/Contracts/IUpdatedFields.cs
index fe6e2ffc33..a40cf0d36f 100644
--- a/src/JsonApiDotNetCore/RequestServices/Contracts/IUpdatedFields.cs
+++ b/src/JsonApiDotNetCore/RequestServices/Contracts/IUpdatedFields.cs
@@ -17,5 +17,4 @@ public interface ITargetedFields
         /// </summary>
         List<RelationshipAttribute> Relationships { get; set; }
     }
-
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs b/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs
index 869587786a..bbcdae9298 100644
--- a/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs
+++ b/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs
@@ -23,21 +23,6 @@ public interface IRequestSerializer
         /// <param name="entities">Entities to serialize</param>
         /// <returns>The serialized content</returns>
         string Serialize(IEnumerable entities);
-        ///// <summary>
-        ///// Sets the <see cref="AttrAttribute"/>s to serialize for resources of type <typeparamref name="TResource"/>.
-        ///// If no <see cref="AttrAttribute"/>s are specified, by default all attributes are included in the serialized result.
-        ///// </summary>
-        ///// <typeparam name="TResource">Type of the resource to serialize</typeparam>
-        ///// <param name="filter">Should be of the form: (TResource e) => new { e.Attr1, e.Attr2 }</param>
-        //void  AAttributesToSerialize(IEnumerable<AttrAttribute> attributes);
-        ///// <summary>
-        ///// Sets the <see cref="RelationshipAttribute"/>s to serialize for resources of type <typeparamref name="TResource"/>.
-        ///// If no <see cref="RelationshipAttribute"/>s are specified, by default no relationships are included in the serialization result.
-        ///// The <paramref name="filter"/>should be of the form: (TResource e) => new { e.Attr1, e.Attr2 }
-        ///// </summary>
-        ///// <typeparam name="TResource">Type of the resource to serialize</typeparam>
-        ///// <param name="filter">Should be of the form: (TResource e) => new { e.Attr1, e.Attr2 }</param>
-        //void SetRelationshipsToSerialize(IEnumerable<RelationshipAttribute> attributes);
 
         /// <inheritdoc/>
         public IEnumerable<AttrAttribute> AttributesToSerialize { set; }

From 8674f52d798a7635ad93ad0d5e5eb2a77114ad61 Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Mon, 4 Nov 2019 17:29:04 +0100
Subject: [PATCH 4/9] fix: add IResourceQueryService and IResourceCmdService to
 DI container in application builder

---
 src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs b/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs
index 302aeb831f..8c00ce8fc1 100644
--- a/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs
+++ b/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs
@@ -150,6 +150,9 @@ public void ConfigureServices()
             _services.AddScoped(typeof(IResourceService<>), typeof(DefaultResourceService<>));
             _services.AddScoped(typeof(IResourceService<,>), typeof(DefaultResourceService<,>));
 
+            _services.AddScoped(typeof(IResourceQueryService<,>), typeof(DefaultResourceService<,>));
+            _services.AddScoped(typeof(IResourceCmdService<,>), typeof(DefaultResourceService<,>));
+
             _services.AddSingleton<ILinksConfiguration>(JsonApiOptions);
             _services.AddSingleton(resourceGraph);
             _services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();

From 1b7f9b2822af473d8a6c5abc6a9151af96b1b988 Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Mon, 4 Nov 2019 17:31:42 +0100
Subject: [PATCH 5/9] chore: update comments IRequestSerializer

---
 .../Serialization/Client/IRequestSerializer.cs    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs b/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs
index bbcdae9298..d4a86702ec 100644
--- a/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs
+++ b/src/JsonApiDotNetCore/Serialization/Client/IRequestSerializer.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Internal.Contracts;
 
 namespace JsonApiDotNetCore.Serialization.Client
 {
@@ -23,11 +24,17 @@ public interface IRequestSerializer
         /// <param name="entities">Entities to serialize</param>
         /// <returns>The serialized content</returns>
         string Serialize(IEnumerable entities);
-
-        /// <inheritdoc/>
+        /// <summary>
+        /// Sets the attributes that will be included in the serialized payload.
+        /// You can use <see cref="IResourceGraph.GetAttributes{TResource}(Expression{System.Func{TResource, dynamic}})"/>
+        /// to conveniently access the desired <see cref="AttrAttribute"/> instances
+        /// </summary>
         public IEnumerable<AttrAttribute> AttributesToSerialize { set; }
-
-        /// <inheritdoc/>
+        /// <summary>
+        /// Sets the relationships that will be included in the serialized payload.
+        /// You can use <see cref="IResourceGraph.GetRelationships{TResource}(Expression{System.Func{TResource, dynamic}})"/>
+        /// to conveniently access the desired <see cref="RelationshipAttribute"/> instances
+        /// </summary>
         public IEnumerable<RelationshipAttribute> RelationshipsToSerialize { set; }
     }
 }
\ No newline at end of file

From 3f46fa0c8cd9eebfec7e61902114890a587cceb5 Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Tue, 5 Nov 2019 10:06:51 +0100
Subject: [PATCH 6/9] chore: moved ef core related building to extension
 methods

---
 .../Builders/IResourceGraphBuilder.cs         | 11 ---
 .../Builders/JsonApiApplicationBuilder.cs     | 24 +-----
 .../Builders/ResourceGraphBuilder.cs          | 37 ++------
 .../EntityFrameworkCoreExtension.cs           | 84 +++++++++++++++++++
 .../IServiceCollectionExtensions.cs           | 26 +-----
 .../Acceptance/Spec/EndToEndTest.cs           |  4 +-
 .../Builders/ContextGraphBuilder_Tests.cs     |  1 +
 .../IServiceCollectionExtensionsTests.cs      |  3 +-
 .../Internal/ContextGraphBuilder_Tests.cs     |  3 +-
 9 files changed, 103 insertions(+), 90 deletions(-)
 create mode 100644 src/JsonApiDotNetCore/Extensions/EntityFrameworkCoreExtension.cs

diff --git a/src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs
index a9a74cf9a7..40de07dff2 100644
--- a/src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs
+++ b/src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs
@@ -13,7 +13,6 @@ public interface IResourceGraphBuilder
         /// Construct the <see cref="ResourceGraph"/>
         /// </summary>
         IResourceGraph Build();
-
         /// <summary>
         /// Add a json:api resource
         /// </summary>
@@ -24,8 +23,6 @@ public interface IResourceGraphBuilder
         /// See <see cref="IResourceNameFormatter" />.
         /// </param>
         IResourceGraphBuilder AddResource<TResource>(string pluralizedTypeName = null) where TResource : class, IIdentifiable<int>;
-
-
         /// <summary>
         /// Add a json:api resource
         /// </summary>
@@ -37,7 +34,6 @@ public interface IResourceGraphBuilder
         /// See <see cref="IResourceNameFormatter" />.
         /// </param>
         IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedTypeName = null) where TResource : class, IIdentifiable<TId>;
-
         /// <summary>
         /// Add a Json:Api resource
         /// </summary>
@@ -49,12 +45,5 @@ public interface IResourceGraphBuilder
         /// See <see cref="IResourceNameFormatter" />.
         /// </param>
         IResourceGraphBuilder AddResource(Type entityType, Type idType, string pluralizedTypeName = null);
-
-        /// <summary>
-        /// Add all the models that are part of the provided <see cref="DbContext" /> 
-        /// that also implement <see cref="IIdentifiable"/>
-        /// </summary>
-        /// <typeparam name="T">The <see cref="DbContext"/> implementation type.</typeparam>
-        IResourceGraphBuilder AddDbContext<T>() where T : DbContext;   
     }
 }
diff --git a/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs b/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs
index 8c00ce8fc1..0d5bf08e12 100644
--- a/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs
+++ b/src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs
@@ -20,6 +20,7 @@
 using JsonApiDotNetCore.Serialization.Server.Builders;
 using JsonApiDotNetCore.Serialization.Server;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using JsonApiDotNetCore.Extensions;
 
 namespace JsonApiDotNetCore.Builders
 {
@@ -30,10 +31,10 @@ namespace JsonApiDotNetCore.Builders
     public class JsonApiApplicationBuilder
     {
         public readonly JsonApiOptions JsonApiOptions = new JsonApiOptions();
-        private IResourceGraphBuilder _resourceGraphBuilder;
+        internal IResourceGraphBuilder _resourceGraphBuilder;
+        internal bool _usesDbContext;
+        internal readonly IServiceCollection _services;
         private IServiceDiscoveryFacade _serviceDiscoveryFacade;
-        private bool _usesDbContext;
-        private readonly IServiceCollection _services;
         private readonly IMvcCoreBuilder _mvcBuilder;
 
         public JsonApiApplicationBuilder(IServiceCollection services, IMvcCoreBuilder mvcBuilder)
@@ -42,11 +43,6 @@ public JsonApiApplicationBuilder(IServiceCollection services, IMvcCoreBuilder mv
             _mvcBuilder = mvcBuilder;
         }
 
-        internal void ConfigureLogging()
-        {
-            _services.AddLogging();
-        }
-
         /// <summary>
         /// Executes the action provided by the user to configure <see cref="JsonApiOptions"/>
         /// </summary>
@@ -98,18 +94,6 @@ public void ConfigureResources(Action<IResourceGraphBuilder> resourceGraphBuilde
             resourceGraphBuilder(_resourceGraphBuilder);
         }
 
-        /// <summary>
-        /// Executes the action provided by the user to configure the resources using <see cref="IResourceGraphBuilder"/>.
-        /// Additionally, inspects the EF core database context for models that implement IIdentifiable.
-        /// </summary>
-        public void ConfigureResources<TContext>(Action<IResourceGraphBuilder> resourceGraphBuilder) where TContext : DbContext
-        {
-            _resourceGraphBuilder.AddDbContext<TContext>();
-            _usesDbContext = true;
-            _services.AddScoped<IDbContextResolver, DbContextResolver<TContext>>();
-            resourceGraphBuilder?.Invoke(_resourceGraphBuilder);
-        }
-
         /// <summary>
         /// Registers the remaining internals.
         /// </summary>
diff --git a/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
index e025d4f7de..6aef80f92d 100644
--- a/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
+++ b/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
@@ -10,16 +10,15 @@
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Models.Links;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
 namespace JsonApiDotNetCore.Builders
 {
     public class ResourceGraphBuilder : IResourceGraphBuilder
     {
-        private readonly List<ResourceContext> _entities = new List<ResourceContext>();
-        private readonly List<ValidationResult> _validationResults = new List<ValidationResult>();
-        private readonly IResourceNameFormatter _resourceNameFormatter = new KebabCaseFormatter();
+        internal readonly List<ResourceContext> _entities = new List<ResourceContext>();
+        internal readonly List<ValidationResult> _validationResults = new List<ValidationResult>();
+        internal readonly IResourceNameFormatter _resourceNameFormatter = new KebabCaseFormatter();
 
         public ResourceGraphBuilder() { }
 
@@ -67,7 +66,7 @@ public IResourceGraphBuilder AddResource(Type entityType, Type idType, string pl
             return this;
         }
 
-        private ResourceContext GetEntity(string pluralizedTypeName, Type entityType, Type idType) => new ResourceContext
+        internal ResourceContext GetEntity(string pluralizedTypeName, Type entityType, Type idType) => new ResourceContext
         {
             ResourceName = pluralizedTypeName,
             ResourceType = entityType,
@@ -178,29 +177,7 @@ protected virtual Type GetRelationshipType(RelationshipAttribute relation, Prope
 
         private Type GetResourceDefinitionType(Type entityType) => typeof(ResourceDefinition<>).MakeGenericType(entityType);
 
-        /// <inheritdoc />
-        public IResourceGraphBuilder AddDbContext<T>() where T : DbContext
-        {
-            var contextType = typeof(T);
-            var contextProperties = contextType.GetProperties();
-            foreach (var property in contextProperties)
-            {
-                var dbSetType = property.PropertyType;
-                if (dbSetType.GetTypeInfo().IsGenericType
-                    && dbSetType.GetGenericTypeDefinition() == typeof(DbSet<>))
-                {
-                    var entityType = dbSetType.GetGenericArguments()[0];
-                    AssertEntityIsNotAlreadyDefined(entityType);
-                    var (isJsonApiResource, idType) = GetIdType(entityType);
-                    if (isJsonApiResource)
-                        _entities.Add(GetEntity(GetResourceNameFromDbSetProperty(property, entityType), entityType, idType));
-                }
-            }
-
-            return this;
-        }
-
-        private string GetResourceNameFromDbSetProperty(PropertyInfo property, Type resourceType)
+        internal string GetResourceNameFromDbSetProperty(PropertyInfo property, Type resourceType)
         {
             // this check is actually duplicated in the DefaultResourceNameFormatter
             // however, we perform it here so that we allow class attributes to be prioritized over
@@ -221,7 +198,7 @@ private string GetResourceNameFromDbSetProperty(PropertyInfo property, Type reso
             return _resourceNameFormatter.FormatResourceName(resourceType);
         }
 
-        private (bool isJsonApiResource, Type idType) GetIdType(Type resourceType)
+        internal (bool isJsonApiResource, Type idType) GetIdType(Type resourceType)
         {
             var possible = TypeLocator.GetIdType(resourceType);
             if (possible.isJsonApiResource)
@@ -232,7 +209,7 @@ private string GetResourceNameFromDbSetProperty(PropertyInfo property, Type reso
             return (false, null);
         }
 
-        private void AssertEntityIsNotAlreadyDefined(Type entityType)
+        internal void AssertEntityIsNotAlreadyDefined(Type entityType)
         {
             if (_entities.Any(e => e.ResourceType == entityType))
                 throw new InvalidOperationException($"Cannot add entity type {entityType} to context resourceGraph, there is already an entity of that type configured.");
diff --git a/src/JsonApiDotNetCore/Extensions/EntityFrameworkCoreExtension.cs b/src/JsonApiDotNetCore/Extensions/EntityFrameworkCoreExtension.cs
new file mode 100644
index 0000000000..b2d78d6b5e
--- /dev/null
+++ b/src/JsonApiDotNetCore/Extensions/EntityFrameworkCoreExtension.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Reflection;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Graph;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Data;
+
+namespace JsonApiDotNetCore.Extensions.EntityFrameworkCore
+{
+    public static class IResourceGraphBuilderExtensions
+    {
+        /// <summary>
+        /// Add all the models that are part of the provided <see cref="DbContext" /> 
+        /// that also implement <see cref="IIdentifiable"/>
+        /// </summary>
+        /// <typeparam name="TDbContext">The <see cref="DbContext"/> implementation type.</typeparam>
+        public static IResourceGraphBuilder AddDbContext<TDbContext>(this IResourceGraphBuilder resourceGraphBuilder) where TDbContext : DbContext
+        {
+            var builder = (ResourceGraphBuilder)resourceGraphBuilder;
+            var contextType = typeof(TDbContext);
+            var contextProperties = contextType.GetProperties();
+            foreach (var property in contextProperties)
+            {
+                var dbSetType = property.PropertyType;
+                if (dbSetType.GetTypeInfo().IsGenericType
+                    && dbSetType.GetGenericTypeDefinition() == typeof(DbSet<>))
+                {
+                    var entityType = dbSetType.GetGenericArguments()[0];
+                    var (isJsonApiResource, idType) = builder.GetIdType(entityType);
+                    if (isJsonApiResource)
+                        builder._entities.Add(builder.GetEntity(builder.GetResourceNameFromDbSetProperty(property, entityType), entityType, idType));
+                }
+            }
+            return resourceGraphBuilder;
+        }
+    }
+
+    public static class IServiceCollectionExtensions
+    {
+        /// <summary>
+        /// Enabling JsonApiDotNetCore using the EF Core DbContext to build the ResourceGraph.
+        /// </summary>
+        /// <typeparam name="TContext"></typeparam>
+        /// <param name="services"></param>
+        /// <param name="options"></param>
+        /// <param name="resources"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddJsonApi<TDbContext>(this IServiceCollection services,
+                                                    Action<JsonApiOptions> options = null,
+                                                    Action<IServiceDiscoveryFacade> discovery = null,
+                                                    Action<IResourceGraphBuilder> resources = null,
+                                                    IMvcCoreBuilder mvcBuilder = null)
+            where TDbContext : DbContext
+        {
+            var application = new JsonApiApplicationBuilder(services, mvcBuilder ?? services.AddMvcCore());
+            if (options != null)
+                application.ConfigureJsonApiOptions(options);
+            application.ConfigureMvc();
+            if (discovery != null)
+                application.AutoDiscover(discovery);
+            application.ConfigureResources<TDbContext>(resources);
+            application.ConfigureServices();
+            return services;
+        }
+    }
+
+    public static class JsonApiApplicationBuildExtensions
+    {
+        /// <summary>
+        /// Executes the action provided by the user to configure the resources using <see cref="IResourceGraphBuilder"/>.
+        /// Additionally, inspects the EF core database context for models that implement IIdentifiable.
+        /// </summary>
+        public static void ConfigureResources<TContext>(this JsonApiApplicationBuilder builder, Action<IResourceGraphBuilder> resourceGraphBuilder) where TContext : DbContext
+        {
+            builder._resourceGraphBuilder.AddDbContext<TContext>();
+            builder._usesDbContext = true;
+            builder._services.AddScoped<IDbContextResolver, DbContextResolver<TContext>>();
+            resourceGraphBuilder?.Invoke(builder._resourceGraphBuilder);
+        }
+    }
+}
diff --git a/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs b/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs
index aab18dec6b..eb30283428 100644
--- a/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs
+++ b/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs
@@ -18,33 +18,9 @@ namespace JsonApiDotNetCore.Extensions
     // ReSharper disable once InconsistentNaming
     public static class IServiceCollectionExtensions
     {
-        /// <summary>
-        /// Enabling JsonApiDotNetCore using the EF Core DbContext to build the ResourceGraph.
-        /// </summary>
-        /// <typeparam name="TContext"></typeparam>
-        /// <param name="services"></param>
-        /// <param name="options"></param>
-        /// <param name="resources"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddJsonApi<TEfCoreDbContext>(this IServiceCollection services,
-                                                              Action<JsonApiOptions> options = null,
-                                                              Action<IResourceGraphBuilder> resources = null,
-                                                              IMvcCoreBuilder mvcBuilder = null)
-            where TEfCoreDbContext : DbContext
-        {
-            var application = new JsonApiApplicationBuilder(services, mvcBuilder ?? services.AddMvcCore());
-            if (options != null)
-                application.ConfigureJsonApiOptions(options);
-            application.ConfigureLogging();
-            application.ConfigureMvc();
-            application.ConfigureResources<TEfCoreDbContext>(resources);
-            application.ConfigureServices();
-            return services;
-        }
-
         /// <summary>
         /// Enabling JsonApiDotNetCore using manual declaration to build the ResourceGraph.
-        /// </summary>z
+        /// </summary>
         /// <param name="services"></param>
         /// <param name="options"></param>
         /// <param name="resources"></param>
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/EndToEndTest.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/EndToEndTest.cs
index e287e1ae20..1e291df454 100644
--- a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/EndToEndTest.cs
+++ b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/EndToEndTest.cs
@@ -47,11 +47,11 @@ public AppDbContext GetDbContext()
         }
 
         public async Task<(string, HttpResponseMessage)> SendRequest(string method, string route, string content)
-        {
-            var request = new HttpRequestMessage(new HttpMethod(method), route);
+        {            var request = new HttpRequestMessage(new HttpMethod(method), route);
             request.Content = new StringContent(content);
             request.Content.Headers.ContentType = JsonApiContentType;
             var response = await _client.SendAsync(request);
+
             var body = await response.Content?.ReadAsStringAsync();
             return (body, response);
         }
diff --git a/test/UnitTests/Builders/ContextGraphBuilder_Tests.cs b/test/UnitTests/Builders/ContextGraphBuilder_Tests.cs
index fae27307d2..058c8f05eb 100644
--- a/test/UnitTests/Builders/ContextGraphBuilder_Tests.cs
+++ b/test/UnitTests/Builders/ContextGraphBuilder_Tests.cs
@@ -5,6 +5,7 @@
 using Humanizer;
 using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Extensions;
+using JsonApiDotNetCore.Extensions.EntityFrameworkCore;
 using JsonApiDotNetCore.Graph;
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
diff --git a/test/UnitTests/Extensions/IServiceCollectionExtensionsTests.cs b/test/UnitTests/Extensions/IServiceCollectionExtensionsTests.cs
index 20fa848b35..bd81705deb 100644
--- a/test/UnitTests/Extensions/IServiceCollectionExtensionsTests.cs
+++ b/test/UnitTests/Extensions/IServiceCollectionExtensionsTests.cs
@@ -19,6 +19,7 @@
 using JsonApiDotNetCore.Managers.Contracts;
 using JsonApiDotNetCore.Serialization.Server.Builders;
 using JsonApiDotNetCore.Serialization.Server;
+using JsonApiDotNetCore.Extensions.EntityFrameworkCore;
 
 namespace UnitTests.Extensions
 {
@@ -29,7 +30,7 @@ public void AddJsonApiInternals_Adds_All_Required_Services()
         {
             // Arrange
             var services = new ServiceCollection();
-
+            services.AddLogging();
             services.AddDbContext<AppDbContext>(options => options.UseInMemoryDatabase("UnitTestDb"), ServiceLifetime.Transient);
             services.AddJsonApi<AppDbContext>();
 
diff --git a/test/UnitTests/Internal/ContextGraphBuilder_Tests.cs b/test/UnitTests/Internal/ContextGraphBuilder_Tests.cs
index cf61c512d7..9a7be084d8 100644
--- a/test/UnitTests/Internal/ContextGraphBuilder_Tests.cs
+++ b/test/UnitTests/Internal/ContextGraphBuilder_Tests.cs
@@ -1,4 +1,5 @@
 using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCore.Extensions.EntityFrameworkCore;
 using JsonApiDotNetCore.Internal;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -11,7 +12,7 @@ public class ResourceGraphBuilder_Tests
         [Fact]
         public void AddDbContext_Does_Not_Throw_If_Context_Contains_Members_That_DoNot_Implement_IIdentifiable()
         {
-            // Arrange
+            // Arrange 
             var resourceGraphBuilder = new ResourceGraphBuilder();
 
             // Act

From 6156166cdf87093e993664272e6814030300de32 Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Tue, 5 Nov 2019 10:10:12 +0100
Subject: [PATCH 7/9] chore: spacing, rename file

---
 .../Acceptance/Spec/EndToEndTest.cs                            | 3 ++-
 ...textGraphBuilder_Tests.cs => ResourceGraphBuilder_Tests.cs} | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename test/UnitTests/Internal/{ContextGraphBuilder_Tests.cs => ResourceGraphBuilder_Tests.cs} (98%)

diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/EndToEndTest.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/EndToEndTest.cs
index 140148c55d..ee5451c542 100644
--- a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/EndToEndTest.cs
+++ b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/EndToEndTest.cs
@@ -47,7 +47,8 @@ public AppDbContext GetDbContext()
         }
 
         public async Task<(string, HttpResponseMessage)> SendRequest(string method, string route, string content)
-        {            var request = new HttpRequestMessage(new HttpMethod(method), route);
+        {
+            var request = new HttpRequestMessage(new HttpMethod(method), route);
             request.Content = new StringContent(content);
             request.Content.Headers.ContentType = JsonApiContentType;
             var response = await _client.SendAsync(request);
diff --git a/test/UnitTests/Internal/ContextGraphBuilder_Tests.cs b/test/UnitTests/Internal/ResourceGraphBuilder_Tests.cs
similarity index 98%
rename from test/UnitTests/Internal/ContextGraphBuilder_Tests.cs
rename to test/UnitTests/Internal/ResourceGraphBuilder_Tests.cs
index 9a7be084d8..e765004ac5 100644
--- a/test/UnitTests/Internal/ContextGraphBuilder_Tests.cs
+++ b/test/UnitTests/Internal/ResourceGraphBuilder_Tests.cs
@@ -12,7 +12,7 @@ public class ResourceGraphBuilder_Tests
         [Fact]
         public void AddDbContext_Does_Not_Throw_If_Context_Contains_Members_That_DoNot_Implement_IIdentifiable()
         {
-            // Arrange 
+            // Arrange
             var resourceGraphBuilder = new ResourceGraphBuilder();
 
             // Act

From 7264350dc7ddc2a4027449acbc7f4dd2f38eb2c3 Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Wed, 6 Nov 2019 18:05:23 +0100
Subject: [PATCH 8/9] refactor: remove need for internal modifier

---
 .../Builders/IResourceGraphBuilder.cs         |  1 +
 .../Builders/ResourceGraphBuilder.cs          | 56 ++++++-------------
 .../EntityFrameworkCoreExtension.cs           | 35 ++++++++++--
 3 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs
index 40de07dff2..3b38531918 100644
--- a/src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs
+++ b/src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using JsonApiDotNetCore.Graph;
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Contracts;
diff --git a/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
index 6aef80f92d..d2e75f41f3 100644
--- a/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
+++ b/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
@@ -16,22 +16,22 @@ namespace JsonApiDotNetCore.Builders
 {
     public class ResourceGraphBuilder : IResourceGraphBuilder
     {
-        internal readonly List<ResourceContext> _entities = new List<ResourceContext>();
-        internal readonly List<ValidationResult> _validationResults = new List<ValidationResult>();
-        internal readonly IResourceNameFormatter _resourceNameFormatter = new KebabCaseFormatter();
+        private List<ResourceContext> _resources { get; set; } = new List<ResourceContext>();
+        private List<ValidationResult> _validationResults { get; set; } = new List<ValidationResult>();
+        private IResourceNameFormatter _formatter { get; set; } = new KebabCaseFormatter();
 
         public ResourceGraphBuilder() { }
 
         public ResourceGraphBuilder(IResourceNameFormatter formatter)
         {
-            _resourceNameFormatter = formatter;
+            _formatter = formatter;
         }
 
         /// <inheritdoc />
         public IResourceGraph Build()
         {
-            _entities.ForEach(SetResourceLinksOptions);
-            var resourceGraph = new ResourceGraph(_entities, _validationResults);
+            _resources.ForEach(SetResourceLinksOptions);
+            var resourceGraph = new ResourceGraph(_resources, _validationResults);
             return resourceGraph;
         }
 
@@ -55,18 +55,17 @@ public IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedTypeNa
             => AddResource(typeof(TResource), typeof(TId), pluralizedTypeName);
 
         /// <inheritdoc />
-        public IResourceGraphBuilder AddResource(Type entityType, Type idType, string pluralizedTypeName = null)
+        public IResourceGraphBuilder AddResource(Type entityType, Type idType = null, string pluralizedTypeName = null)
         {
             AssertEntityIsNotAlreadyDefined(entityType);
-
-            pluralizedTypeName = pluralizedTypeName ?? _resourceNameFormatter.FormatResourceName(entityType);
-
-            _entities.Add(GetEntity(pluralizedTypeName, entityType, idType));
+            idType ??= GetIdType(entityType).idType;
+            pluralizedTypeName ??= _formatter.FormatResourceName(entityType);
+            _resources.Add(GetEntity(pluralizedTypeName, entityType, idType));
 
             return this;
         }
 
-        internal ResourceContext GetEntity(string pluralizedTypeName, Type entityType, Type idType) => new ResourceContext
+        private ResourceContext GetEntity(string pluralizedTypeName, Type entityType, Type idType) => new ResourceContext
         {
             ResourceName = pluralizedTypeName,
             ResourceType = entityType,
@@ -92,7 +91,7 @@ protected virtual List<AttrAttribute> GetAttributes(Type entityType)
                 {
                     var idAttr = new AttrAttribute()
                     {
-                        PublicAttributeName = _resourceNameFormatter.FormatPropertyName(prop),
+                        PublicAttributeName = _formatter.FormatPropertyName(prop),
                         PropertyInfo = prop,
                         InternalAttributeName = prop.Name
                     };
@@ -104,7 +103,7 @@ protected virtual List<AttrAttribute> GetAttributes(Type entityType)
                 if (attribute == null)
                     continue;
 
-                attribute.PublicAttributeName = attribute.PublicAttributeName ?? _resourceNameFormatter.FormatPropertyName(prop);
+                attribute.PublicAttributeName = attribute.PublicAttributeName ?? _formatter.FormatPropertyName(prop);
                 attribute.InternalAttributeName = prop.Name;
                 attribute.PropertyInfo = prop;
 
@@ -122,7 +121,7 @@ protected virtual List<RelationshipAttribute> GetRelationships(Type entityType)
                 var attribute = (RelationshipAttribute)prop.GetCustomAttribute(typeof(RelationshipAttribute));
                 if (attribute == null) continue;
 
-                attribute.PublicRelationshipName = attribute.PublicRelationshipName ?? _resourceNameFormatter.FormatPropertyName(prop);
+                attribute.PublicRelationshipName = attribute.PublicRelationshipName ?? _formatter.FormatPropertyName(prop);
                 attribute.InternalRelationshipName = prop.Name;
                 attribute.RightType = GetRelationshipType(attribute, prop);
                 attribute.LeftType = entityType;
@@ -177,28 +176,7 @@ protected virtual Type GetRelationshipType(RelationshipAttribute relation, Prope
 
         private Type GetResourceDefinitionType(Type entityType) => typeof(ResourceDefinition<>).MakeGenericType(entityType);
 
-        internal string GetResourceNameFromDbSetProperty(PropertyInfo property, Type resourceType)
-        {
-            // this check is actually duplicated in the DefaultResourceNameFormatter
-            // however, we perform it here so that we allow class attributes to be prioritized over
-            // the DbSet attribute. Eventually, the DbSet attribute should be deprecated.
-            //
-            // check the class definition first
-            // [Resource("models"] public class Model : Identifiable { /* ... */ }
-            if (resourceType.GetCustomAttribute(typeof(ResourceAttribute)) is ResourceAttribute classResourceAttribute)
-                return classResourceAttribute.ResourceName;
-
-            // check the DbContext member next
-            // [Resource("models")] public DbSet<Model> Models { get; set; }
-            if (property.GetCustomAttribute(typeof(ResourceAttribute)) is ResourceAttribute resourceAttribute)
-                return resourceAttribute.ResourceName;
-
-            // fallback to the established convention using the DbSet Property.Name
-            // e.g DbSet<FooBar> FooBars { get; set; } => "foo-bars"
-            return _resourceNameFormatter.FormatResourceName(resourceType);
-        }
-
-        internal (bool isJsonApiResource, Type idType) GetIdType(Type resourceType)
+        private (bool isJsonApiResource, Type idType) GetIdType(Type resourceType)
         {
             var possible = TypeLocator.GetIdType(resourceType);
             if (possible.isJsonApiResource)
@@ -209,9 +187,9 @@ internal string GetResourceNameFromDbSetProperty(PropertyInfo property, Type res
             return (false, null);
         }
 
-        internal void AssertEntityIsNotAlreadyDefined(Type entityType)
+        private void AssertEntityIsNotAlreadyDefined(Type entityType)
         {
-            if (_entities.Any(e => e.ResourceType == entityType))
+            if (_resources.Any(e => e.ResourceType == entityType))
                 throw new InvalidOperationException($"Cannot add entity type {entityType} to context resourceGraph, there is already an entity of that type configured.");
         }
     }
diff --git a/src/JsonApiDotNetCore/Extensions/EntityFrameworkCoreExtension.cs b/src/JsonApiDotNetCore/Extensions/EntityFrameworkCoreExtension.cs
index b2d78d6b5e..af9272f48c 100644
--- a/src/JsonApiDotNetCore/Extensions/EntityFrameworkCoreExtension.cs
+++ b/src/JsonApiDotNetCore/Extensions/EntityFrameworkCoreExtension.cs
@@ -10,6 +10,10 @@
 
 namespace JsonApiDotNetCore.Extensions.EntityFrameworkCore
 {
+
+    /// <summary>
+    /// Extensions for configuring JsonApiDotNetCore with EF Core
+    /// </summary>
     public static class IResourceGraphBuilderExtensions
     {
         /// <summary>
@@ -28,16 +32,36 @@ public static IResourceGraphBuilder AddDbContext<TDbContext>(this IResourceGraph
                 if (dbSetType.GetTypeInfo().IsGenericType
                     && dbSetType.GetGenericTypeDefinition() == typeof(DbSet<>))
                 {
-                    var entityType = dbSetType.GetGenericArguments()[0];
-                    var (isJsonApiResource, idType) = builder.GetIdType(entityType);
-                    if (isJsonApiResource)
-                        builder._entities.Add(builder.GetEntity(builder.GetResourceNameFromDbSetProperty(property, entityType), entityType, idType));
+                    var resourceType = dbSetType.GetGenericArguments()[0];
+                    builder.AddResource(resourceType, pluralizedTypeName: GetResourceNameFromDbSetProperty(property, resourceType));
                 }
             }
             return resourceGraphBuilder;
         }
+
+        private static string GetResourceNameFromDbSetProperty(PropertyInfo property, Type resourceType)
+        {
+            // this check is actually duplicated in the DefaultResourceNameFormatter
+            // however, we perform it here so that we allow class attributes to be prioritized over
+            // the DbSet attribute. Eventually, the DbSet attribute should be deprecated.
+            //
+            // check the class definition first
+            // [Resource("models"] public class Model : Identifiable { /* ... */ }
+            if (resourceType.GetCustomAttribute(typeof(ResourceAttribute)) is ResourceAttribute classResourceAttribute)
+                return classResourceAttribute.ResourceName;
+
+            // check the DbContext member next
+            // [Resource("models")] public DbSet<Model> Models { get; set; }
+            if (property.GetCustomAttribute(typeof(ResourceAttribute)) is ResourceAttribute resourceAttribute)
+                return resourceAttribute.ResourceName;
+
+            return null;
+        }
     }
 
+    /// <summary>
+    /// Extensions for configuring JsonApiDotNetCore with EF Core
+    /// </summary>
     public static class IServiceCollectionExtensions
     {
         /// <summary>
@@ -67,6 +91,9 @@ public static IServiceCollection AddJsonApi<TDbContext>(this IServiceCollection
         }
     }
 
+    /// <summary>
+    /// Extensions for configuring JsonApiDotNetCore with EF Core
+    /// </summary>
     public static class JsonApiApplicationBuildExtensions
     {
         /// <summary>

From 2515c1efae459f433e1176ea3a8652b0520755cd Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Wed, 6 Nov 2019 18:19:55 +0100
Subject: [PATCH 9/9] refactor: minor refactor id type retrieval

---
 .../Builders/ResourceGraphBuilder.cs          | 28 +++++++---------
 src/JsonApiDotNetCore/Graph/TypeLocator.cs    | 33 ++++---------------
 test/UnitTests/Graph/TypeLocator_Tests.cs     | 14 ++++----
 3 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
index d2e75f41f3..05d4a6a8c5 100644
--- a/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
+++ b/src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs
@@ -55,12 +55,19 @@ public IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedTypeNa
             => AddResource(typeof(TResource), typeof(TId), pluralizedTypeName);
 
         /// <inheritdoc />
-        public IResourceGraphBuilder AddResource(Type entityType, Type idType = null, string pluralizedTypeName = null)
+        public IResourceGraphBuilder AddResource(Type resourceType, Type idType = null, string pluralizedTypeName = null)
         {
-            AssertEntityIsNotAlreadyDefined(entityType);
-            idType ??= GetIdType(entityType).idType;
-            pluralizedTypeName ??= _formatter.FormatResourceName(entityType);
-            _resources.Add(GetEntity(pluralizedTypeName, entityType, idType));
+            AssertEntityIsNotAlreadyDefined(resourceType);
+            if (resourceType.Implements<IIdentifiable>())
+            {
+                pluralizedTypeName ??= _formatter.FormatResourceName(resourceType);
+                idType ??= TypeLocator.GetIdType(resourceType);
+                _resources.Add(GetEntity(pluralizedTypeName, resourceType, idType));
+            }
+            else
+            {
+                _validationResults.Add(new ValidationResult(LogLevel.Warning, $"{resourceType} does not implement 'IIdentifiable<>'. "));
+            }
 
             return this;
         }
@@ -176,17 +183,6 @@ protected virtual Type GetRelationshipType(RelationshipAttribute relation, Prope
 
         private Type GetResourceDefinitionType(Type entityType) => typeof(ResourceDefinition<>).MakeGenericType(entityType);
 
-        private (bool isJsonApiResource, Type idType) GetIdType(Type resourceType)
-        {
-            var possible = TypeLocator.GetIdType(resourceType);
-            if (possible.isJsonApiResource)
-                return possible;
-
-            _validationResults.Add(new ValidationResult(LogLevel.Warning, $"{resourceType} does not implement 'IIdentifiable<>'. "));
-
-            return (false, null);
-        }
-
         private void AssertEntityIsNotAlreadyDefined(Type entityType)
         {
             if (_resources.Any(e => e.ResourceType == entityType))
diff --git a/src/JsonApiDotNetCore/Graph/TypeLocator.cs b/src/JsonApiDotNetCore/Graph/TypeLocator.cs
index 1e82e438c3..de5a2cd82f 100644
--- a/src/JsonApiDotNetCore/Graph/TypeLocator.cs
+++ b/src/JsonApiDotNetCore/Graph/TypeLocator.cs
@@ -1,3 +1,4 @@
+using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Models;
 using System;
 using System.Collections.Generic;
@@ -19,30 +20,10 @@ static class TypeLocator
         /// Determine whether or not this is a json:api resource by checking if it implements <see cref="IIdentifiable"/>.
         /// Returns the status and the resultant id type, either `(true, Type)` OR `(false, null)`
         /// </summary>        
-        public static (bool isJsonApiResource, Type idType) GetIdType(Type resourceType)
+        public static Type GetIdType(Type resourceType)
         {
-            var identitifableType = GetIdentifiableIdType(resourceType);
-            return (identitifableType != null)
-                ? (true, identitifableType)
-                : (false, null);
-        }
-
-        private static Type GetIdentifiableIdType(Type identifiableType)
-            => GetIdentifiableInterface(identifiableType)?.GetGenericArguments()[0];
-
-        private static Type GetIdentifiableInterface(Type type)
-            => type.GetInterfaces().FirstOrDefault(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IIdentifiable<>));
-
-        // TODO: determine if this optimization is even helpful...
-        private static Type[] GetAssemblyTypes(Assembly assembly)
-        {
-            if (_typeCache.TryGetValue(assembly, out var types) == false)
-            {
-                types = assembly.GetTypes();
-                _typeCache[assembly] = types;
-            }
-
-            return types;
+            var identifiableInterface = resourceType.GetInterfaces().FirstOrDefault(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IIdentifiable<>));
+            return identifiableInterface?.GetGenericArguments()[0];
         }
 
         /// <summary>
@@ -76,13 +57,11 @@ private static IEnumerable<ResourceDescriptor> FindIdentifableTypes(Assembly ass
         /// </returns>
         internal static bool TryGetResourceDescriptor(Type type, out ResourceDescriptor descriptor)
         {
-            var possible = GetIdType(type);
-            if (possible.isJsonApiResource)
+            if (type.Implements<IIdentifiable>())
             {
-                descriptor = new ResourceDescriptor(type, possible.idType);
+                descriptor = new ResourceDescriptor(type, GetIdType(type));
                 return true;
             }
-
             descriptor = ResourceDescriptor.Empty;
             return false;
         }
diff --git a/test/UnitTests/Graph/TypeLocator_Tests.cs b/test/UnitTests/Graph/TypeLocator_Tests.cs
index 26381ea1fb..502cfa1139 100644
--- a/test/UnitTests/Graph/TypeLocator_Tests.cs
+++ b/test/UnitTests/Graph/TypeLocator_Tests.cs
@@ -59,14 +59,13 @@ public void GetIdType_Correctly_Identifies_JsonApiResource()
         {
             // Arrange
             var type = typeof(Model);
-            var exextedIdType = typeof(int);
+            var expectedIdType = typeof(int);
 
             // Act
-            var (isJsonApiResource, idType) = TypeLocator.GetIdType(type);
+            var idType = TypeLocator.GetIdType(type);
 
             // Assert
-            Assert.True(isJsonApiResource);
-            Assert.Equal(exextedIdType, idType);
+            Assert.Equal(expectedIdType, idType);
         }
 
         [Fact]
@@ -74,14 +73,13 @@ public void GetIdType_Correctly_Identifies_NonJsonApiResource()
         {
             // Arrange
             var type = typeof(DerivedType);
-            Type exextedIdType = null;
+            Type expectedIdType = null;
 
             // Act
-            var (isJsonApiResource, idType) = TypeLocator.GetIdType(type);
+            var idType = TypeLocator.GetIdType(type);
 
             // Assert
-            Assert.False(isJsonApiResource);
-            Assert.Equal(exextedIdType, idType);
+            Assert.Equal(expectedIdType, idType);
         }
 
         [Fact]