Removed single-parameter resource repositories

Bart Koelman · Bart Koelman · commit 8870ccd03175 · 2021-10-08T18:06:05.000+02:00
diff --git a/src/Examples/MultiDbContextExample/Repositories/DbContextARepository.cs b/src/Examples/MultiDbContextExample/Repositories/DbContextARepository.cs
@@ -10,7 +10,7 @@
 namespace MultiDbContextExample.Repositories
 {
     [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class DbContextARepository<TResource> : EntityFrameworkCoreRepository<TResource>
+    public sealed class DbContextARepository<TResource> : EntityFrameworkCoreRepository<TResource, int>
         where TResource : class, IIdentifiable<int>
     {
         public DbContextARepository(ITargetedFields targetedFields, DbContextResolver<DbContextA> dbContextResolver, IResourceGraph resourceGraph,
diff --git a/src/Examples/MultiDbContextExample/Repositories/DbContextBRepository.cs b/src/Examples/MultiDbContextExample/Repositories/DbContextBRepository.cs
@@ -10,7 +10,7 @@
 namespace MultiDbContextExample.Repositories
 {
     [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class DbContextBRepository<TResource> : EntityFrameworkCoreRepository<TResource>
+    public sealed class DbContextBRepository<TResource> : EntityFrameworkCoreRepository<TResource, int>
         where TResource : class, IIdentifiable<int>
     {
         public DbContextBRepository(ITargetedFields targetedFields, DbContextResolver<DbContextB> dbContextResolver, IResourceGraph resourceGraph,
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs b/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
@@ -190,8 +190,7 @@ private void AddResourceLayer()
 
         private void AddRepositoryLayer()
         {
-            RegisterImplementationForOpenInterfaces(ServiceDiscoveryFacade.RepositoryInterfaces, typeof(EntityFrameworkCoreRepository<>),
-                typeof(EntityFrameworkCoreRepository<,>));
+            RegisterImplementationForOpenInterfaces(ServiceDiscoveryFacade.RepositoryInterfaces, null, typeof(EntityFrameworkCoreRepository<,>));
 
             _services.AddScoped<IResourceRepositoryAccessor, ResourceRepositoryAccessor>();
         }
diff --git a/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs b/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs
@@ -36,11 +36,8 @@ public sealed class ServiceDiscoveryFacade
 
         internal static readonly HashSet<Type> RepositoryInterfaces = new()
         {
-            typeof(IResourceRepository<>),
             typeof(IResourceRepository<,>),
-            typeof(IResourceWriteRepository<>),
             typeof(IResourceWriteRepository<,>),
-            typeof(IResourceReadRepository<>),
             typeof(IResourceReadRepository<,>)
         };
 
diff --git a/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs b/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs
@@ -584,19 +584,4 @@ protected virtual async Task SaveChangesAsync(CancellationToken cancellationToke
             }
         }
     }
-
-    /// <summary>
-    /// Implements the foundational Repository layer in the JsonApiDotNetCore architecture that uses Entity Framework Core.
-    /// </summary>
-    [PublicAPI]
-    public class EntityFrameworkCoreRepository<TResource> : EntityFrameworkCoreRepository<TResource, int>, IResourceRepository<TResource>
-        where TResource : class, IIdentifiable<int>
-    {
-        public EntityFrameworkCoreRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
-        {
-        }
-    }
 }
diff --git a/src/JsonApiDotNetCore/Repositories/IResourceReadRepository.cs b/src/JsonApiDotNetCore/Repositories/IResourceReadRepository.cs
@@ -8,12 +8,6 @@
 
 namespace JsonApiDotNetCore.Repositories
 {
-    /// <inheritdoc />
-    public interface IResourceReadRepository<TResource> : IResourceReadRepository<TResource, int>
-        where TResource : class, IIdentifiable<int>
-    {
-    }
-
     /// <summary>
     /// Groups read operations.
     /// </summary>
diff --git a/src/JsonApiDotNetCore/Repositories/IResourceRepository.cs b/src/JsonApiDotNetCore/Repositories/IResourceRepository.cs
@@ -1,21 +1,7 @@
-using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
 namespace JsonApiDotNetCore.Repositories
 {
-    /// <summary>
-    /// Represents the foundational Resource Repository layer in the JsonApiDotNetCore architecture that provides data access to an underlying store.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface IResourceRepository<TResource>
-        : IResourceRepository<TResource, int>, IResourceReadRepository<TResource>, IResourceWriteRepository<TResource>
-        where TResource : class, IIdentifiable<int>
-    {
-    }
-
     /// <summary>
     /// Represents the foundational Resource Repository layer in the JsonApiDotNetCore architecture that provides data access to an underlying store.
     /// </summary>
diff --git a/src/JsonApiDotNetCore/Repositories/IResourceWriteRepository.cs b/src/JsonApiDotNetCore/Repositories/IResourceWriteRepository.cs
@@ -7,12 +7,6 @@
 
 namespace JsonApiDotNetCore.Repositories
 {
-    /// <inheritdoc />
-    public interface IResourceWriteRepository<TResource> : IResourceWriteRepository<TResource, int>
-        where TResource : class, IIdentifiable<int>
-    {
-    }
-
     /// <summary>
     /// Groups write operations.
     /// </summary>
diff --git a/src/JsonApiDotNetCore/Repositories/ResourceRepositoryAccessor.cs b/src/JsonApiDotNetCore/Repositories/ResourceRepositoryAccessor.cs
@@ -130,17 +130,6 @@ protected object ResolveReadRepository(Type resourceClrType)
 
         protected virtual object ResolveReadRepository(ResourceType resourceType)
         {
-            if (resourceType.IdentityClrType == typeof(int))
-            {
-                Type intRepositoryType = typeof(IResourceReadRepository<>).MakeGenericType(resourceType.ClrType);
-                object intRepository = _serviceProvider.GetService(intRepositoryType);
-
-                if (intRepository != null)
-                {
-                    return intRepository;
-                }
-            }
-
             Type resourceDefinitionType = typeof(IResourceReadRepository<,>).MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
             return _serviceProvider.GetRequiredService(resourceDefinitionType);
         }
@@ -170,17 +159,6 @@ protected virtual object ResolveWriteRepository(Type resourceClrType)
         {
             ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
 
-            if (resourceType.IdentityClrType == typeof(int))
-            {
-                Type intRepositoryType = typeof(IResourceWriteRepository<>).MakeGenericType(resourceType.ClrType);
-                object intRepository = _serviceProvider.GetService(intRepositoryType);
-
-                if (intRepository != null)
-                {
-                    return intRepository;
-                }
-            }
-
             Type resourceDefinitionType = typeof(IResourceWriteRepository<,>).MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
             return _serviceProvider.GetRequiredService(resourceDefinitionType);
         }
diff --git a/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs b/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
@@ -110,7 +110,7 @@ public void Can_add_resource_repository_from_current_assembly_to_container()
             // Assert
             ServiceProvider services = _services.BuildServiceProvider();
 
-            var resourceRepository = services.GetRequiredService<IResourceRepository<TestResource>>();
+            var resourceRepository = services.GetRequiredService<IResourceRepository<TestResource, int>>();
             resourceRepository.Should().BeOfType<TestResourceRepository>();
         }
 
diff --git a/test/DiscoveryTests/TestResourceRepository.cs b/test/DiscoveryTests/TestResourceRepository.cs
@@ -9,7 +9,7 @@
 namespace DiscoveryTests
 {
     [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class TestResourceRepository : EntityFrameworkCoreRepository<TestResource>
+    public sealed class TestResourceRepository : EntityFrameworkCoreRepository<TestResource, int>
     {
         public TestResourceRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
             IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs
@@ -11,7 +11,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions
 {
     [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class PerformerRepository : IResourceRepository<Performer>
+    public sealed class PerformerRepository : IResourceRepository<Performer, int>
     {
         public Task<IReadOnlyCollection<Performer>> GetAsync(QueryLayer layer, CancellationToken cancellationToken)
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs
@@ -52,16 +52,4 @@ private void RecursiveRewriteFilterInLayer(QueryLayer queryLayer)
             }
         }
     }
-
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public class CarCompositeKeyAwareRepository<TResource> : CarCompositeKeyAwareRepository<TResource, int>, IResourceRepository<TResource>
-        where TResource : class, IIdentifiable<int>
-    {
-        public CarCompositeKeyAwareRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
-        {
-        }
-    }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs
@@ -28,7 +28,7 @@ public CompositeKeyTests(IntegrationTestContext<TestableStartup<CompositeDbConte
             testContext.ConfigureServicesAfterStartup(services =>
             {
                 services.AddResourceRepository<CarCompositeKeyAwareRepository<Car, string>>();
-                services.AddResourceRepository<CarCompositeKeyAwareRepository<Dealership>>();
+                services.AddResourceRepository<CarCompositeKeyAwareRepository<Dealership, int>>();
             });
 
             var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs
@@ -11,7 +11,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
 {
     [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class BuildingRepository : EntityFrameworkCoreRepository<Building>
+    public sealed class BuildingRepository : EntityFrameworkCoreRepository<Building, int>
     {
         public BuildingRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
             IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs
@@ -14,8 +14,8 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets
     /// Enables sparse fieldset tests to verify which fields were (not) retrieved from the database.
     /// </summary>
     [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class ResultCapturingRepository<TResource> : EntityFrameworkCoreRepository<TResource>
-        where TResource : class, IIdentifiable<int>
+    public sealed class ResultCapturingRepository<TResource, TId> : EntityFrameworkCoreRepository<TResource, TId>
+        where TResource : class, IIdentifiable<TId>
     {
         private readonly ResourceCaptureStore _captureStore;
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
@@ -29,9 +29,9 @@ public SparseFieldSetTests(IntegrationTestContext<TestableStartup<QueryStringDbC
             {
                 services.AddSingleton<ResourceCaptureStore>();
 
-                services.AddResourceRepository<ResultCapturingRepository<Blog>>();
-                services.AddResourceRepository<ResultCapturingRepository<BlogPost>>();
-                services.AddResourceRepository<ResultCapturingRepository<WebAccount>>();
+                services.AddResourceRepository<ResultCapturingRepository<Blog, int>>();
+                services.AddResourceRepository<ResultCapturingRepository<BlogPost, int>>();
+                services.AddResourceRepository<ResultCapturingRepository<WebAccount, int>>();
             });
         }
 
diff --git a/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs b/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs
@@ -110,9 +110,9 @@ public void AddResourceRepository_Registers_All_Shorthand_Repository_Interfaces(
 
             // Assert
             ServiceProvider provider = services.BuildServiceProvider();
-            Assert.IsType<IntResourceRepository>(provider.GetRequiredService(typeof(IResourceRepository<IntResource>)));
-            Assert.IsType<IntResourceRepository>(provider.GetRequiredService(typeof(IResourceReadRepository<IntResource>)));
-            Assert.IsType<IntResourceRepository>(provider.GetRequiredService(typeof(IResourceWriteRepository<IntResource>)));
+            Assert.IsType<IntResourceRepository>(provider.GetRequiredService(typeof(IResourceRepository<IntResource, int>)));
+            Assert.IsType<IntResourceRepository>(provider.GetRequiredService(typeof(IResourceReadRepository<IntResource, int>)));
+            Assert.IsType<IntResourceRepository>(provider.GetRequiredService(typeof(IResourceWriteRepository<IntResource, int>)));
         }
 
         [Fact]
@@ -300,7 +300,7 @@ public Task RemoveFromToManyRelationshipAsync(Guid leftId, string relationshipNa
         }
 
         [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class IntResourceRepository : IResourceRepository<IntResource>
+        private sealed class IntResourceRepository : IResourceRepository<IntResource, int>
         {
             public Task<IReadOnlyCollection<IntResource>> GetAsync(QueryLayer layer, CancellationToken cancellationToken)
             {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`namespace MultiDbContextExample.Repositories`
`11`	`11`	`{`
`12`	`12`	`[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]`
`13`		`- public sealed class DbContextARepository<TResource> : EntityFrameworkCoreRepository<TResource>`
	`13`	`+ public sealed class DbContextARepository<TResource> : EntityFrameworkCoreRepository<TResource, int>`
`14`	`14`	`where TResource : class, IIdentifiable<int>`
`15`	`15`	`{`
`16`	`16`	`public DbContextARepository(ITargetedFields targetedFields, DbContextResolver<DbContextA> dbContextResolver, IResourceGraph resourceGraph,`
Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,7 @@ private void AddResourceLayer()`
`190`	`190`
`191`	`191`	`private void AddRepositoryLayer()`
`192`	`192`	`{`
`193`		`- RegisterImplementationForOpenInterfaces(ServiceDiscoveryFacade.RepositoryInterfaces, typeof(EntityFrameworkCoreRepository<>),`
`194`		`- typeof(EntityFrameworkCoreRepository<,>));`
	`193`	`+ RegisterImplementationForOpenInterfaces(ServiceDiscoveryFacade.RepositoryInterfaces, null, typeof(EntityFrameworkCoreRepository<,>));`
`195`	`194`
`196`	`195`	`_services.AddScoped<IResourceRepositoryAccessor, ResourceRepositoryAccessor>();`
`197`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -584,19 +584,4 @@ protected virtual async Task SaveChangesAsync(CancellationToken cancellationToke`
`584`	`584`	`}`
`585`	`585`	`}`
`586`	`586`	`}`
`587`		`-`
`588`		`- /// <summary>`
`589`		`- /// Implements the foundational Repository layer in the JsonApiDotNetCore architecture that uses Entity Framework Core.`
`590`		`- /// </summary>`
`591`		`- [PublicAPI]`
`592`		`- public class EntityFrameworkCoreRepository<TResource> : EntityFrameworkCoreRepository<TResource, int>, IResourceRepository<TResource>`
`593`		`- where TResource : class, IIdentifiable<int>`
`594`		`- {`
`595`		`- public EntityFrameworkCoreRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,`
`596`		`- IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,`
`597`		`- IResourceDefinitionAccessor resourceDefinitionAccessor)`
`598`		`- : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)`
`599`		`- {`
`600`		`- }`
`601`		`- }`
`602`	`587`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public void Can_add_resource_repository_from_current_assembly_to_container()`
`110`	`110`	`// Assert`
`111`	`111`	`ServiceProvider services = _services.BuildServiceProvider();`
`112`	`112`
`113`		`- var resourceRepository = services.GetRequiredService<IResourceRepository<TestResource>>();`
	`113`	`+ var resourceRepository = services.GetRequiredService<IResourceRepository<TestResource, int>>();`
`114`	`114`	`resourceRepository.Should().BeOfType<TestResourceRepository>();`
`115`	`115`	`}`
`116`	`116`