Rename IncludeRootDiscriminatorInJsonId to HasRootDiscriminatorInJson…

…Id (#34717)
dotnet · Sep 20, 2024 · a89537e · a89537e
1 parent 59d16b6
commit a89537e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/src/EFCore.Cosmos/Extensions/CosmosEntityTypeBuilderExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosEntityTypeBuilderExtensions.cs
@@ -531,7 +531,7 @@ public static EntityTypeBuilder HasDiscriminatorInJsonId(
     ///     <see langword="null" /> to revert to the default setting.
     /// </param>
     /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-    public static EntityTypeBuilder IncludeRootDiscriminatorInJsonId(
+    public static EntityTypeBuilder HasRootDiscriminatorInJsonId(
         this EntityTypeBuilder entityTypeBuilder,
         bool? includeDiscriminator = true)
     {
@@ -578,11 +578,11 @@ public static EntityTypeBuilder<TEntity> HasDiscriminatorInJsonId<TEntity>(
     ///     <see langword="null" /> to revert to the default setting.
     /// </param>
     /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-    public static EntityTypeBuilder<TEntity> IncludeRootDiscriminatorInJsonId<TEntity>(
+    public static EntityTypeBuilder<TEntity> HasRootDiscriminatorInJsonId<TEntity>(
         this EntityTypeBuilder<TEntity> entityTypeBuilder,
         bool? includeDiscriminator = true)
         where TEntity : class
-        => (EntityTypeBuilder<TEntity>)IncludeRootDiscriminatorInJsonId((EntityTypeBuilder)entityTypeBuilder, includeDiscriminator);
+        => (EntityTypeBuilder<TEntity>)HasRootDiscriminatorInJsonId((EntityTypeBuilder)entityTypeBuilder, includeDiscriminator);
 
     /// <summary>
     ///     Includes the discriminator value of the entity type in the JSON "id" value. This was the default behavior before EF Core 9.
@@ -633,12 +633,12 @@ public static EntityTypeBuilder<TEntity> IncludeRootDiscriminatorInJsonId<TEntit
     /// </param>
     /// <param name="fromDataAnnotation">Indicates whether the configuration was specified using a data annotation.</param>
     /// <returns>The same builder instance if the configuration was applied, <see langword="null" /> otherwise.</returns>
-    public static IConventionEntityTypeBuilder? IncludeRootDiscriminatorInJsonId(
+    public static IConventionEntityTypeBuilder? HasRootDiscriminatorInJsonId(
         this IConventionEntityTypeBuilder entityTypeBuilder,
         bool? includeDiscriminator,
         bool fromDataAnnotation = false)
     {
-        if (!entityTypeBuilder.CanSetIncludeRootDiscriminatorInJsonId(includeDiscriminator, fromDataAnnotation))
+        if (!entityTypeBuilder.CanSetRootDiscriminatorInJsonId(includeDiscriminator, fromDataAnnotation))
         {
             return null;
         }
@@ -699,7 +699,7 @@ public static bool CanSetDiscriminatorInJsonId(
     /// </param>
     /// <param name="fromDataAnnotation">Indicates whether the configuration was specified using a data annotation.</param>
     /// <returns><see langword="true" /> if the configuration can be applied.</returns>
-    public static bool CanSetIncludeRootDiscriminatorInJsonId(
+    public static bool CanSetRootDiscriminatorInJsonId(
         this IConventionEntityTypeBuilder entityTypeBuilder,
         bool? includeDiscriminator,
         bool fromDataAnnotation = false)

diff --git a/src/EFCore.Cosmos/Extensions/CosmosModelBuilderExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosModelBuilderExtensions.cs
@@ -165,7 +165,7 @@ public static ModelBuilder HasDiscriminatorInJsonIds(
     ///     <see langword="null" /> to revert to the default setting.
     /// </param>
     /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-    public static ModelBuilder IncludeRootDiscriminatorInJsonId(
+    public static ModelBuilder HasRootDiscriminatorInJsonId(
         this ModelBuilder modelBuilder,
         bool? includeDiscriminator = true)
     {

diff --git a/test/EFCore.Cosmos.FunctionalTests/FindCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/FindCosmosTest.cs
@@ -461,11 +461,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
 
             modelBuilder.Entity<IntKey>()
                 .ToContainer("Ints")
-                .IncludeRootDiscriminatorInJsonId();
+                .HasRootDiscriminatorInJsonId();
 
             modelBuilder.Entity<NullableIntKey>()
                 .ToContainer("Ints")
-                .IncludeRootDiscriminatorInJsonId();
+                .HasRootDiscriminatorInJsonId();
 
             modelBuilder.Entity<StringKey>()
                 .ToContainer("Strings");
@@ -475,7 +475,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
 
             modelBuilder.Entity<BaseType>()
                 .ToContainer("Base")
-                .IncludeRootDiscriminatorInJsonId();
+                .HasRootDiscriminatorInJsonId();
 
             modelBuilder.Entity<ShadowKey>().ToContainer("ShadowKeys");
         }

diff --git a/test/EFCore.Cosmos.FunctionalTests/KeysWithConvertersCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/KeysWithConvertersCosmosTest.cs
@@ -20,7 +20,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         {
             base.OnModelCreating(modelBuilder, context);
 
-            modelBuilder.IncludeRootDiscriminatorInJsonId();
+            modelBuilder.HasRootDiscriminatorInJsonId();
         }
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)

diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindQueryCosmosFixture.cs b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindQueryCosmosFixture.cs
@@ -42,32 +42,32 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         modelBuilder.Entity<Employee>().ToContainer("Employees");
 
         modelBuilder.Entity<Order>()
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .ToContainer("ProductsAndOrders");
 
         modelBuilder.Entity<OrderDetail>()
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .ToContainer("ProductsAndOrders");
 
         modelBuilder.Entity<Product>()
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .ToContainer("ProductsAndOrders");
 
         modelBuilder.Entity<OrderQuery>()
             .ToContainer("ProductsAndOrders")
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .HasDiscriminator<string>("$type").HasValue("Order");
 
         modelBuilder
             .Entity<ProductQuery>()
             .ToContainer("ProductsAndOrders")
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .HasDiscriminator<string>("$type").HasValue("Product");
 
         modelBuilder
             .Entity<ProductView>()
             .ToContainer("ProductsAndOrders")
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .HasDiscriminator<string>("$type").HasValue("ProductView");
 
         modelBuilder

diff --git a/...EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs b/...EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
@@ -858,7 +858,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         {
             base.OnModelCreating(modelBuilder, context);
 
-            modelBuilder.IncludeRootDiscriminatorInJsonId();
+            modelBuilder.HasRootDiscriminatorInJsonId();
         }
     }
 }