Review feedback: use ResourceType resourceType instead of ResourceType type everywhere

Author: Bart Koelman

src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs

@@ -27,25 +27,25 @@ internal sealed class ResourceObjectTreeNode : IEquatable<ResourceObjectTreeNode
         // Related resource objects per relationship. These are emitted in 'included'.
         private Dictionary<RelationshipAttribute, HashSet<ResourceObjectTreeNode>>? _childrenByRelationship;
 
-        private bool IsTreeRoot => RootType.Equals(Type);
+        private bool IsTreeRoot => RootType.Equals(ResourceType);
 
         // The resource this node was built for. We only store it for the LinkBuilder.
         public IIdentifiable Resource { get; }
 
         // The resource type. We use its relationships to maintain order.
-        public ResourceType Type { get; }
+        public ResourceType ResourceType { get; }
 
         // The produced resource object from Resource. For each resource, at most one ResourceObject and one tree node must exist.
         public ResourceObject ResourceObject { get; }
 
-        public ResourceObjectTreeNode(IIdentifiable resource, ResourceType type, ResourceObject resourceObject)
+        public ResourceObjectTreeNode(IIdentifiable resource, ResourceType resourceType, ResourceObject resourceObject)
         {
             ArgumentGuard.NotNull(resource, nameof(resource));
-            ArgumentGuard.NotNull(type, nameof(type));
+            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
             ArgumentGuard.NotNull(resourceObject, nameof(resourceObject));
 
             Resource = resource;
-            Type = type;
+            ResourceType = resourceType;
             ResourceObject = resourceObject;
         }
 
@@ -133,7 +133,7 @@ private static void VisitRelationshipChildrenInSubtree(ResourceObjectTreeNode tr
         {
             if (treeNode._childrenByRelationship != null)
             {
-                foreach (RelationshipAttribute relationship in treeNode.Type.Relationships)
+                foreach (RelationshipAttribute relationship in treeNode.ResourceType.Relationships)
                 {
                     if (treeNode._childrenByRelationship.TryGetValue(relationship, out HashSet<ResourceObjectTreeNode>? rightNodes))
                     {
@@ -228,7 +228,7 @@ public override int GetHashCode()
         public override string ToString()
         {
             var builder = new StringBuilder();
-            builder.Append(IsTreeRoot ? Type.PublicName : $"{ResourceObject.Type}:{ResourceObject.Id}");
+            builder.Append(IsTreeRoot ? ResourceType.PublicName : $"{ResourceObject.Type}:{ResourceObject.Id}");
 
             if (_directChildren != null)
             {

src/JsonApiDotNetCore/Serialization/Response/ResponseModelAdapter.cs

@@ -151,10 +151,10 @@ protected virtual AtomicResultObject ConvertOperation(OperationContainer? operat
             };
         }
 
-        private void TraverseResource(IIdentifiable resource, ResourceType type, EndpointKind kind, IImmutableSet<IncludeElementExpression> includeElements,
-            ResourceObjectTreeNode parentTreeNode, RelationshipAttribute? parentRelationship)
+        private void TraverseResource(IIdentifiable resource, ResourceType resourceType, EndpointKind kind,
+            IImmutableSet<IncludeElementExpression> includeElements, ResourceObjectTreeNode parentTreeNode, RelationshipAttribute? parentRelationship)
         {
-            ResourceObjectTreeNode treeNode = GetOrCreateTreeNode(resource, type, kind);
+            ResourceObjectTreeNode treeNode = GetOrCreateTreeNode(resource, resourceType, kind);
 
             if (parentRelationship != null)
             {
@@ -171,20 +171,20 @@ private void TraverseResource(IIdentifiable resource, ResourceType type, Endpoin
             }
         }
 
-        private ResourceObjectTreeNode GetOrCreateTreeNode(IIdentifiable resource, ResourceType type, EndpointKind kind)
+        private ResourceObjectTreeNode GetOrCreateTreeNode(IIdentifiable resource, ResourceType resourceType, EndpointKind kind)
         {
             if (!_resourceToTreeNodeCache.TryGetValue(resource, out ResourceObjectTreeNode? treeNode))
             {
-                ResourceObject resourceObject = ConvertResource(resource, type, kind);
-                treeNode = new ResourceObjectTreeNode(resource, type, resourceObject);
+                ResourceObject resourceObject = ConvertResource(resource, resourceType, kind);
+                treeNode = new ResourceObjectTreeNode(resource, resourceType, resourceObject);
 
                 _resourceToTreeNodeCache.Add(resource, treeNode);
             }
 
             return treeNode;
         }
 
-        protected virtual ResourceObject ConvertResource(IIdentifiable resource, ResourceType type, EndpointKind kind)
+        protected virtual ResourceObject ConvertResource(IIdentifiable resource, ResourceType resourceType, EndpointKind kind)
         {
             bool isRelationship = kind == EndpointKind.Relationship;
 
@@ -195,28 +195,28 @@ protected virtual ResourceObject ConvertResource(IIdentifiable resource, Resourc
 
             var resourceObject = new ResourceObject
             {
-                Type = type.PublicName,
+                Type = resourceType.PublicName,
                 Id = resource.StringId
             };
 
             if (!isRelationship)
             {
-                IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForSerializer(type);
+                IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForSerializer(resourceType);
 
-                resourceObject.Attributes = ConvertAttributes(resource, type, fieldSet);
-                resourceObject.Links = _linkBuilder.GetResourceLinks(type, resource);
-                resourceObject.Meta = _resourceDefinitionAccessor.GetMeta(type, resource);
+                resourceObject.Attributes = ConvertAttributes(resource, resourceType, fieldSet);
+                resourceObject.Links = _linkBuilder.GetResourceLinks(resourceType, resource);
+                resourceObject.Meta = _resourceDefinitionAccessor.GetMeta(resourceType, resource);
             }
 
             return resourceObject;
         }
 
-        protected virtual IDictionary<string, object?>? ConvertAttributes(IIdentifiable resource, ResourceType type,
+        protected virtual IDictionary<string, object?>? ConvertAttributes(IIdentifiable resource, ResourceType resourceType,
             IImmutableSet<ResourceFieldAttribute> fieldSet)
         {
-            var attrMap = new Dictionary<string, object?>(type.Attributes.Count);
+            var attrMap = new Dictionary<string, object?>(resourceType.Attributes.Count);
 
-            foreach (AttrAttribute attr in type.Attributes)
+            foreach (AttrAttribute attr in resourceType.Attributes)
             {
                 if (!fieldSet.Contains(attr) || attr.Property.Name == nameof(Identifiable<object>.Id))
                 {
@@ -278,9 +278,9 @@ private void PopulateRelationshipsInTree(ResourceObjectTreeNode rootNode, Endpoi
 
         private void PopulateRelationshipsInResourceObject(ResourceObjectTreeNode treeNode)
         {
-            IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForSerializer(treeNode.Type);
+            IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForSerializer(treeNode.ResourceType);
 
-            foreach (RelationshipAttribute relationship in treeNode.Type.Relationships)
+            foreach (RelationshipAttribute relationship in treeNode.ResourceType.Relationships)
             {
                 if (fieldSet.Contains(relationship))
                 {
@@ -315,7 +315,7 @@ private static SingleOrManyData<ResourceIdentifierObject> GetRelationshipData(Re
             {
                 IEnumerable<ResourceIdentifierObject> resourceIdentifierObjects = rightNodes.Select(rightNode => new ResourceIdentifierObject
                 {
-                    Type = rightNode.Type.PublicName,
+                    Type = rightNode.ResourceType.PublicName,
                     Id = rightNode.ResourceObject.Id
                 });