Rename IndexDefinition to IndexKeysDefinition.

Author: rstam

src/MongoDB.Driver.Tests/IndexDefinitionBuilderTests.cs renamed to src/MongoDB.Driver.Tests/IndexKeysDefinitionBuilderTests.cs

@@ -23,7 +23,7 @@
 namespace MongoDB.Driver.Tests
 {
     [TestFixture]
-    public class IndexDefinitionBuilderTests
+    public class IndexKeysDefinitionBuilderTests
     {
         [Test]
         public void Ascending()
@@ -47,23 +47,23 @@ public void Combine()
         {
             var subject = CreateSubject<BsonDocument>();
 
-            var definition = subject.Combine(
+            var result = subject.Combine(
                 "{a: 1, b: -1}",
                 subject.Descending("c"));
 
-            Assert(definition, "{a: 1, b: -1, c: -1}");
+            Assert(result, "{a: 1, b: -1, c: -1}");
         }
 
         [Test]
         public void Combine_with_repeated_fields()
         {
             var subject = CreateSubject<BsonDocument>();
 
-            var definition = subject.Combine(
+            var combined = subject.Combine(
                 "{a: 1, b: -1}",
                 subject.Descending("a"));
 
-            Action act = () => Render(definition);
+            Action act = () => Render(combined);
 
             act.ShouldThrow<MongoException>();
         }
@@ -73,25 +73,25 @@ public void Combine_many_texts()
         {
             var subject = CreateSubject<BsonDocument>();
 
-            var definition = subject.Combine(
+            var result = subject.Combine(
                 subject.Text("a"),
                 subject.Text("b"),
                 subject.Text("c"));
 
-            Assert(definition, "{a: 'text', b: 'text', c: 'text'}");
+            Assert(result, "{a: 'text', b: 'text', c: 'text'}");
         }
 
         [Test]
         public void Combine_with_repeated_fields_using_extension_methods()
         {
             var subject = CreateSubject<BsonDocument>();
 
-            var definition = subject.Ascending("a")
+            var result = subject.Ascending("a")
                 .Ascending("b")
                 .Descending("c")
                 .Descending("a");
 
-            Action act = () => Render(definition);
+            Action act = () => Render(result);
 
             act.ShouldThrow<MongoException>();
         }
@@ -185,22 +185,22 @@ public void Text_Typed()
             Assert(subject.Text("$**"), "{'$**': 'text'}");
         }
 
-        private void Assert<TDocument>(IndexDefinition<TDocument> definition, string expectedJson)
+        private void Assert<TDocument>(IndexKeysDefinition<TDocument> keys, string expectedJson)
         {
-            var renderedSort = Render<TDocument>(definition);
+            var renderedSort = Render<TDocument>(keys);
 
             renderedSort.Should().Be(expectedJson);
         }
 
-        private BsonDocument Render<TDocument>(IndexDefinition<TDocument> definition)
+        private BsonDocument Render<TDocument>(IndexKeysDefinition<TDocument> keys)
         {
             var documentSerializer = BsonSerializer.SerializerRegistry.GetSerializer<TDocument>();
-            return definition.Render(documentSerializer, BsonSerializer.SerializerRegistry);
+            return keys.Render(documentSerializer, BsonSerializer.SerializerRegistry);
         }
 
-        private IndexDefinitionBuilder<TDocument> CreateSubject<TDocument>()
+        private IndexKeysDefinitionBuilder<TDocument> CreateSubject<TDocument>()
         {
-            return new IndexDefinitionBuilder<TDocument>();
+            return new IndexKeysDefinitionBuilder<TDocument>();
         }
 
         private class Person

src/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj

@@ -98,7 +98,7 @@
     <Compile Include="Linq\Translators\PredicateTranslatorTests.cs" />
     <Compile Include="PipelineDefinitionTests.cs" />
     <Compile Include="ProjectionDefinitionBuilderTests.cs" />
-    <Compile Include="IndexDefinitionBuilderTests.cs" />
+    <Compile Include="IndexKeysDefinitionBuilderTests.cs" />
     <Compile Include="SortDefinitionBuilderTests.cs" />
     <Compile Include="UpdateDefinitionBuilderTests.cs" />
     <Compile Include="FilterDefinitionBuilderTests.cs" />

src/MongoDB.Driver/Builders.cs

@@ -22,7 +22,7 @@ namespace MongoDB.Driver
     public static class Builders<TDocument>
     {
         private static FilterDefinitionBuilder<TDocument> __filter = new FilterDefinitionBuilder<TDocument>();
-        private static IndexDefinitionBuilder<TDocument> __index = new IndexDefinitionBuilder<TDocument>();
+        private static IndexKeysDefinitionBuilder<TDocument> __index = new IndexKeysDefinitionBuilder<TDocument>();
         private static ProjectionDefinitionBuilder<TDocument> __projection = new ProjectionDefinitionBuilder<TDocument>();
         private static SortDefinitionBuilder<TDocument> __sort = new SortDefinitionBuilder<TDocument>();
         private static UpdateDefinitionBuilder<TDocument> __update = new UpdateDefinitionBuilder<TDocument>();
@@ -36,9 +36,9 @@ public static FilterDefinitionBuilder<TDocument> Filter
         }
 
         /// <summary>
-        /// Gets an <see cref="IndexDefinitionBuilder{TDocument}"/>.
+        /// Gets an <see cref="IndexKeysDefinitionBuilder{TDocument}"/>.
         /// </summary>
-        public static IndexDefinitionBuilder<TDocument> Index
+        public static IndexKeysDefinitionBuilder<TDocument> IndexKeys
         {
             get { return __index; }
         }

src/MongoDB.Driver/IMongoIndexManager.cs

@@ -48,19 +48,19 @@ public interface IMongoIndexManager<TDocument>
         /// <summary>
         /// Creates an index.
         /// </summary>
-        /// <param name="definition">The definition.</param>
+        /// <param name="keys">The keys.</param>
         /// <param name="options">The options.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>A task.</returns>
-        Task CreateAsync(IndexDefinition<TDocument> definition, CreateIndexOptions options = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task CreateAsync(IndexKeysDefinition<TDocument> keys, CreateIndexOptions options = null, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Drops an index.
         /// </summary>
-        /// <param name="definition">The definition.</param>
+        /// <param name="keys">The keys.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>A task.</returns>
-        Task DropAsync(IndexDefinition<TDocument> definition, CancellationToken cancellationToken = default(CancellationToken));
+        Task DropAsync(IndexKeysDefinition<TDocument> keys, CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Drops an index by its name.