Response type: Fix deadlock on scenarios with SynchronizationContext when using Response.Container

Microsoft.Azure.Cosmos/src/Batch/BatchAsyncContainerExecutor.cs

@@ -30,7 +30,7 @@ internal class BatchAsyncContainerExecutor : IDisposable
         private const int DefaultDispatchTimerInSeconds = 1;
         private const int MinimumDispatchTimerInSeconds = 1;
 
-        private readonly ContainerCore cosmosContainer;
+        private readonly ContainerInternal cosmosContainer;
         private readonly CosmosClientContext cosmosClientContext;
         private readonly int maxServerRequestBodyLength;
         private readonly int maxServerRequestOperationCount;
@@ -49,7 +49,7 @@ internal BatchAsyncContainerExecutor()
         }
 
         public BatchAsyncContainerExecutor(
-            ContainerCore cosmosContainer,
+            ContainerInternal cosmosContainer,
             CosmosClientContext cosmosClientContext,
             int maxServerRequestOperationCount,
             int maxServerRequestBodyLength,

Microsoft.Azure.Cosmos/src/Batch/BatchAsyncContainerExecutorCache.cs

@@ -17,7 +17,7 @@ internal class BatchAsyncContainerExecutorCache : IDisposable
         private ConcurrentDictionary<string, BatchAsyncContainerExecutor> executorsPerContainer = new ConcurrentDictionary<string, BatchAsyncContainerExecutor>();
 
         public BatchAsyncContainerExecutor GetExecutorForContainer(
-            ContainerCore container,
+            ContainerInternal container,
             CosmosClientContext cosmosClientContext)
         {
             if (!cosmosClientContext.ClientOptions.AllowBulkExecution)

Microsoft.Azure.Cosmos/src/Batch/BatchCore.cs

@@ -15,7 +15,7 @@ internal class BatchCore : TransactionalBatch
     {
         private readonly PartitionKey partitionKey;
 
-        private readonly ContainerCore container;
+        private readonly ContainerInternal container;
 
         private List<ItemBatchOperation> operations;
 
@@ -25,7 +25,7 @@ internal class BatchCore : TransactionalBatch
         /// <param name="container">Container that has items on which batch operations are to be performed.</param>
         /// <param name="partitionKey">The partition key for all items in the batch. <see cref="PartitionKey"/>.</param>
         internal BatchCore(
-            ContainerCore container,
+            ContainerInternal container,
             PartitionKey partitionKey)
         {
             this.container = container;

Microsoft.Azure.Cosmos/src/Batch/BatchExecutor.cs

@@ -15,7 +15,7 @@ namespace Microsoft.Azure.Cosmos
 
     internal sealed class BatchExecutor
     {
-        private readonly ContainerCore container;
+        private readonly ContainerInternal container;
 
         private readonly CosmosClientContext clientContext;
 
@@ -28,7 +28,7 @@ internal sealed class BatchExecutor
         private readonly CosmosDiagnosticsContext diagnosticsContext;
 
         public BatchExecutor(
-            ContainerCore container,
+            ContainerInternal container,
             PartitionKey partitionKey,
             IReadOnlyList<ItemBatchOperation> operations,
             RequestOptions batchOptions,

Microsoft.Azure.Cosmos/src/Batch/ItemBatchOperation.cs

@@ -46,14 +46,14 @@ public ItemBatchOperation(
         public ItemBatchOperation(
             OperationType operationType,
             int operationIndex,
-            ContainerCore containerCore,
+            ContainerInternal containerCore,
             string id = null,
             Stream resourceStream = null,
             TransactionalBatchItemRequestOptions requestOptions = null)
         {
             this.OperationType = operationType;
             this.OperationIndex = operationIndex;
-            this.ContainerCore = containerCore;
+            this.ContainerInternal = containerCore;
             this.Id = id;
             this.ResourceStream = resourceStream;
             this.RequestOptions = requestOptions;
@@ -72,7 +72,7 @@ public ItemBatchOperation(
 
         public int OperationIndex { get; internal set; }
 
-        internal ContainerCore ContainerCore { get; }
+        internal ContainerInternal ContainerInternal { get; }
 
         internal CosmosDiagnosticsContext DiagnosticsContext { get; set; }
 
@@ -321,12 +321,12 @@ internal virtual async Task EncryptAndMaterializeResourceAsync(CosmosSerializerC
             if (this.body.IsEmpty && this.ResourceStream != null)
             {
                 Stream stream = this.ResourceStream;
-                if (this.ContainerCore != null && this.RequestOptions?.EncryptionOptions != null)
+                if (this.ContainerInternal != null && this.RequestOptions?.EncryptionOptions != null)
                 {
-                    stream = await this.ContainerCore.ClientContext.EncryptItemAsync(
+                    stream = await this.ContainerInternal.ClientContext.EncryptItemAsync(
                         stream,
                         this.RequestOptions.EncryptionOptions,
-                        (DatabaseCore)this.ContainerCore.Database,
+                        (DatabaseInternal)this.ContainerInternal.Database,
                         this.DiagnosticsContext,
                         cancellationToken);
                 }
@@ -387,7 +387,7 @@ public ItemBatchOperation(
             OperationType operationType,
             int operationIndex,
             T resource,
-            ContainerCore containerCore,
+            ContainerInternal containerCore,
             string id = null,
             TransactionalBatchItemRequestOptions requestOptions = null)
             : base(operationType, operationIndex, containerCore: containerCore, id: id, requestOptions: requestOptions)

Microsoft.Azure.Cosmos/src/Batch/TransactionalBatchResponse.cs

@@ -314,11 +314,11 @@ internal static async Task<TransactionalBatchResponse> FromResponseMessageAsync(
                 {
                     for (int index = 0; index < serverRequest.Operations.Count; index++)
                     {
-                        ContainerCore containerCore = serverRequest.Operations[index].ContainerCore;
+                        ContainerInternal containerCore = serverRequest.Operations[index].ContainerInternal;
                         TransactionalBatchOperationResult result = response.results[index];
                         result.ResourceStream = await containerCore.ClientContext.DecryptItemAsync(
                             result.ResourceStream,
-                            (DatabaseCore)containerCore.Database,
+                            (DatabaseInternal)containerCore.Database,
                             responseMessage.DiagnosticsContext,
                             cancellationToken);
                     }

Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/Bootstrapping/PartitionSynchronizerCore.cs

@@ -23,14 +23,14 @@ internal sealed class PartitionSynchronizerCore : PartitionSynchronizer
         internal static int DefaultDegreeOfParallelism = 25;
 #pragma warning restore SA1401 // Fields should be private
 
-        private readonly ContainerCore container;
+        private readonly ContainerInternal container;
         private readonly DocumentServiceLeaseContainer leaseContainer;
         private readonly DocumentServiceLeaseManager leaseManager;
         private readonly int degreeOfParallelism;
         private readonly int maxBatchSize;
 
         public PartitionSynchronizerCore(
-            ContainerCore container,
+            ContainerInternal container,
             DocumentServiceLeaseContainer leaseContainer,
             DocumentServiceLeaseManager leaseManager,
             int degreeOfParallelism,

Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/ChangeFeedEstimatorCore.cs

@@ -21,10 +21,10 @@ internal sealed class ChangeFeedEstimatorCore : ChangeFeedProcessor
 
         private readonly ChangesEstimationHandler initialEstimateDelegate;
         private CancellationTokenSource shutdownCts;
-        private ContainerCore leaseContainer;
+        private ContainerInternal leaseContainer;
         private string monitoredContainerRid;
         private TimeSpan? estimatorPeriod = null;
-        private ContainerCore monitoredContainer;
+        private ContainerInternal monitoredContainer;
         private DocumentServiceLeaseStoreManager documentServiceLeaseStoreManager;
         private FeedEstimator feedEstimator;
         private RemainingWorkEstimator remainingWorkEstimator;
@@ -55,12 +55,12 @@ internal ChangeFeedEstimatorCore(
 
         public void ApplyBuildConfiguration(
             DocumentServiceLeaseStoreManager customDocumentServiceLeaseStoreManager,
-            ContainerCore leaseContainer,
+            ContainerInternal leaseContainer,
             string monitoredContainerRid,
             string instanceName,
             ChangeFeedLeaseOptions changeFeedLeaseOptions,
             ChangeFeedProcessorOptions changeFeedProcessorOptions,
-            ContainerCore monitoredContainer)
+            ContainerInternal monitoredContainer)
         {
             if (monitoredContainer == null) throw new ArgumentNullException(nameof(monitoredContainer));
             if (leaseContainer == null && customDocumentServiceLeaseStoreManager == null) throw new ArgumentNullException(nameof(leaseContainer));

Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/ChangeFeedProcessorBuilder.cs

@@ -15,36 +15,36 @@ public class ChangeFeedProcessorBuilder
     {
         private const string InMemoryDefaultHostName = "InMemory";
 
-        private readonly ContainerCore monitoredContainer;
+        private readonly ContainerInternal monitoredContainer;
         private readonly ChangeFeedProcessor changeFeedProcessor;
         private readonly ChangeFeedLeaseOptions changeFeedLeaseOptions;
         private readonly Action<DocumentServiceLeaseStoreManager,
-                ContainerCore,
+                ContainerInternal,
                 string,
                 string,
                 ChangeFeedLeaseOptions,
                 ChangeFeedProcessorOptions,
-                ContainerCore> applyBuilderConfiguration;
+                ContainerInternal> applyBuilderConfiguration;
 
         private ChangeFeedProcessorOptions changeFeedProcessorOptions;
 
-        private ContainerCore leaseContainer;
+        private ContainerInternal leaseContainer;
         private string InstanceName;
         private DocumentServiceLeaseStoreManager LeaseStoreManager;
         private string monitoredContainerRid;
         private bool isBuilt;
 
         internal ChangeFeedProcessorBuilder(
             string processorName,
-            ContainerCore container,
+            ContainerInternal container,
             ChangeFeedProcessor changeFeedProcessor,
             Action<DocumentServiceLeaseStoreManager,
-                ContainerCore,
+                ContainerInternal,
                 string,
                 string,
                 ChangeFeedLeaseOptions,
                 ChangeFeedProcessorOptions,
-                ContainerCore> applyBuilderConfiguration)
+                ContainerInternal> applyBuilderConfiguration)
         {
             this.changeFeedLeaseOptions = new ChangeFeedLeaseOptions();
             this.changeFeedLeaseOptions.LeasePrefix = processorName;
@@ -162,7 +162,7 @@ public ChangeFeedProcessorBuilder WithLeaseContainer(Container leaseContainer)
             if (this.leaseContainer != null) throw new InvalidOperationException("The builder already defined a lease container.");
             if (this.LeaseStoreManager != null) throw new InvalidOperationException("The builder already defined an in-memory lease container instance.");
 
-            this.leaseContainer = (ContainerInlineCore)leaseContainer;
+            this.leaseContainer = (ContainerInternal)leaseContainer;
             return this;
         }
 

Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/ChangeFeedProcessorCore.cs

@@ -18,10 +18,10 @@ namespace Microsoft.Azure.Cosmos.ChangeFeed
     internal sealed class ChangeFeedProcessorCore<T> : ChangeFeedProcessor
     {
         private readonly ChangeFeedObserverFactory<T> observerFactory;
-        private ContainerCore leaseContainer;
+        private ContainerInternal leaseContainer;
         private string monitoredContainerRid;
         private string instanceName;
-        private ContainerCore monitoredContainer;
+        private ContainerInternal monitoredContainer;
         private PartitionManager partitionManager;
         private ChangeFeedLeaseOptions changeFeedLeaseOptions;
         private ChangeFeedProcessorOptions changeFeedProcessorOptions;
@@ -37,12 +37,12 @@ public ChangeFeedProcessorCore(ChangeFeedObserverFactory<T> observerFactory)
 
         public void ApplyBuildConfiguration(
             DocumentServiceLeaseStoreManager customDocumentServiceLeaseStoreManager,
-            ContainerCore leaseContainer,
+            ContainerInternal leaseContainer,
             string monitoredContainerRid,
             string instanceName,
             ChangeFeedLeaseOptions changeFeedLeaseOptions,
             ChangeFeedProcessorOptions changeFeedProcessorOptions,
-            ContainerCore monitoredContainer)
+            ContainerInternal monitoredContainer)
         {
             if (monitoredContainer == null) throw new ArgumentNullException(nameof(monitoredContainer));
             if (customDocumentServiceLeaseStoreManager == null && leaseContainer == null) throw new ArgumentNullException(nameof(leaseContainer));
@@ -87,7 +87,7 @@ private async Task InitializeAsync()
 
         internal static async Task<DocumentServiceLeaseStoreManager> InitializeLeaseStoreManagerAsync(
             DocumentServiceLeaseStoreManager documentServiceLeaseStoreManager,
-            ContainerCore leaseContainer,
+            ContainerInternal leaseContainer,
             string leaseContainerPrefix,
             string instanceName)
         {

Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/FeedProcessing/FeedProcessorFactoryCore.cs

@@ -13,13 +13,13 @@ namespace Microsoft.Azure.Cosmos.ChangeFeed.FeedProcessing
 
     internal class FeedProcessorFactoryCore<T> : FeedProcessorFactory<T>
     {
-        private readonly ContainerCore container;
+        private readonly ContainerInternal container;
         private readonly ChangeFeedProcessorOptions changeFeedProcessorOptions;
         private readonly DocumentServiceLeaseCheckpointer leaseCheckpointer;
         private readonly CosmosSerializerCore serializerCore;
 
         public FeedProcessorFactoryCore(
-            ContainerCore container,
+            ContainerInternal container,
             ChangeFeedProcessorOptions changeFeedProcessorOptions,
             DocumentServiceLeaseCheckpointer leaseCheckpointer,
             CosmosSerializerCore serializerCore)

Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/Utils/CosmosContainerExtensions.cs

@@ -103,8 +103,8 @@ public static async Task<string> GetMonitoredContainerRidAsync(
                 return suggestedMonitoredRid;
             }
 
-            string containerRid = await ((ContainerCore)monitoredContainer).GetRIDAsync(cancellationToken);
-            string databaseRid = await ((DatabaseCore)((ContainerCore)monitoredContainer).Database).GetRIDAsync(cancellationToken);
+            string containerRid = await ((ContainerInternal)monitoredContainer).GetRIDAsync(cancellationToken);
+            string databaseRid = await ((DatabaseInternal)((ContainerInternal)monitoredContainer).Database).GetRIDAsync(cancellationToken);
             return $"{databaseRid}_{containerRid}";
         }
 
@@ -118,7 +118,7 @@ public static string GetLeasePrefix(
                 CultureInfo.InvariantCulture,
                 "{0}{1}_{2}",
                 optionsPrefix,
-                ((ContainerCore)monitoredContainer).ClientContext.Client.Endpoint.Host,
+                ((ContainerInternal)monitoredContainer).ClientContext.Client.Endpoint.Host,
                 monitoredContainerRid);
         }
     }

Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/Utils/ResultSetIteratorUtils.cs

@@ -12,7 +12,7 @@ public static ChangeFeedPartitionKeyResultSetIteratorCore BuildResultSetIterator
             string partitionKeyRangeId,
             string continuationToken,
             int? maxItemCount,
-            ContainerCore container,
+            ContainerInternal container,
             DateTime? startTime,
             bool startFromBeginning)
         {

Microsoft.Azure.Cosmos/src/CosmosClient.cs

@@ -309,7 +309,7 @@ public virtual Task<AccountProperties> ReadAccountAsync()
         /// <returns>Cosmos database proxy</returns>
         public virtual Database GetDatabase(string id)
         {
-            return new DatabaseInlineCore(new DatabaseCore(this.ClientContext, id));
+            return new DatabaseInlineCore(this.ClientContext, id);
         }
 
         /// <summary>

Microsoft.Azure.Cosmos/src/FeedRange/Continuations/FeedRangeCompositeContinuation.cs

@@ -172,7 +172,7 @@ public override Documents.ShouldRetryResult HandleChangeFeedNotModified(Response
         }
 
         public override async Task<Documents.ShouldRetryResult> HandleSplitAsync(
-            ContainerCore containerCore,
+            ContainerInternal containerCore,
             ResponseMessage responseMessage,
             CancellationToken cancellationToken)
         {

Microsoft.Azure.Cosmos/src/FeedRange/FeedRangeContinuation.cs

@@ -61,7 +61,7 @@ public static bool TryParse(
         public abstract Documents.ShouldRetryResult HandleChangeFeedNotModified(ResponseMessage responseMessage);
 
         public abstract Task<Documents.ShouldRetryResult> HandleSplitAsync(
-            ContainerCore containerCore,
+            ContainerInternal containerCore,
             ResponseMessage responseMessage,
             CancellationToken cancellationToken);
     }

Microsoft.Azure.Cosmos/src/FeedRangeIteratorCore.cs

@@ -21,14 +21,14 @@ internal sealed class FeedRangeIteratorCore : FeedIteratorInternal
     {
         internal readonly FeedRangeInternal FeedRangeInternal;
         internal FeedRangeContinuation FeedRangeContinuation { get; private set; }
-        private readonly ContainerCore containerCore;
+        private readonly ContainerInternal containerCore;
         private readonly CosmosClientContext clientContext;
         private readonly QueryRequestOptions queryRequestOptions;
         private readonly AsyncLazy<TryCatch<string>> lazyContainerRid;
         private bool hasMoreResultsInternal;
 
         public static FeedRangeIteratorCore Create(
-            ContainerCore containerCore,
+            ContainerInternal containerCore,
             FeedRangeInternal feedRangeInternal,
             string continuation,
             QueryRequestOptions options)
@@ -65,7 +65,7 @@ public static FeedRangeIteratorCore Create(
         /// For unit tests
         /// </summary>
         internal FeedRangeIteratorCore(
-            ContainerCore containerCore,
+            ContainerInternal containerCore,
             FeedRangeContinuation feedRangeContinuation,
             QueryRequestOptions options)
             : this(containerCore, feedRangeContinuation.FeedRange, options)
@@ -74,7 +74,7 @@ internal FeedRangeIteratorCore(
         }
 
         private FeedRangeIteratorCore(
-            ContainerCore containerCore,
+            ContainerInternal containerCore,
             FeedRangeInternal feedRangeInternal,
             QueryRequestOptions options)
             : this(containerCore, options)
@@ -83,7 +83,7 @@ private FeedRangeIteratorCore(
         }
 
         private FeedRangeIteratorCore(
-            ContainerCore containerCore,
+            ContainerInternal containerCore,
             QueryRequestOptions options)
         {
             this.containerCore = containerCore ?? throw new ArgumentNullException(nameof(containerCore));

Microsoft.Azure.Cosmos/src/Handler/RequestInvokerHandler.cs

@@ -65,7 +65,7 @@ public virtual async Task<T> SendAsync<T>(
             ResourceType resourceType,
             OperationType operationType,
             RequestOptions requestOptions,
-            ContainerCore cosmosContainerCore,
+            ContainerInternal cosmosContainerCore,
             Cosmos.PartitionKey? partitionKey,
             Stream streamPayload,
             Action<RequestMessage> requestEnricher,
@@ -98,7 +98,7 @@ public virtual async Task<ResponseMessage> SendAsync(
             ResourceType resourceType,
             OperationType operationType,
             RequestOptions requestOptions,
-            ContainerCore cosmosContainerCore,
+            ContainerInternal cosmosContainerCore,
             Cosmos.PartitionKey? partitionKey,
             Stream streamPayload,
             Action<RequestMessage> requestEnricher,