Review updates

Author: ajcvickers

Diff for: src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs

@@ -168,18 +168,36 @@ private static ValueComparer CreateStringDictionaryComparer(
 
     // This ensures that the element reader/writers are not null when using Cosmos dictionary type mappings, but
     // is never actually used because Cosmos does not (yet) read and write JSON using this mechanism.
+    /// <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>
 #pragma warning disable EF1001
-    private sealed class PlaceholderJsonStringKeyedDictionaryReaderWriter<TElement>(JsonValueReaderWriter elementReaderWriter)
+    public sealed class PlaceholderJsonStringKeyedDictionaryReaderWriter<TElement>(JsonValueReaderWriter elementReaderWriter)
         : JsonValueReaderWriter<IEnumerable<KeyValuePair<string, TElement>>>, ICompositeJsonValueReaderWriter
 #pragma warning restore EF1001
     {
         private readonly JsonValueReaderWriter<TElement> _elementReaderWriter = (JsonValueReaderWriter<TElement>)elementReaderWriter;
 
+        /// <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>
         public override IEnumerable<KeyValuePair<string, TElement>> FromJsonTyped(
             ref Utf8JsonReaderManager manager,
             object? existingObject = null)
             => throw new NotImplementedException("JsonValueReaderWriter infrastructure is not supported on Cosmos.");
 
+        /// <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>
         public override void ToJsonTyped(Utf8JsonWriter writer, IEnumerable<KeyValuePair<string, TElement>> value)
             => throw new NotImplementedException("JsonValueReaderWriter infrastructure is not supported on Cosmos.");
 

Diff for: test/EFCore.Cosmos.FunctionalTests/Scaffolding/CompiledModelCosmosTest.cs

@@ -29,6 +29,8 @@ public virtual Task Basic_cosmos_model()
                         eb.HasPartitionKey("PartitionId");
                         eb.HasKey("Id", "PartitionId");
                         eb.ToContainer("DataContainer");
+                        eb.Property<Dictionary<string, string[]>>("Map");
+                        eb.Property<List<Dictionary<string, int>>>("List");
                         eb.UseETagConcurrency();
                         eb.HasNoDiscriminator();
                         eb.Property(d => d.Blob).ToJsonProperty("JsonBlob");
@@ -94,6 +96,38 @@ public virtual Task Basic_cosmos_model()
                 Assert.NotNull(partitionId.GetValueComparer());
                 Assert.NotNull(partitionId.GetKeyValueComparer());
 
+                var map = dataEntity.FindProperty("Map")!;
+                Assert.Equal(typeof(Dictionary<string, string[]>), map.ClrType);
+                Assert.Null(map.PropertyInfo);
+                Assert.Null(map.FieldInfo);
+                Assert.True(map.IsNullable);
+                Assert.False(map.IsConcurrencyToken);
+                Assert.False(map.IsPrimitiveCollection);
+                Assert.Equal(ValueGenerated.Never, map.ValueGenerated);
+                Assert.Equal(PropertySaveBehavior.Save, map.GetAfterSaveBehavior());
+                Assert.Equal(PropertySaveBehavior.Save, map.GetBeforeSaveBehavior());
+                Assert.Equal("Map", CosmosPropertyExtensions.GetJsonPropertyName(map));
+                Assert.Null(map.GetValueGeneratorFactory());
+                Assert.Null(map.GetValueConverter());
+                Assert.NotNull(map.GetValueComparer());
+                Assert.NotNull(map.GetKeyValueComparer());
+
+                var list = dataEntity.FindProperty("List")!;
+                Assert.Equal(typeof(List<Dictionary<string, int>>), list.ClrType);
+                Assert.Null(list.PropertyInfo);
+                Assert.Null(list.FieldInfo);
+                Assert.True(list.IsNullable);
+                Assert.False(list.IsConcurrencyToken);
+                Assert.False(list.IsPrimitiveCollection);
+                Assert.Equal(ValueGenerated.Never, list.ValueGenerated);
+                Assert.Equal(PropertySaveBehavior.Save, list.GetAfterSaveBehavior());
+                Assert.Equal(PropertySaveBehavior.Save, list.GetBeforeSaveBehavior());
+                Assert.Equal("List", CosmosPropertyExtensions.GetJsonPropertyName(list));
+                Assert.Null(list.GetValueGeneratorFactory());
+                Assert.Null(list.GetValueConverter());
+                Assert.NotNull(list.GetValueComparer());
+                Assert.NotNull(list.GetKeyValueComparer());
+
                 var eTag = dataEntity.FindProperty("_etag")!;
                 Assert.Equal(typeof(string), eTag.ClrType);
                 Assert.Null(eTag.PropertyInfo);
@@ -143,7 +177,7 @@ public virtual Task Basic_cosmos_model()
 
                 Assert.Equal(2, dataEntity.GetKeys().Count());
 
-                Assert.Equal([id, partitionId, blob, storeId, jObject, eTag], dataEntity.GetProperties());
+                Assert.Equal([id, partitionId, blob, list, map, storeId, jObject, eTag], dataEntity.GetProperties());
             });
 
     protected override void BuildBigModel(ModelBuilder modelBuilder, bool jsonColumns)