fix: removed usage of guid-based repositories

Author: maurei

src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs

@@ -38,29 +38,6 @@ public DefaultEntityRepository(
         { }
     }
 
-    public class DefaultGuidEntityRepository<TEntity>
-    : DefaultEntityRepository<TEntity, Guid>,
-    IGuidEntityRepository<TEntity>
-    where TEntity : class, IIdentifiable<Guid>
-    {
-        public DefaultGuidEntityRepository(
-            IJsonApiContext jsonApiContext,
-            IDbContextResolver contextResolver
-            )
-        : base(jsonApiContext, contextResolver)
-        { }
-
-        public DefaultGuidEntityRepository(
-            ILoggerFactory loggerFactory,
-            IJsonApiContext jsonApiContext,
-            IDbContextResolver contextResolver,
-            ResourceDefinition<TEntity> resourceDefinition = null
-            )
-        : base(loggerFactory, jsonApiContext, contextResolver, resourceDefinition)
-        { }
-    }
-
-
     /// <summary>
     /// Provides a default repository implementation and is responsible for
     /// abstracting any EF Core APIs away from the service layer.
@@ -148,7 +125,6 @@ public virtual IQueryable<TEntity> Sort(IQueryable<TEntity> entities, List<SortQ
                     }
                 }
             }
-
             return entities;
         }
 

src/JsonApiDotNetCore/Data/IEntityReadRepository.cs

@@ -12,11 +12,6 @@ public interface IEntityReadRepository<TEntity>
        where TEntity : class, IIdentifiable<int>
     { }
 
-    public interface IGuidEntityReadRepository<TEntity>
-       : IEntityReadRepository<TEntity, Guid>
-       where TEntity : class, IIdentifiable<Guid>
-    { }
-
     public interface IEntityReadRepository<TEntity, in TId>
         where TEntity : class, IIdentifiable<TId>
     {

src/JsonApiDotNetCore/Data/IEntityRepository.cs

@@ -3,10 +3,6 @@
 
 namespace JsonApiDotNetCore.Data
 {
-    public interface IGuidEntityRepository<TEntity>
-    : IEntityRepository<TEntity, Guid>
-    where TEntity : class, IIdentifiable<Guid>
-    { }
 
     public interface IEntityRepository<TEntity>
         : IEntityRepository<TEntity, int>

src/JsonApiDotNetCore/Data/IEntityWriteRepository.cs

@@ -10,11 +10,6 @@ public interface IEntityWriteRepository<TEntity>
         where TEntity : class, IIdentifiable<int>
     { }
 
-    public interface IGuidEntityWriteRepository<TEntity>
-       : IEntityReadRepository<TEntity, Guid>
-       where TEntity : class, IIdentifiable<Guid>
-    { }
-
     public interface IEntityWriteRepository<TEntity, in TId>
         where TEntity : class, IIdentifiable<TId>
     {

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -112,9 +112,13 @@ public static void AddJsonApiInternals(
                 AddOperationServices(services);
 
             services.AddScoped(typeof(IEntityRepository<>), typeof(DefaultEntityRepository<>));
-            services.AddScoped(typeof(IGuidEntityRepository<>), typeof(DefaultGuidEntityRepository<>));
             services.AddScoped(typeof(IEntityRepository<,>), typeof(DefaultEntityRepository<,>));
 
+            services.AddScoped(typeof(IEntityReadRepository<,>), typeof(DefaultEntityRepository<,>));
+            services.AddScoped(typeof(IEntityWriteRepository<,>), typeof(DefaultEntityRepository<,>));
+
+
+
             services.AddScoped(typeof(ICreateService<>), typeof(EntityResourceService<>));
             services.AddScoped(typeof(ICreateService<,>), typeof(EntityResourceService<,>));
 

src/JsonApiDotNetCore/Graph/ServiceDiscoveryFacade.cs

@@ -40,13 +40,10 @@ public class ServiceDiscoveryFacade
 
         internal static HashSet<Type> RepositoryInterfaces = new HashSet<Type> {
             typeof(IEntityRepository<>),
-            typeof(IGuidEntityRepository<>),
             typeof(IEntityRepository<,>),
             typeof(IEntityWriteRepository<>),
-            typeof(IGuidEntityWriteRepository<>),
             typeof(IEntityWriteRepository<,>),
             typeof(IEntityReadRepository<>),
-            typeof(IGuidEntityReadRepository<>),
             typeof(IEntityReadRepository<,>)
         };
 

src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs

@@ -165,8 +165,7 @@ IEnumerable<TEntity> GetWhereAndInclude<TEntity, TId>(IEnumerable<TId> ids, stri
 
         IEntityReadRepository<TEntity, TId> GetRepository<TEntity, TId>() where TEntity : class, IIdentifiable<TId>
         {
-            var openType = typeof(TId) == typeof(Guid) ? typeof(IGuidEntityRepository<>) : typeof(IEntityRepository<>);
-            return _genericProcessorFactory.GetProcessor<IEntityReadRepository<TEntity, TId>>(openType, typeof(TEntity));
+            return _genericProcessorFactory.GetProcessor<IEntityReadRepository<TEntity, TId>>(typeof(IEntityReadRepository<,>), typeof(TEntity), typeof(TId));
         }
 
 

test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs

@@ -325,12 +325,12 @@ void SetupProcessorFactoryForResourceDefinition<TModel>(
 
             if (dbContext != null)
             {
-                var repo = CreateTestRepository<TModel>(dbContext, apiContext);
-                processorFactory.Setup(c => c.GetProcessor<IEntityReadRepository<TModel, int>>(typeof(IEntityRepository<>), typeof(TModel))).Returns(repo);
+                IEntityReadRepository<TModel, int> repo = CreateTestRepository<TModel>(dbContext, apiContext);
+                processorFactory.Setup(c => c.GetProcessor<IEntityReadRepository<TModel, int>>(typeof(IEntityReadRepository<,>), typeof(TModel), typeof(int))).Returns(repo);
             }
         }
 
-        IEntityRepository<TModel, int> CreateTestRepository<TModel>(
+        IEntityReadRepository<TModel, int> CreateTestRepository<TModel>(
         AppDbContext dbContext,
         IJsonApiContext apiContext
         ) where TModel : class, IIdentifiable<int>