diff --git a/Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptionContainer.cs b/Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptionContainer.cs index bdba7677b6..10496f704a 100644 --- a/Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptionContainer.cs +++ b/Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptionContainer.cs @@ -1025,7 +1025,7 @@ public override Task DeleteAllItemsByPartitionKeyStreamAsync( #if SDKPROJECTREF public override ChangeFeedProcessorBuilder GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes( string processorName, - ChangeFeedHandler> onChangesDelegate) + ChangeFeedHandler> onChangesDelegate) { return this.container.GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes( processorName, diff --git a/Microsoft.Azure.Cosmos.Encryption/src/EncryptionContainer.cs b/Microsoft.Azure.Cosmos.Encryption/src/EncryptionContainer.cs index 32df3587bb..64c7dc36a1 100644 --- a/Microsoft.Azure.Cosmos.Encryption/src/EncryptionContainer.cs +++ b/Microsoft.Azure.Cosmos.Encryption/src/EncryptionContainer.cs @@ -758,7 +758,7 @@ public override Task> GetPartitionKeyRangesAsync( #if SDKPROJECTREF public override ChangeFeedProcessorBuilder GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes( string processorName, - ChangeFeedHandler> onChangesDelegate) + ChangeFeedHandler> onChangesDelegate) { throw new NotImplementedException(); } diff --git a/Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/Observers/ChangeFeedObserverFactoryCore.cs b/Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/Observers/ChangeFeedObserverFactoryCore.cs index c71d6f06a2..2154a27856 100644 --- a/Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/Observers/ChangeFeedObserverFactoryCore.cs +++ b/Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/Observers/ChangeFeedObserverFactoryCore.cs @@ -52,7 +52,7 @@ internal sealed class ChangeFeedObserverFactoryCore : ChangeFeedObserverFacto private readonly ChangesHandler legacyOnChanges; private readonly ChangeFeedHandler onChanges; private readonly ChangeFeedHandlerWithManualCheckpoint onChangesWithManualCheckpoint; - private readonly ChangeFeedHandler> onAllVersionsAndDeletesChanges; + private readonly ChangeFeedHandler> onAllVersionsAndDeletesChanges; private readonly CosmosSerializerCore serializerCore; public ChangeFeedObserverFactoryCore( @@ -72,7 +72,7 @@ public ChangeFeedObserverFactoryCore( } public ChangeFeedObserverFactoryCore( - ChangeFeedHandler> onChanges, + ChangeFeedHandler> onChanges, CosmosSerializerCore serializerCore) : this(serializerCore) { @@ -130,7 +130,7 @@ private Task AllVersionsAndDeletesStreamHandlerAsync( Stream stream, CancellationToken cancellationToken) { - IReadOnlyCollection> changes = this.AllVersionsAsIReadOnlyCollection(stream, context); + IReadOnlyCollection> changes = this.AllVersionsAsIReadOnlyCollection(stream, context); if (changes.Count == 0) { return Task.CompletedTask; @@ -156,13 +156,13 @@ private IReadOnlyCollection AsIReadOnlyCollection( } } - private IReadOnlyCollection> AllVersionsAsIReadOnlyCollection( + private IReadOnlyCollection> AllVersionsAsIReadOnlyCollection( Stream stream, ChangeFeedObserverContextCore context) { try { - return CosmosFeedResponseSerializer.FromFeedResponseStream>( + return CosmosFeedResponseSerializer.FromFeedResponseStream>( this.serializerCore, stream); } diff --git a/Microsoft.Azure.Cosmos/src/Resource/Container/Container.cs b/Microsoft.Azure.Cosmos/src/Resource/Container/Container.cs index 2ee396cac6..4aeef068ff 100644 --- a/Microsoft.Azure.Cosmos/src/Resource/Container/Container.cs +++ b/Microsoft.Azure.Cosmos/src/Resource/Container/Container.cs @@ -1697,7 +1697,7 @@ public abstract Task> GetPartitionKeyRangesAsync( /// ManualResetEvent allProcessedDocumentsEvent = new ManualResetEvent(false); /// /// ChangeFeedProcessor changeFeedProcessor = this.Container - /// .GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes(processorName: "processor", onChangesDelegate: (ChangeFeedProcessorContext context, IReadOnlyCollection> documents, CancellationToken token) => + /// .GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes(processorName: "processor", onChangesDelegate: (ChangeFeedProcessorContext context, IReadOnlyCollection> documents, CancellationToken token) => /// { /// Console.WriteLine($"number of documents processed: {documents.Count}"); /// @@ -1705,7 +1705,7 @@ public abstract Task> GetPartitionKeyRangesAsync( /// string pk = default; /// string description = default; /// - /// foreach (ChangeFeedItemChange changeFeedItem in documents) + /// foreach (ChangeFeedItem changeFeedItem in documents) /// { /// if (changeFeedItem.Metadata.OperationType != ChangeFeedOperationType.Delete) /// { @@ -1754,7 +1754,7 @@ public abstract Task> GetPartitionKeyRangesAsync( /// An instance of public abstract ChangeFeedProcessorBuilder GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes( string processorName, - ChangeFeedHandler> onChangesDelegate); + ChangeFeedHandler> onChangesDelegate); #endif } } \ No newline at end of file diff --git a/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerCore.Items.cs b/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerCore.Items.cs index 5e96126c71..0a7c4b2082 100644 --- a/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerCore.Items.cs +++ b/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerCore.Items.cs @@ -1222,7 +1222,7 @@ public Task PatchItemStreamAsync( public override ChangeFeedProcessorBuilder GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes( string processorName, - ChangeFeedHandler> onChangesDelegate) + ChangeFeedHandler> onChangesDelegate) { if (processorName == null) { diff --git a/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerInternal.cs b/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerInternal.cs index 7e980bac56..cedef3f3de 100644 --- a/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerInternal.cs +++ b/Microsoft.Azure.Cosmos/src/Resource/Container/ContainerInternal.cs @@ -150,7 +150,7 @@ public abstract Task> GetPartitionKeyRangesAsync( public abstract ChangeFeedProcessorBuilder GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes( string processorName, - ChangeFeedHandler> onChangesDelegate); + ChangeFeedHandler> onChangesDelegate); #endif public abstract class TryExecuteQueryResult diff --git a/Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedItemChange{T}.cs b/Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedItem.cs similarity index 78% rename from Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedItemChange{T}.cs rename to Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedItem.cs index deb9c7db87..fc0c04ffd0 100644 --- a/Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedItemChange{T}.cs +++ b/Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedItem.cs @@ -23,19 +23,19 @@ namespace Microsoft.Azure.Cosmos /// PartitionKey partitionKey = new PartitionKey(@"learning"); /// ChangeFeedStartFrom changeFeedStartFrom = ChangeFeedStartFrom.Now(FeedRange.FromPartitionKey(partitionKey)); /// - /// using (FeedIterator> feedIterator = container.GetChangeFeedIterator>( + /// using (FeedIterator> feedIterator = container.GetChangeFeedIterator>( /// changeFeedStartFrom: changeFeedStartFrom, /// changeFeedMode: changeFeedMode)) /// { /// while (feedIterator.HasMoreResults) /// { - /// FeedResponse> feedResponse = await feedIterator.ReadNextAsync(); + /// FeedResponse> feedResponse = await feedIterator.ReadNextAsync(); /// /// if (feedResponse.StatusCode != HttpStatusCode.NotModified) /// { - /// IEnumerable> feedResource = feedResponse.Resource; + /// IEnumerable> feedResource = feedResponse.Resource; /// - /// foreach(ChangeFeedItemChanges itemChanges in feedResource) + /// foreach(ChangeFeedItem itemChanges in feedResource) /// { /// ToDoActivity currentToDoActivity = itemChanges.Current; /// ToDoActivity previousToDoActivity = itemChanges.Previous; @@ -47,13 +47,13 @@ namespace Microsoft.Azure.Cosmos /// ]]> /// /// - /// is an optional helper class that uses Newtonsoft serialization libraries. Users are welcome to create their own custom helper class. + /// is an optional helper class that uses Newtonsoft serialization libraries. Users are welcome to create their own custom helper class. #if PREVIEW public #else internal #endif - class ChangeFeedItemChange + class ChangeFeedItem { /// /// The full fidelity change feed current item. diff --git a/Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedMetadata.cs b/Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedMetadata.cs index 81b10461f9..c5bd4642fa 100644 --- a/Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedMetadata.cs +++ b/Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedMetadata.cs @@ -20,7 +20,7 @@ namespace Microsoft.Azure.Cosmos class ChangeFeedMetadata { /// - /// New instance of meta data for created. + /// New instance of meta data for created. /// /// /// diff --git a/Microsoft.Azure.Cosmos/src/Serializer/CosmosSerializerCore.cs b/Microsoft.Azure.Cosmos/src/Serializer/CosmosSerializerCore.cs index 2c4996048c..703b2f2374 100644 --- a/Microsoft.Azure.Cosmos/src/Serializer/CosmosSerializerCore.cs +++ b/Microsoft.Azure.Cosmos/src/Serializer/CosmosSerializerCore.cs @@ -162,7 +162,7 @@ private CosmosSerializer GetSerializer() string directAssemblyName = typeof(Documents.PartitionKeyRange).Assembly.GetName().Name; string inputAssemblyName = inputType.Assembly.GetName().Name; bool inputIsClientOrDirect = string.Equals(inputAssemblyName, clientAssemblyName) || string.Equals(inputAssemblyName, directAssemblyName); - bool typeIsWhiteListed = inputType == typeof(Document) || (inputType.IsGenericType && inputType.GetGenericTypeDefinition() == typeof(ChangeFeedItemChange<>)); + bool typeIsWhiteListed = inputType == typeof(Document) || (inputType.IsGenericType && inputType.GetGenericTypeDefinition() == typeof(ChangeFeedItem<>)); if (!typeIsWhiteListed && inputIsClientOrDirect) { diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/ChangeFeed/GetChangeFeedProcessorBuilderWithAllVersionsAndDeletesTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/ChangeFeed/GetChangeFeedProcessorBuilderWithAllVersionsAndDeletesTests.cs index 33f5d9d0c4..5a31025e71 100644 --- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/ChangeFeed/GetChangeFeedProcessorBuilderWithAllVersionsAndDeletesTests.cs +++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/ChangeFeed/GetChangeFeedProcessorBuilderWithAllVersionsAndDeletesTests.cs @@ -39,13 +39,13 @@ public async Task WhenADocumentIsCreatedThenUpdatedThenDeletedTestsAsync() Exception exception = default; ChangeFeedProcessor processor = monitoredContainer - .GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes(processorName: "processor", onChangesDelegate: (ChangeFeedProcessorContext context, IReadOnlyCollection> docs, CancellationToken token) => + .GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes(processorName: "processor", onChangesDelegate: (ChangeFeedProcessorContext context, IReadOnlyCollection> docs, CancellationToken token) => { string id = default; string pk = default; string description = default; - foreach (ChangeFeedItemChange change in docs) + foreach (ChangeFeedItem change in docs) { if (change.Metadata.OperationType != ChangeFeedOperationType.Delete) { @@ -75,7 +75,7 @@ public async Task WhenADocumentIsCreatedThenUpdatedThenDeletedTestsAsync() Assert.IsTrue(context.Diagnostics.ToString().Contains("Change Feed Processor Read Next Async")); Assert.AreEqual(expected: 3, actual: docs.Count); - ChangeFeedItemChange createChange = docs.ElementAt(0); + ChangeFeedItem createChange = docs.ElementAt(0); Assert.IsNotNull(createChange.Current); Assert.AreEqual(expected: "1", actual: createChange.Current.id.ToString()); Assert.AreEqual(expected: "1", actual: createChange.Current.pk.ToString()); @@ -84,7 +84,7 @@ public async Task WhenADocumentIsCreatedThenUpdatedThenDeletedTestsAsync() Assert.AreEqual(expected: createChange.Metadata.PreviousLsn, actual: 0); Assert.IsNull(createChange.Previous); - ChangeFeedItemChange replaceChange = docs.ElementAt(1); + ChangeFeedItem replaceChange = docs.ElementAt(1); Assert.IsNotNull(replaceChange.Current); Assert.AreEqual(expected: "1", actual: replaceChange.Current.id.ToString()); Assert.AreEqual(expected: "1", actual: replaceChange.Current.pk.ToString()); @@ -93,7 +93,7 @@ public async Task WhenADocumentIsCreatedThenUpdatedThenDeletedTestsAsync() Assert.AreEqual(expected: createChange.Metadata.Lsn, actual: replaceChange.Metadata.PreviousLsn); Assert.IsNull(replaceChange.Previous); - ChangeFeedItemChange deleteChange = docs.ElementAt(2); + ChangeFeedItem deleteChange = docs.ElementAt(2); Assert.IsNull(deleteChange.Current.id); Assert.AreEqual(expected: deleteChange.Metadata.OperationType, actual: ChangeFeedOperationType.Delete); Assert.AreEqual(expected: replaceChange.Metadata.Lsn, actual: deleteChange.Metadata.PreviousLsn); @@ -341,7 +341,7 @@ private static async Task BuildChangeFeedProcessorWithAllVersionsAndDeletesAsync ChangeFeedProcessor allVersionsAndDeletesProcessorAtomic = null; ChangeFeedProcessorBuilder allVersionsAndDeletesProcessorBuilder = monitoredContainer - .GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes(processorName: $"processorName", onChangesDelegate: (ChangeFeedProcessorContext context, IReadOnlyCollection> documents, CancellationToken token) => Task.CompletedTask) + .GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes(processorName: $"processorName", onChangesDelegate: (ChangeFeedProcessorContext context, IReadOnlyCollection> documents, CancellationToken token) => Task.CompletedTask) .WithInstanceName(Guid.NewGuid().ToString()) .WithMaxItems(1) .WithLeaseContainer(leaseContainer) diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/FeedToken/ChangeFeedIteratorCoreTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/FeedToken/ChangeFeedIteratorCoreTests.cs index b8d132e141..a43d86faf5 100644 --- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/FeedToken/ChangeFeedIteratorCoreTests.cs +++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/FeedToken/ChangeFeedIteratorCoreTests.cs @@ -822,7 +822,7 @@ private async Task ValidateChangeFeedIteratorCore_WithQuery( enableQueryOnPreviousImage: true); ContainerCore container = (ContainerCore)response; // FF does not work with StartFromBeginning currently, so we capture an initial continuation. - FeedIterator> fullFidelityIterator = container.GetChangeFeedIteratorWithQuery>( + FeedIterator> fullFidelityIterator = container.GetChangeFeedIteratorWithQuery>( ChangeFeedStartFrom.Now(), ChangeFeedMode.AllVersionsAndDeletes, querySpec, @@ -831,7 +831,7 @@ private async Task ValidateChangeFeedIteratorCore_WithQuery( string initialContinuation = null; while (fullFidelityIterator.HasMoreResults) { - FeedResponse> feedResponse = await fullFidelityIterator.ReadNextAsync(this.cancellationToken); + FeedResponse> feedResponse = await fullFidelityIterator.ReadNextAsync(this.cancellationToken); initialContinuation = feedResponse.ContinuationToken; if (feedResponse.StatusCode == HttpStatusCode.NotModified) @@ -855,7 +855,7 @@ private async Task ValidateChangeFeedIteratorCore_WithQuery( } // Resume Change Feed and verify we pickup the events where documents matches the query - fullFidelityIterator = container.GetChangeFeedIteratorWithQuery>( + fullFidelityIterator = container.GetChangeFeedIteratorWithQuery>( ChangeFeedStartFrom.ContinuationToken(initialContinuation), ChangeFeedMode.AllVersionsAndDeletes, querySpec, @@ -864,9 +864,9 @@ private async Task ValidateChangeFeedIteratorCore_WithQuery( while (fullFidelityIterator.HasMoreResults) { - FeedResponse> feedResponse = await fullFidelityIterator.ReadNextAsync(this.cancellationToken); + FeedResponse> feedResponse = await fullFidelityIterator.ReadNextAsync(this.cancellationToken); - foreach (ChangeFeedItemChange item in feedResponse) + foreach (ChangeFeedItem item in feedResponse) { Assert.AreEqual("id3", item.Current.Id); } @@ -884,7 +884,7 @@ private async Task ValidateChangeFeedIteratorCore_WithQuery( await container.DeleteItemAsync("id2", new Cosmos.PartitionKey("pkey1")); await container.DeleteItemAsync("id3", new Cosmos.PartitionKey("pkey1")); - fullFidelityIterator = container.GetChangeFeedIteratorWithQuery>( + fullFidelityIterator = container.GetChangeFeedIteratorWithQuery>( ChangeFeedStartFrom.ContinuationToken(initialContinuation), ChangeFeedMode.AllVersionsAndDeletes, querySpec, @@ -892,9 +892,9 @@ private async Task ValidateChangeFeedIteratorCore_WithQuery( detectedEvents = 0; while (fullFidelityIterator.HasMoreResults) { - FeedResponse> feedResponse = await fullFidelityIterator.ReadNextAsync(this.cancellationToken); + FeedResponse> feedResponse = await fullFidelityIterator.ReadNextAsync(this.cancellationToken); - foreach (ChangeFeedItemChange item in feedResponse) + foreach (ChangeFeedItem item in feedResponse) { Assert.AreEqual("id3", item.Previous.Id); Assert.AreEqual(ChangeFeedOperationType.Delete, item.Metadata.OperationType); @@ -925,14 +925,14 @@ public async Task ChangeFeedIteratorCore_FeedRange_FromPartitionKey_VerifyingWir ChangeFeedMode changeFeedMode = ChangeFeedMode.AllVersionsAndDeletes; ChangeFeedStartFrom changeFeedStartFrom = ChangeFeedStartFrom.Now(FeedRange.FromPartitionKey(partitionKey)); - using (FeedIterator> feedIterator = container.GetChangeFeedIterator>( + using (FeedIterator> feedIterator = container.GetChangeFeedIterator>( changeFeedStartFrom: changeFeedStartFrom, changeFeedMode: changeFeedMode)) { string continuation = null; while (feedIterator.HasMoreResults) { - FeedResponse> feedResponse = await feedIterator.ReadNextAsync(); + FeedResponse> feedResponse = await feedIterator.ReadNextAsync(); if (feedResponse.StatusCode == HttpStatusCode.NotModified) { @@ -950,20 +950,20 @@ public async Task ChangeFeedIteratorCore_FeedRange_FromPartitionKey_VerifyingWir #if DEBUG Console.WriteLine(JsonConvert.SerializeObject(feedResponse.Resource)); #endif - IEnumerable> itemChanges = feedResponse.Resource; + IEnumerable> itemChanges = feedResponse.Resource; ChangeFeedIteratorCoreTests.AssertGatewayMode(feedResponse); Assert.AreEqual(expected: 2, actual: itemChanges.Count()); - foreach(ChangeFeedItemChange item in itemChanges) + foreach(ChangeFeedItem item in itemChanges) { Item current = item.Current; Item previous = item.Previous; ChangeFeedMetadata metadata = item.Metadata; } - ChangeFeedItemChange createOperation = itemChanges.ElementAtOrDefault(0); + ChangeFeedItem createOperation = itemChanges.ElementAtOrDefault(0); Assert.AreEqual(expected: id, actual: createOperation.Current.Id); Assert.AreEqual(expected: "One Microsoft Way", actual: createOperation.Current.Line1); @@ -977,7 +977,7 @@ public async Task ChangeFeedIteratorCore_FeedRange_FromPartitionKey_VerifyingWir Assert.AreEqual(expected: default, actual: createOperation.Metadata.PreviousLsn); Assert.IsFalse(createOperation.Metadata.IsTimeToLiveExpired); - ChangeFeedItemChange replaceOperation = itemChanges.ElementAtOrDefault(1); + ChangeFeedItem replaceOperation = itemChanges.ElementAtOrDefault(1); Assert.AreEqual(expected: id, actual: replaceOperation.Current.Id); Assert.AreEqual(expected: "205 16th St NW", actual: replaceOperation.Current.Line1); @@ -1010,14 +1010,14 @@ public async Task ChangeFeedIteratorCore_FeedRange_VerifyingWireFormatTests() string id = Guid.NewGuid().ToString(); string otherId = Guid.NewGuid().ToString(); - using (FeedIterator> feedIterator = container.GetChangeFeedIterator>( + using (FeedIterator> feedIterator = container.GetChangeFeedIterator>( changeFeedStartFrom: ChangeFeedStartFrom.Now(), changeFeedMode: ChangeFeedMode.AllVersionsAndDeletes)) { string continuation = null; while (feedIterator.HasMoreResults) { - FeedResponse> feedResponse = await feedIterator.ReadNextAsync(); + FeedResponse> feedResponse = await feedIterator.ReadNextAsync(); if (feedResponse.StatusCode == HttpStatusCode.NotModified) { @@ -1037,13 +1037,13 @@ public async Task ChangeFeedIteratorCore_FeedRange_VerifyingWireFormatTests() #if DEBUG Console.WriteLine(JsonConvert.SerializeObject(feedResponse.Resource)); #endif - List> resources = feedResponse.Resource.ToList(); + List> resources = feedResponse.Resource.ToList(); ChangeFeedIteratorCoreTests.AssertGatewayMode(feedResponse); Assert.AreEqual(expected: 4, actual: resources.Count); - ChangeFeedItemChange firstCreateOperation = resources[0]; + ChangeFeedItem firstCreateOperation = resources[0]; Assert.AreEqual(expected: otherId, actual: firstCreateOperation.Current.Id); Assert.AreEqual(expected: "87 38floor, Witthayu Rd, Lumphini, Pathum Wan District", actual: firstCreateOperation.Current.Line1); @@ -1056,7 +1056,7 @@ public async Task ChangeFeedIteratorCore_FeedRange_VerifyingWireFormatTests() Assert.AreEqual(expected: default, actual: firstCreateOperation.Metadata.PreviousLsn); Assert.IsFalse(firstCreateOperation.Metadata.IsTimeToLiveExpired); - ChangeFeedItemChange createOperation = resources[1]; + ChangeFeedItem createOperation = resources[1]; Assert.AreEqual(expected: id, actual: createOperation.Current.Id); Assert.AreEqual(expected: "One Microsoft Way", actual: createOperation.Current.Line1); @@ -1069,7 +1069,7 @@ public async Task ChangeFeedIteratorCore_FeedRange_VerifyingWireFormatTests() Assert.AreEqual(expected: default, actual: createOperation.Metadata.PreviousLsn); Assert.IsFalse(createOperation.Metadata.IsTimeToLiveExpired); - ChangeFeedItemChange replaceOperation = resources[2]; + ChangeFeedItem replaceOperation = resources[2]; Assert.AreEqual(expected: id, actual: replaceOperation.Current.Id); Assert.AreEqual(expected: "205 16th St NW", actual: replaceOperation.Current.Line1); @@ -1082,7 +1082,7 @@ public async Task ChangeFeedIteratorCore_FeedRange_VerifyingWireFormatTests() Assert.AreNotEqual(notExpected: default, actual: replaceOperation.Metadata.PreviousLsn); Assert.IsFalse(replaceOperation.Metadata.IsTimeToLiveExpired); - ChangeFeedItemChange deleteOperation = resources[3]; + ChangeFeedItem deleteOperation = resources[3]; Assert.IsNull(deleteOperation.Current.Id); Assert.IsNull(deleteOperation.Current.Line1); @@ -1144,14 +1144,14 @@ public async Task ChangeFeedIteratorCore_FeedRange_FromPartitionKey_Dynamic_Veri #if DEBUG Console.WriteLine(JsonConvert.SerializeObject(feedResponse.Resource)); #endif - List> itemChanges = JsonConvert.DeserializeObject>>( + List> itemChanges = JsonConvert.DeserializeObject>>( JsonConvert.SerializeObject(feedResponse.Resource)); ChangeFeedIteratorCoreTests.AssertGatewayMode(feedResponse); Assert.AreEqual(expected: 3, actual: itemChanges.Count); - ChangeFeedItemChange createOperation = itemChanges[0]; + ChangeFeedItem createOperation = itemChanges[0]; Assert.AreEqual(expected: id, actual: createOperation.Current.Id); Assert.AreEqual(expected: "One Microsoft Way", actual: createOperation.Current.Line1); @@ -1165,7 +1165,7 @@ public async Task ChangeFeedIteratorCore_FeedRange_FromPartitionKey_Dynamic_Veri Assert.AreEqual(expected: default, actual: createOperation.Metadata.PreviousLsn); Assert.IsFalse(createOperation.Metadata.IsTimeToLiveExpired); - ChangeFeedItemChange replaceOperation = itemChanges[1]; + ChangeFeedItem replaceOperation = itemChanges[1]; Assert.AreEqual(expected: id, actual: replaceOperation.Current.Id); Assert.AreEqual(expected: "205 16th St NW", actual: replaceOperation.Current.Line1); @@ -1179,7 +1179,7 @@ public async Task ChangeFeedIteratorCore_FeedRange_FromPartitionKey_Dynamic_Veri Assert.AreNotEqual(notExpected: default, actual: replaceOperation.Metadata.PreviousLsn); Assert.IsFalse(replaceOperation.Metadata.IsTimeToLiveExpired); - ChangeFeedItemChange deleteOperation = itemChanges[2]; + ChangeFeedItem deleteOperation = itemChanges[2]; Assert.IsNotNull(deleteOperation.Metadata); Assert.AreEqual(expected: ChangeFeedOperationType.Delete, actual: deleteOperation.Metadata.OperationType); diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetPreviewSDKAPI.json b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetPreviewSDKAPI.json index b19e9c455e..f11e74d42a 100644 --- a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetPreviewSDKAPI.json +++ b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetPreviewSDKAPI.json @@ -1,6 +1,6 @@ { "Subclasses": { - "Microsoft.Azure.Cosmos.ChangeFeedItemChange`1;System.Object;IsAbstract:False;IsSealed:False;IsInterface:False;IsEnum:False;IsClass:True;IsValueType:False;IsNested:False;IsGenericType:True;IsSerializable:False": { + "Microsoft.Azure.Cosmos.ChangeFeedItem`1;System.Object;IsAbstract:False;IsSealed:False;IsInterface:False;IsEnum:False;IsClass:True;IsValueType:False;IsNested:False;IsGenericType:True;IsSerializable:False": { "Subclasses": {}, "Members": { "Microsoft.Azure.Cosmos.ChangeFeedMetadata get_Metadata()[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]": {