Use Worker ObjectSerializer by default for Cosmos

Author: jviau

extensions/Worker.Extensions.CosmosDB/src/Config/CosmosDBExtensionOptions.cs

@@ -13,7 +13,10 @@ public class CosmosDBExtensionOptions
         /// </summary>
         public CosmosClientOptions ClientOptions { get; set; } = new() { ConnectionMode = ConnectionMode.Gateway };
 
-        // TODO: in next major version, ensure this is WorkerOptions.Serializer by default.
+        /// <summary>
+        /// Gets or sets the <see cref="ObjectSerializer" /> to use for Cosmos DB operations.
+        /// Defaults to the worker serializer if left unset.
+        /// </summary>
         public ObjectSerializer? Serializer { get; set; }
     }
 }

extensions/Worker.Extensions.CosmosDB/src/Extensions/FunctionsWorkerApplicationBuilderExtensions.cs

@@ -33,7 +33,8 @@ public static IFunctionsWorkerApplicationBuilder ConfigureCosmosDBExtension(
             builder.Services.AddOptions<CosmosDBExtensionOptions>()
                 .PostConfigure<IOptions<WorkerOptions>>((cosmos, worker) =>
                 {
-                    ObjectSerializer? serializer = cosmos.Serializer ?? worker.Value.Serializer;
+                    cosmos.Serializer ??= worker.Value.Serializer;
+                    ObjectSerializer? serializer = cosmos.Serializer;
                     if (serializer is not null && cosmos.ClientOptions.Serializer is null)
                     {
                         cosmos.ClientOptions.Serializer = new WorkerCosmosSerializer(serializer);
@@ -58,21 +59,5 @@ public static IFunctionsWorkerApplicationBuilder ConfigureCosmosDBExtensionOptio
             builder.Services.Configure(options);
             return builder;
         }
-
-        /// <summary>
-        /// Configures the CosmosDBExtensionOptions for the Functions Worker Cosmos extension.
-        /// </summary>
-        /// <param name="builder">The IFunctionsWorkerApplicationBuilder to add the configuration to.</param>
-        /// <returns>The same instance of the <see cref="IFunctionsWorkerApplicationBuilder"/> for chaining.</returns>
-        public static IFunctionsWorkerApplicationBuilder UseCosmosDBWorkerSerializer(this IFunctionsWorkerApplicationBuilder builder)
-        {
-            builder.Services.AddOptions<CosmosDBExtensionOptions>()
-                .Configure<IOptions<WorkerOptions>>((cosmos, worker) =>
-                {
-                    cosmos.Serializer ??= worker.Value.Serializer;
-                });
-
-            return builder;
-        }
     }
 }