Open up some members for extensibility. This helps to reduce some copy/pasted code in JsonApiDotNetCore.MongoDb. (#927)

Bart Koelman · web-flow · commit ee131bc17e5e · 2021-01-19T16:44:24.000+01:00
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryableBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryableBuilder.cs
@@ -13,7 +13,7 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
     /// <summary>
     /// Drives conversion from <see cref="QueryLayer"/> into system <see cref="Expression"/> trees.
     /// </summary>
-    public sealed class QueryableBuilder
+    public class QueryableBuilder
     {
         private readonly Expression _source;
         private readonly Type _elementType;
@@ -38,7 +38,7 @@ public QueryableBuilder(Expression source, Type elementType, Type extensionType,
             _lambdaScopeFactory = lambdaScopeFactory ?? new LambdaScopeFactory(_nameFactory);
         }
 
-        public Expression ApplyQuery(QueryLayer layer)
+        public virtual Expression ApplyQuery(QueryLayer layer)
         {
             if (layer == null) throw new ArgumentNullException(nameof(layer));
 
@@ -72,39 +72,39 @@ public Expression ApplyQuery(QueryLayer layer)
             return expression;
         }
 
-        private Expression ApplyInclude(Expression source, IncludeExpression include, ResourceContext resourceContext)
+        protected virtual Expression ApplyInclude(Expression source, IncludeExpression include, ResourceContext resourceContext)
         {
             using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
 
             var builder = new IncludeClauseBuilder(source, lambdaScope, resourceContext, _resourceContextProvider);
             return builder.ApplyInclude(include);
         }
 
-        private Expression ApplyFilter(Expression source, FilterExpression filter)
+        protected virtual Expression ApplyFilter(Expression source, FilterExpression filter)
         {
             using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
 
             var builder = new WhereClauseBuilder(source, lambdaScope, _extensionType);
             return builder.ApplyWhere(filter);
         }
 
-        private Expression ApplySort(Expression source, SortExpression sort)
+        protected virtual Expression ApplySort(Expression source, SortExpression sort)
         {
             using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
 
             var builder = new OrderClauseBuilder(source, lambdaScope, _extensionType);
             return builder.ApplyOrderBy(sort);
         }
 
-        private Expression ApplyPagination(Expression source, PaginationExpression pagination)
+        protected virtual Expression ApplyPagination(Expression source, PaginationExpression pagination)
         {
             using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
 
             var builder = new SkipTakeClauseBuilder(source, lambdaScope, _extensionType);
             return builder.ApplySkipTake(pagination);
         }
 
-        private Expression ApplyProjection(Expression source, IDictionary<ResourceFieldAttribute, QueryLayer> projection, ResourceContext resourceContext)
+        protected virtual Expression ApplyProjection(Expression source, IDictionary<ResourceFieldAttribute, QueryLayer> projection, ResourceContext resourceContext)
         {
             using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
 
diff --git a/src/JsonApiDotNetCore/Repositories/ResourceRepositoryAccessor.cs b/src/JsonApiDotNetCore/Repositories/ResourceRepositoryAccessor.cs
@@ -26,7 +26,7 @@ public ResourceRepositoryAccessor(IServiceProvider serviceProvider, IResourceCon
         public async Task<IReadOnlyCollection<TResource>> GetAsync<TResource>(QueryLayer layer, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable
         {
-            dynamic repository = GetReadRepository(typeof(TResource));
+            dynamic repository = ResolveReadRepository(typeof(TResource));
             return (IReadOnlyCollection<TResource>) await repository.GetAsync(layer, cancellationToken);
         }
 
@@ -35,83 +35,83 @@ public async Task<IReadOnlyCollection<IIdentifiable>> GetAsync(Type resourceType
         {
             if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));
 
-            dynamic repository = GetReadRepository(resourceType);
+            dynamic repository = ResolveReadRepository(resourceType);
             return (IReadOnlyCollection<IIdentifiable>) await repository.GetAsync(layer, cancellationToken);
         }
 
         /// <inheritdoc />
         public async Task<int> CountAsync<TResource>(FilterExpression topFilter, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable
         {
-            dynamic repository = GetReadRepository(typeof(TResource));
+            dynamic repository = ResolveReadRepository(typeof(TResource));
             return (int) await repository.CountAsync(topFilter, cancellationToken);
         }
 
         /// <inheritdoc />
         public async Task<TResource> GetForCreateAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable<TId>
         {
-            dynamic repository = GetWriteRepository(typeof(TResource));
+            dynamic repository = ResolveWriteRepository(typeof(TResource));
             return await repository.GetForCreateAsync(id, cancellationToken);
         }
 
         /// <inheritdoc />
         public async Task CreateAsync<TResource>(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable
         {
-            dynamic repository = GetWriteRepository(typeof(TResource));
+            dynamic repository = ResolveWriteRepository(typeof(TResource));
             await repository.CreateAsync(resourceFromRequest, resourceForDatabase, cancellationToken);
         }
 
         /// <inheritdoc />
         public async Task<TResource> GetForUpdateAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable
         {
-            dynamic repository = GetWriteRepository(typeof(TResource));
+            dynamic repository = ResolveWriteRepository(typeof(TResource));
             return await repository.GetForUpdateAsync(queryLayer, cancellationToken);
         }
 
         /// <inheritdoc />
         public async Task UpdateAsync<TResource>(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable
         {
-            dynamic repository = GetWriteRepository(typeof(TResource));
+            dynamic repository = ResolveWriteRepository(typeof(TResource));
             await repository.UpdateAsync(resourceFromRequest, resourceFromDatabase, cancellationToken);
         }
 
         /// <inheritdoc />
         public async Task DeleteAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable<TId>
         {
-            dynamic repository = GetWriteRepository(typeof(TResource));
+            dynamic repository = ResolveWriteRepository(typeof(TResource));
             await repository.DeleteAsync(id, cancellationToken);
         }
 
         /// <inheritdoc />
         public async Task SetRelationshipAsync<TResource>(TResource primaryResource, object secondaryResourceIds, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable
         {
-            dynamic repository = GetWriteRepository(typeof(TResource));
+            dynamic repository = ResolveWriteRepository(typeof(TResource));
             await repository.SetRelationshipAsync(primaryResource, secondaryResourceIds, cancellationToken);
         }
 
         /// <inheritdoc />
         public async Task AddToToManyRelationshipAsync<TResource, TId>(TId primaryId, ISet<IIdentifiable> secondaryResourceIds, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable<TId>
         {
-            dynamic repository = GetWriteRepository(typeof(TResource));
+            dynamic repository = ResolveWriteRepository(typeof(TResource));
             await repository.AddToToManyRelationshipAsync(primaryId, secondaryResourceIds, cancellationToken);
         }
 
         /// <inheritdoc />
         public async Task RemoveFromToManyRelationshipAsync<TResource>(TResource primaryResource, ISet<IIdentifiable> secondaryResourceIds, CancellationToken cancellationToken)
             where TResource : class, IIdentifiable
         {
-            dynamic repository = GetWriteRepository(typeof(TResource));
+            dynamic repository = ResolveWriteRepository(typeof(TResource));
             await repository.RemoveFromToManyRelationshipAsync(primaryResource, secondaryResourceIds, cancellationToken);
         }
 
-        protected object GetReadRepository(Type resourceType)
+        protected virtual object ResolveReadRepository(Type resourceType)
         {
             var resourceContext = _resourceContextProvider.GetResourceContext(resourceType);
 
@@ -130,7 +130,7 @@ protected object GetReadRepository(Type resourceType)
             return _serviceProvider.GetRequiredService(resourceDefinitionType);
         }
 
-        protected object GetWriteRepository(Type resourceType)
+        protected virtual object ResolveWriteRepository(Type resourceType)
         {
             var resourceContext = _resourceContextProvider.GetResourceContext(resourceType);
 
diff --git a/src/JsonApiDotNetCore/Resources/ResourceDefinitionAccessor.cs b/src/JsonApiDotNetCore/Resources/ResourceDefinitionAccessor.cs
@@ -23,7 +23,7 @@ public IReadOnlyCollection<IncludeElementExpression> OnApplyIncludes(Type resour
         {
             if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));
 
-            dynamic resourceDefinition = GetResourceDefinition(resourceType);
+            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
             return resourceDefinition.OnApplyIncludes(existingIncludes);
         }
 
@@ -32,7 +32,7 @@ public FilterExpression OnApplyFilter(Type resourceType, FilterExpression existi
         {
             if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));
 
-            dynamic resourceDefinition = GetResourceDefinition(resourceType);
+            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
             return resourceDefinition.OnApplyFilter(existingFilter);
         }
 
@@ -41,7 +41,7 @@ public SortExpression OnApplySort(Type resourceType, SortExpression existingSort
         {
             if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));
 
-            dynamic resourceDefinition = GetResourceDefinition(resourceType);
+            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
             return resourceDefinition.OnApplySort(existingSort);
         }
 
@@ -50,7 +50,7 @@ public PaginationExpression OnApplyPagination(Type resourceType, PaginationExpre
         {
             if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));
 
-            dynamic resourceDefinition = GetResourceDefinition(resourceType);
+            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
             return resourceDefinition.OnApplyPagination(existingPagination);
         }
 
@@ -59,7 +59,7 @@ public SparseFieldSetExpression OnApplySparseFieldSet(Type resourceType, SparseF
         {
             if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));
 
-            dynamic resourceDefinition = GetResourceDefinition(resourceType);
+            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
             return resourceDefinition.OnApplySparseFieldSet(existingSparseFieldSet);
         }
 
@@ -69,7 +69,7 @@ public object GetQueryableHandlerForQueryStringParameter(Type resourceType, stri
             if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));
             if (parameterName == null) throw new ArgumentNullException(nameof(parameterName));
 
-            dynamic resourceDefinition = GetResourceDefinition(resourceType);
+            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
             var handlers = resourceDefinition.OnRegisterQueryableHandlersForQueryStringParameters();
 
             return handlers != null && handlers.ContainsKey(parameterName) ? handlers[parameterName] : null;
@@ -80,11 +80,11 @@ public IDictionary<string, object> GetMeta(Type resourceType, IIdentifiable reso
         {
             if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));
 
-            dynamic resourceDefinition = GetResourceDefinition(resourceType);
+            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
             return resourceDefinition.GetMeta((dynamic) resourceInstance);
         }
 
-        protected object GetResourceDefinition(Type resourceType)
+        protected virtual object ResolveResourceDefinition(Type resourceType)
         {
             var resourceContext = _resourceContextProvider.GetResourceContext(resourceType);
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding`
`13`	`13`	`/// <summary>`
`14`	`14`	`/// Drives conversion from <see cref="QueryLayer"/> into system <see cref="Expression"/> trees.`
`15`	`15`	`/// </summary>`
`16`		`- public sealed class QueryableBuilder`
	`16`	`+ public class QueryableBuilder`
`17`	`17`	`{`
`18`	`18`	`private readonly Expression _source;`
`19`	`19`	`private readonly Type _elementType;`
`@@ -38,7 +38,7 @@ public QueryableBuilder(Expression source, Type elementType, Type extensionType,`
`38`	`38`	`_lambdaScopeFactory = lambdaScopeFactory ?? new LambdaScopeFactory(_nameFactory);`
`39`	`39`	`}`
`40`	`40`
`41`		`- public Expression ApplyQuery(QueryLayer layer)`
	`41`	`+ public virtual Expression ApplyQuery(QueryLayer layer)`
`42`	`42`	`{`
`43`	`43`	`if (layer == null) throw new ArgumentNullException(nameof(layer));`
`44`	`44`
`@@ -72,39 +72,39 @@ public Expression ApplyQuery(QueryLayer layer)`
`72`	`72`	`return expression;`
`73`	`73`	`}`
`74`	`74`
`75`		`- private Expression ApplyInclude(Expression source, IncludeExpression include, ResourceContext resourceContext)`
	`75`	`+ protected virtual Expression ApplyInclude(Expression source, IncludeExpression include, ResourceContext resourceContext)`
`76`	`76`	`{`
`77`	`77`	`using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);`
`78`	`78`
`79`	`79`	`var builder = new IncludeClauseBuilder(source, lambdaScope, resourceContext, _resourceContextProvider);`
`80`	`80`	`return builder.ApplyInclude(include);`
`81`	`81`	`}`
`82`	`82`
`83`		`- private Expression ApplyFilter(Expression source, FilterExpression filter)`
	`83`	`+ protected virtual Expression ApplyFilter(Expression source, FilterExpression filter)`
`84`	`84`	`{`
`85`	`85`	`using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);`
`86`	`86`
`87`	`87`	`var builder = new WhereClauseBuilder(source, lambdaScope, _extensionType);`
`88`	`88`	`return builder.ApplyWhere(filter);`
`89`	`89`	`}`
`90`	`90`
`91`		`- private Expression ApplySort(Expression source, SortExpression sort)`
	`91`	`+ protected virtual Expression ApplySort(Expression source, SortExpression sort)`
`92`	`92`	`{`
`93`	`93`	`using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);`
`94`	`94`
`95`	`95`	`var builder = new OrderClauseBuilder(source, lambdaScope, _extensionType);`
`96`	`96`	`return builder.ApplyOrderBy(sort);`
`97`	`97`	`}`
`98`	`98`
`99`		`- private Expression ApplyPagination(Expression source, PaginationExpression pagination)`
	`99`	`+ protected virtual Expression ApplyPagination(Expression source, PaginationExpression pagination)`
`100`	`100`	`{`
`101`	`101`	`using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);`
`102`	`102`
`103`	`103`	`var builder = new SkipTakeClauseBuilder(source, lambdaScope, _extensionType);`
`104`	`104`	`return builder.ApplySkipTake(pagination);`
`105`	`105`	`}`
`106`	`106`
`107`		`- private Expression ApplyProjection(Expression source, IDictionary<ResourceFieldAttribute, QueryLayer> projection, ResourceContext resourceContext)`
	`107`	`+ protected virtual Expression ApplyProjection(Expression source, IDictionary<ResourceFieldAttribute, QueryLayer> projection, ResourceContext resourceContext)`
`108`	`108`	`{`
`109`	`109`	`using var lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public ResourceRepositoryAccessor(IServiceProvider serviceProvider, IResourceCon`
`26`	`26`	`public async Task<IReadOnlyCollection<TResource>> GetAsync<TResource>(QueryLayer layer, CancellationToken cancellationToken)`
`27`	`27`	`where TResource : class, IIdentifiable`
`28`	`28`	`{`
`29`		`- dynamic repository = GetReadRepository(typeof(TResource));`
	`29`	`+ dynamic repository = ResolveReadRepository(typeof(TResource));`
`30`	`30`	`return (IReadOnlyCollection<TResource>) await repository.GetAsync(layer, cancellationToken);`
`31`	`31`	`}`
`32`	`32`
`@@ -35,83 +35,83 @@ public async Task<IReadOnlyCollection<IIdentifiable>> GetAsync(Type resourceType`
`35`	`35`	`{`
`36`	`36`	`if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));`
`37`	`37`
`38`		`- dynamic repository = GetReadRepository(resourceType);`
	`38`	`+ dynamic repository = ResolveReadRepository(resourceType);`
`39`	`39`	`return (IReadOnlyCollection<IIdentifiable>) await repository.GetAsync(layer, cancellationToken);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/// <inheritdoc />`
`43`	`43`	`public async Task<int> CountAsync<TResource>(FilterExpression topFilter, CancellationToken cancellationToken)`
`44`	`44`	`where TResource : class, IIdentifiable`
`45`	`45`	`{`
`46`		`- dynamic repository = GetReadRepository(typeof(TResource));`
	`46`	`+ dynamic repository = ResolveReadRepository(typeof(TResource));`
`47`	`47`	`return (int) await repository.CountAsync(topFilter, cancellationToken);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/// <inheritdoc />`
`51`	`51`	`public async Task<TResource> GetForCreateAsync<TResource, TId>(TId id, CancellationToken cancellationToken)`
`52`	`52`	`where TResource : class, IIdentifiable<TId>`
`53`	`53`	`{`
`54`		`- dynamic repository = GetWriteRepository(typeof(TResource));`
	`54`	`+ dynamic repository = ResolveWriteRepository(typeof(TResource));`
`55`	`55`	`return await repository.GetForCreateAsync(id, cancellationToken);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/// <inheritdoc />`
`59`	`59`	`public async Task CreateAsync<TResource>(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken)`
`60`	`60`	`where TResource : class, IIdentifiable`
`61`	`61`	`{`
`62`		`- dynamic repository = GetWriteRepository(typeof(TResource));`
	`62`	`+ dynamic repository = ResolveWriteRepository(typeof(TResource));`
`63`	`63`	`await repository.CreateAsync(resourceFromRequest, resourceForDatabase, cancellationToken);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/// <inheritdoc />`
`67`	`67`	`public async Task<TResource> GetForUpdateAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)`
`68`	`68`	`where TResource : class, IIdentifiable`
`69`	`69`	`{`
`70`		`- dynamic repository = GetWriteRepository(typeof(TResource));`
	`70`	`+ dynamic repository = ResolveWriteRepository(typeof(TResource));`
`71`	`71`	`return await repository.GetForUpdateAsync(queryLayer, cancellationToken);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/// <inheritdoc />`
`75`	`75`	`public async Task UpdateAsync<TResource>(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken)`
`76`	`76`	`where TResource : class, IIdentifiable`
`77`	`77`	`{`
`78`		`- dynamic repository = GetWriteRepository(typeof(TResource));`
	`78`	`+ dynamic repository = ResolveWriteRepository(typeof(TResource));`
`79`	`79`	`await repository.UpdateAsync(resourceFromRequest, resourceFromDatabase, cancellationToken);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/// <inheritdoc />`
`83`	`83`	`public async Task DeleteAsync<TResource, TId>(TId id, CancellationToken cancellationToken)`
`84`	`84`	`where TResource : class, IIdentifiable<TId>`
`85`	`85`	`{`
`86`		`- dynamic repository = GetWriteRepository(typeof(TResource));`
	`86`	`+ dynamic repository = ResolveWriteRepository(typeof(TResource));`
`87`	`87`	`await repository.DeleteAsync(id, cancellationToken);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/// <inheritdoc />`
`91`	`91`	`public async Task SetRelationshipAsync<TResource>(TResource primaryResource, object secondaryResourceIds, CancellationToken cancellationToken)`
`92`	`92`	`where TResource : class, IIdentifiable`
`93`	`93`	`{`
`94`		`- dynamic repository = GetWriteRepository(typeof(TResource));`
	`94`	`+ dynamic repository = ResolveWriteRepository(typeof(TResource));`
`95`	`95`	`await repository.SetRelationshipAsync(primaryResource, secondaryResourceIds, cancellationToken);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/// <inheritdoc />`
`99`	`99`	`public async Task AddToToManyRelationshipAsync<TResource, TId>(TId primaryId, ISet<IIdentifiable> secondaryResourceIds, CancellationToken cancellationToken)`
`100`	`100`	`where TResource : class, IIdentifiable<TId>`
`101`	`101`	`{`
`102`		`- dynamic repository = GetWriteRepository(typeof(TResource));`
	`102`	`+ dynamic repository = ResolveWriteRepository(typeof(TResource));`
`103`	`103`	`await repository.AddToToManyRelationshipAsync(primaryId, secondaryResourceIds, cancellationToken);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/// <inheritdoc />`
`107`	`107`	`public async Task RemoveFromToManyRelationshipAsync<TResource>(TResource primaryResource, ISet<IIdentifiable> secondaryResourceIds, CancellationToken cancellationToken)`
`108`	`108`	`where TResource : class, IIdentifiable`
`109`	`109`	`{`
`110`		`- dynamic repository = GetWriteRepository(typeof(TResource));`
	`110`	`+ dynamic repository = ResolveWriteRepository(typeof(TResource));`
`111`	`111`	`await repository.RemoveFromToManyRelationshipAsync(primaryResource, secondaryResourceIds, cancellationToken);`
`112`	`112`	`}`
`113`	`113`
`114`		`- protected object GetReadRepository(Type resourceType)`
	`114`	`+ protected virtual object ResolveReadRepository(Type resourceType)`
`115`	`115`	`{`
`116`	`116`	`var resourceContext = _resourceContextProvider.GetResourceContext(resourceType);`
`117`	`117`
`@@ -130,7 +130,7 @@ protected object GetReadRepository(Type resourceType)`
`130`	`130`	`return _serviceProvider.GetRequiredService(resourceDefinitionType);`
`131`	`131`	`}`
`132`	`132`
`133`		`- protected object GetWriteRepository(Type resourceType)`
	`133`	`+ protected virtual object ResolveWriteRepository(Type resourceType)`
`134`	`134`	`{`
`135`	`135`	`var resourceContext = _resourceContextProvider.GetResourceContext(resourceType);`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public IReadOnlyCollection<IncludeElementExpression> OnApplyIncludes(Type resour`
`23`	`23`	`{`
`24`	`24`	`if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));`
`25`	`25`
`26`		`- dynamic resourceDefinition = GetResourceDefinition(resourceType);`
	`26`	`+ dynamic resourceDefinition = ResolveResourceDefinition(resourceType);`
`27`	`27`	`return resourceDefinition.OnApplyIncludes(existingIncludes);`
`28`	`28`	`}`
`29`	`29`
`@@ -32,7 +32,7 @@ public FilterExpression OnApplyFilter(Type resourceType, FilterExpression existi`
`32`	`32`	`{`
`33`	`33`	`if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));`
`34`	`34`
`35`		`- dynamic resourceDefinition = GetResourceDefinition(resourceType);`
	`35`	`+ dynamic resourceDefinition = ResolveResourceDefinition(resourceType);`
`36`	`36`	`return resourceDefinition.OnApplyFilter(existingFilter);`
`37`	`37`	`}`
`38`	`38`
`@@ -41,7 +41,7 @@ public SortExpression OnApplySort(Type resourceType, SortExpression existingSort`
`41`	`41`	`{`
`42`	`42`	`if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));`
`43`	`43`
`44`		`- dynamic resourceDefinition = GetResourceDefinition(resourceType);`
	`44`	`+ dynamic resourceDefinition = ResolveResourceDefinition(resourceType);`
`45`	`45`	`return resourceDefinition.OnApplySort(existingSort);`
`46`	`46`	`}`
`47`	`47`
`@@ -50,7 +50,7 @@ public PaginationExpression OnApplyPagination(Type resourceType, PaginationExpre`
`50`	`50`	`{`
`51`	`51`	`if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));`
`52`	`52`
`53`		`- dynamic resourceDefinition = GetResourceDefinition(resourceType);`
	`53`	`+ dynamic resourceDefinition = ResolveResourceDefinition(resourceType);`
`54`	`54`	`return resourceDefinition.OnApplyPagination(existingPagination);`
`55`	`55`	`}`
`56`	`56`
`@@ -59,7 +59,7 @@ public SparseFieldSetExpression OnApplySparseFieldSet(Type resourceType, SparseF`
`59`	`59`	`{`
`60`	`60`	`if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));`
`61`	`61`
`62`		`- dynamic resourceDefinition = GetResourceDefinition(resourceType);`
	`62`	`+ dynamic resourceDefinition = ResolveResourceDefinition(resourceType);`
`63`	`63`	`return resourceDefinition.OnApplySparseFieldSet(existingSparseFieldSet);`
`64`	`64`	`}`
`65`	`65`
`@@ -69,7 +69,7 @@ public object GetQueryableHandlerForQueryStringParameter(Type resourceType, stri`
`69`	`69`	`if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));`
`70`	`70`	`if (parameterName == null) throw new ArgumentNullException(nameof(parameterName));`
`71`	`71`
`72`		`- dynamic resourceDefinition = GetResourceDefinition(resourceType);`
	`72`	`+ dynamic resourceDefinition = ResolveResourceDefinition(resourceType);`
`73`	`73`	`var handlers = resourceDefinition.OnRegisterQueryableHandlersForQueryStringParameters();`
`74`	`74`
`75`	`75`	`return handlers != null && handlers.ContainsKey(parameterName) ? handlers[parameterName] : null;`
`@@ -80,11 +80,11 @@ public IDictionary<string, object> GetMeta(Type resourceType, IIdentifiable reso`
`80`	`80`	`{`
`81`	`81`	`if (resourceType == null) throw new ArgumentNullException(nameof(resourceType));`
`82`	`82`
`83`		`- dynamic resourceDefinition = GetResourceDefinition(resourceType);`
	`83`	`+ dynamic resourceDefinition = ResolveResourceDefinition(resourceType);`
`84`	`84`	`return resourceDefinition.GetMeta((dynamic) resourceInstance);`
`85`	`85`	`}`
`86`	`86`
`87`		`- protected object GetResourceDefinition(Type resourceType)`
	`87`	`+ protected virtual object ResolveResourceDefinition(Type resourceType)`
`88`	`88`	`{`
`89`	`89`	`var resourceContext = _resourceContextProvider.GetResourceContext(resourceType);`
`90`	`90`