style: consistent variable naming|

Author: maurei

src/JsonApiDotNetCore/Hooks/ResourceHookExecutor.cs

@@ -21,7 +21,7 @@ internal class ResourceHookExecutor : IResourceHookExecutor
         private readonly ITraversalHelper _traversalHelper;
         private readonly IIncludeService _includeService;
         private readonly ITargetedFields _targetedFields;
-        private readonly IResourceGraph _inverseRelationships;
+        private readonly IResourceGraph _resourceGraph;
         public ResourceHookExecutor(
             IHookExecutorHelper executorHelper,
             ITraversalHelper traversalHelper,
@@ -33,7 +33,7 @@ public ResourceHookExecutor(
             _traversalHelper = traversalHelper;
             _targetedFields = targetedFields;
             _includeService = includedRelationships;
-            _inverseRelationships = resourceGraph;
+            _resourceGraph = resourceGraph;
         }
 
         /// <inheritdoc/>
@@ -324,7 +324,7 @@ Dictionary<RelationshipAttribute, IEnumerable> ReplaceKeysWithInverseRelationshi
             /// If it isn't, JADNC currently knows nothing about this relationship pointing back, and it 
             /// currently cannot fire hooks for entities resolved through inverse relationships.
             var inversableRelationshipAttributes = entitiesByRelationship.Where(kvp => kvp.Key.InverseNavigation != null);
-            return inversableRelationshipAttributes.ToDictionary(kvp => _inverseRelationships.GetInverse(kvp.Key), kvp => kvp.Value);
+            return inversableRelationshipAttributes.ToDictionary(kvp => _resourceGraph.GetInverse(kvp.Key), kvp => kvp.Value);
         }
 
         /// <summary>
@@ -337,7 +337,7 @@ void FireForAffectedImplicits(Type entityTypeToInclude, Dictionary<RelationshipA
             if (container == null) return;
             var implicitAffected = _executorHelper.LoadImplicitlyAffected(implicitsTarget, existingImplicitEntities);
             if (!implicitAffected.Any()) return;
-            var inverse = implicitAffected.ToDictionary(kvp => _inverseRelationships.GetInverse(kvp.Key), kvp => kvp.Value);
+            var inverse = implicitAffected.ToDictionary(kvp => _resourceGraph.GetInverse(kvp.Key), kvp => kvp.Value);
             var resourcesByRelationship = CreateRelationshipHelper(entityTypeToInclude, inverse);
             CallHook(container, ResourceHook.BeforeImplicitUpdateRelationship, new object[] { resourcesByRelationship, pipeline, });
         }

src/JsonApiDotNetCore/Internal/DefaultRoutingConvention.cs

@@ -35,7 +35,7 @@ namespace JsonApiDotNetCore.Internal
     /// public class SomeVeryCustomController{SomeResource} : JsonApiMixin { }
     /// // => /some-very-customs/relationship/related-resource
     /// </example>
-    public class DefaultRoutingConvention : IJsonApiRoutingConvention
+    public class DefaultRoutingConvention : IJsonApiRoutingConvention, IControllerResourceMapping
     {
         private readonly string _namespace;
         private readonly IResourceNameFormatter _formatter;
@@ -120,11 +120,6 @@ private Type GetResourceTypeFromController(Type type)
             var target = typeof(BaseJsonApiController<,>);
             var identifiable = typeof(IIdentifiable);
             var currentBaseType = type;
-            if (type.Name.Contains("TodoItemsCustom"))
-            {
-                var x = 123;
-            }
-                    
             while (!currentBaseType.IsGenericType || currentBaseType.GetGenericTypeDefinition() != target)
             {
                 var nextBaseType = currentBaseType.BaseType;

src/JsonApiDotNetCore/Internal/IControllerResourceMapping.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace JsonApiDotNetCore.Internal
+{
+    /// <summary>
+    /// Registery of which resource is associated with which controller.
+    /// </summary>
+    public interface IControllerResourceMapping
+    {
+        /// <summary>
+        /// Get the associated resource with the controller with the provided controller name
+        /// </summary>
+        Type GetAssociatedResource(string controllerName);
+    }
+}

src/JsonApiDotNetCore/Internal/IDefaultRoutingConvention.cs

@@ -1,14 +1,10 @@
-using System;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
 
 namespace JsonApiDotNetCore.Internal
 {
     /// <summary>
     /// Service for specifying which routing convention to use. This can be overriden to customize
     /// the relation between controllers and mapped routes.
     /// </summary>
-    public interface IJsonApiRoutingConvention : IApplicationModelConvention
-    {
-        Type GetAssociatedResource(string controllerName);
-    }
+    public interface IJsonApiRoutingConvention : IApplicationModelConvention { }
 }

src/JsonApiDotNetCore/Internal/IJsonApiRoutingConvention.cs

@@ -21,25 +21,25 @@ public class CurrentRequestMiddleware
         private readonly RequestDelegate _next;
         private HttpContext _httpContext;
         private ICurrentRequest _currentRequest;
-        private IResourceGraph _contextEntityProvider;
+        private IResourceGraph _resourceGraph;
         private IJsonApiOptions _options;
-        private IJsonApiRoutingConvention _routingConvention;
+        private IControllerResourceMapping _controllerResourceMapping;
 
         public CurrentRequestMiddleware(RequestDelegate next)
         {
             _next = next;
         }
 
         public async Task Invoke(HttpContext httpContext,
-                                IJsonApiRoutingConvention routingConvention,
-                                IJsonApiOptions options,
+                                 IControllerResourceMapping controllerResourceMapping,
+                                 IJsonApiOptions options,
                                  ICurrentRequest currentRequest,
-                                 IResourceGraph contextEntityProvider)
+                                 IResourceGraph resourceGraph)
         {
             _httpContext = httpContext;
             _currentRequest = currentRequest;
-            _routingConvention = routingConvention;
-            _contextEntityProvider = contextEntityProvider;
+            _controllerResourceMapping = controllerResourceMapping;
+            _resourceGraph = resourceGraph;
             _options = options;
             var requestResource = GetCurrentEntity();
             if (requestResource != null)
@@ -166,8 +166,8 @@ private void FlushResponse(HttpContext context, int statusCode)
         private ContextEntity GetCurrentEntity()
         {
             var controllerName = (string)_httpContext.GetRouteData().Values["controller"];
-            var resourceType = _routingConvention.GetAssociatedResource(controllerName);
-            var requestResource = _contextEntityProvider.GetContextEntity(resourceType);
+            var resourceType = _controllerResourceMapping.GetAssociatedResource(controllerName);
+            var requestResource = _resourceGraph.GetContextEntity(resourceType);
             if (requestResource == null)
                 return requestResource;
             var rd = _httpContext.GetRouteData().Values;

src/JsonApiDotNetCore/Middleware/RequestMiddleware.cs

@@ -103,7 +103,6 @@ public override object GetValue(object entity)
         /// <param name="newValue">The new property value</param>
         public override void SetValue(object entity, object newValue)
         {
-
             var propertyInfo = entity
                 .GetType()
                 .GetProperty(InternalRelationshipName);

src/JsonApiDotNetCore/Models/Annotation/HasManyThroughAttribute.cs

@@ -14,12 +14,12 @@ namespace JsonApiDotNetCore.Query
     /// </summary>
     public abstract class QueryParameterService
     {
-        protected readonly IResourceGraph _contextEntityProvider;
+        protected readonly IResourceGraph _resourceGraph;
         protected readonly ContextEntity _requestResource;
 
-        protected QueryParameterService(IResourceGraph contextEntityProvider, ICurrentRequest currentRequest)
+        protected QueryParameterService(IResourceGraph resourceGraph, ICurrentRequest currentRequest)
         {
-            _contextEntityProvider = contextEntityProvider;
+            _resourceGraph = resourceGraph;
             _requestResource = currentRequest.GetRequestResource();
         }
 
@@ -48,15 +48,9 @@ protected AttrAttribute GetAttribute(string target, RelationshipAttribute relati
         {
             AttrAttribute attribute;
             if (relationship != null)
-            {
-                var relatedContextEntity = _contextEntityProvider.GetContextEntity(relationship.DependentType);
-                attribute = relatedContextEntity.Attributes
-                  .FirstOrDefault(a => a.Is(target));
-            }
+                attribute = _resourceGraph.GetAttributes(relationship.DependentType).FirstOrDefault(a => a.Is(target));
             else
-            {
                 attribute = _requestResource.Attributes.FirstOrDefault(attr => attr.Is(target));
-            }
 
             if (attribute == null)
                 throw new JsonApiException(400, $"'{target}' is not a valid attribute.");

src/JsonApiDotNetCore/QueryParameterServices/Common/QueryParameterService.cs

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

src/JsonApiDotNetCore/QueryParameterServices/FilterService.cs

@@ -14,7 +14,7 @@ public class IncludeService : QueryParameterService, IIncludeService
         /// todo: use read-only lists.
         private readonly List<List<RelationshipAttribute>> _includedChains;
 
-        public IncludeService(IResourceGraph contextEntityProvider, ICurrentRequest currentRequest) : base(contextEntityProvider, currentRequest)
+        public IncludeService(IResourceGraph resourceGraph, ICurrentRequest currentRequest) : base(resourceGraph, currentRequest)
         {
             _includedChains = new List<List<RelationshipAttribute>>();
         }
@@ -52,7 +52,7 @@ private void ParseChain(string chain)
                     throw CannotIncludeError(resourceContext, relationshipName);
 
                 parsedChain.Add(relationship);
-                resourceContext = _contextEntityProvider.GetContextEntity(relationship.DependentType);
+                resourceContext = _resourceGraph.GetContextEntity(relationship.DependentType);
             }
             _includedChains.Add(parsedChain);
         }

src/JsonApiDotNetCore/QueryParameterServices/IncludeService.cs

@@ -17,9 +17,9 @@ public class SortService : QueryParameterService, ISortService
         private bool _isProcessed;
 
         public SortService(IResourceDefinitionProvider resourceDefinitionProvider,
-                           IResourceGraph contextEntityProvider,
+                           IResourceGraph resourceGraph,
                            ICurrentRequest currentRequest)
-            : base(contextEntityProvider, currentRequest)
+            : base(resourceGraph, currentRequest)
         {
             _resourceDefinitionProvider = resourceDefinitionProvider;
             _queries = new List<SortQueryContext>();

src/JsonApiDotNetCore/QueryParameterServices/SortService.cs

@@ -24,7 +24,7 @@ public class SparseFieldsService : QueryParameterService, ISparseFieldsService
 
         public override string Name => "fields";
 
-        public SparseFieldsService(IResourceGraph contextEntityProvider, ICurrentRequest currentRequest) : base(contextEntityProvider, currentRequest)
+        public SparseFieldsService(IResourceGraph resourceGraph, ICurrentRequest currentRequest) : base(resourceGraph, currentRequest)
         {
             _selectedFields = new List<AttrAttribute>();
             _selectedRelationshipFields = new Dictionary<RelationshipAttribute, List<AttrAttribute>>();
@@ -47,7 +47,7 @@ public virtual void Parse(KeyValuePair<string, StringValues> queryParameter)
             var typeName = queryParameter.Key.Split(QueryConstants.OPEN_BRACKET, QueryConstants.CLOSE_BRACKET)[1];
             var fields = new List<string> { nameof(Identifiable.Id) };
 
-            var relationship = _requestResource.Relationships.SingleOrDefault(a => a.Is(typeName));
+            var relationship = _requestResource.Relationships.FirstOrDefault(a => a.Is(typeName));
             if (relationship == null && string.Equals(typeName, _requestResource.EntityName, StringComparison.OrdinalIgnoreCase) == false)
                 throw new JsonApiException(400, $"fields[{typeName}] is invalid");
 
@@ -56,8 +56,8 @@ public virtual void Parse(KeyValuePair<string, StringValues> queryParameter)
             {
                 if (relationship != default)
                 {
-                    var relationProperty = _contextEntityProvider.GetContextEntity(relationship.DependentType);
-                    var attr = relationProperty.Attributes.SingleOrDefault(a => a.Is(field));
+                    var relationProperty = _resourceGraph.GetContextEntity(relationship.DependentType);
+                    var attr = relationProperty.Attributes.FirstOrDefault(a => a.Is(field));
                     if (attr == null)
                         throw new JsonApiException(400, $"'{relationship.DependentType.Name}' does not contain '{field}'.");
 
@@ -67,7 +67,7 @@ public virtual void Parse(KeyValuePair<string, StringValues> queryParameter)
                 }
                 else
                 {
-                    var attr = _requestResource.Attributes.SingleOrDefault(a => a.Is(field));
+                    var attr = _requestResource.Attributes.FirstOrDefault(a => a.Is(field));
                     if (attr == null)
                         throw new JsonApiException(400, $"'{_requestResource.EntityName}' does not contain '{field}'.");