Removed unneeded ToList/ToArray calls

Author: Bart Koelman

src/JsonApiDotNetCore/Controllers/JsonApiControllerMixin.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Models.JsonApiDocuments;
 using Microsoft.AspNetCore.Mvc;
@@ -16,7 +15,7 @@ protected IActionResult Error(Error error)
 
         protected IActionResult Error(IEnumerable<Error> errors)
         {
-            var document = new ErrorDocument(errors.ToList());
+            var document = new ErrorDocument(errors);
 
             return new ObjectResult(document)
             {

src/JsonApiDotNetCore/Data/DefaultResourceRepository.cs

@@ -172,7 +172,7 @@ private void DetachRelationships(TResource entity)
 
                 if (value is IEnumerable<IIdentifiable> collection)
                 {
-                    foreach (IIdentifiable single in collection.ToList())
+                    foreach (IIdentifiable single in collection)
                         _context.Entry(single).State = EntityState.Detached;
                     // detaching has many relationships is not sufficient to 
                     // trigger a full reload of relationships: the navigation 
@@ -255,7 +255,6 @@ private IEnumerable GetTrackedManyRelationshipValue(IEnumerable<IIdentifiable> r
                     if (tracked != null) newWasAlreadyAttached = true;
                     return Convert.ChangeType(tracked ?? pointer, relationshipAttr.RightType);
                 })
-                .ToList()
                 .CopyToTypedCollection(relationshipAttr.PropertyInfo.PropertyType);
 
             if (newWasAlreadyAttached) wasAlreadyAttached = true;

src/JsonApiDotNetCore/Internal/Contracts/IResourceContextProvider.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using JsonApiDotNetCore.Models;
 
 namespace JsonApiDotNetCore.Internal.Contracts
@@ -11,7 +12,7 @@ public interface IResourceContextProvider
         /// <summary>
         /// Gets all registered context entities
         /// </summary>
-        ResourceContext[] GetResourceContexts();
+        IEnumerable<ResourceContext> GetResourceContexts();
 
         /// <summary>
         /// Get the resource metadata by the DbSet property name
@@ -28,4 +29,4 @@ public interface IResourceContextProvider
         /// </summary>
         ResourceContext GetResourceContext<TResource>() where TResource : class, IIdentifiable;
     }
-}
+}

src/JsonApiDotNetCore/Internal/ResourceGraph.cs

@@ -20,7 +20,7 @@ public ResourceGraph(List<ResourceContext> resources)
         }
 
         /// <inheritdoc />
-        public ResourceContext[] GetResourceContexts() => Resources.ToArray();
+        public IEnumerable<ResourceContext> GetResourceContexts() => Resources;
         /// <inheritdoc />
         public ResourceContext GetResourceContext(string resourceName)
             => Resources.SingleOrDefault(e => e.ResourceName == resourceName);

src/JsonApiDotNetCore/Serialization/Server/Builders/ResponseResourceObjectBuilder.cs

@@ -69,9 +69,7 @@ protected override RelationshipEntry GetRelationshipData(RelationshipAttribute r
         private bool ShouldInclude(RelationshipAttribute relationship, out List<List<RelationshipAttribute>> inclusionChain)
         {
             inclusionChain = _includeService.Get()?.Where(l => l.First().Equals(relationship)).ToList();
-            if (inclusionChain == null || !inclusionChain.Any())
-                return false;
-            return true;
+            return inclusionChain != null && inclusionChain.Any();
         }
     }
 }

test/IntegrationTests/Data/EntityRepositoryTests.cs

@@ -176,7 +176,7 @@ private AppDbContext GetContext(Guid? seed = null)
                 .Options;
             var context = new AppDbContext(options);
 
-            context.TodoItems.RemoveRange(context.TodoItems.ToList());
+            context.TodoItems.RemoveRange(context.TodoItems);
             return context;
         }
 

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/PagingTests.cs

@@ -37,7 +37,7 @@ public async Task Pagination_WithPageSizeAndPageNumber_ReturnsCorrectSubsetOfRes
             const int expectedEntitiesPerPage = 2;
             var totalCount = expectedEntitiesPerPage * 2;
             var person = new Person();
-            var todoItems = _todoItemFaker.Generate(totalCount).ToList();
+            var todoItems = _todoItemFaker.Generate(totalCount);
             foreach (var todoItem in todoItems)
             {
                 todoItem.Owner = person;
@@ -82,7 +82,7 @@ public async Task Pagination_OnGivenPage_DisplaysCorrectTopLevelLinks(int pageNu
             {
                 LastName = "&Ampersand"
             };
-            var todoItems = _todoItemFaker.Generate(totalCount).ToList();
+            var todoItems = _todoItemFaker.Generate(totalCount);
 
             foreach (var todoItem in todoItems)
                 todoItem.Owner = person;

test/JsonApiDotNetCoreExampleTests/Acceptance/TodoItemsControllerTests.cs

@@ -47,7 +47,7 @@ public TodoItemControllerTests(TestFixture<Startup> fixture)
         public async Task Can_Get_TodoItems_Paginate_Check()
         {
             // Arrange
-            _context.TodoItems.RemoveRange(_context.TodoItems.ToList());
+            _context.TodoItems.RemoveRange(_context.TodoItems);
             _context.SaveChanges();
             int expectedEntitiesPerPage = _fixture.GetService<IJsonApiOptions>().DefaultPageSize;
             var person = new Person();

test/UnitTests/ResourceHooks/AffectedEntitiesHelperTests.cs

@@ -89,9 +89,9 @@ public void RelationshipsDictionary_GetAffected()
             var affectedThroughToMany = relationshipsDictionary.GetAffected(d => d.ToManies).ToList();
 
             // Assert
-            affectedThroughFirstToOne.ForEach((entity) => Assert.Contains(entity, FirstToOnesEntities));
-            affectedThroughSecondToOne.ForEach((entity) => Assert.Contains(entity, SecondToOnesEntities));
-            affectedThroughToMany.ForEach((entity) => Assert.Contains(entity, ToManiesEntities));
+            affectedThroughFirstToOne.ForEach(entity => Assert.Contains(entity, FirstToOnesEntities));
+            affectedThroughSecondToOne.ForEach(entity => Assert.Contains(entity, SecondToOnesEntities));
+            affectedThroughToMany.ForEach(entity => Assert.Contains(entity, ToManiesEntities));
         }
 
         [Fact]
@@ -178,9 +178,9 @@ public void EntityDiff_GetAffected_Relationships()
             var affectedThroughToMany = diffs.GetAffected(d => d.ToManies).ToList();
 
             // Assert
-            affectedThroughFirstToOne.ForEach((entity) => Assert.Contains(entity, FirstToOnesEntities));
-            affectedThroughSecondToOne.ForEach((entity) => Assert.Contains(entity, SecondToOnesEntities));
-            affectedThroughToMany.ForEach((entity) => Assert.Contains(entity, ToManiesEntities));
+            affectedThroughFirstToOne.ForEach(entity => Assert.Contains(entity, FirstToOnesEntities));
+            affectedThroughSecondToOne.ForEach(entity => Assert.Contains(entity, SecondToOnesEntities));
+            affectedThroughToMany.ForEach(entity => Assert.Contains(entity, ToManiesEntities));
         }
 
         [Fact]
@@ -195,8 +195,8 @@ public void EntityDiff_GetAffected_Attributes()
             DiffableEntityHashSet<Dummy> diffs = new DiffableEntityHashSet<Dummy>(AllEntities, dbEntities, Relationships, updatedAttributes);
 
             // Act
-            var affectedThroughSomeUpdatedProperty = diffs.GetAffected(d => d.SomeUpdatedProperty).ToList();
-            var affectedThroughSomeNotUpdatedProperty = diffs.GetAffected(d => d.SomeNotUpdatedProperty).ToList();
+            var affectedThroughSomeUpdatedProperty = diffs.GetAffected(d => d.SomeUpdatedProperty);
+            var affectedThroughSomeNotUpdatedProperty = diffs.GetAffected(d => d.SomeNotUpdatedProperty);
 
             // Assert
             Assert.NotEmpty(affectedThroughSomeUpdatedProperty);
@@ -213,17 +213,17 @@ private void AssertRelationshipDictionaryGetters(Dictionary<RelationshipAttribut
             Assert.Contains(ToManyAttr, toManies.Keys);
             Assert.Equal(relationshipsDictionary.Keys.Count, toOnes.Keys.Count + toManies.Keys.Count + notTargeted.Keys.Count);
 
-            toOnes[FirstToOneAttr].ToList().ForEach((entity) =>
+            toOnes[FirstToOneAttr].ToList().ForEach(entity =>
             {
                 Assert.Contains(entity, FirstToOnesEntities);
             });
 
-            toOnes[SecondToOneAttr].ToList().ForEach((entity) =>
+            toOnes[SecondToOneAttr].ToList().ForEach(entity =>
             {
                 Assert.Contains(entity, SecondToOnesEntities);
             });
 
-            toManies[ToManyAttr].ToList().ForEach((entity) =>
+            toManies[ToManyAttr].ToList().ForEach(entity =>
             {
                 Assert.Contains(entity, ToManiesEntities);
             });

test/UnitTests/ResourceHooks/ResourceHookExecutor/Delete/BeforeDelete_WithDbValue_Tests.cs

@@ -88,7 +88,7 @@ public void BeforeDelete_No_Children_Hooks()
 
         private bool CheckImplicitTodos(IRelationshipsDictionary<TodoItem> rh)
         {
-            var todos = rh.GetByRelationship<Person>().ToList();
+            var todos = rh.GetByRelationship<Person>();
             return todos.Count == 2;
         }