Merge pull request #1527 from json-api-dotnet/merge-master-into-openapi

bkoelman · web-flow · commit 9bdea378d042 · 2024-04-10T03:54:52.000+02:00
Merge master into openapi
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2023.3.4",
+      "version": "2024.1.0",
       "commands": [
         "jb"
       ]
@@ -21,7 +21,7 @@
       ]
     },
     "docfx": {
-      "version": "2.74.0",
+      "version": "2.76.0",
       "commands": [
         "docfx"
       ]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -206,7 +206,7 @@ jobs:
       run: |
         $inspectCodeOutputPath = Join-Path $env:RUNNER_TEMP 'jetbrains-inspectcode-results.xml'
         Write-Output "INSPECT_CODE_OUTPUT_PATH=$inspectCodeOutputPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        dotnet jb inspectcode JsonApiDotNetCore.sln --build --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --properties:RunAnalyzers=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
+        dotnet jb inspectcode JsonApiDotNetCore.sln --build --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --format="xml" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --properties:RunAnalyzers=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
     - name: Verify outcome
       shell: pwsh
       run: |
diff --git a/JsonApiDotNetCore.sln.DotSettings b/JsonApiDotNetCore.sln.DotSettings
@@ -594,11 +594,14 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=546845333F49494AB6CF8F0477A0F71D/@KeyIndexDefined">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=546845333F49494AB6CF8F0477A0F71D/Comment/@EntryValue">Replace argument null check using throw expression with Guard clause</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=546845333F49494AB6CF8F0477A0F71D/CustomPatternPlaceholder/=argument/@KeyIndexDefined">True</s:Boolean>
diff --git a/benchmarks/Serialization/SerializationBenchmarkBase.cs b/benchmarks/Serialization/SerializationBenchmarkBase.cs
@@ -41,7 +41,7 @@ protected SerializationBenchmarkBase()
 
         var linkBuilder = new FakeLinkBuilder();
         var metaBuilder = new NoMetaBuilder();
-        IQueryConstraintProvider[] constraintProviders = Array.Empty<IQueryConstraintProvider>();
+        IQueryConstraintProvider[] constraintProviders = [];
         var resourceDefinitionAccessor = new NeverResourceDefinitionAccessor();
         var sparseFieldSetCache = new SparseFieldSetCache(constraintProviders, resourceDefinitionAccessor);
         var requestQueryStringAccessor = new FakeRequestQueryStringAccessor();
diff --git a/docs/docfx.json b/docs/docfx.json
@@ -24,6 +24,9 @@
                     "internals/**.md",
                     "toc.yml",
                     "*.md"
+                ],
+                "exclude": [
+                    "**/README.md"
                 ]
             }
         ],
diff --git a/docs/request-examples/index.md b/docs/request-examples/index.md
@@ -1,3 +1,7 @@
+---
+_disableToc: true
+---
+
 # Example requests
 
 These requests have been generated against the "GettingStarted" application and are updated on every deployment.
diff --git a/docs/request-examples/toc.md b/docs/request-examples/toc.md
diff --git a/inspectcode.ps1 b/inspectcode.ps1
@@ -10,7 +10,7 @@ if ($LastExitCode -ne 0) {
 
 $outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.xml')
 $resultPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.html')
-dotnet jb inspectcode JsonApiDotNetCore.sln --dotnetcoresdk=$(dotnet --version) --build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:RunAnalyzers=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
+dotnet jb inspectcode JsonApiDotNetCore.sln --dotnetcoresdk=$(dotnet --version) --build --output="$outputPath" --format="xml" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:RunAnalyzers=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
 
 if ($LastExitCode -ne 0) {
     throw "Code inspection failed with exit code $LastExitCode"
diff --git a/src/Examples/NoEntityFrameworkExample/NullSafeExpressionRewriter.cs b/src/Examples/NoEntityFrameworkExample/NullSafeExpressionRewriter.cs
@@ -300,7 +300,7 @@ private static ConstantExpression CreateConstantForMemberIsNull(Type type)
 
             if (getter != null)
             {
-                object? value = getter.Invoke(null, Array.Empty<object>());
+                object? value = getter.Invoke(null, []);
                 return Expression.Constant(value, type);
             }
         }
diff --git a/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs b/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs
@@ -201,7 +201,7 @@ private static void WriteObject(StringBuilder builder, object? value)
 
     private static bool HasToStringOverload(Type type)
     {
-        MethodInfo? toStringMethod = type.GetMethod("ToString", Array.Empty<Type>());
+        MethodInfo? toStringMethod = type.GetMethod("ToString", []);
         return toStringMethod != null && toStringMethod.DeclaringType != typeof(object);
     }
 
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs
@@ -52,6 +52,8 @@ public LogicalExpression(LogicalOperator @operator, IImmutableList<FilterExpress
     {
         ArgumentGuard.NotNull(filters);
 
+        // Workaround for https://youtrack.jetbrains.com/issue/RSRP-496512/Invalid-Use-collection-expression-suggestion.
+        // ReSharper disable once UseCollectionExpression
         ImmutableArray<FilterExpression> terms = filters.WhereNotNull().ToImmutableArray();
 
         return terms.Length > 1 ? new LogicalExpression(@operator, terms) : terms.FirstOrDefault();
diff --git a/src/JsonApiDotNetCore/QueryStrings/FieldChains/FieldChainPattern.cs b/src/JsonApiDotNetCore/QueryStrings/FieldChains/FieldChainPattern.cs
@@ -49,7 +49,7 @@ internal FieldChainPattern(FieldTypes choices, bool atLeastOne, bool atMostOne,
     /// </summary>
     /// <remarks>
     /// Patterns are similar to regular expressions, but a lot simpler. They consist of a sequence of terms. A term can be a single character or a character
-    /// choice, optionally followed by a quantifier.
+    /// choice. A term is optionally followed by a quantifier.
     /// <p>
     /// The following characters can be used:
     /// <list type="table">
@@ -58,18 +58,26 @@ internal FieldChainPattern(FieldTypes choices, bool atLeastOne, bool atMostOne,
     /// <description>
     /// Matches a to-many relationship.
     /// </description>
+    /// </item>
+    /// <item>
     /// <term>O</term>
     /// <description>
     /// Matches a to-one relationship.
     /// </description>
+    /// </item>
+    /// <item>
     /// <term>R</term>
     /// <description>
     /// Matches a relationship.
     /// </description>
+    /// </item>
+    /// <item>
     /// <term>A</term>
     /// <description>
     /// Matches an attribute.
     /// </description>
+    /// </item>
+    /// <item>
     /// <term>F</term>
     /// <description>
     /// Matches a field.
@@ -86,15 +94,19 @@ internal FieldChainPattern(FieldTypes choices, bool atLeastOne, bool atMostOne,
     /// <item>
     /// <term>?</term>
     /// <description>
-    /// Matches its term zero or one times.
+    /// Matches its preceding term zero or one times.
     /// </description>
+    /// </item>
+    /// <item>
     /// <term>*</term>
     /// <description>
-    /// Matches its term zero or more times.
+    /// Matches its preceding term zero or more times.
     /// </description>
+    /// </item>
+    /// <item>
     /// <term>+</term>
     /// <description>
-    /// Matches its term one or more times.
+    /// Matches its preceding term one or more times.
     /// </description>
     /// </item>
     /// </list>
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentAdapter.cs
@@ -13,22 +13,22 @@ public interface IDocumentAdapter
     /// <list type="bullet">
     /// <item>
     /// <description>
-    /// <code><![CDATA[IList<OperationContainer>]]></code> (operations)
+    /// <c><![CDATA[IList<OperationContainer>]]></c> (operations)
     /// </description>
     /// </item>
     /// <item>
     /// <description>
-    /// <code><![CDATA[ISet<IIdentifiable>]]></code> (to-many relationship, unknown relationship)
+    /// <c><![CDATA[ISet<IIdentifiable>]]></c> (to-many relationship, unknown relationship)
     /// </description>
     /// </item>
     /// <item>
     /// <description>
-    /// <code><![CDATA[IIdentifiable]]></code> (resource, to-one relationship)
+    /// <c><![CDATA[IIdentifiable]]></c> (resource, to-one relationship)
     /// </description>
     /// </item>
     /// <item>
     /// <description>
-    /// <code><![CDATA[null]]></code> (to-one relationship)
+    /// <c><![CDATA[null]]></c> (to-one relationship)
     /// </description>
     /// </item>
     /// </list>
diff --git a/src/JsonApiDotNetCore/Serialization/Response/IResponseModelAdapter.cs b/src/JsonApiDotNetCore/Serialization/Response/IResponseModelAdapter.cs
@@ -12,32 +12,32 @@ public interface IResponseModelAdapter
     /// <list type="bullet">
     /// <item>
     /// <description>
-    /// <code><![CDATA[IEnumerable<IIdentifiable>]]></code>
+    /// <c><![CDATA[IEnumerable<IIdentifiable>]]></c>
     /// </description>
     /// </item>
     /// <item>
     /// <description>
-    /// <code><![CDATA[IIdentifiable]]></code>
+    /// <c><![CDATA[IIdentifiable]]></c>
     /// </description>
     /// </item>
     /// <item>
     /// <description>
-    /// <code><![CDATA[null]]></code>
+    /// <c><![CDATA[null]]></c>
     /// </description>
     /// </item>
     /// <item>
     /// <description>
-    /// <code><![CDATA[IEnumerable<OperationContainer?>]]></code>
+    /// <c><![CDATA[IEnumerable<OperationContainer?>]]></c>
     /// </description>
     /// </item>
     /// <item>
     /// <description>
-    /// <code><![CDATA[IEnumerable<ErrorObject>]]></code>
+    /// <c><![CDATA[IEnumerable<ErrorObject>]]></c>
     /// </description>
     /// </item>
     /// <item>
     /// <description>
-    /// <code><![CDATA[ErrorObject]]></code>
+    /// <c><![CDATA[ErrorObject]]></c>
     /// </description>
     /// </item>
     /// </list>
diff --git a/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs b/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs
@@ -214,7 +214,7 @@ private string GetLinkForPagination(int pageOffset, string? pageSizeValue)
         };
 
         UriComponents components = _options.UseRelativeLinks ? UriComponents.PathAndQuery : UriComponents.AbsoluteUri;
-        return builder.Uri.GetComponents(components, UriFormat.SafeUnescaped);
+        return builder.Uri.GetComponents(components, UriFormat.UriEscaped);
     }
 
     private string GetQueryStringInPaginationLink(int pageOffset, string? pageSizeValue)
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/ImageContainer.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/ImageContainer.cs
@@ -12,7 +12,7 @@ public sealed class ImageContainer : Identifiable<long>
     public string FileName { get; set; } = null!;
 
     [Attr]
-    public byte[] Data { get; set; } = Array.Empty<byte>();
+    public byte[] Data { get; set; } = [];
 
     [Attr]
     public byte[]? Thumbnail { get; set; }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs
@@ -85,6 +85,10 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         responseDocument.Data.ManyValue.ShouldHaveCount(1);
         responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someString").With(value => value.Should().Be(resource.SomeString));
+
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be("http://localhost/filterableResources?filter=equals(someString,'This%2c+that+%26+more+%2b+some')");
+        responseDocument.Links.First.Should().Be("http://localhost/filterableResources?filter=equals(someString,%27This,%20that%20%26%20more%20%2B%20some%27)");
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceWriteTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceWriteTests.cs
@@ -1766,7 +1766,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         });
 
         tandemStore.AssertLeftType<Tandem>();
-        tandemStore.AssertRightTypes(Array.Empty<Type>());
+        tandemStore.AssertRightTypes([]);
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceTypeCapturingDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceTypeCapturingDefinition.cs
@@ -82,7 +82,7 @@ public override Task OnWriteSucceededAsync(TResource resource, WriteOperationKin
 
     private void EnsureSnapshot(TResource leftType, IIdentifiable? rightResourceId = null)
     {
-        IIdentifiable[] rightResourceIds = rightResourceId != null ? [rightResourceId] : Array.Empty<IIdentifiable>();
+        IIdentifiable[] rightResourceIds = rightResourceId != null ? [rightResourceId] : [];
 
         EnsureSnapshot(leftType, rightResourceIds);
     }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"jetbrains.resharper.globaltools": {`
`6`		`- "version": "2023.3.4",`
	`6`	`+ "version": "2024.1.0",`
`7`	`7`	`"commands": [`
`8`	`8`	`"jb"`
`9`	`9`	`]`
`@@ -21,7 +21,7 @@`
`21`	`21`	`]`
`22`	`22`	`},`
`23`	`23`	`"docfx": {`
`24`		`- "version": "2.74.0",`
	`24`	`+ "version": "2.76.0",`
`25`	`25`	`"commands": [`
`26`	`26`	`"docfx"`
`27`	`27`	`]`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@`
`24`	`24`	`"internals/**.md",`
`25`	`25`	`"toc.yml",`
`26`	`26`	`"*.md"`
	`27`	`+ ],`
	`28`	`+ "exclude": [`
	`29`	`+ "**/README.md"`
`27`	`30`	`]`
`28`	`31`	`}`
`29`	`32`	`],`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ private static ConstantExpression CreateConstantForMemberIsNull(Type type)`
`300`	`300`
`301`	`301`	`if (getter != null)`
`302`	`302`	`{`
`303`		`- object? value = getter.Invoke(null, Array.Empty<object>());`
	`303`	`+ object? value = getter.Invoke(null, []);`
`304`	`304`	`return Expression.Constant(value, type);`
`305`	`305`	`}`
`306`	`306`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ private static void WriteObject(StringBuilder builder, object? value)`
`201`	`201`
`202`	`202`	`private static bool HasToStringOverload(Type type)`
`203`	`203`	`{`
`204`		`- MethodInfo? toStringMethod = type.GetMethod("ToString", Array.Empty<Type>());`
	`204`	`+ MethodInfo? toStringMethod = type.GetMethod("ToString", []);`
`205`	`205`	`return toStringMethod != null && toStringMethod.DeclaringType != typeof(object);`
`206`	`206`	`}`
`207`	`207`