Various fixes and improvements

src/JsonApiDotNetCore/Queries/Expressions/SparseFieldTableExpression.cs

@@ -30,14 +30,14 @@ public override string ToString()
         {
             var builder = new StringBuilder();
 
-            foreach ((ResourceType resource, SparseFieldSetExpression fields) in Table)
+            foreach ((ResourceType resourceType, SparseFieldSetExpression fields) in Table)
             {
                 if (builder.Length > 0)
                 {
                     builder.Append(',');
                 }
 
-                builder.Append(resource.PublicName);
+                builder.Append(resourceType.PublicName);
                 builder.Append('(');
                 builder.Append(fields);
                 builder.Append(')');

src/JsonApiDotNetCore/Queries/IQueryLayerComposer.cs

@@ -46,7 +46,7 @@ QueryLayer WrapLayerForSecondaryEndpoint<TId>(QueryLayer secondaryLayer, Resourc
         /// Builds a query that retrieves the primary resource, including all of its attributes and all targeted relationships, during a create/update/delete
         /// request.
         /// </summary>
-        QueryLayer ComposeForUpdate<TId>(TId id, ResourceType primaryResource);
+        QueryLayer ComposeForUpdate<TId>(TId id, ResourceType primaryResourceType);
 
         /// <summary>
         /// Builds a query for each targeted relationship with a filter to match on its right resource IDs.

src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs

@@ -382,16 +382,16 @@ private IncludeExpression RewriteIncludeForSecondaryEndpoint(IncludeExpression?
         }
 
         /// <inheritdoc />
-        public QueryLayer ComposeForUpdate<TId>(TId id, ResourceType primaryResource)
+        public QueryLayer ComposeForUpdate<TId>(TId id, ResourceType primaryResourceType)
         {
-            ArgumentGuard.NotNull(primaryResource, nameof(primaryResource));
+            ArgumentGuard.NotNull(primaryResourceType, nameof(primaryResourceType));
 
             IImmutableSet<IncludeElementExpression> includeElements = _targetedFields.Relationships
                 .Select(relationship => new IncludeElementExpression(relationship)).ToImmutableHashSet();
 
-            AttrAttribute primaryIdAttribute = GetIdAttribute(primaryResource);
+            AttrAttribute primaryIdAttribute = GetIdAttribute(primaryResourceType);
 
-            QueryLayer primaryLayer = ComposeTopLayer(Array.Empty<ExpressionInScope>(), primaryResource);
+            QueryLayer primaryLayer = ComposeTopLayer(Array.Empty<ExpressionInScope>(), primaryResourceType);
             primaryLayer.Include = includeElements.Any() ? new IncludeExpression(includeElements) : IncludeExpression.Empty;
             primaryLayer.Sort = null;
             primaryLayer.Pagination = null;

src/JsonApiDotNetCore/QueryStrings/Internal/SparseFieldSetQueryStringParameterReader.cs

@@ -69,10 +69,10 @@ public virtual void Read(string parameterName, StringValues parameterValue)
 
             try
             {
-                ResourceType targetResource = GetSparseFieldType(parameterName);
-                SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue, targetResource);
+                ResourceType targetResourceType = GetSparseFieldType(parameterName);
+                SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue, targetResourceType);
 
-                _sparseFieldTableBuilder[targetResource] = sparseFieldSet;
+                _sparseFieldTableBuilder[targetResourceType] = sparseFieldSet;
             }
             catch (QueryParseException exception)
             {

src/JsonApiDotNetCore/Serialization/Response/ResponseModelAdapter.cs

@@ -211,12 +211,12 @@ protected virtual ResourceObject ConvertResource(IIdentifiable resource, Resourc
             return resourceObject;
         }
 
-        protected virtual IDictionary<string, object?>? ConvertAttributes(IIdentifiable resource, ResourceType resourceType,
+        protected virtual IDictionary<string, object?>? ConvertAttributes(IIdentifiable resource, ResourceType type,
             IImmutableSet<ResourceFieldAttribute> fieldSet)
         {
-            var attrMap = new Dictionary<string, object?>(resourceType.Attributes.Count);
+            var attrMap = new Dictionary<string, object?>(type.Attributes.Count);
 
-            foreach (AttrAttribute attr in resourceType.Attributes)
+            foreach (AttrAttribute attr in type.Attributes)
             {
                 if (!fieldSet.Contains(attr) || attr.Property.Name == nameof(Identifiable<object>.Id))
                 {