style: rename Entity to Resource

Author: maurei

src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs

@@ -38,7 +38,7 @@ public IResourceGraph Build()
 
         private void SetResourceLinksOptions(ResourceContext resourceContext)
         {
-            var attribute = (LinksAttribute)resourceContext.EntityType.GetCustomAttribute(typeof(LinksAttribute));
+            var attribute = (LinksAttribute)resourceContext.ResourceType.GetCustomAttribute(typeof(LinksAttribute));
             if (attribute != null)
             {
                 resourceContext.RelationshipLinks = attribute.RelationshipLinks;
@@ -69,12 +69,12 @@ public IResourceGraphBuilder AddResource(Type entityType, Type idType, string pl
 
         private ResourceContext GetEntity(string pluralizedTypeName, Type entityType, Type idType) => new ResourceContext
         {
-            EntityName = pluralizedTypeName,
-            EntityType = entityType,
+            ResourceName = pluralizedTypeName,
+            ResourceType = entityType,
             IdentityType = idType,
             Attributes = GetAttributes(entityType),
             Relationships = GetRelationships(entityType),
-            ResourceType = GetResourceDefinitionType(entityType)
+            ResourceDefinitionType = GetResourceDefinitionType(entityType)
         };
 
 
@@ -234,7 +234,7 @@ private string GetResourceNameFromDbSetProperty(PropertyInfo property, Type reso
 
         private void AssertEntityIsNotAlreadyDefined(Type entityType)
         {
-            if (_entities.Any(e => e.EntityType == entityType))
+            if (_entities.Any(e => e.ResourceType == entityType))
                 throw new InvalidOperationException($"Cannot add entity type {entityType} to context resourceGraph, there is already an entity of that type configured.");
         }
     }

src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs

@@ -97,23 +97,14 @@ public HashSet<TEntity> LoadDbValues<TEntity>(IEnumerable<TEntity> entities, Res
             return new HashSet<TEntity>(dbValues);
         }
 
-
         public bool ShouldLoadDbValues(Type entityType, ResourceHook hook)
         {
             var discovery = GetHookDiscovery(entityType);
-
             if (discovery.DatabaseValuesDisabledHooks.Contains(hook))
-            {
                 return false;
-            }
             if (discovery.DatabaseValuesEnabledHooks.Contains(hook))
-            {
                 return true;
-            }
-            else
-            {
-                return _options.LoaDatabaseValues;
-            }
+            return _options.LoaDatabaseValues;
         }
 
         bool ShouldExecuteHook(DependentType entityType, ResourceHook hook)

src/JsonApiDotNetCore/Internal/Contracts/IContextEntityProvider.cs renamed to src/JsonApiDotNetCore/Internal/Contracts/IResourceContextProvider.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Models;
 
 namespace JsonApiDotNetCore.Internal.Contracts
@@ -14,7 +11,7 @@ public interface IResourceContextProvider
         /// <summary>
         /// Gets all registered context entities
         /// </summary>
-        ResourceContext[] GetContextEntities();
+        ResourceContext[] GetResourceContexts();
 
         /// <summary>
         /// Get the resource metadata by the DbSet property name

src/JsonApiDotNetCore/Internal/InverseRelationships.cs

@@ -45,9 +45,9 @@ public void Resolve()
             {
                 DbContext context = _resolver.GetContext();
 
-                foreach (ResourceContext ce in _provider.GetContextEntities())
+                foreach (ResourceContext ce in _provider.GetResourceContexts())
                 {
-                    IEntityType meta = context.Model.FindEntityType(ce.EntityType);
+                    IEntityType meta = context.Model.FindEntityType(ce.ResourceType);
                     if (meta == null) continue;
                     foreach (var attr in ce.Relationships)
                     {

src/JsonApiDotNetCore/Internal/ContextEntity.cs renamed to src/JsonApiDotNetCore/Internal/ResourceContext.cs

@@ -11,12 +11,12 @@ public class ResourceContext
         /// <summary>
         /// The exposed resource name
         /// </summary>
-        public string EntityName { get; set; }
+        public string ResourceName { get; set; }
 
         /// <summary>
         /// The data model type
         /// </summary>
-        public Type EntityType { get; set; }
+        public Type ResourceType { get; set; }
 
         /// <summary>
         /// The identity member type
@@ -27,7 +27,7 @@ public class ResourceContext
         /// The concrete <see cref="ResourceDefinition{T}"/> type.
         /// We store this so that we don't need to re-compute the generic type.
         /// </summary>
-        public Type ResourceType { get; set; }
+        public Type ResourceDefinitionType { get; set; }
 
         /// <summary>
         /// Exposed resource attributes.

src/JsonApiDotNetCore/Internal/ResourceGraph.cs

@@ -13,28 +13,25 @@ namespace JsonApiDotNetCore.Internal
     public class ResourceGraph : IResourceGraph
     {
         internal List<ValidationResult> ValidationResults { get; }
-        private List<ResourceContext> _entities { get; }
+        private List<ResourceContext> _resources { get; }
 
         public ResourceGraph(List<ResourceContext> entities, List<ValidationResult> validationResults = null)
         {
-            _entities = entities;
+            _resources = entities;
             ValidationResults = validationResults;
         }
 
         /// <inheritdoc />
-        public ResourceContext[] GetContextEntities() => _entities.ToArray();
-
+        public ResourceContext[] GetResourceContexts() => _resources.ToArray();
         /// <inheritdoc />
         public ResourceContext GetResourceContext(string entityName)
-            => _entities.SingleOrDefault(e => string.Equals(e.EntityName, entityName, StringComparison.OrdinalIgnoreCase));
-
+            => _resources.SingleOrDefault(e => string.Equals(e.ResourceName, entityName, StringComparison.OrdinalIgnoreCase));
         /// <inheritdoc />
         public ResourceContext GetResourceContext(Type entityType)
-            => _entities.SingleOrDefault(e => e.EntityType == entityType);
+            => _resources.SingleOrDefault(e => e.ResourceType == entityType);
         /// <inheritdoc />
         public ResourceContext GetResourceContext<TResource>() where TResource : class, IIdentifiable
             => GetResourceContext(typeof(TResource));
-
         /// <inheritdoc/>
         public List<IResourceField> GetFields<T>(Expression<Func<T, dynamic>> selector = null) where T : IIdentifiable
         {
@@ -65,7 +62,6 @@ public List<RelationshipAttribute> GetRelationships(Type type)
         {
             return GetResourceContext(type).Relationships.ToList();
         }
-
         /// <inheritdoc />
         public RelationshipAttribute GetInverse(RelationshipAttribute relationship)
         {
@@ -144,7 +140,5 @@ private enum FieldFilterType
             Attribute,
             Relationship
         }
-
-
     }
 }

src/JsonApiDotNetCore/Middleware/DefaultTypeMatchFilter.cs

@@ -33,7 +33,7 @@ public void OnActionExecuting(ActionExecutingContext context)
 
                     throw new JsonApiException(409,
                         $"Cannot '{context.HttpContext.Request.Method}' type '{deserializedType.Name}' "
-                        + $"to '{expectedJsonApiResource?.EntityName}' endpoint.",
+                        + $"to '{expectedJsonApiResource?.ResourceName}' endpoint.",
                         detail: "Check that the request payload type matches the type expected by this endpoint.");
                 }
             }

src/JsonApiDotNetCore/Middleware/RequestMiddleware.cs

@@ -46,7 +46,7 @@ public async Task Invoke(HttpContext httpContext,
             {
                 _currentRequest.SetRequestResource(GetCurrentEntity());
                 _currentRequest.IsRelationshipPath = PathIsRelationship();
-                _currentRequest.BasePath = GetBasePath(_currentRequest.GetRequestResource().EntityName);
+                _currentRequest.BasePath = GetBasePath(_currentRequest.GetRequestResource().ResourceName);
             }
 
             if (IsValid())

src/JsonApiDotNetCore/QueryParameterServices/Common/QueryParameterService.cs

@@ -66,7 +66,7 @@ protected RelationshipAttribute GetRelationship(string propertyName)
             if (propertyName == null) return null;
             var relationship = _requestResource.Relationships.FirstOrDefault(r => r.Is(propertyName));
             if (relationship == null)
-                throw new JsonApiException(400, $"{propertyName} is not a valid relationship on {_requestResource.EntityName}.");
+                throw new JsonApiException(400, $"{propertyName} is not a valid relationship on {_requestResource.ResourceName}.");
 
             return relationship;
         }

src/JsonApiDotNetCore/QueryParameterServices/FilterService.cs

@@ -18,7 +18,7 @@ public class FilterService : QueryParameterService, IFilterService
 
         public FilterService(IResourceDefinitionProvider resourceDefinitionProvider, IResourceGraph resourceGraph, ICurrentRequest currentRequest) : base(resourceGraph, currentRequest)
         {
-            _requestResourceDefinition = resourceDefinitionProvider.Get(_requestResource.EntityType);
+            _requestResourceDefinition = resourceDefinitionProvider.Get(_requestResource.ResourceType);
             _filters = new List<FilterQueryContext>();
         }