Create PrimitiveCollection top-level internal method.

ajcvickers · ajcvickers · commit 423bc0bd7716 · 2023-08-09T12:37:59.000+01:00
diff --git a/src/EFCore.Cosmos/Extensions/CosmosPrimitiveCollectionBuilderExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosPrimitiveCollectionBuilderExtensions.cs
@@ -1,8 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
-
 namespace Microsoft.EntityFrameworkCore;
 
 /// <summary>
@@ -55,37 +53,4 @@ public static PrimitiveCollectionBuilder<TProperty> ToJsonProperty<TProperty>(
         this PrimitiveCollectionBuilder<TProperty> primitiveCollectionBuilder,
         string name)
         => (PrimitiveCollectionBuilder<TProperty>)ToJsonProperty((PrimitiveCollectionBuilder)primitiveCollectionBuilder, name);
-
-    /// <summary>
-    ///     Configures this property to be the etag concurrency token.
-    /// </summary>
-    /// <remarks>
-    ///     See <see href="https://aka.ms/efcore-docs-modeling">Modeling entity types and relationships</see>, and
-    ///     <see href="https://aka.ms/efcore-docs-cosmos">Accessing Azure Cosmos DB with EF Core</see> for more information and examples.
-    /// </remarks>
-    /// <param name="primitiveCollectionBuilder">The builder for the property being configured.</param>
-    /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-    public static PrimitiveCollectionBuilder IsETagConcurrency(this PrimitiveCollectionBuilder primitiveCollectionBuilder)
-    {
-        primitiveCollectionBuilder
-            .IsConcurrencyToken()
-            .ToJsonProperty("_etag")
-            .ValueGeneratedOnAddOrUpdate();
-
-        return primitiveCollectionBuilder;
-    }
-
-    /// <summary>
-    ///     Configures this property to be the etag concurrency token.
-    /// </summary>
-    /// <remarks>
-    ///     See <see href="https://aka.ms/efcore-docs-modeling">Modeling entity types and relationships</see>, and
-    ///     <see href="https://aka.ms/efcore-docs-cosmos">Accessing Azure Cosmos DB with EF Core</see> for more information and examples.
-    /// </remarks>
-    /// <typeparam name="TProperty">The type of the property being configured.</typeparam>
-    /// <param name="primitiveCollectionBuilder">The builder for the property being configured.</param>
-    /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-    public static PrimitiveCollectionBuilder<TProperty> IsETagConcurrency<TProperty>(
-        this PrimitiveCollectionBuilder<TProperty> primitiveCollectionBuilder)
-        => (PrimitiveCollectionBuilder<TProperty>)IsETagConcurrency((PrimitiveCollectionBuilder)primitiveCollectionBuilder);
 }
diff --git a/src/EFCore/Metadata/Builders/ComplexPropertyBuilder.cs b/src/EFCore/Metadata/Builders/ComplexPropertyBuilder.cs
@@ -215,9 +215,9 @@ public virtual ComplexTypePropertyBuilder Property(Type propertyType, string pro
     /// <returns>An object that can be used to configure the property.</returns>
     public virtual ComplexTypePrimitiveCollectionBuilder PrimitiveCollection(string propertyName)
         => new(
-            TypeBuilder.Property(
+            TypeBuilder.PrimitiveCollection(
                 Check.NotEmpty(propertyName, nameof(propertyName)),
-                ConfigurationSource.Explicit)!.PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata);
+                ConfigurationSource.Explicit)!.Metadata);
 
     /// <summary>
     ///     Returns an object that can be used to configure a property of the complex type.
@@ -235,10 +235,9 @@ public virtual ComplexTypePrimitiveCollectionBuilder PrimitiveCollection(string
     /// <returns>An object that can be used to configure the property.</returns>
     public virtual ComplexTypePrimitiveCollectionBuilder<TProperty> PrimitiveCollection<TProperty>(string propertyName)
         => new(
-            TypeBuilder.Property(
+            TypeBuilder.PrimitiveCollection(
                 typeof(TProperty),
-                Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!
-                .PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata);
+                Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!.Metadata);
 
     /// <summary>
     ///     Returns an object that can be used to configure a property of the complex type.
@@ -256,10 +255,9 @@ public virtual ComplexTypePrimitiveCollectionBuilder<TProperty> PrimitiveCollect
     /// <returns>An object that can be used to configure the property.</returns>
     public virtual ComplexTypePrimitiveCollectionBuilder PrimitiveCollection(Type propertyType, string propertyName)
         => new(
-            TypeBuilder.Property(
+            TypeBuilder.PrimitiveCollection(
                 Check.NotNull(propertyType, nameof(propertyType)),
-                Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!
-                .PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata);
+                Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!.Metadata);
 
     /// <summary>
     ///     Returns an object that can be used to configure a property of the complex type.
diff --git a/src/EFCore/Metadata/Builders/ComplexPropertyBuilder`.cs b/src/EFCore/Metadata/Builders/ComplexPropertyBuilder`.cs
@@ -110,7 +110,7 @@ public virtual ComplexTypePropertyBuilder<TProperty> Property<TProperty>(Express
     /// </param>
     /// <returns>An object that can be used to configure the property.</returns>
     public virtual ComplexTypePrimitiveCollectionBuilder<TProperty> PrimitiveCollection<TProperty>(Expression<Func<TComplex, TProperty>> propertyExpression)
-        => new(TypeBuilder.Property(
+        => new(TypeBuilder.PrimitiveCollection(
                     Check.NotNull(propertyExpression, nameof(propertyExpression)).GetMemberAccess(), ConfigurationSource.Explicit)!
                 .Metadata);
 
diff --git a/src/EFCore/Metadata/Builders/ComplexTypePrimitiveCollectionBuilder.cs b/src/EFCore/Metadata/Builders/ComplexTypePrimitiveCollectionBuilder.cs
@@ -363,7 +363,7 @@ public virtual ComplexTypePrimitiveCollectionBuilder HasField(string fieldName)
     /// </summary>
     /// <returns>A builder to configure the collection element type.</returns>
     public virtual ElementTypeBuilder ElementType()
-        => new((IMutableElementType)Builder.PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata.GetElementType()!);
+        => new((IMutableElementType)Builder.Metadata.GetElementType()!);
 
     /// <summary>
     ///     Configures the elements of this collection.
diff --git a/src/EFCore/Metadata/Builders/EntityTypeBuilder.cs b/src/EFCore/Metadata/Builders/EntityTypeBuilder.cs
@@ -183,9 +183,8 @@ public virtual PropertyBuilder Property(Type propertyType, string propertyName)
     /// <returns>An object that can be used to configure the property.</returns>
     public virtual PrimitiveCollectionBuilder PrimitiveCollection(string propertyName)
         => new(
-            Builder.Property(
-                Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!
-                .PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata);
+            Builder.PrimitiveCollection(
+                Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!.Metadata);
 
     /// <summary>
     ///     Returns an object that can be used to configure a property of the entity type where that property represents
@@ -204,10 +203,9 @@ public virtual PrimitiveCollectionBuilder PrimitiveCollection(string propertyNam
     /// <returns>An object that can be used to configure the property.</returns>
     public virtual PrimitiveCollectionBuilder<TProperty> PrimitiveCollection<TProperty>(string propertyName)
         => new(
-                Builder.Property(
+                Builder.PrimitiveCollection(
                     typeof(TProperty),
-                    Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!
-                    .PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata);
+                    Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!.Metadata);
 
     /// <summary>
     ///     Returns an object that can be used to configure a property of the entity type where that property represents
@@ -226,10 +224,9 @@ public virtual PrimitiveCollectionBuilder<TProperty> PrimitiveCollection<TProper
     /// <returns>An object that can be used to configure the property.</returns>
     public virtual PrimitiveCollectionBuilder PrimitiveCollection(Type propertyType, string propertyName)
         => new(
-            Builder.Property(
+            Builder.PrimitiveCollection(
                 Check.NotNull(propertyType, nameof(propertyType)),
-                Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!
-                .PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata);
+                Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!.Metadata);
 
     /// <summary>
     ///     Returns an object that can be used to configure a property of the entity type.
diff --git a/src/EFCore/Metadata/Builders/EntityTypeBuilder`.cs b/src/EFCore/Metadata/Builders/EntityTypeBuilder`.cs
@@ -164,8 +164,8 @@ public virtual PropertyBuilder<TProperty> Property<TProperty>(Expression<Func<TE
     public virtual PrimitiveCollectionBuilder<TProperty> PrimitiveCollection<TProperty>(
         Expression<Func<TEntity, TProperty>> propertyExpression)
         => new(
-            Builder.Property(Check.NotNull(propertyExpression, nameof(propertyExpression)).GetMemberAccess(),
-                    ConfigurationSource.Explicit)!.PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata);
+            Builder.PrimitiveCollection(Check.NotNull(propertyExpression, nameof(propertyExpression)).GetMemberAccess(),
+                    ConfigurationSource.Explicit)!.Metadata);
 
     /// <summary>
     ///     Configures a complex property of the entity type.
diff --git a/src/EFCore/Metadata/Builders/IConventionPropertyBuilder.cs b/src/EFCore/Metadata/Builders/IConventionPropertyBuilder.cs
@@ -545,13 +545,13 @@ bool CanSetProviderValueComparer(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    IConventionElementTypeBuilder? PrimitiveCollection(bool fromDataAnnotation = false);
+    IConventionElementTypeBuilder? ElementType(bool fromDataAnnotation = false);
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    bool CanSetPrimitiveCollection(bool fromDataAnnotation = false);
+    bool CanSetElementType(bool fromDataAnnotation = false);
 }
diff --git a/src/EFCore/Metadata/Builders/OwnedNavigationBuilder.cs b/src/EFCore/Metadata/Builders/OwnedNavigationBuilder.cs
@@ -206,10 +206,9 @@ public virtual PropertyBuilder Property(Type propertyType, string propertyName)
     public virtual PrimitiveCollectionBuilder PrimitiveCollection(string propertyName)
         => UpdateBuilder(
             () => new PrimitiveCollectionBuilder(
-                DependentEntityType.Builder.Property(
+                DependentEntityType.Builder.PrimitiveCollection(
                     Check.NotEmpty(propertyName, nameof(propertyName)),
-                    ConfigurationSource.Explicit)!
-                    .PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata));
+                    ConfigurationSource.Explicit)!.Metadata));
 
     /// <summary>
     ///     Returns an object that can be used to configure a property of the owned type where that property represents
@@ -229,10 +228,9 @@ public virtual PrimitiveCollectionBuilder PrimitiveCollection(string propertyNam
     public virtual PrimitiveCollectionBuilder<TProperty> PrimitiveCollection<TProperty>(string propertyName)
         => UpdateBuilder(
             () => new PrimitiveCollectionBuilder<TProperty>(
-                DependentEntityType.Builder.Property(
+                DependentEntityType.Builder.PrimitiveCollection(
                     typeof(TProperty),
-                    Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!
-                    .PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata));
+                    Check.NotEmpty(propertyName, nameof(propertyName)), ConfigurationSource.Explicit)!.Metadata));
 
     /// <summary>
     ///     Returns an object that can be used to configure a property of the owned type where that property represents
@@ -251,10 +249,9 @@ public virtual PrimitiveCollectionBuilder<TProperty> PrimitiveCollection<TProper
     /// <returns>An object that can be used to configure the property.</returns>
     public virtual PrimitiveCollectionBuilder PrimitiveCollection(Type propertyType, string propertyName)
         => new(
-            DependentEntityType.Builder.Property(
+            DependentEntityType.Builder.PrimitiveCollection(
                 Check.NotNull(propertyType, nameof(propertyType)), Check.NotEmpty(propertyName, nameof(propertyName)),
-                ConfigurationSource.Explicit)!
-                .PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata);
+                ConfigurationSource.Explicit)!.Metadata);
 
     /// <summary>
     ///     Returns an object that can be used to configure a property of the entity type.
diff --git a/src/EFCore/Metadata/Builders/OwnedNavigationBuilder`.cs b/src/EFCore/Metadata/Builders/OwnedNavigationBuilder`.cs
@@ -116,9 +116,9 @@ public virtual PropertyBuilder<TProperty> PrimitiveCollection<TProperty>(
         Expression<Func<TDependentEntity, TProperty>> propertyExpression)
         => UpdateBuilder(
             () => new PropertyBuilder<TProperty>(
-                DependentEntityType.Builder.Property(
+                DependentEntityType.Builder.PrimitiveCollection(
                     Check.NotNull(propertyExpression, nameof(propertyExpression)).GetMemberAccess(),
-                    ConfigurationSource.Explicit)!.PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata));
+                    ConfigurationSource.Explicit)!.Metadata));
 
     /// <summary>
     ///     Returns an object that can be used to configure an existing navigation property
diff --git a/src/EFCore/Metadata/Builders/PrimitiveCollectionBuilder.cs b/src/EFCore/Metadata/Builders/PrimitiveCollectionBuilder.cs
@@ -365,7 +365,7 @@ public virtual PrimitiveCollectionBuilder HasField(string fieldName)
     /// </summary>
     /// <returns>A builder to configure the collection element type.</returns>
     public virtual ElementTypeBuilder ElementType()
-        => new((IMutableElementType)Builder.PrimitiveCollection(ConfigurationSource.Explicit)!.Metadata.GetElementType()!);
+        => new((IMutableElementType)Builder.Metadata.GetElementType()!);
 
     /// <summary>
     ///     Configures the elements of this collection.
diff --git a/src/EFCore/Metadata/Conventions/IElementTypeAnnotationChangedConvention.cs b/src/EFCore/Metadata/Conventions/IElementTypeAnnotationChangedConvention.cs
@@ -19,7 +19,7 @@ public interface IElementTypeAnnotationChangedConvention : IConvention
     /// <param name="annotation">The new annotation.</param>
     /// <param name="oldAnnotation">The old annotation.</param>
     /// <param name="context">Additional information associated with convention execution.</param>
-    void ProcessPropertyAnnotationChanged(
+    void ProcessElementTypeAnnotationChanged(
         IConventionElementTypeBuilder builder,
         string name,
         IConventionAnnotation? annotation,
diff --git a/src/EFCore/Metadata/Conventions/IElementTypeNullabilityChangedConvention.cs b/src/EFCore/Metadata/Conventions/IElementTypeNullabilityChangedConvention.cs
@@ -16,7 +16,7 @@ public interface IElementTypeNullabilityChangedConvention : IConvention
     /// </summary>
     /// <param name="builder">The builder for the element.</param>
     /// <param name="context">Additional information associated with convention execution.</param>
-    void ProcessPropertyNullabilityChanged(
+    void ProcessElementTypeNullabilityChanged(
         IConventionElementTypeBuilder builder,
         IConventionContext<bool?> context);
 }
diff --git a/src/EFCore/Metadata/Conventions/Internal/ConventionDispatcher.ImmediateConventionScope.cs b/src/EFCore/Metadata/Conventions/Internal/ConventionDispatcher.ImmediateConventionScope.cs
@@ -1567,7 +1567,7 @@ public IConventionModelBuilder OnModelInitialized(IConventionModelBuilder modelB
                         return null;
                     }
 
-                    elementConvention.ProcessPropertyNullabilityChanged(builder, _boolConventionContext);
+                    elementConvention.ProcessElementTypeNullabilityChanged(builder, _boolConventionContext);
                     if (_boolConventionContext.ShouldStopProcessing())
                     {
                         return _boolConventionContext.Result;
@@ -1704,7 +1704,7 @@ public IConventionModelBuilder OnModelInitialized(IConventionModelBuilder modelB
                 _annotationConventionContext.ResetState(annotation);
                 foreach (var elementConvention in _conventionSet.ElementTypeAnnotationChangedConventions)
                 {
-                    elementConvention.ProcessPropertyAnnotationChanged(
+                    elementConvention.ProcessElementTypeAnnotationChanged(
                         builder, name, annotation, oldAnnotation, _annotationConventionContext);
 
                     if (_annotationConventionContext.ShouldStopProcessing())
diff --git a/src/EFCore/Metadata/Conventions/PropertyDiscoveryConvention.cs b/src/EFCore/Metadata/Conventions/PropertyDiscoveryConvention.cs
@@ -94,7 +94,7 @@ private void Process(IConventionEntityTypeBuilder entityTypeBuilder)
             var propertyBuilder = entityTypeBuilder.Property(propertyInfo);
             if (mapping?.ElementTypeMapping != null)
             {
-                propertyBuilder?.PrimitiveCollection();
+                propertyBuilder?.ElementType();
             }
         }
     }
diff --git a/src/EFCore/Metadata/Internal/ElementType.cs b/src/EFCore/Metadata/Internal/ElementType.cs
@@ -108,7 +108,7 @@ public virtual void SetRemovedFromModel()
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    protected new virtual IConventionAnnotation? OnAnnotationSet(
+    protected override IConventionAnnotation? OnAnnotationSet(
         string name,
         IConventionAnnotation? annotation,
         IConventionAnnotation? oldAnnotation)
diff --git a/src/EFCore/Metadata/Internal/InternalPropertyBuilder.cs b/src/EFCore/Metadata/Internal/InternalPropertyBuilder.cs
diff --git a/src/EFCore/Metadata/Internal/InternalTypeBaseBuilder.cs b/src/EFCore/Metadata/Internal/InternalTypeBaseBuilder.cs
diff --git a/test/EFCore.Cosmos.FunctionalTests/CosmosApiConsistencyTest.cs b/test/EFCore.Cosmos.FunctionalTests/CosmosApiConsistencyTest.cs
diff --git a/test/EFCore.Tests/ApiConsistencyTest.cs b/test/EFCore.Tests/ApiConsistencyTest.cs
diff --git a/test/EFCore.Tests/Metadata/Conventions/ConventionDispatcherTest.cs b/test/EFCore.Tests/Metadata/Conventions/ConventionDispatcherTest.cs
diff --git a/test/EFCore.Tests/ModelBuilding/PrimitiveCollectionsTestBase.cs b/test/EFCore.Tests/ModelBuilding/PrimitiveCollectionsTestBase.cs
diff --git a/test/EFCore.Tests/ModelBuilding/TestModel.cs b/test/EFCore.Tests/ModelBuilding/TestModel.cs
