renamed IBsonItemSerializationInfoProvider to IBsonArraySerializer. renamed IBsonMemberSerializationInfoProvider to IBsonDocumentSerializer.

craiggwilson · craiggwilson · commit cd627fe665cc · 2012-05-29T07:55:55.000-04:00
diff --git a/Bson/Bson.csproj b/Bson/Bson.csproj
@@ -103,10 +103,10 @@
     <Compile Include="Serialization\Conventions\IgnoreIfDefaultConventions.cs" />
     <Compile Include="Serialization\Conventions\SerializationOptionsConventions.cs" />
     <Compile Include="Serialization\IBsonClassMapModifier.cs" />
-    <Compile Include="Serialization\IBsonItemSerializationInfoProvider.cs" />
+    <Compile Include="Serialization\IBsonArraySerializer.cs" />
     <Compile Include="Serialization\IBsonMemberMapModifier.cs" />
     <Compile Include="Serialization\IBsonIdProvider.cs" />
-    <Compile Include="Serialization\IBsonMemberSerializationInfoProvider.cs" />
+    <Compile Include="Serialization\IBsonDocumentSerializer.cs" />
     <Compile Include="Serialization\Options\ArraySerializationOptions.cs" />
     <Compile Include="Serialization\Options\BsonBaseSerializationOptions.cs" />
     <Compile Include="Serialization\Options\DateTimeSerializationOptions.cs" />
diff --git a/Bson/Serialization/BsonClassMapSerializer.cs b/Bson/Serialization/BsonClassMapSerializer.cs
@@ -30,7 +30,7 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Represents a serializer for a class map.
     /// </summary>
-    internal class BsonClassMapSerializer : IBsonSerializer, IBsonIdProvider, IBsonMemberSerializationInfoProvider
+    internal class BsonClassMapSerializer : IBsonSerializer, IBsonIdProvider, IBsonDocumentSerializer
     {
         // private fields
         private BsonClassMap _classMap;
diff --git a/Bson/Serialization/IBsonArraySerializer.cs b/Bson/Serialization/IBsonArraySerializer.cs
@@ -23,10 +23,10 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Contract for serializers to implement if they serialize an array of items.
     /// </summary>
-    public interface IBsonItemSerializationInfoProvider
+    public interface IBsonArraySerializer : IBsonSerializer
     {
         /// <summary>
-        /// Gets the serialization info for individual items of an enumerable type.
+        /// Gets the serialization info for individual items of the array.
         /// </summary>
         /// <returns>The serialization info for the items.</returns>
         BsonSerializationInfo GetItemSerializationInfo();
diff --git a/Bson/Serialization/IBsonDocumentSerializer.cs b/Bson/Serialization/IBsonDocumentSerializer.cs
@@ -23,7 +23,7 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Contract for composite serializers that contain a number of named serializers.
     /// </summary>
-    public interface IBsonMemberSerializationInfoProvider
+    public interface IBsonDocumentSerializer : IBsonSerializer
     {
         /// <summary>
         /// Gets the serialization info for a member.
diff --git a/Bson/Serialization/Options/ArraySerializationOptions.cs b/Bson/Serialization/Options/ArraySerializationOptions.cs
@@ -71,8 +71,8 @@ public IBsonSerializationOptions ItemSerializationOptions
         public override void ApplyAttribute(IBsonSerializer serializer, Attribute attribute)
         {
             EnsureNotFrozen();
-            var itemSerializationInfoProvider = serializer as IBsonItemSerializationInfoProvider;
-            if (itemSerializationInfoProvider == null)
+            var arraySerializer = serializer as IBsonArraySerializer;
+            if (arraySerializer == null)
             {
                 var message = string.Format(
                         "A serialization options attribute of type {0} cannot be used when the serializer is of type {1}.",
@@ -81,7 +81,7 @@ public override void ApplyAttribute(IBsonSerializer serializer, Attribute attrib
                 throw new NotSupportedException(message);
             }
 
-            var itemSerializer = itemSerializationInfoProvider.GetItemSerializationInfo().Serializer;
+            var itemSerializer = arraySerializer.GetItemSerializationInfo().Serializer;
             if (_itemSerializationOptions == null)
             {
                 var itemDefaultSerializationOptions = itemSerializer.GetDefaultSerializationOptions();
diff --git a/Bson/Serialization/Serializers/ArraySerializer.cs b/Bson/Serialization/Serializers/ArraySerializer.cs
@@ -30,7 +30,7 @@ namespace MongoDB.Bson.Serialization.Serializers
     /// Represents a serializer for one-dimensional arrays.
     /// </summary>
     /// <typeparam name="T">The type of the elements.</typeparam>
-    public class ArraySerializer<T> : BsonBaseSerializer, IBsonItemSerializationInfoProvider
+    public class ArraySerializer<T> : BsonBaseSerializer, IBsonArraySerializer
     {
         // constructors
         /// <summary>
diff --git a/Bson/Serialization/Serializers/CollectionGenericSerializers.cs b/Bson/Serialization/Serializers/CollectionGenericSerializers.cs
@@ -30,7 +30,7 @@ namespace MongoDB.Bson.Serialization.Serializers
     /// Represents a serializer for enumerable values.
     /// </summary>
     /// <typeparam name="T">The type of the elements.</typeparam>
-    public class EnumerableSerializer<T> : BsonBaseSerializer, IBsonItemSerializationInfoProvider
+    public class EnumerableSerializer<T> : BsonBaseSerializer, IBsonArraySerializer
     {
         // constructors
         /// <summary>
@@ -188,7 +188,7 @@ private ICollection<T> CreateInstance(Type type)
     /// Represents a serializer for Queues.
     /// </summary>
     /// <typeparam name="T">The type of the elements.</typeparam>
-    public class QueueSerializer<T> : BsonBaseSerializer, IBsonItemSerializationInfoProvider
+    public class QueueSerializer<T> : BsonBaseSerializer, IBsonArraySerializer
     {
         // constructors
         /// <summary>
@@ -310,7 +310,7 @@ public override void Serialize(
     /// Represents a serializer for Stacks.
     /// </summary>
     /// <typeparam name="T">The type of the elements.</typeparam>
-    public class StackSerializer<T> : BsonBaseSerializer, IBsonItemSerializationInfoProvider
+    public class StackSerializer<T> : BsonBaseSerializer, IBsonArraySerializer
     {
         // constructors
         /// <summary>
diff --git a/Bson/Serialization/Serializers/CollectionSerializers.cs b/Bson/Serialization/Serializers/CollectionSerializers.cs
@@ -29,7 +29,7 @@ namespace MongoDB.Bson.Serialization.Serializers
     /// <summary>
     /// Represents a serializer for enumerable values.
     /// </summary>
-    public class EnumerableSerializer : BsonBaseSerializer, IBsonItemSerializationInfoProvider
+    public class EnumerableSerializer : BsonBaseSerializer, IBsonArraySerializer
     {
         // private static fields
         private static EnumerableSerializer __instance = new EnumerableSerializer();
@@ -198,7 +198,7 @@ private IList CreateInstance(Type type)
     /// <summary>
     /// Represents a serializer for Queues.
     /// </summary>
-    public class QueueSerializer : BsonBaseSerializer, IBsonItemSerializationInfoProvider
+    public class QueueSerializer : BsonBaseSerializer, IBsonArraySerializer
     {
         // private static fields
         private static QueueSerializer __instance = new QueueSerializer();
@@ -331,7 +331,7 @@ public override void Serialize(
     /// <summary>
     /// Represents a serializer for Stacks.
     /// </summary>
-    public class StackSerializer : BsonBaseSerializer, IBsonItemSerializationInfoProvider
+    public class StackSerializer : BsonBaseSerializer, IBsonArraySerializer
     {
         // private static fields
         private static StackSerializer __instance = new StackSerializer();
diff --git a/Driver/Core/MongoDBRef.cs b/Driver/Core/MongoDBRef.cs
@@ -193,7 +193,7 @@ public override string ToString()
     /// <summary>
     /// Represents a serializer for MongoDBRefs.
     /// </summary>
-    public class MongoDBRefSerializer : BsonBaseSerializer, IBsonMemberSerializationInfoProvider
+    public class MongoDBRefSerializer : BsonBaseSerializer, IBsonDocumentSerializer
     {
         // public methods
         /// <summary>
diff --git a/Driver/Core/SystemProfileInfo.cs b/Driver/Core/SystemProfileInfo.cs
@@ -328,7 +328,7 @@ public string User
     /// <summary>
     /// Represents a serializer for SystemProfileInfo.
     /// </summary>
-    public class SystemProfileInfoSerializer : BsonBaseSerializer, IBsonMemberSerializationInfoProvider
+    public class SystemProfileInfoSerializer : BsonBaseSerializer, IBsonDocumentSerializer
     {
         // public methods
         /// <summary>
diff --git a/Driver/Linq/Translators/PredicateTranslator.cs b/Driver/Linq/Translators/PredicateTranslator.cs
@@ -123,11 +123,11 @@ private IMongoQuery BuildAnyQuery(MethodCallExpression methodCallExpression)
                 else if (arguments.Length == 2)
                 {
                     var itemSerializationInfo = _serializationInfoHelper.GetItemSerializationInfo("Any", serializationInfo);
-                    if (!(itemSerializationInfo.Serializer is IBsonMemberSerializationInfoProvider))
+                    if (!(itemSerializationInfo.Serializer is IBsonDocumentSerializer))
                     {
                         var message = string.Format("Any is only support for items that serialize into documents. The current serializer is {0} and must implement {1} for participation in Any queries.",
-                            BsonUtils.GetFriendlyTypeName(itemSerializationInfo.GetType()),
-                            BsonUtils.GetFriendlyTypeName(typeof(IBsonMemberSerializationInfoProvider)));
+                            BsonUtils.GetFriendlyTypeName(itemSerializationInfo.Serializer.GetType()),
+                            BsonUtils.GetFriendlyTypeName(typeof(IBsonDocumentSerializer)));
                         throw new NotSupportedException(message);
                     }
                     var itemSerializer = itemSerializationInfo.Serializer;
diff --git a/Driver/Linq/Utils/BsonSerializationInfoFinder.cs b/Driver/Linq/Utils/BsonSerializationInfoFinder.cs
@@ -100,8 +100,8 @@ protected override BsonSerializationInfo VisitBinary(BinaryExpression node)
                 return null;
             }
 
-            var itemSerializationInfoProvider = serializationInfo.Serializer as IBsonItemSerializationInfoProvider;
-            if (itemSerializationInfoProvider == null)
+            var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;
+            if (arraySerializer == null)
             {
                 return null;
             }
@@ -113,7 +113,7 @@ protected override BsonSerializationInfo VisitBinary(BinaryExpression node)
             }
             var index = Convert.ToInt32(indexEpression.Value);
 
-            var itemSerializationInfo = itemSerializationInfoProvider.GetItemSerializationInfo();
+            var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();
             itemSerializationInfo = new BsonSerializationInfo(
                 index.ToString(),
                 itemSerializationInfo.Serializer,
@@ -146,13 +146,13 @@ protected override BsonSerializationInfo VisitMember(MemberExpression node)
                 return null;
             }
 
-            var memberSerializationInfoProvider = serializationInfo.Serializer as IBsonMemberSerializationInfoProvider;
-            if (memberSerializationInfoProvider == null)
+            var documentSerializer = serializationInfo.Serializer as IBsonDocumentSerializer;
+            if (documentSerializer == null)
             {
                 return null;
             }
 
-            var memberSerializationInfo = memberSerializationInfoProvider.GetMemberSerializationInfo(node.Member.Name);
+            var memberSerializationInfo = documentSerializer.GetMemberSerializationInfo(node.Member.Name);
             return CombineSerializationInfo(serializationInfo, memberSerializationInfo);
         }
 
@@ -238,13 +238,13 @@ private BsonSerializationInfo VisitGetItem(MethodCallExpression node)
                 return null;
             }
 
-            var itemSerializationInfoProvider = serializationInfo.Serializer as IBsonItemSerializationInfoProvider;
-            if (itemSerializationInfoProvider == null)
+            var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;
+            if (arraySerializer == null)
             {
                 return null;
             }
 
-            var itemSerializationInfo = itemSerializationInfoProvider.GetItemSerializationInfo();
+            var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();
             itemSerializationInfo = new BsonSerializationInfo(
                 index.ToString(),
                 itemSerializationInfo.Serializer,
@@ -267,14 +267,14 @@ private BsonSerializationInfo VisitElementAt(MethodCallExpression node)
                 return null;
             }
 
-            var itemSerializationInfoProvider = serializationInfo.Serializer as IBsonItemSerializationInfoProvider;
-            if (itemSerializationInfoProvider == null)
+            var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;
+            if (arraySerializer == null)
             {
                 return null;
             }
 
             var index = (int)((ConstantExpression)node.Arguments[1]).Value;
-            var itemSerializationInfo = itemSerializationInfoProvider.GetItemSerializationInfo();
+            var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();
             itemSerializationInfo = new BsonSerializationInfo(
                 index.ToString(),
                 itemSerializationInfo.Serializer,
diff --git a/Driver/Linq/Utils/BsonSerializationInfoHelper.cs b/Driver/Linq/Utils/BsonSerializationInfoHelper.cs
@@ -56,10 +56,10 @@ public BsonSerializationInfo GetSerializationInfo(Expression node)
         /// <returns>The item BsonSerializationInfo for the expression.</returns>
         public BsonSerializationInfo GetItemSerializationInfo(string methodName, BsonSerializationInfo serializationInfo)
         {
-            var itemSerializationInfoProvider = serializationInfo.Serializer as IBsonItemSerializationInfoProvider;
-            if (itemSerializationInfoProvider != null)
+            var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;
+            if (arraySerializer != null)
             {
-                var itemSerializationInfo = itemSerializationInfoProvider.GetItemSerializationInfo();
+                var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();
                 if (itemSerializationInfo != null)
                 {
                     return itemSerializationInfo;
@@ -69,7 +69,7 @@ public BsonSerializationInfo GetItemSerializationInfo(string methodName, BsonSer
             string message = string.Format("{0} requires that the serializer specified for {1} support items by implementing {2} and returning a non-null result. {3} is the current serializer.",
                 methodName,
                 serializationInfo.ElementName,
-                typeof(IBsonItemSerializationInfoProvider),
+                typeof(IBsonArraySerializer),
                 serializationInfo.Serializer.GetType());
             throw new NotSupportedException(message);
         }
diff --git a/DriverUnitTests/Linq/SelectQueryTests.cs b/DriverUnitTests/Linq/SelectQueryTests.cs
@@ -1941,7 +1941,7 @@ where c.A.Any()
         }
 
         [Test]
-        [ExpectedException(typeof(NotSupportedException), ExpectedMessage = "Any is only support for items that serialize into documents. The current serializer is BsonSerializationInfo and must implement IBsonMemberSerializationInfoProvider for participation in Any queries.")]
+        [ExpectedException(typeof(NotSupportedException), ExpectedMessage = "Any is only support for items that serialize into documents. The current serializer is Int32Serializer and must implement IBsonDocumentSerializer for participation in Any queries.")]
         public void TestWhereAAnyWithPredicate()
         {
             var query = from c in _collection.AsQueryable<C>()
diff --git a/DriverUnitTestsVB/Linq/SelectQueryTests.vb b/DriverUnitTestsVB/Linq/SelectQueryTests.vb
@@ -1842,7 +1842,7 @@ Namespace MongoDB.DriverUnitTests.Linq
         End Sub
 
         <Test()> _
-        <ExpectedException(GetType(NotSupportedException), ExpectedMessage:="Any is only support for items that serialize into documents. The current serializer is BsonSerializationInfo and must implement IBsonMemberSerializationInfoProvider for participation in Any queries.")> _
+        <ExpectedException(GetType(NotSupportedException), ExpectedMessage:="Any is only support for items that serialize into documents. The current serializer is Int32Serializer and must implement IBsonDocumentSerializer for participation in Any queries.")> _
         Public Sub TestWhereAAnyWithPredicate()
             Dim query = From c In _collection.AsQueryable(Of C)()
                         Where c.A.Any(Function(a) a > 3)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ namespace MongoDB.Bson.Serialization`
`30`	`30`	`/// <summary>`
`31`	`31`	`/// Represents a serializer for a class map.`
`32`	`32`	`/// </summary>`
`33`		`- internal class BsonClassMapSerializer : IBsonSerializer, IBsonIdProvider, IBsonMemberSerializationInfoProvider`
	`33`	`+ internal class BsonClassMapSerializer : IBsonSerializer, IBsonIdProvider, IBsonDocumentSerializer`
`34`	`34`	`{`
`35`	`35`	`// private fields`
`36`	`36`	`private BsonClassMap _classMap;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace MongoDB.Bson.Serialization`
`23`	`23`	`/// <summary>`
`24`	`24`	`/// Contract for composite serializers that contain a number of named serializers.`
`25`	`25`	`/// </summary>`
`26`		`- public interface IBsonMemberSerializationInfoProvider`
	`26`	`+ public interface IBsonDocumentSerializer : IBsonSerializer`
`27`	`27`	`{`
`28`	`28`	`/// <summary>`
`29`	`29`	`/// Gets the serialization info for a member.`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ public IBsonSerializationOptions ItemSerializationOptions`
`71`	`71`	`public override void ApplyAttribute(IBsonSerializer serializer, Attribute attribute)`
`72`	`72`	`{`
`73`	`73`	`EnsureNotFrozen();`
`74`		`- var itemSerializationInfoProvider = serializer as IBsonItemSerializationInfoProvider;`
`75`		`- if (itemSerializationInfoProvider == null)`
	`74`	`+ var arraySerializer = serializer as IBsonArraySerializer;`
	`75`	`+ if (arraySerializer == null)`
`76`	`76`	`{`
`77`	`77`	`var message = string.Format(`
`78`	`78`	`"A serialization options attribute of type {0} cannot be used when the serializer is of type {1}.",`
`@@ -81,7 +81,7 @@ public override void ApplyAttribute(IBsonSerializer serializer, Attribute attrib`
`81`	`81`	`throw new NotSupportedException(message);`
`82`	`82`	`}`
`83`	`83`
`84`		`- var itemSerializer = itemSerializationInfoProvider.GetItemSerializationInfo().Serializer;`
	`84`	`+ var itemSerializer = arraySerializer.GetItemSerializationInfo().Serializer;`
`85`	`85`	`if (_itemSerializationOptions == null)`
`86`	`86`	`{`
`87`	`87`	`var itemDefaultSerializationOptions = itemSerializer.GetDefaultSerializationOptions();`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public override string ToString()`
`193`	`193`	`/// <summary>`
`194`	`194`	`/// Represents a serializer for MongoDBRefs.`
`195`	`195`	`/// </summary>`
`196`		`- public class MongoDBRefSerializer : BsonBaseSerializer, IBsonMemberSerializationInfoProvider`
	`196`	`+ public class MongoDBRefSerializer : BsonBaseSerializer, IBsonDocumentSerializer`
`197`	`197`	`{`
`198`	`198`	`// public methods`
`199`	`199`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ public string User`
`328`	`328`	`/// <summary>`
`329`	`329`	`/// Represents a serializer for SystemProfileInfo.`
`330`	`330`	`/// </summary>`
`331`		`- public class SystemProfileInfoSerializer : BsonBaseSerializer, IBsonMemberSerializationInfoProvider`
	`331`	`+ public class SystemProfileInfoSerializer : BsonBaseSerializer, IBsonDocumentSerializer`
`332`	`332`	`{`
`333`	`333`	`// public methods`
`334`	`334`	`/// <summary>`