Moved all the BsonDocument wrappers to Legacy.

Author: rstam

src/MongoDB.Driver.Tests/Jira/CSharp140Tests.cs renamed to src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp140Tests.cs

@@ -70,6 +70,7 @@
     <Compile Include="Jira\CSharp111Tests.cs" />
     <Compile Include="Jira\CSharp112Tests.cs" />
     <Compile Include="Jira\CSharp134Tests.cs" />
+    <Compile Include="Jira\CSharp140Tests.cs" />
     <Compile Include="Jira\CSharp163Tests.cs" />
     <Compile Include="Jira\CSharp172Tests.cs" />
     <Compile Include="Jira\CSharp198Tests.cs" />
@@ -86,6 +87,7 @@
     <Compile Include="Jira\CSharp269Tests.cs" />
     <Compile Include="Jira\CSharp281Tests.cs" />
     <Compile Include="Jira\CSharp282Tests.cs" />
+    <Compile Include="Jira\CSharp290Tests.cs" />
     <Compile Include="Jira\CSharp307Tests.cs" />
     <Compile Include="Jira\CSharp325Tests.cs" />
     <Compile Include="Jira\CSharp330Tests.cs" />
@@ -99,6 +101,7 @@
     <Compile Include="Jira\CSharp524Tests.cs" />
     <Compile Include="Jira\CSharp538Tests.cs" />
     <Compile Include="Jira\CSharp542Tests.cs" />
+    <Compile Include="Jira\CSharp594Tests.cs" />
     <Compile Include="Jira\CSharp613Tests.cs" />
     <Compile Include="Jira\CSharp653Tests.cs" />
     <Compile Include="Jira\CSharp714Tests.cs" />

src/MongoDB.Driver.Tests/Jira/CSharp290Tests.cs renamed to src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp290Tests.cs

@@ -115,6 +115,31 @@
     <Compile Include="SystemProfileInfo.cs" />
     <Compile Include="UpdateFlags.cs" />
     <Compile Include="ValidateCollectionArgs.cs" />
+    <Compile Include="Wrappers\BaseWrapper.cs" />
+    <Compile Include="Wrappers\CollectionOptionsDocument.cs" />
+    <Compile Include="Wrappers\CollectionOptionsWrapper.cs" />
+    <Compile Include="Wrappers\CommandDocument.cs" />
+    <Compile Include="Wrappers\CommandWrapper.cs" />
+    <Compile Include="Wrappers\FieldsDocument.cs" />
+    <Compile Include="Wrappers\FieldsWrapper.cs" />
+    <Compile Include="Wrappers\GeoHaystackSearchOptionsDocument.cs" />
+    <Compile Include="Wrappers\GeoHaystackSearchOptionsWrapper.cs" />
+    <Compile Include="Wrappers\GeoNearOptionsDocument.cs" />
+    <Compile Include="Wrappers\GeoNearOptionsWrapper.cs" />
+    <Compile Include="Wrappers\GroupByDocument.cs" />
+    <Compile Include="Wrappers\GroupByWrapper.cs" />
+    <Compile Include="Wrappers\IndexKeysDocument.cs" />
+    <Compile Include="Wrappers\IndexKeysWrapper.cs" />
+    <Compile Include="Wrappers\IndexOptionsDocument.cs" />
+    <Compile Include="Wrappers\IndexOptionsWrapper.cs" />
+    <Compile Include="Wrappers\QueryDocument.cs" />
+    <Compile Include="Wrappers\QueryWrapper.cs" />
+    <Compile Include="Wrappers\ScopeDocument.cs" />
+    <Compile Include="Wrappers\ScopeWrapper.cs" />
+    <Compile Include="Wrappers\SortByDocument.cs" />
+    <Compile Include="Wrappers\SortByWrapper.cs" />
+    <Compile Include="Wrappers\UpdateDocument.cs" />
+    <Compile Include="Wrappers\UpdateWrapper.cs" />
     <Compile Include="XYPoint.cs" />
   </ItemGroup>
   <ItemGroup>

src/MongoDB.Driver.Tests/Jira/CSharp594Tests.cs renamed to src/MongoDB.Driver.Legacy.Tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp594Tests.cs

@@ -122,7 +122,7 @@ public void TestAndNullSecond()
         [Test]
         public void TestAndWithEmptyQuery()
         {
-            var emptyQuery = new QueryDocument();
+            var emptyQuery = Query.Empty;
             var expected = "{ }";
             var negated = "{ \"$nor\" : [{ }] }";
 
@@ -566,7 +566,7 @@ public void TestOrNullSecond()
         [Test]
         public void TestOrWithEmptyQuery()
         {
-            var emptyQuery = new QueryDocument();
+            var emptyQuery = Query.Empty;
             var expected = "{ }";
             var negated = "{ \"$nor\" : [{ }] }";
 

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

@@ -34,7 +34,7 @@ public void TestNoArgs()
         public void TestOneNestedAnd()
         {
             var query = Query.And(
-                new QueryDocument("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) })
+                Query.Create("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) })
             );
             var expected = "{ 'x' : 1, 'y' : 2 }".Replace("'", "\"");
             var json = query.ToJson();
@@ -68,7 +68,7 @@ public void TestTwoClauses()
         public void TestCombineAndWithOneClause()
         {
             var query = Query.And(
-                new QueryDocument("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) }),
+                Query.Create("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) }),
                 Query.EQ("z", 3)
             );
             var expected = "{ 'x' : 1, 'y' : 2, 'z' : 3 }".Replace("'", "\"");
@@ -80,8 +80,8 @@ public void TestCombineAndWithOneClause()
         public void TestCombineAndWithAnd()
         {
             var query = Query.And(
-                new QueryDocument("$and", new BsonArray { new BsonDocument("a", 1), new BsonDocument("b", 2) }),
-                new QueryDocument("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) })
+                Query.Create("$and", new BsonArray { new BsonDocument("a", 1), new BsonDocument("b", 2) }),
+                Query.Create("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) })
             );
             var expected = "{ 'a' : 1, 'b' : 2, 'x' : 1, 'y' : 2 }".Replace("'", "\"");
             var json = query.ToJson();
@@ -94,7 +94,7 @@ public void TestCombineTwoClausesWithAnd()
             var query = Query.And(
                 Query.EQ("a", 1),
                 Query.EQ("b", 2),
-                new QueryDocument("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) })
+                Query.Create("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) })
             );
             var expected = "{ 'a' : 1, 'b' : 2, 'x' : 1, 'y' : 2 }".Replace("'", "\"");
             var json = query.ToJson();
@@ -156,7 +156,7 @@ public void TestCombineTwoNonCombinableClausesForSameField()
         public void TestNestedAndClause()
         {
             var query = Query.And(
-                new QueryDocument("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) }),
+                Query.Create("$and", new BsonArray { new BsonDocument("x", 1), new BsonDocument("y", 2) }),
                 Query.EQ("z", 3)
             );
             var expected = "{ 'x' : 1, 'y' : 2, 'z' : 3 }".Replace("'", "\"");

src/MongoDB.Driver.Legacy/MongoDB.Driver.Legacy/MongoDB.Driver.Legacy.csproj

@@ -162,11 +162,8 @@
     <Compile Include="Jira\CSharp598Tests.cs" />
     <Compile Include="Jira\CSharp532Tests.cs" />
     <Compile Include="Jira\CSharp137Tests.cs" />
-    <Compile Include="Jira\CSharp140Tests.cs" />
     <Compile Include="Jira\CSharp283Tests.cs" />
-    <Compile Include="Jira\CSharp290Tests.cs" />
     <Compile Include="Jira\CSharp321Tests.cs" />
-    <Compile Include="Jira\CSharp594Tests.cs" />
     <Compile Include="Linq\Utils\BsonSerializationInfoHelperTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MongoBulkWriteExceptionTests.cs" />

src/MongoDB.Driver/Wrappers/BaseWrapper.cs renamed to src/MongoDB.Driver.Legacy/MongoDB.Driver.Legacy/Wrappers/BaseWrapper.cs

@@ -0,0 +1,50 @@
+/* Copyright 2010-2014 MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Attributes;
+using MongoDB.Bson.Serialization.Serializers;
+
+namespace MongoDB.Driver.Builders
+{
+    [BsonSerializer(typeof(MongoQueryWrapper.Serializer))]
+    internal class MongoQueryWrapper : IMongoQuery
+    {
+        // fields
+        private readonly BsonDocument _wrapped;
+
+        // constructors
+        public MongoQueryWrapper(BsonDocument wrapped)
+        {
+            _wrapped = wrapped;
+        }
+
+        // methods
+        public override string ToString()
+        {
+            return _wrapped.ToJson();
+        }
+
+        // nested classes
+        internal class Serializer : SerializerBase<MongoQueryWrapper>
+        {
+            public override void Serialize(BsonSerializationContext context, BsonSerializationArgs args, MongoQueryWrapper value)
+            {
+                BsonDocumentSerializer.Instance.Serialize(context, value._wrapped);
+            }
+        }
+    }
+}

src/MongoDB.Driver/Wrappers/CollectionOptionsDocument.cs renamed to src/MongoDB.Driver.Legacy/MongoDB.Driver.Legacy/Wrappers/CollectionOptionsDocument.cs

@@ -0,0 +1,48 @@
+/* Copyright 2010-2014 MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System;
+using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Attributes;
+using MongoDB.Bson.Serialization.Serializers;
+
+namespace MongoDB.Driver.Builders
+{
+    [BsonSerializer(typeof(MongoUpdateWrapper.Serializer))]
+    internal class MongoUpdateWrapper : IMongoUpdate
+    {
+        // fields
+        private Type _nominalType;
+        private IBsonSerializer _serializer;
+        private readonly object _wrapped;
+
+        // constructors
+        public MongoUpdateWrapper(object wrapped, IBsonSerializer serializer, Type nominalType)
+        {
+            _wrapped = wrapped;
+            _serializer = serializer;
+            _nominalType = nominalType;
+        }
+
+        // nested classes
+        internal class Serializer : SerializerBase<MongoUpdateWrapper>
+        {
+            public override void Serialize(BsonSerializationContext context, BsonSerializationArgs args, MongoUpdateWrapper value)
+            {
+                value._serializer.Serialize(context, new BsonSerializationArgs { NominalType = value._nominalType }, value._wrapped);
+            }
+        }
+    }
+}