Use built-in HashSet<>.UnionWith() instead of our own .AddRange()

Author: bkoelman

src/JsonApiDotNetCore/CollectionExtensions.cs

@@ -79,15 +79,4 @@ public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)
         return source.Where(element => element is not null)!;
 #pragma warning restore AV1250 // Evaluate LINQ query before returning it
     }
-
-    public static void AddRange<T>(this ICollection<T> source, IEnumerable<T> itemsToAdd)
-    {
-        ArgumentGuard.NotNull(source);
-        ArgumentGuard.NotNull(itemsToAdd);
-
-        foreach (T item in itemsToAdd)
-        {
-            source.Add(item);
-        }
-    }
 }

src/JsonApiDotNetCore/Queries/Internal/Parsing/IncludeParser.cs

@@ -110,7 +110,7 @@ private ICollection<IncludeTreeNode> LookupRelationshipName(string relationshipN
 
             if (relationships.Any())
             {
-                relationshipsFound.AddRange(relationships);
+                relationshipsFound.UnionWith(relationships);
 
                 RelationshipAttribute[] relationshipsToInclude = relationships.Where(relationship => !relationship.IsIncludeBlocked()).ToArray();
                 ICollection<IncludeTreeNode> affectedChildren = parent.EnsureChildren(relationshipsToInclude);

src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs

@@ -254,7 +254,7 @@ private static IImmutableSet<IncludeElementExpression> ApplyIncludeElementUpdate
         IDictionary<IncludeElementExpression, IImmutableSet<IncludeElementExpression>> updatesInChildren)
     {
         ImmutableHashSet<IncludeElementExpression>.Builder newElementsBuilder = ImmutableHashSet.CreateBuilder<IncludeElementExpression>();
-        newElementsBuilder.AddRange(includeElements);
+        newElementsBuilder.UnionWith(includeElements);
 
         foreach ((IncludeElementExpression existingElement, IImmutableSet<IncludeElementExpression> updatedChildren) in updatesInChildren)
         {

src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs

@@ -471,7 +471,7 @@ private IEnumerable GetRightValueToStoreForAddToToMany(TResource leftResource, H
 
         if (rightResourceIdsStored.Any())
         {
-            rightResourceIdsStored.AddRange(rightResourceIdsToAdd);
+            rightResourceIdsStored.UnionWith(rightResourceIdsToAdd);
             return rightResourceIdsStored;
         }
 

src/JsonApiDotNetCore/Resources/OperationContainer.cs

@@ -58,6 +58,6 @@ private void AddSecondaryResources(RelationshipAttribute relationship, HashSet<I
         object? rightValue = relationship.GetValue(Resource);
         IReadOnlyCollection<IIdentifiable> rightResources = CollectionConverter.ExtractResources(rightValue);
 
-        secondaryResources.AddRange(rightResources);
+        secondaryResources.UnionWith(rightResources);
     }
 }

src/JsonApiDotNetCore/Resources/TargetedFields.cs

@@ -18,8 +18,8 @@ public void CopyFrom(ITargetedFields other)
     {
         Clear();
 
-        Attributes.AddRange(other.Attributes);
-        Relationships.AddRange(other.Relationships);
+        Attributes.UnionWith(other.Attributes);
+        Relationships.UnionWith(other.Relationships);
     }
 
     public void Clear()

src/JsonApiDotNetCore/Serialization/Request/Adapters/RelationshipDataAdapter.cs

@@ -111,7 +111,7 @@ private IEnumerable ConvertToManyRelationshipData(SingleOrManyData<ResourceIdent
         }
 
         var resourceSet = new HashSet<IIdentifiable>(IdentifiableComparer.Instance);
-        resourceSet.AddRange(rightResources);
+        resourceSet.UnionWith(rightResources);
         return resourceSet;
     }
 }

test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteTests.cs

@@ -67,12 +67,12 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     public async Task Can_get_resources_at_custom_action_method()
     {
         // Arrange
-        List<Town> town = _fakers.Town.Generate(7);
+        List<Town> towns = _fakers.Town.Generate(7);
 
         await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
             await dbContext.ClearTableAsync<Town>();
-            dbContext.Towns.AddRange(town);
+            dbContext.Towns.AddRange(towns);
             await dbContext.SaveChangesAsync();
         });
 

test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs

@@ -1142,7 +1142,7 @@ private void RemoveFromSubscribers(WorkItem workItem, ISet<IIdentifiable> rightR
         {
             if (!workItem.Subscribers.IsNullOrEmpty())
             {
-                PreloadedSubscribers.AddRange(workItem.Subscribers);
+                PreloadedSubscribers.UnionWith(workItem.Subscribers);
             }
 
             foreach (long subscriberId in ExtraSubscribersIdsToRemove)
@@ -1158,7 +1158,7 @@ private void RemoveFromTags(WorkItem workItem, ISet<IIdentifiable> rightResource
         {
             if (!workItem.Tags.IsNullOrEmpty())
             {
-                PreloadedTags.AddRange(workItem.Tags);
+                PreloadedTags.UnionWith(workItem.Tags);
             }
 
             foreach (int tagId in ExtraTagIdsToRemove)

test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs

@@ -66,7 +66,7 @@ public async Task Can_clear_OneToOne_relationship()
 
         await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            dbContext.Groups.AddRange(existingGroup);
+            dbContext.Groups.Add(existingGroup);
             await dbContext.SaveChangesAsync();
         });
 

test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs

@@ -209,7 +209,7 @@ public async Task Can_clear_OneToOne_relationship()
 
         await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            dbContext.RgbColors.AddRange(existingColor);
+            dbContext.RgbColors.Add(existingColor);
             await dbContext.SaveChangesAsync();
         });