Merge 38a4a83 into fe64052

Author: bkoelman

benchmarks/QueryString/QueryStringParserBenchmarks.cs

@@ -4,8 +4,8 @@
 using JsonApiDotNetCore;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
+using JsonApiDotNetCore.Queries.Parsing;
 using JsonApiDotNetCore.QueryStrings;
-using JsonApiDotNetCore.QueryStrings.Internal;
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Logging.Abstractions;
 
@@ -37,11 +37,23 @@ public QueryStringParserBenchmarks()
 
         var resourceFactory = new ResourceFactory(new ServiceContainer());
 
-        var includeReader = new IncludeQueryStringParameterReader(request, resourceGraph, options);
-        var filterReader = new FilterQueryStringParameterReader(request, resourceGraph, resourceFactory, options);
-        var sortReader = new SortQueryStringParameterReader(request, resourceGraph);
-        var sparseFieldSetReader = new SparseFieldSetQueryStringParameterReader(request, resourceGraph);
-        var paginationReader = new PaginationQueryStringParameterReader(request, resourceGraph, options);
+        var includeParser = new IncludeParser(options);
+        var includeReader = new IncludeQueryStringParameterReader(includeParser, request, resourceGraph);
+
+        var filterScopeParser = new QueryStringParameterScopeParser();
+        var filterValueParser = new FilterParser(resourceFactory);
+        var filterReader = new FilterQueryStringParameterReader(filterScopeParser, filterValueParser, request, resourceGraph, options);
+
+        var sortScopeParser = new QueryStringParameterScopeParser();
+        var sortValueParser = new SortParser();
+        var sortReader = new SortQueryStringParameterReader(sortScopeParser, sortValueParser, request, resourceGraph);
+
+        var sparseFieldSetScopeParser = new SparseFieldTypeParser(resourceGraph);
+        var sparseFieldSetValueParser = new SparseFieldSetParser();
+        var sparseFieldSetReader = new SparseFieldSetQueryStringParameterReader(sparseFieldSetScopeParser, sparseFieldSetValueParser, request, resourceGraph);
+
+        var paginationParser = new PaginationParser();
+        var paginationReader = new PaginationQueryStringParameterReader(paginationParser, request, resourceGraph, options);
 
         IQueryStringParameterReader[] readers = ArrayFactory.Create<IQueryStringParameterReader>(includeReader, filterReader, sortReader,
             sparseFieldSetReader, paginationReader);

benchmarks/Serialization/OperationsSerializationBenchmarks.cs

@@ -3,7 +3,6 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries;
-using JsonApiDotNetCore.Queries.Internal;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 

benchmarks/Serialization/ResourceSerializationBenchmarks.cs

@@ -6,7 +6,6 @@
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Queries.Expressions;
-using JsonApiDotNetCore.Queries.Internal;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 

benchmarks/Serialization/SerializationBenchmarkBase.cs

@@ -5,7 +5,6 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries;
-using JsonApiDotNetCore.Queries.Internal;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Response;

benchmarks/Tools/NeverResourceDefinitionAccessor.cs

@@ -2,6 +2,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries.Expressions;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
@@ -13,6 +14,7 @@ namespace Benchmarks.Tools;
 internal sealed class NeverResourceDefinitionAccessor : IResourceDefinitionAccessor
 {
     bool IResourceDefinitionAccessor.IsReadOnlyRequest => throw new NotImplementedException();
+    public IQueryableBuilder QueryableBuilder => throw new NotImplementedException();
 
     public IImmutableSet<IncludeElementExpression> OnApplyIncludes(ResourceType resourceType, IImmutableSet<IncludeElementExpression> existingIncludes)
     {

src/Examples/NoEntityFrameworkExample/QueryLayerToLinqConverter.cs

@@ -1,21 +1,21 @@
 using System.Collections;
 using System.Linq.Expressions;
 using JsonApiDotNetCore.Queries;
-using JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using JsonApiDotNetCore.Resources;
 using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace NoEntityFrameworkExample;
 
 internal sealed class QueryLayerToLinqConverter
 {
-    private readonly IResourceFactory _resourceFactory;
     private readonly IModel _model;
+    private readonly IQueryableBuilder _queryableBuilder;
 
-    public QueryLayerToLinqConverter(IResourceFactory resourceFactory, IModel model)
+    public QueryLayerToLinqConverter(IModel model, IQueryableBuilder queryableBuilder)
     {
-        _resourceFactory = resourceFactory;
         _model = model;
+        _queryableBuilder = queryableBuilder;
     }
 
     public IEnumerable<TResource> ApplyQueryLayer<TResource>(QueryLayer queryLayer, IEnumerable<TResource> resources)
@@ -26,10 +26,9 @@ public IEnumerable<TResource> ApplyQueryLayer<TResource>(QueryLayer queryLayer,
         converter.ConvertIncludesToSelections();
 
         // Convert QueryLayer into LINQ expression.
-        Expression source = ((IEnumerable)resources).AsQueryable().Expression;
-        var nameFactory = new LambdaParameterNameFactory();
-        var queryableBuilder = new QueryableBuilder(source, queryLayer.ResourceType.ClrType, typeof(Enumerable), nameFactory, _resourceFactory, _model);
-        Expression expression = queryableBuilder.ApplyQuery(queryLayer);
+        IQueryable source = ((IEnumerable)resources).AsQueryable();
+        var context = QueryableBuilderContext.CreateRoot(source, typeof(Enumerable), _model, null);
+        Expression expression = _queryableBuilder.ApplyQuery(queryLayer, context);
 
         // Insert null checks to prevent a NullReferenceException during execution of expressions such as:
         // 'todoItems => todoItems.Where(todoItem => todoItem.Assignee.Id == 1)' when a TodoItem doesn't have an assignee.

src/Examples/NoEntityFrameworkExample/Repositories/InMemoryResourceRepository.cs

@@ -1,7 +1,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Queries.Expressions;
-using JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using JsonApiDotNetCore.Repositories;
 using JsonApiDotNetCore.Resources;
 using NoEntityFrameworkExample.Data;
@@ -25,12 +25,12 @@ public abstract class InMemoryResourceRepository<TResource, TId> : IResourceRead
     private readonly ResourceType _resourceType;
     private readonly QueryLayerToLinqConverter _queryLayerToLinqConverter;
 
-    protected InMemoryResourceRepository(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
+    protected InMemoryResourceRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder)
     {
         _resourceType = resourceGraph.GetResourceType<TResource>();
 
         var model = new InMemoryModel(resourceGraph);
-        _queryLayerToLinqConverter = new QueryLayerToLinqConverter(resourceFactory, model);
+        _queryLayerToLinqConverter = new QueryLayerToLinqConverter(model, queryableBuilder);
     }
 
     /// <inheritdoc />

src/Examples/NoEntityFrameworkExample/Repositories/PersonRepository.cs

@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using NoEntityFrameworkExample.Data;
 using NoEntityFrameworkExample.Models;
 
@@ -9,8 +9,8 @@ namespace NoEntityFrameworkExample.Repositories;
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 public sealed class PersonRepository : InMemoryResourceRepository<Person, long>
 {
-    public PersonRepository(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
-        : base(resourceGraph, resourceFactory)
+    public PersonRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder)
+        : base(resourceGraph, queryableBuilder)
     {
     }
 

src/Examples/NoEntityFrameworkExample/Repositories/TagRepository.cs

@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using NoEntityFrameworkExample.Data;
 using NoEntityFrameworkExample.Models;
 
@@ -9,8 +9,8 @@ namespace NoEntityFrameworkExample.Repositories;
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 public sealed class TagRepository : InMemoryResourceRepository<Tag, long>
 {
-    public TagRepository(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
-        : base(resourceGraph, resourceFactory)
+    public TagRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder)
+        : base(resourceGraph, queryableBuilder)
     {
     }
 

src/Examples/NoEntityFrameworkExample/Repositories/TodoItemRepository.cs

@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using NoEntityFrameworkExample.Data;
 using NoEntityFrameworkExample.Models;
 
@@ -9,8 +9,8 @@ namespace NoEntityFrameworkExample.Repositories;
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 public sealed class TodoItemRepository : InMemoryResourceRepository<TodoItem, long>
 {
-    public TodoItemRepository(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
-        : base(resourceGraph, resourceFactory)
+    public TodoItemRepository(IResourceGraph resourceGraph, IQueryableBuilder queryableBuilder)
+        : base(resourceGraph, queryableBuilder)
     {
     }