CSHARP-1413: Moved IndexOptionDefaults from Core to High.

Author: rstam

src/MongoDB.Driver.Core.Tests/Core/Operations/CreateCollectionOperationTests.cs

@@ -152,15 +152,15 @@ public void CreateCommand_should_return_expected_result_when_Capped_is_set(
         [Test]
         public void CreateCommand_should_return_expected_result_when_IndexOptionDefaults_is_set()
         {
-            var value = new IndexOptionDefaults { StorageEngine = new BsonDocument("x", 1) };
+            var value = new BsonDocument("storageEngine", new BsonDocument("x", 1));
             var subject = new CreateCollectionOperation(_collectionNamespace, _messageEncoderSettings)
             {
                 IndexOptionDefaults = value
             };
             var expectedResult = new BsonDocument
             {
                 { "create", _collectionNamespace.CollectionName },
-                { "indexOptionDefaults", new BsonDocument("storageEngine", new BsonDocument("x", 1)) }
+                { "indexOptionDefaults", value }
             };
 
             var result = subject.CreateCommand();
@@ -472,7 +472,7 @@ public void Execute_should_create_collection_when_UsePowerOf2Sizes_is_set(
         public void IndexOptionDefaults_should_work()
         {
             var subject = new CreateCollectionOperation(_collectionNamespace, _messageEncoderSettings);
-            var value = new IndexOptionDefaults { StorageEngine = new BsonDocument("x", 1) };
+            var value = new BsonDocument("storageEngine", new BsonDocument("x", 1));
             subject.IndexOptionDefaults.Should().BeNull();
 
             subject.IndexOptionDefaults = value;

src/MongoDB.Driver.Core/Core/Operations/CreateCollectionOperation.cs

@@ -33,7 +33,7 @@ public class CreateCollectionOperation : IWriteOperation<BsonDocument>
         private bool? _autoIndexId;
         private bool? _capped;
         private readonly CollectionNamespace _collectionNamespace;
-        private IndexOptionDefaults _indexOptionDefaults;
+        private BsonDocument _indexOptionDefaults;
         private long? _maxDocuments;
         private long? _maxSize;
         private readonly MessageEncoderSettings _messageEncoderSettings;
@@ -99,7 +99,7 @@ public CollectionNamespace CollectionNamespace
         /// <value>
         /// The index option defaults.
         /// </value>
-        public IndexOptionDefaults IndexOptionDefaults
+        public BsonDocument IndexOptionDefaults
         {
             get { return _indexOptionDefaults; }
             set { _indexOptionDefaults = value; }
@@ -212,7 +212,7 @@ internal BsonDocument CreateCommand()
                 { "max", () => _maxDocuments.Value, _maxDocuments.HasValue },
                 { "flags", () => _usePowerOf2Sizes.Value ? 1 : 0, _usePowerOf2Sizes.HasValue},
                 { "storageEngine", () => _storageEngine, _storageEngine != null },
-                { "indexOptionDefaults", () => _indexOptionDefaults.ToBsonDocument(), _indexOptionDefaults != null },
+                { "indexOptionDefaults", _indexOptionDefaults, _indexOptionDefaults != null },
                 { "validator", _validator, _validator != null },
                 { "validationAction", () => _validationAction.Value.ToString().ToLowerInvariant(), _validationAction.HasValue },
                 { "validationLevel", () => _validationLevel.Value.ToString().ToLowerInvariant(), _validationLevel.HasValue }

src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj

@@ -139,7 +139,6 @@
     <Compile Include="Core\Operations\CreateIndexesUsingInsertOperation.cs" />
     <Compile Include="Core\Operations\DocumentValidationAction.cs" />
     <Compile Include="Core\Operations\DocumentValidationLevel.cs" />
-    <Compile Include="Core\Operations\IndexOptionDefaults.cs" />
     <Compile Include="Core\Operations\ListCollectionsUsingCommandOperation.cs" />
     <Compile Include="Core\Operations\ListCollectionsUsingQueryOperation.cs" />
     <Compile Include="Core\Operations\ListIndexesUsingCommandOperation.cs" />

src/MongoDB.Driver.Core/Core/Operations/IndexOptionDefaults.cs renamed to src/MongoDB.Driver/IndexOptionDefaults.cs

@@ -15,7 +15,7 @@
 
 using MongoDB.Bson;
 
-namespace MongoDB.Driver.Core.Operations
+namespace MongoDB.Driver
 {
     /// <summary>
     /// Represents index option defaults.
@@ -35,12 +35,12 @@ public BsonDocument StorageEngine
             set { _storageEngine = value; }
         }
 
-        // public methods
+        // internal methods
         /// <summary>
         /// Returns this instance represented as a BsonDocument.
         /// </summary>
         /// <returns>A BsonDocument.</returns>
-        public BsonDocument ToBsonDocument()
+        internal BsonDocument ToBsonDocument()
         {
             return new BsonDocument
             {

src/MongoDB.Driver/MongoDB.Driver.csproj

@@ -80,6 +80,7 @@
     <Compile Include="CreateIndexModel.cs" />
     <Compile Include="FilteredMongoCollectionBase.cs" />
     <Compile Include="IndexKeysDefinition.cs" />
+    <Compile Include="IndexOptionDefaults.cs" />
     <Compile Include="Linq\AggregateQueryableExecutionModel.cs" />
     <Compile Include="Linq\ExecutionPlanBuilder.cs" />
     <Compile Include="Linq\ExpressionHelper.cs" />

src/MongoDB.Driver/MongoDatabaseImpl.cs

@@ -162,7 +162,7 @@ private Task CreateCollectionHelperAsync<TDocument>(string name, CreateCollectio
             {
                 AutoIndexId = options.AutoIndexId,
                 Capped = options.Capped,
-                IndexOptionDefaults = options.IndexOptionDefaults,
+                IndexOptionDefaults = options.IndexOptionDefaults?.ToBsonDocument(),
                 MaxDocuments = options.MaxDocuments,
                 MaxSize = options.MaxSize,
                 StorageEngine = options.StorageEngine,