React to PR feedback

Author: AndriySvyryd

src/EFCore.Relational/Metadata/Internal/Table.cs

@@ -147,11 +147,9 @@ public virtual bool IsExcludedFromMigrations
         {
             IProperty => propertyBase.GetTableColumnMappings()
                 .FirstOrDefault(cm => cm.TableMapping.Table == this)?.Column,
-            INavigation nav when nav.TargetEntityType.GetContainerColumnName() is string containerName
-                && containerName.Length != 0
+            INavigation nav when nav.TargetEntityType.GetContainerColumnName() is { Length: > 0 } containerName
                 => FindColumn(containerName),
-            IComplexProperty cp when cp.ComplexType.GetContainerColumnName() is string containerName
-                && containerName.Length != 0
+            IComplexProperty cp when cp.ComplexType.GetContainerColumnName() is { Length: > 0 } containerName
                 => FindColumn(containerName),
             _ => null
         };

src/EFCore.Relational/Metadata/Internal/TableBase.cs

@@ -94,8 +94,10 @@ public override bool IsReadOnly
         {
             IProperty => propertyBase.GetDefaultColumnMappings()
                 .FirstOrDefault(cm => cm.TableMapping.Table == this)?.Column,
-            INavigation nav => FindColumn(nav.TargetEntityType.GetContainerColumnName()!),
-            IComplexProperty cp => FindColumn(cp.ComplexType.GetContainerColumnName()!),
+            INavigation nav when nav.TargetEntityType.GetContainerColumnName() is { Length: > 0 } containerName
+                => FindColumn(containerName),
+            IComplexProperty cp when cp.ComplexType.GetContainerColumnName() is { Length: > 0 } containerName
+                => FindColumn(containerName),
             _ => null
         };
 

src/EFCore/Infrastructure/JsonPath.cs

@@ -29,9 +29,13 @@ public class JsonPath
     /// </param>
     public JsonPath(IReadOnlyList<JsonPathSegment> segments, int[] ordinals)
     {
-        Check.DebugAssert(
-            ordinals.Length == segments.Count(s => s.IsArray),
-            "Ordinals count must match the number of array segments.");
+        var arraySegmentCount = segments.Count(s => s.IsArray);
+        if (ordinals.Length != arraySegmentCount)
+        {
+            throw new ArgumentException(
+                CoreStrings.InvalidJsonPathOrdinalCount(ordinals.Length, arraySegmentCount),
+                nameof(ordinals));
+        }
 
         Segments = segments;
         Ordinals = ordinals;

src/EFCore/Infrastructure/JsonPathSegment.cs

@@ -9,7 +9,7 @@ namespace Microsoft.EntityFrameworkCore.Infrastructure;
 /// <remarks>
 ///     See <see href="https://aka.ms/efcore-docs-modeling">Modeling entity types and relationships</see> for more information and examples.
 /// </remarks>
-public readonly struct JsonPathSegment
+public sealed class JsonPathSegment
 {
     /// <summary>
     ///     Creates a new <see cref="JsonPathSegment" /> for a named property.

src/EFCore/Properties/CoreStrings.Designer.cs

@@ -778,6 +778,9 @@
   <data name="InvalidIncludeExpression" xml:space="preserve">
     <value>The expression '{expression}' is invalid inside an 'Include' operation, since it does not represent a property access: 't =&gt; t.MyProperty'. To target navigations declared on derived types, use casting ('t =&gt; ((Derived)t).MyProperty') or the 'as' operator ('t =&gt; (t as Derived).MyProperty'). Collection navigation access can be filtered by composing Where, OrderBy(Descending), ThenBy(Descending), Skip or Take operations. For more information on including related data, see https://go.microsoft.com/fwlink/?LinkID=746393.</value>
   </data>
+  <data name="InvalidJsonPathOrdinalCount" xml:space="preserve">
+    <value>The number of ordinals provided ({ordinalsCount}) must match the number of array segments in the JSON path ({arraySegmentCount}).</value>
+  </data>
   <data name="InvalidKeyValue" xml:space="preserve">
     <value>Unable to track an entity of type '{entityType}' because its primary key property '{keyProperty}' is null.</value>
   </data>