renamed Update2 to UpdateDefinition.

craiggwilson · Mar 3, 2015 · 4d5f7e9 · 4d5f7e9
1 parent 61f5225
commit 4d5f7e9
Show file tree

Hide file tree

Showing 13 changed files with 193 additions and 193 deletions.
diff --git a/src/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs b/src/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs
@@ -250,7 +250,7 @@ public void FindOneAndUpdateAsync_with_an_expression_should_call_collection_with
 
             subject.Received().FindOneAndUpdateAsync<Person>(
                 Arg.Any<ExpressionFilterDefinition<Person>>(),
-                Arg.Is<BsonDocumentUpdate<Person>>(x => x.Document == update),
+                Arg.Is<BsonDocumentUpdateDefinition<Person>>(x => x.Document == update),
                 null,
                 default(CancellationToken));
         }
@@ -265,7 +265,7 @@ public void FindOneAndUpdateAsync_with_an_expression_and_result_options_should_c
 
             subject.Received().FindOneAndUpdateAsync<BsonDocument>(
                 Arg.Any<ExpressionFilterDefinition<Person>>(),
-                Arg.Is<BsonDocumentUpdate<Person>>(x => x.Document == update),
+                Arg.Is<BsonDocumentUpdateDefinition<Person>>(x => x.Document == update),
                 options,
                 default(CancellationToken));
         }
@@ -290,7 +290,7 @@ public void UpdateManyAsync_with_an_expression_should_call_collection_with_the_c
 
             subject.Received().UpdateManyAsync(
                 Arg.Any<ExpressionFilterDefinition<Person>>(),
-                Arg.Is<BsonDocumentUpdate<Person>>(x => x.Document == update),
+                Arg.Is<BsonDocumentUpdateDefinition<Person>>(x => x.Document == update),
                 null,
                 default(CancellationToken));
         }
@@ -304,7 +304,7 @@ public void UpdateOneAsync_with_an_expression_should_call_collection_with_the_co
 
             subject.Received().UpdateOneAsync(
                 Arg.Any<ExpressionFilterDefinition<Person>>(),
-                Arg.Is<BsonDocumentUpdate<Person>>(x => x.Document == update),
+                Arg.Is<BsonDocumentUpdateDefinition<Person>>(x => x.Document == update),
                 null,
                 default(CancellationToken));
         }

diff --git a/src/MongoDB.Driver.Tests/Update2BuilderTests.cs b/src/MongoDB.Driver.Tests/Update2BuilderTests.cs
@@ -514,15 +514,15 @@ public void Unset_Typed()
             Assert(subject.Unset("Age"), "{$unset: {Age: 1}}");
         }
 
-        private void Assert<TDocument>(Update2<TDocument> update, BsonDocument expected)
+        private void Assert<TDocument>(UpdateDefinition<TDocument> update, BsonDocument expected)
         {
             var documentSerializer = BsonSerializer.SerializerRegistry.GetSerializer<TDocument>();
             var renderedUpdate = update.Render(documentSerializer, BsonSerializer.SerializerRegistry);
 
             renderedUpdate.Should().Be(expected);
         }
 
-        private void Assert<TDocument>(Update2<TDocument> update, string expected)
+        private void Assert<TDocument>(UpdateDefinition<TDocument> update, string expected)
         {
             Assert(update, BsonDocument.Parse(expected));
         }

diff --git a/src/MongoDB.Driver.Tests/WriteModelTests.cs b/src/MongoDB.Driver.Tests/WriteModelTests.cs
@@ -123,7 +123,7 @@ public void Should_convert_from_UpdateRequest_to_UpdateMany(bool isUpsert)
             result.Should().BeOfType<UpdateManyModel<BsonDocument>>();
             var model = (UpdateManyModel<BsonDocument>)result;
             ((BsonDocumentFilterDefinition<BsonDocument>)model.Filter).Document.Should().BeSameAs(filter);
-            ((BsonDocumentUpdate<BsonDocument>)model.Update).Document.Should().BeSameAs(update);
+            ((BsonDocumentUpdateDefinition<BsonDocument>)model.Update).Document.Should().BeSameAs(update);
             model.IsUpsert.Should().Be(isUpsert);
         }
 

diff --git a/src/MongoDB.Driver/IMongoCollection.cs b/src/MongoDB.Driver/IMongoCollection.cs
@@ -99,7 +99,7 @@ public interface IMongoCollection<TDocument> : IReadOnlyMongoCollection<TDocumen
         /// <returns>
         /// The returned document.
         /// </returns>
-        Task<TResult> FindOneAndUpdateAsync<TResult>(FilterDefinition<TDocument> filter, Update2<TDocument> update, FindOneAndUpdateOptions<TDocument, TResult> options = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<TResult> FindOneAndUpdateAsync<TResult>(FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TResult> options = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Inserts a single document.
@@ -145,7 +145,7 @@ public interface IMongoCollection<TDocument> : IReadOnlyMongoCollection<TDocumen
         /// <returns>
         /// The result of the update operation.
         /// </returns>
-        Task<UpdateResult> UpdateManyAsync(FilterDefinition<TDocument> filter, Update2<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<UpdateResult> UpdateManyAsync(FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Updates a single document.
@@ -157,7 +157,7 @@ public interface IMongoCollection<TDocument> : IReadOnlyMongoCollection<TDocumen
         /// <returns>
         /// The result of the update operation.
         /// </returns>
-        Task<UpdateResult> UpdateOneAsync(FilterDefinition<TDocument> filter, Update2<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<UpdateResult> UpdateOneAsync(FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Returns a new collection with a different read preference.

diff --git a/src/MongoDB.Driver/IMongoCollectionExtensions.cs b/src/MongoDB.Driver/IMongoCollectionExtensions.cs
@@ -229,7 +229,7 @@ public static Task<TDocument> FindOneAndReplaceAsync<TDocument>(this IMongoColle
         /// <returns>
         /// The returned document.
         /// </returns>
-        public static Task<TDocument> FindOneAndUpdateAsync<TDocument>(this IMongoCollection<TDocument> collection, FilterDefinition<TDocument> filter, Update2<TDocument> update, FindOneAndUpdateOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TDocument> FindOneAndUpdateAsync<TDocument>(this IMongoCollection<TDocument> collection, FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, "collection");
             Ensure.IsNotNull(collection, "filter");
@@ -253,7 +253,7 @@ public static Task<TDocument> FindOneAndUpdateAsync<TDocument>(this IMongoCollec
         /// <returns>
         /// The returned document.
         /// </returns>
-        public static Task<TDocument> FindOneAndUpdateAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, Update2<TDocument> update, FindOneAndUpdateOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TDocument> FindOneAndUpdateAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, "collection");
             Ensure.IsNotNull(collection, "filter");
@@ -278,7 +278,7 @@ public static Task<TDocument> FindOneAndUpdateAsync<TDocument>(this IMongoCollec
         /// <returns>
         /// The returned document.
         /// </returns>
-        public static Task<TResult> FindOneAndUpdateAsync<TDocument, TResult>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, Update2<TDocument> update, FindOneAndUpdateOptions<TDocument, TResult> options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TResult> FindOneAndUpdateAsync<TDocument, TResult>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TResult> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, "collection");
             Ensure.IsNotNull(filter, "filter");
@@ -318,7 +318,7 @@ public static Task<ReplaceOneResult> ReplaceOneAsync<TDocument>(this IMongoColle
         /// <returns>
         /// The result of the update operation.
         /// </returns>
-        public static Task<UpdateResult> UpdateManyAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, Update2<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<UpdateResult> UpdateManyAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, UpdateDefinition<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, "collection");
             Ensure.IsNotNull(filter, "filter");
@@ -338,7 +338,7 @@ public static Task<UpdateResult> UpdateManyAsync<TDocument>(this IMongoCollectio
         /// <returns>
         /// The result of the update operation.
         /// </returns>
-        public static Task<UpdateResult> UpdateOneAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, Update2<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<UpdateResult> UpdateOneAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, UpdateDefinition<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, "collection");
             Ensure.IsNotNull(filter, "filter");

diff --git a/src/MongoDB.Driver/MongoCollectionBase.cs b/src/MongoDB.Driver/MongoCollectionBase.cs
@@ -76,7 +76,7 @@ public virtual async Task<DeleteResult> DeleteOneAsync(FilterDefinition<TDocumen
         public abstract Task<TResult> FindOneAndReplaceAsync<TResult>(FilterDefinition<TDocument> filter, TDocument replacement, FindOneAndReplaceOptions<TDocument, TResult> options = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <inheritdoc />
-        public abstract Task<TResult> FindOneAndUpdateAsync<TResult>(FilterDefinition<TDocument> filter, Update2<TDocument> update, FindOneAndUpdateOptions<TDocument, TResult> options = null, CancellationToken cancellationToken = default(CancellationToken));
+        public abstract Task<TResult> FindOneAndUpdateAsync<TResult>(FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TResult> options = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <inheritdoc />
         public virtual async Task InsertOneAsync(TDocument document, CancellationToken cancellationToken = default(CancellationToken))
@@ -128,7 +128,7 @@ public virtual async Task<ReplaceOneResult> ReplaceOneAsync(FilterDefinition<TDo
         }
 
         /// <inheritdoc />
-        public virtual async Task<UpdateResult> UpdateManyAsync(FilterDefinition<TDocument> filter, Update2<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<UpdateResult> UpdateManyAsync(FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(filter, "filter");
             Ensure.IsNotNull(update, "update");
@@ -151,7 +151,7 @@ public virtual async Task<UpdateResult> UpdateManyAsync(FilterDefinition<TDocume
         }
 
         /// <inheritdoc />
-        public virtual async Task<UpdateResult> UpdateOneAsync(FilterDefinition<TDocument> filter, Update2<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task<UpdateResult> UpdateOneAsync(FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, UpdateOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(filter, "filter");
             Ensure.IsNotNull(update, "update");

diff --git a/src/MongoDB.Driver/MongoCollectionImpl.cs b/src/MongoDB.Driver/MongoCollectionImpl.cs
@@ -277,7 +277,7 @@ public override Task<TResult> FindOneAndReplaceAsync<TResult>(FilterDefinition<T
             return ExecuteWriteOperation(operation, cancellationToken);
         }
 
-        public override Task<TResult> FindOneAndUpdateAsync<TResult>(FilterDefinition<TDocument> filter, Update2<TDocument> update, FindOneAndUpdateOptions<TDocument, TResult> options, CancellationToken cancellationToken)
+        public override Task<TResult> FindOneAndUpdateAsync<TResult>(FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TResult> options, CancellationToken cancellationToken)
         {
             Ensure.IsNotNull(filter, "filter");
             Ensure.IsNotNull(update, "update");

diff --git a/src/MongoDB.Driver/MongoDB.Driver.csproj b/src/MongoDB.Driver/MongoDB.Driver.csproj
@@ -132,7 +132,7 @@
     <Compile Include="MongoIndexManagerBase.cs" />
     <Compile Include="FindFluentBase.cs" />
     <Compile Include="Command.cs" />
-    <Compile Include="Update2Builder.cs" />
+    <Compile Include="UpdateDefinitionBuilder.cs" />
     <Compile Include="ReadOnlyMongoCollectionBase.cs" />
     <Compile Include="RenameCollectionOptions.cs" />
     <Compile Include="CreateCollectionOptions.cs" />
@@ -154,7 +154,7 @@
     <Compile Include="ProjectionDefinition.cs" />
     <Compile Include="FieldName.cs" />
     <Compile Include="SortDefinition.cs" />
-    <Compile Include="Update2.cs" />
+    <Compile Include="UpdateDefinition.cs" />
     <Compile Include="UpdateOptions.cs" />
     <Compile Include="UpdateOneModel.cs" />
     <Compile Include="UpdateManyModel.cs" />

diff --git a/src/MongoDB.Driver/Update2.cs → src/MongoDB.Driver/UpdateDefinition.cs b/src/MongoDB.Driver/Update2.cs → src/MongoDB.Driver/UpdateDefinition.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Driver
     /// Base class for updates.
     /// </summary>
     /// <typeparam name="TDocument">The type of the document.</typeparam>
-    public abstract class Update2<TDocument>
+    public abstract class UpdateDefinition<TDocument>
     {
         /// <summary>
         /// Renders the update to a <see cref="BsonDocument"/>.
@@ -35,36 +35,36 @@ public abstract class Update2<TDocument>
         public abstract BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry);
 
         /// <summary>
-        /// Performs an implicit conversion from <see cref="BsonDocument"/> to <see cref="Update2{TDocument}"/>.
+        /// Performs an implicit conversion from <see cref="BsonDocument"/> to <see cref="UpdateDefinition{TDocument}"/>.
         /// </summary>
         /// <param name="document">The document.</param>
         /// <returns>
         /// The result of the conversion.
         /// </returns>
-        public static implicit operator Update2<TDocument>(BsonDocument document)
+        public static implicit operator UpdateDefinition<TDocument>(BsonDocument document)
         {
             if (document == null)
             {
                 return null;
             }
 
-            return new BsonDocumentUpdate<TDocument>(document);
+            return new BsonDocumentUpdateDefinition<TDocument>(document);
         }
 
         /// <summary>
-        /// Performs an implicit conversion from <see cref="System.String"/> to <see cref="Update2{TDocument}"/>.
+        /// Performs an implicit conversion from <see cref="System.String"/> to <see cref="UpdateDefinition{TDocument}"/>.
         /// </summary>
         /// <param name="json">The JSON string.</param>
         /// <returns>
         /// The result of the conversion.
         /// </returns>
-        public static implicit operator Update2<TDocument>(string json)
+        public static implicit operator UpdateDefinition<TDocument>(string json)
         {
             if (json == null)
             {
                 return null;
             }
-            return new JsonUpdate<TDocument>(json);
+            return new JsonUpdateDefinition<TDocument>(json);
         }
 
         /// <summary>
@@ -75,25 +75,25 @@ public abstract class Update2<TDocument>
         /// <returns>
         /// The result of the operator.
         /// </returns>
-        public static Update2<TDocument> operator +(Update2<TDocument> lhs, Update2<TDocument> rhs)
+        public static UpdateDefinition<TDocument> operator +(UpdateDefinition<TDocument> lhs, UpdateDefinition<TDocument> rhs)
         {
-            return new CombinedUpdate<TDocument>(new[] { lhs, rhs });
+            return new CombinedUpdateDefinition<TDocument>(new[] { lhs, rhs });
         }
     }
 
     /// <summary>
     /// A <see cref="BsonDocument"/> based update.
     /// </summary>
     /// <typeparam name="TDocument">The type of the document.</typeparam>
-    public sealed class BsonDocumentUpdate<TDocument> : Update2<TDocument>
+    public sealed class BsonDocumentUpdateDefinition<TDocument> : UpdateDefinition<TDocument>
     {
         private readonly BsonDocument _document;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="BsonDocumentUpdate{TDocument}"/> class.
+        /// Initializes a new instance of the <see cref="BsonDocumentUpdateDefinition{TDocument}"/> class.
         /// </summary>
         /// <param name="document">The document.</param>
-        public BsonDocumentUpdate(BsonDocument document)
+        public BsonDocumentUpdateDefinition(BsonDocument document)
         {
             _document = Ensure.IsNotNull(document, "document");
         }
@@ -117,15 +117,15 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
     /// A JSON <see cref="String" /> based update.
     /// </summary>
     /// <typeparam name="TDocument">The type of the document.</typeparam>
-    public sealed class JsonUpdate<TDocument> : Update2<TDocument>
+    public sealed class JsonUpdateDefinition<TDocument> : UpdateDefinition<TDocument>
     {
         private readonly string _json;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="JsonUpdate{TDocument}"/> class.
+        /// Initializes a new instance of the <see cref="JsonUpdateDefinition{TDocument}"/> class.
         /// </summary>
         /// <param name="json">The json.</param>
-        public JsonUpdate(string json)
+        public JsonUpdateDefinition(string json)
         {
             _json = Ensure.IsNotNullOrEmpty(json, "json");
         }
@@ -149,15 +149,15 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
     /// An <see cref="Object" /> based update.
     /// </summary>
     /// <typeparam name="TDocument">The type of the document.</typeparam>
-    public sealed class ObjectUpdate<TDocument> : Update2<TDocument>
+    public sealed class ObjectUpdateDefinition<TDocument> : UpdateDefinition<TDocument>
     {
         private readonly object _obj;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ObjectUpdate{TDocument}"/> class.
+        /// Initializes a new instance of the <see cref="ObjectUpdateDefinition{TDocument}"/> class.
         /// </summary>
         /// <param name="obj">The object.</param>
-        public ObjectUpdate(object obj)
+        public ObjectUpdateDefinition(object obj)
         {
             _obj = Ensure.IsNotNull(obj, "obj");
         }