chore: renamed type parameters for consistency

Author: maurei

JsonApiDotnetCore.sln

@@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7A2B7ADD-ECB
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCoreExampleTests", "test\JsonApiDotNetCoreExampleTests\JsonApiDotNetCoreExampleTests.csproj", "{0B959765-40D2-43B5-87EE-FE2FEF9DBED5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCoreExampleTests", "test\JsonApiDotNetCoreExampleTests\JsonApiDotNetCoreExampleTests.csproj", "{0B959765-40D2-43B5-87EE-FE2FEF9DBED5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C5B4D998-CECB-454D-9F32-085A897577BE}"
 	ProjectSection(SolutionItems) = preProject

src/Examples/JsonApiDotNetCoreExample/Resources/TagResource.cs

@@ -13,7 +13,7 @@ public TagResource(IResourceGraph graph) : base(graph)
         {
         }
 
-        public override IEnumerable<Tag> BeforeCreate(IResourceHashSet<Tag> affected, ResourcePipeline pipeline)
+        public override IEnumerable<Tag> BeforeCreate(IEntityHashSet<Tag> affected, ResourcePipeline pipeline)
         {
             return base.BeforeCreate(affected, pipeline);
         }

src/JsonApiDotNetCore/Hooks/Execution/ResourceDiffs.cs renamed to src/JsonApiDotNetCore/Hooks/Execution/EntityDiffs.cs

@@ -12,106 +12,106 @@ namespace JsonApiDotNetCore.Hooks
     /// Contains the resources from the request and the corresponding database values.
     /// 
     /// Also contains information about updated relationships through 
-    /// implementation of IRelationshipsDictionary<typeparamref name="TResource"/>>
+    /// implementation of IRelationshipsDictionary<typeparamref name="TEntity"/>>
     /// </summary>
-    public interface IResourceDiffs<TResource> : IRelationshipsDictionary<TResource>, IEnumerable<ResourceDiffPair<TResource>> where TResource : class, IIdentifiable
+    public interface IEntityDiff<TEntity> : IRelationshipsDictionary<TEntity>, IEnumerable<EntityDiffPair<TEntity>> where TEntity : class, IIdentifiable
     {
         /// <summary>
         /// The database values of the resources affected by the request.
         /// </summary>
-        HashSet<TResource> DatabaseValues { get; }
+        HashSet<TEntity> DatabaseValues { get; }
 
         /// <summary>
         /// The resources that were affected by the request.
         /// </summary>
-        HashSet<TResource> Resources { get; }
+        HashSet<TEntity> Entities { get; }
     }
 
     /// <inheritdoc />
-    public class ResourceDiffs<TResource> : IResourceDiffs<TResource> where TResource : class, IIdentifiable
+    public class EntityDiffs<TEntity> : IEntityDiff<TEntity> where TEntity : class, IIdentifiable
     {
         /// <inheritdoc />
-        public HashSet<TResource> DatabaseValues { get => _databaseValues ?? ThrowNoDbValuesError(); }
-        private readonly HashSet<TResource> _databaseValues;
+        public HashSet<TEntity> DatabaseValues { get => _databaseValues ?? ThrowNoDbValuesError(); }
+        private readonly HashSet<TEntity> _databaseValues;
         private readonly bool _databaseValuesLoaded;
 
         /// <inheritdoc />
-        public HashSet<TResource> Resources { get; private set; }
+        public HashSet<TEntity> Entities { get; private set; }
         /// <inheritdoc />
-        public RelationshipsDictionary<TResource> AffectedRelationships { get; private set; }
+        public RelationshipsDictionary<TEntity> AffectedRelationships { get; private set; }
 
-        public ResourceDiffs(HashSet<TResource> requestEntities,
-                          HashSet<TResource> databaseEntities,
-                          Dictionary<RelationshipAttribute, HashSet<TResource>> relationships) 
+        public EntityDiffs(HashSet<TEntity> requestEntities,
+                          HashSet<TEntity> databaseEntities,
+                          Dictionary<RelationshipAttribute, HashSet<TEntity>> relationships) 
         {
-            Resources = requestEntities;
-            AffectedRelationships = new RelationshipsDictionary<TResource>(relationships);
+            Entities = requestEntities;
+            AffectedRelationships = new RelationshipsDictionary<TEntity>(relationships);
             _databaseValues = databaseEntities;
             _databaseValuesLoaded |= _databaseValues != null;
         }
 
         /// <summary>
         /// Used internally by the ResourceHookExecutor to make live a bit easier with generics
         /// </summary>
-        internal ResourceDiffs(IEnumerable requestEntities,
+        internal EntityDiffs(IEnumerable requestEntities,
                   IEnumerable databaseEntities,
                   Dictionary<RelationshipAttribute, IEnumerable> relationships) 
-            : this((HashSet<TResource>)requestEntities, (HashSet<TResource>)databaseEntities, TypeHelper.ConvertRelationshipDictionary<TResource>(relationships)) { }
+            : this((HashSet<TEntity>)requestEntities, (HashSet<TEntity>)databaseEntities, TypeHelper.ConvertRelationshipDictionary<TEntity>(relationships)) { }
 
 
         /// <inheritdoc />
-        public Dictionary<RelationshipAttribute, HashSet<TResource>> GetByRelationship<TPrincipalResource>() where TPrincipalResource : class, IIdentifiable
+        public Dictionary<RelationshipAttribute, HashSet<TEntity>> GetByRelationship<TPrincipalResource>() where TPrincipalResource : class, IIdentifiable
         {
             return GetByRelationship(typeof(TPrincipalResource));
         }
 
         /// <inheritdoc />
-        public Dictionary<RelationshipAttribute, HashSet<TResource>> GetByRelationship(Type principalType)
+        public Dictionary<RelationshipAttribute, HashSet<TEntity>> GetByRelationship(Type principalType)
         {
             return AffectedRelationships.GetByRelationship(principalType);
         }
 
         /// <inheritdoc />
-        public IEnumerator<ResourceDiffPair<TResource>> GetEnumerator()
+        public IEnumerator<EntityDiffPair<TEntity>> GetEnumerator()
         {
             if (!_databaseValuesLoaded) ThrowNoDbValuesError();
 
-            foreach (var entity in Resources)
+            foreach (var entity in Entities)
             {
-                TResource currentValueInDatabase = null;
+                TEntity currentValueInDatabase = null;
                 currentValueInDatabase = _databaseValues.Single(e => entity.StringId == e.StringId);
-                yield return new ResourceDiffPair<TResource>(entity, currentValueInDatabase);
+                yield return new EntityDiffPair<TEntity>(entity, currentValueInDatabase);
             }
         }
 
         /// <inheritdoc />
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-        private HashSet<TResource> ThrowNoDbValuesError()
+        private HashSet<TEntity> ThrowNoDbValuesError()
         {
             throw new MemberAccessException("Cannot access database entities if the LoadDatabaseValues option is set to false");
         }
     }
 
     /// <summary>
-    /// A wrapper that contains an resource that is affected by the request, 
+    /// A wrapper that contains an entity that is affected by the request, 
     /// matched to its current database value
     /// </summary>
-    public class ResourceDiffPair<TResource> where TResource : class, IIdentifiable
+    public class EntityDiffPair<TEntity> where TEntity : class, IIdentifiable
     {
-        public ResourceDiffPair(TResource resource, TResource databaseValue)
+        public EntityDiffPair(TEntity entity, TEntity databaseValue)
         {
-            Resource = resource;
+            Entity = entity;
             DatabaseValue = databaseValue;
         }
 
         /// <summary>
         /// The resource from the request matching the resource from the database.
         /// </summary>
-        public TResource Resource { get; private set; }
+        public TEntity Entity { get; private set; }
         /// <summary>
         /// The resource from the database matching the resource from the request.
         /// </summary>
-        public TResource DatabaseValue { get; private set; }
+        public TEntity DatabaseValue { get; private set; }
     }
 }

src/JsonApiDotNetCore/Hooks/Execution/ResourceHashSet.cs renamed to src/JsonApiDotNetCore/Hooks/Execution/EntityHashSet.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using JsonApiDotNetCore.Models;
-using System.Linq;
 using System.Collections;
 using JsonApiDotNetCore.Internal;
 using System;
@@ -13,10 +12,7 @@ namespace JsonApiDotNetCore.Hooks
     /// Also contains information about updated relationships through 
     /// implementation of IAffectedRelationshipsDictionary<typeparamref name="TResource"/>>
     /// </summary>
-    public interface IResourceHashSet<TResource> : IRelationshipsDictionary<TResource>, IEnumerable<TResource> where TResource : class, IIdentifiable
-    {
-
-    }
+    public interface IEntityHashSet<TResource> : IRelationshipsDictionary<TResource>, IEnumerable<TResource> where TResource : class, IIdentifiable { }
 
     /// <summary>
     /// Implementation of IResourceHashSet{TResource}.
@@ -26,12 +22,12 @@ public interface IResourceHashSet<TResource> : IRelationshipsDictionary<TResourc
     /// Also contains information about updated relationships through 
     /// implementation of IRelationshipsDictionary<typeparamref name="TResource"/>>
     /// </summary>
-    public class ResourceHashSet<TResource> : HashSet<TResource>, IResourceHashSet<TResource> where TResource : class, IIdentifiable
+    public class EntityHashSet<TResource> : HashSet<TResource>, IEntityHashSet<TResource> where TResource : class, IIdentifiable
     {
         /// <inheritdoc />
         public RelationshipsDictionary<TResource> AffectedRelationships { get; private set; }
 
-        public ResourceHashSet(HashSet<TResource> entities,
+        public EntityHashSet(HashSet<TResource> entities,
                         Dictionary<RelationshipAttribute, HashSet<TResource>> relationships) : base(entities)
         {
             AffectedRelationships = new RelationshipsDictionary<TResource>(relationships);
@@ -40,7 +36,7 @@ public ResourceHashSet(HashSet<TResource> entities,
         /// <summary>
         /// Used internally by the ResourceHookExecutor to make live a bit easier with generics
         /// </summary>
-        internal ResourceHashSet(IEnumerable entities,
+        internal EntityHashSet(IEnumerable entities,
                         Dictionary<RelationshipAttribute, IEnumerable> relationships)
             : this((HashSet<TResource>)entities, TypeHelper.ConvertRelationshipDictionary<TResource>(relationships)) { }