Removed workaround for dotnet/efcore#21026

Bart Koelman · Bart Koelman · commit 65ba7c52da13 · 2021-04-21T10:45:28.000+02:00
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs
@@ -12,10 +12,6 @@ public sealed class JsonApiOptions : IJsonApiOptions
     {
         internal static readonly NamingStrategy DefaultNamingStrategy = new CamelCaseNamingStrategy();
 
-        // Workaround for https://github.com/dotnet/efcore/issues/21026
-        internal bool DisableTopPagination { get; set; }
-        internal bool DisableChildrenPagination { get; set; }
-
         /// <inheritdoc />
         public string Namespace { get; set; }
 
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs
@@ -100,7 +100,7 @@ private QueryLayer ComposeTopLayer(IEnumerable<ExpressionInScope> constraints, R
             {
                 Filter = GetFilter(expressionsInTopScope, resourceContext),
                 Sort = GetSort(expressionsInTopScope, resourceContext),
-                Pagination = ((JsonApiOptions)_options).DisableTopPagination ? null : topPagination,
+                Pagination = topPagination,
                 Projection = GetProjectionForSparseAttributeSet(resourceContext)
             };
         }
@@ -164,7 +164,7 @@ private IReadOnlyCollection<IncludeElementExpression> ProcessIncludeSet(IReadOnl
                     {
                         Filter = GetFilter(expressionsInCurrentScope, resourceContext),
                         Sort = GetSort(expressionsInCurrentScope, resourceContext),
-                        Pagination = ((JsonApiOptions)_options).DisableChildrenPagination ? null : GetPagination(expressionsInCurrentScope, resourceContext),
+                        Pagination = GetPagination(expressionsInCurrentScope, resourceContext),
                         Projection = GetProjectionForSparseAttributeSet(resourceContext)
                     };
 
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs
@@ -28,9 +28,6 @@ public FilterDepthTests(ExampleIntegrationTestContext<TestableStartup<QueryStrin
 
             var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
             options.EnableLegacyFilterNotation = false;
-
-            options.DisableTopPagination = false;
-            options.DisableChildrenPagination = false;
         }
 
         [Fact]
@@ -327,11 +324,6 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                 await dbContext.SaveChangesAsync();
             });
 
-            // Workaround for https://github.com/dotnet/efcore/issues/21026
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DisableTopPagination = false;
-            options.DisableChildrenPagination = true;
-
             const string route = "/blogPosts?include=labels&filter[labels]=equals(name,'Hot')";
 
             // Act
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs
@@ -36,9 +36,6 @@ public PaginationWithTotalCountTests(ExampleIntegrationTestContext<TestableStart
             options.MaximumPageSize = null;
             options.MaximumPageNumber = null;
             options.AllowUnknownQueryStringParameters = true;
-
-            options.DisableTopPagination = false;
-            options.DisableChildrenPagination = false;
         }
 
         [Fact]
@@ -303,11 +300,6 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                 await dbContext.SaveChangesAsync();
             });
 
-            // Workaround for https://github.com/dotnet/efcore/issues/21026
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DisableTopPagination = true;
-            options.DisableChildrenPagination = false;
-
             const string route = "/blogPosts?include=labels&page[number]=labels:2&page[size]=labels:1";
 
             // Act
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/ResourceHooks/ResourceHookTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/ResourceHooks/ResourceHookTests.cs
@@ -47,10 +47,6 @@ public ResourceHookTests(ExampleIntegrationTestContext<ResourceHooksStartup<AppD
 
                 services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
             });
-
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DisableTopPagination = false;
-            options.DisableChildrenPagination = false;
         }
 
         [Fact]
@@ -335,11 +331,6 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                 await dbContext.SaveChangesAsync();
             });
 
-            // Workaround for https://github.com/dotnet/efcore/issues/21026
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DisableTopPagination = false;
-            options.DisableChildrenPagination = true;
-
             const string route = "/api/v1/articles?include=tags";
 
             // Act

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,6 @@ public sealed class JsonApiOptions : IJsonApiOptions`
`12`	`12`	`{`
`13`	`13`	`internal static readonly NamingStrategy DefaultNamingStrategy = new CamelCaseNamingStrategy();`
`14`	`14`
`15`		`- // Workaround for https://github.com/dotnet/efcore/issues/21026`
`16`		`- internal bool DisableTopPagination { get; set; }`
`17`		`- internal bool DisableChildrenPagination { get; set; }`
`18`		`-`
`19`	`15`	`/// <inheritdoc />`
`20`	`16`	`public string Namespace { get; set; }`
`21`	`17`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private QueryLayer ComposeTopLayer(IEnumerable<ExpressionInScope> constraints, R`
`100`	`100`	`{`
`101`	`101`	`Filter = GetFilter(expressionsInTopScope, resourceContext),`
`102`	`102`	`Sort = GetSort(expressionsInTopScope, resourceContext),`
`103`		`- Pagination = ((JsonApiOptions)_options).DisableTopPagination ? null : topPagination,`
	`103`	`+ Pagination = topPagination,`
`104`	`104`	`Projection = GetProjectionForSparseAttributeSet(resourceContext)`
`105`	`105`	`};`
`106`	`106`	`}`
`@@ -164,7 +164,7 @@ private IReadOnlyCollection<IncludeElementExpression> ProcessIncludeSet(IReadOnl`
`164`	`164`	`{`
`165`	`165`	`Filter = GetFilter(expressionsInCurrentScope, resourceContext),`
`166`	`166`	`Sort = GetSort(expressionsInCurrentScope, resourceContext),`
`167`		`- Pagination = ((JsonApiOptions)_options).DisableChildrenPagination ? null : GetPagination(expressionsInCurrentScope, resourceContext),`
	`167`	`+ Pagination = GetPagination(expressionsInCurrentScope, resourceContext),`
`168`	`168`	`Projection = GetProjectionForSparseAttributeSet(resourceContext)`
`169`	`169`	`};`
`170`	`170`