Simplify ordering calls

Author: bkoelman

src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs

@@ -58,7 +58,7 @@ private string InnerToString(bool toFullString)
         builder.Append('(');
         builder.Append(toFullString ? TargetAttribute.ToFullString() : TargetAttribute.ToString());
         builder.Append(',');
-        builder.Append(string.Join(',', Constants.Select(constant => toFullString ? constant.ToFullString() : constant.ToString()).OrderBy(value => value)));
+        builder.Append(string.Join(',', Constants.Select(constant => toFullString ? constant.ToFullString() : constant.ToString()).Order()));
         builder.Append(')');
 
         return builder.ToString();

src/JsonApiDotNetCore/Queries/Expressions/IncludeElementExpression.cs

@@ -62,7 +62,7 @@ private string InnerToString(bool toFullString)
         if (Children.Count > 0)
         {
             builder.Append('{');
-            builder.Append(string.Join(',', Children.Select(child => toFullString ? child.ToFullString() : child.ToString()).OrderBy(name => name)));
+            builder.Append(string.Join(',', Children.Select(child => toFullString ? child.ToFullString() : child.ToString()).Order()));
             builder.Append('}');
         }
 

src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs

@@ -50,7 +50,7 @@ public override string ToFullString()
     private string InnerToString(bool toFullString)
     {
         IReadOnlyCollection<ResourceFieldChainExpression> chains = IncludeChainConverter.Instance.GetRelationshipChains(this);
-        return string.Join(',', chains.Select(field => toFullString ? field.ToFullString() : field.ToString()).Distinct().OrderBy(name => name));
+        return string.Join(',', chains.Select(field => toFullString ? field.ToFullString() : field.ToString()).Distinct().Order());
     }
 
     public override bool Equals(object? obj)

src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpression.cs

@@ -33,12 +33,12 @@ public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgum
 
     public override string ToString()
     {
-        return string.Join(',', Fields.Select(field => field.ToString()).OrderBy(name => name));
+        return string.Join(',', Fields.Select(field => field.ToString()).Order());
     }
 
     public override string ToFullString()
     {
-        return string.Join(',', Fields.Select(field => $"{field.ToFullString()}").OrderBy(name => name));
+        return string.Join(',', Fields.Select(field => $"{field.ToFullString()}").Order());
     }
 
     public override bool Equals(object? obj)

test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs

@@ -613,7 +613,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
 
-        string[] meetingIds = [.. meeting.Attendees.Select(attendee => attendee.StringId!).OrderBy(id => id)];
+        string[] meetingIds = [.. meeting.Attendees.Select(attendee => attendee.StringId!).Order()];
 
         responseDocument.Should().BeJson($$"""
             {