Changed PaginationQueryStringValueExpression.Elements type from IReadOnlyCollection to IImmutableList

Author: Bart Koelman

src/JsonApiDotNetCore/CollectionExtensions.cs

@@ -19,7 +19,7 @@ public static bool IsNullOrEmpty<T>(this IEnumerable<T> source)
             return !source.Any();
         }
 
-        public static int FindIndex<T>(this IList<T> source, Predicate<T> match)
+        public static int FindIndex<T>(this IReadOnlyList<T> source, Predicate<T> match)
         {
             ArgumentGuard.NotNull(source, nameof(source));
             ArgumentGuard.NotNull(match, nameof(match));

src/JsonApiDotNetCore/Queries/Expressions/PaginationQueryStringValueExpression.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using JetBrains.Annotations;
 
@@ -11,9 +11,9 @@ namespace JsonApiDotNetCore.Queries.Expressions
     [PublicAPI]
     public class PaginationQueryStringValueExpression : QueryExpression
     {
-        public IReadOnlyCollection<PaginationElementQueryStringValueExpression> Elements { get; }
+        public IImmutableList<PaginationElementQueryStringValueExpression> Elements { get; }
 
-        public PaginationQueryStringValueExpression(IReadOnlyCollection<PaginationElementQueryStringValueExpression> elements)
+        public PaginationQueryStringValueExpression(IImmutableList<PaginationElementQueryStringValueExpression> elements)
         {
             ArgumentGuard.NotNullNorEmpty(elements, nameof(elements));
 

src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs

@@ -244,7 +244,7 @@ public override QueryExpression PaginationQueryStringValue(PaginationQueryString
         {
             if (expression != null)
             {
-                IReadOnlyCollection<PaginationElementQueryStringValueExpression> newElements = VisitSequence(expression.Elements, argument);
+                IImmutableList<PaginationElementQueryStringValueExpression> newElements = VisitList(expression.Elements, argument);
 
                 var newExpression = new PaginationQueryStringValueExpression(newElements);
                 return newExpression.Equals(expression) ? expression : newExpression;

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

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using JetBrains.Annotations;
@@ -39,20 +38,21 @@ public PaginationQueryStringValueExpression Parse(string source, ResourceContext
 
         protected PaginationQueryStringValueExpression ParsePagination()
         {
-            var elements = new List<PaginationElementQueryStringValueExpression>();
+            ImmutableArray<PaginationElementQueryStringValueExpression>.Builder elementsBuilder =
+                ImmutableArray.CreateBuilder<PaginationElementQueryStringValueExpression>();
 
             PaginationElementQueryStringValueExpression element = ParsePaginationElement();
-            elements.Add(element);
+            elementsBuilder.Add(element);
 
             while (TokenStack.Any())
             {
                 EatSingleCharacterToken(TokenKind.Comma);
 
                 element = ParsePaginationElement();
-                elements.Add(element);
+                elementsBuilder.Add(element);
             }
 
-            return new PaginationQueryStringValueExpression(elements);
+            return new PaginationQueryStringValueExpression(elementsBuilder.ToImmutable());
         }
 
         protected PaginationElementQueryStringValueExpression ParsePaginationElement()

src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs

@@ -1,5 +1,5 @@
-using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
@@ -123,15 +123,15 @@ public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
             var context = new PaginationContext();
 
             foreach (PaginationElementQueryStringValueExpression element in _pageSizeConstraint?.Elements ??
-                Array.Empty<PaginationElementQueryStringValueExpression>())
+                ImmutableArray<PaginationElementQueryStringValueExpression>.Empty)
             {
                 MutablePaginationEntry entry = context.ResolveEntryInScope(element.Scope);
                 entry.PageSize = element.Value == 0 ? null : new PageSize(element.Value);
                 entry.HasSetPageSize = true;
             }
 
             foreach (PaginationElementQueryStringValueExpression element in _pageNumberConstraint?.Elements ??
-                Array.Empty<PaginationElementQueryStringValueExpression>())
+                ImmutableArray<PaginationElementQueryStringValueExpression>.Empty)
             {
                 MutablePaginationEntry entry = context.ResolveEntryInScope(element.Scope);
                 entry.PageNumber = new PageNumber(element.Value);

src/JsonApiDotNetCore/Serialization/Building/LinkBuilder.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
@@ -141,7 +142,7 @@ private string CalculatePageSizeValue(PageSize topPageSize, ResourceContext requ
 
         private string ChangeTopPageSize(string pageSizeParameterValue, PageSize topPageSize, ResourceContext requestContext)
         {
-            IList<PaginationElementQueryStringValueExpression> elements = ParsePageSizeExpression(pageSizeParameterValue, requestContext);
+            IImmutableList<PaginationElementQueryStringValueExpression> elements = ParsePageSizeExpression(pageSizeParameterValue, requestContext);
             int elementInTopScopeIndex = elements.FindIndex(expression => expression.Scope == null);
 
             if (topPageSize != null)
@@ -150,18 +151,18 @@ private string ChangeTopPageSize(string pageSizeParameterValue, PageSize topPage
 
                 if (elementInTopScopeIndex != -1)
                 {
-                    elements[elementInTopScopeIndex] = topPageSizeElement;
+                    elements = elements.SetItem(elementInTopScopeIndex, topPageSizeElement);
                 }
                 else
                 {
-                    elements.Insert(0, topPageSizeElement);
+                    elements = elements.Insert(0, topPageSizeElement);
                 }
             }
             else
             {
                 if (elementInTopScopeIndex != -1)
                 {
-                    elements.RemoveAt(elementInTopScopeIndex);
+                    elements = elements.RemoveAt(elementInTopScopeIndex);
                 }
             }
 
@@ -171,17 +172,18 @@ private string ChangeTopPageSize(string pageSizeParameterValue, PageSize topPage
             return parameterValue == string.Empty ? null : parameterValue;
         }
 
-        private IList<PaginationElementQueryStringValueExpression> ParsePageSizeExpression(string pageSizeParameterValue, ResourceContext requestResource)
+        private IImmutableList<PaginationElementQueryStringValueExpression> ParsePageSizeExpression(string pageSizeParameterValue,
+            ResourceContext requestResource)
         {
             if (pageSizeParameterValue == null)
             {
-                return new List<PaginationElementQueryStringValueExpression>();
+                return ImmutableArray<PaginationElementQueryStringValueExpression>.Empty;
             }
 
             var parser = new PaginationParser(_resourceContextProvider);
             PaginationQueryStringValueExpression paginationExpression = parser.Parse(pageSizeParameterValue, requestResource);
 
-            return paginationExpression.Elements.ToList();
+            return paginationExpression.Elements;
         }
 
         private string GetLinkForPagination(int pageOffset, string pageSizeValue)