Cosmos: Rename Get/SetPropertyName to Get/SetJsonPropertyName

src/EFCore.Cosmos/Extensions/CosmosPropertyBuilderExtensions.cs

@@ -19,7 +19,7 @@ public static class CosmosPropertyBuilderExtensions
         /// </summary>
         /// <remarks> If an empty string is supplied then the property will not be persisted. </remarks>
         /// <param name="propertyBuilder"> The builder for the property being configured. </param>
-        /// <param name="name"> The name of the container. </param>
+        /// <param name="name"> The name of the property. </param>
         /// <returns> The same builder instance so that multiple calls can be chained. </returns>
         public static PropertyBuilder ToJsonProperty(
             [NotNull] this PropertyBuilder propertyBuilder,
@@ -28,7 +28,7 @@ public static PropertyBuilder ToJsonProperty(
             Check.NotNull(propertyBuilder, nameof(propertyBuilder));
             Check.NotNull(name, nameof(name));
 
-            propertyBuilder.Metadata.SetPropertyName(name);
+            propertyBuilder.Metadata.SetJsonPropertyName(name);
 
             return propertyBuilder;
         }
@@ -38,7 +38,7 @@ public static PropertyBuilder ToJsonProperty(
         /// </summary>
         /// <typeparam name="TProperty"> The type of the property being configured. </typeparam>
         /// <param name="propertyBuilder"> The builder for the property being configured. </param>
-        /// <param name="name"> The name of the container. </param>
+        /// <param name="name"> The name of the property. </param>
         /// <returns> The same builder instance so that multiple calls can be chained. </returns>
         public static PropertyBuilder<TProperty> ToJsonProperty<TProperty>(
             [NotNull] this PropertyBuilder<TProperty> propertyBuilder,
@@ -54,7 +54,7 @@ public static PropertyBuilder<TProperty> ToJsonProperty<TProperty>(
         ///     </para>
         /// </summary>
         /// <param name="propertyBuilder"> The builder for the property being configured. </param>
-        /// <param name="name"> The name of the container. </param>
+        /// <param name="name"> The name of the property. </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,
@@ -70,7 +70,7 @@ public static IConventionPropertyBuilder ToJsonProperty(
                 return null;
             }
 
-            propertyBuilder.Metadata.SetPropertyName(name, fromDataAnnotation);
+            propertyBuilder.Metadata.SetJsonPropertyName(name, fromDataAnnotation);
 
             return propertyBuilder;
         }
@@ -79,7 +79,7 @@ public static IConventionPropertyBuilder ToJsonProperty(
         ///     Returns a value indicating whether the given property name can be set.
         /// </summary>
         /// <param name="propertyBuilder"> The builder for the property being configured. </param>
-        /// <param name="name"> The name of the container. </param>
+        /// <param name="name"> The name of the property. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> <c>true</c> if the property name can be set. </returns>
         public static bool CanSetJsonProperty(

src/EFCore.Cosmos/Extensions/CosmosPropertyExtensions.cs

@@ -15,15 +15,15 @@ namespace Microsoft.EntityFrameworkCore
     public static class CosmosPropertyExtensions
     {
         /// <summary>
-        ///     Returns the property name used when targeting Cosmos.
+        ///     Returns the property name that the property is mapped to when targeting Cosmos.
         /// </summary>
         /// <param name="property"> The property. </param>
-        /// <returns> The property name used when targeting Cosmos. </returns>
-        public static string GetPropertyName([NotNull] this IProperty property) =>
+        /// <returns> Returns the property name that the property is mapped to when targeting Cosmos. </returns>
+        public static string GetJsonPropertyName([NotNull] this IProperty property) =>
             (string)property[CosmosAnnotationNames.PropertyName]
-            ?? GetDefaultPropertyName(property);
+            ?? GetDefaultJsonPropertyName(property);
 
-        private static string GetDefaultPropertyName(IProperty property)
+        private static string GetDefaultJsonPropertyName(IProperty property)
         {
             var entityType = property.DeclaringEntityType;
             var ownership = entityType.FindOwnership();
@@ -45,34 +45,36 @@ private static string GetDefaultPropertyName(IProperty property)
         }
 
         /// <summary>
-        ///     Sets the property name used when targeting Cosmos.
+        ///     Sets the property name that the property is mapped to when targeting Cosmos.
         /// </summary>
         /// <param name="property"> The property. </param>
         /// <param name="name"> The name to set. </param>
-        public static void SetPropertyName([NotNull] this IMutableProperty property, [CanBeNull] string name)
+        public static void SetJsonPropertyName([NotNull] this IMutableProperty property, [CanBeNull] string name)
             => property.SetOrRemoveAnnotation(
                 CosmosAnnotationNames.PropertyName,
                 name);
 
         /// <summary>
-        ///     Sets the property name used when targeting Cosmos.
+        ///     Sets the property name that the property is mapped to when targeting Cosmos.
         /// </summary>
         /// <param name="property"> The property. </param>
         /// <param name="name"> The name to set. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        public static void SetPropertyName(
+        public static void SetJsonPropertyName(
             [NotNull] this IConventionProperty property, [CanBeNull] string name, bool fromDataAnnotation = false)
             => property.SetOrRemoveAnnotation(
                 CosmosAnnotationNames.PropertyName,
                 name,
                 fromDataAnnotation);
 
         /// <summary>
-        ///     Gets the <see cref="ConfigurationSource" /> for the property name used when targeting Cosmos.
+        ///     Gets the <see cref="ConfigurationSource" /> the property name that the property is mapped to when targeting Cosmos.
         /// </summary>
         /// <param name="property"> The property. </param>
-        /// <returns> The <see cref="ConfigurationSource" /> for the property name used when targeting Cosmos. </returns>
-        public static ConfigurationSource? GetPropertyNameConfigurationSource([NotNull] this IConventionProperty property)
+        /// <returns>
+        ///     The <see cref="ConfigurationSource" /> the property name that the property is mapped to when targeting Cosmos.
+        /// </returns>
+        public static ConfigurationSource? GetJsonPropertyNameConfigurationSource([NotNull] this IConventionProperty property)
             => property.FindAnnotation(CosmosAnnotationNames.PropertyName)?.GetConfigurationSource();
     }
 }

src/EFCore.Cosmos/Internal/CosmosModelValidator.cs

@@ -123,12 +123,12 @@ protected virtual void ValidateSharedContainerCompatibility(
 
                         partitionKey = nextPartitionKeyProperty;
                     }
-                    else if (partitionKey.GetPropertyName() != nextPartitionKeyProperty.GetPropertyName())
+                    else if (partitionKey.GetJsonPropertyName() != nextPartitionKeyProperty.GetJsonPropertyName())
                     {
                         throw new InvalidOperationException(
                             CosmosStrings.PartitionKeyStoreNameMismatch(
-                                partitionKey.Name, firstEntityType.DisplayName(), partitionKey.GetPropertyName(),
-                                nextPartitionKeyProperty.Name, entityType.DisplayName(), nextPartitionKeyProperty.GetPropertyName()));
+                                partitionKey.Name, firstEntityType.DisplayName(), partitionKey.GetJsonPropertyName(),
+                                nextPartitionKeyProperty.Name, entityType.DisplayName(), nextPartitionKeyProperty.GetJsonPropertyName()));
                     }
                 }
                 else if (partitionKey != null)

src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitor.cs

@@ -594,7 +594,7 @@ private Expression CreateGetValueExpression(
                     return _projectionBindings[jObjectExpression];
                 }
 
-                var storeName = property.GetPropertyName();
+                var storeName = property.GetJsonPropertyName();
                 if (storeName.Length == 0)
                 {
                     var entityType = property.DeclaringEntityType;

src/EFCore.Cosmos/Query/Internal/KeyAccessExpression.cs

@@ -25,7 +25,7 @@ public class KeyAccessExpression : SqlExpression, IAccessExpression
         public KeyAccessExpression(IProperty property, Expression accessExpression)
             : base(property.ClrType, property.GetTypeMapping())
         {
-            Name = property.GetPropertyName();
+            Name = property.GetJsonPropertyName();
             Property = property;
             AccessExpression = accessExpression;
         }

src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseCreator.cs

@@ -185,7 +185,7 @@ private static string GetPartitionKeyStoreName([NotNull] IEntityType entityType)
             var name = entityType.GetPartitionKeyPropertyName();
             if (name != null)
             {
-                return entityType.FindProperty(name).GetPropertyName();
+                return entityType.FindProperty(name).GetJsonPropertyName();
             }
 
             return CosmosClientWrapper.DefaultPartitionKey;

src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseWrapper.cs

@@ -204,7 +204,7 @@ private bool Save(IUpdateEntry entry)
                     {
                         document = documentSource.CreateDocument(entry);
 
-                        var propertyName = entityType.GetDiscriminatorProperty()?.GetPropertyName();
+                        var propertyName = entityType.GetDiscriminatorProperty()?.GetJsonPropertyName();
                         if (propertyName != null)
                         {
                             document[propertyName] =
@@ -259,7 +259,7 @@ private Task<bool> SaveAsync(IUpdateEntry entry, CancellationToken cancellationT
                     {
                         document = documentSource.CreateDocument(entry);
 
-                        var propertyName = entityType.GetDiscriminatorProperty()?.GetPropertyName();
+                        var propertyName = entityType.GetDiscriminatorProperty()?.GetJsonPropertyName();
                         if (propertyName != null)
                         {
                             document[propertyName] =

src/EFCore.Cosmos/Update/Internal/DocumentSource.cs

@@ -68,7 +68,7 @@ public virtual JObject CreateDocument(IUpdateEntry entry)
             var document = new JObject();
             foreach (var property in entry.EntityType.GetProperties())
             {
-                var storeName = property.GetPropertyName();
+                var storeName = property.GetJsonPropertyName();
                 if (storeName.Length != 0)
                 {
                     document[storeName] = ConvertPropertyValue(property, entry.GetCurrentValue(property));
@@ -130,7 +130,7 @@ public virtual JObject UpdateDocument(JObject document, IUpdateEntry entry)
                 if (entry.EntityState == EntityState.Added
                     || entry.IsModified(property))
                 {
-                    var storeName = property.GetPropertyName();
+                    var storeName = property.GetJsonPropertyName();
                     if (storeName.Length != 0)
                     {
                         document[storeName] = ConvertPropertyValue(property, entry.GetCurrentValue(property));

src/EFCore.Cosmos/ValueGeneration/Internal/CosmosValueGeneratorSelector.cs

@@ -19,7 +19,7 @@ public override ValueGenerator Create(IProperty property, IEntityType entityType
         {
             var type = property.ClrType.UnwrapNullableType().UnwrapEnumType();
 
-            if (property.GetPropertyName() == ""
+            if (property.GetJsonPropertyName() == ""
                 && type == typeof(int))
             {
                 return new TemporaryIntValueGenerator();