replaced IBsonArraySerializer's GetItemSerializationInfo with TryGetItemSerializationInfo.

craiggwilson · craiggwilson · commit d39732abcdc5 · 2015-03-21T11:58:03.000-05:00
diff --git a/src/MongoDB.Bson/Serialization/IBsonArraySerializer.cs b/src/MongoDB.Bson/Serialization/IBsonArraySerializer.cs
@@ -21,9 +21,12 @@ namespace MongoDB.Bson.Serialization
     public interface IBsonArraySerializer : IBsonSerializer
     {
         /// <summary>
-        /// Gets the serialization info for individual items of the array.
+        /// Tries to get the serialization info for the individual items of the array.
         /// </summary>
-        /// <returns>The serialization info for the items.</returns>
-        BsonSerializationInfo GetItemSerializationInfo();
+        /// <param name="serializationInfo">The serialization information.</param>
+        /// <returns>
+        ///   <c>true</c> if the serialization info exists; otherwise <c>false</c>.
+        ///</returns>
+        bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo);
     }
 }
diff --git a/src/MongoDB.Bson/Serialization/Serializers/BsonArraySerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/BsonArraySerializer.cs
@@ -66,17 +66,19 @@ protected override BsonArray DeserializeValue(BsonDeserializationContext context
         }
 
         /// <summary>
-        /// Gets the serialization info for individual items of the array.
+        /// Tries to get the serialization info for the individual items of the array.
         /// </summary>
+        /// <param name="serializationInfo">The serialization information.</param>
         /// <returns>
-        /// The serialization info for the items.
+        ///   <c>true</c> if the serialization info exists; otherwise <c>false</c>.
         /// </returns>
-        public BsonSerializationInfo GetItemSerializationInfo()
+        public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)
         {
-            return new BsonSerializationInfo(
+            serializationInfo = new BsonSerializationInfo(
                 null,
                 BsonValueSerializer.Instance,
                 typeof(BsonValue));
+            return true;
         }
 
         // protected methods
diff --git a/src/MongoDB.Bson/Serialization/Serializers/BsonValueCSharpNullSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/BsonValueCSharpNullSerializer.cs
@@ -133,14 +133,15 @@ public BsonValueCSharpNullArrayAndDocumentSerializer(IBsonSerializer<TBsonValue>
         }
 
         /// <summary>
-        /// Gets the serialization info for individual items of the array.
+        /// Tries to get the serialization info for the individual items of the array.
         /// </summary>
+        /// <param name="serializationInfo">The serialization information.</param>
         /// <returns>
         /// The serialization info for the items.
         /// </returns>
-        public BsonSerializationInfo GetItemSerializationInfo()
+        public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)
         {
-            return BsonValueSerializer.Instance.GetItemSerializationInfo();
+            return BsonValueSerializer.Instance.TryGetItemSerializationInfo(out serializationInfo);
         }
 
         /// <summary>
@@ -175,14 +176,15 @@ public BsonValueCSharpNullArraySerializer(IBsonSerializer<TBsonValue> wrappedSer
         }
 
         /// <summary>
-        /// Gets the serialization info for individual items of the array.
+        /// Tries to get the serialization info for the individual items of the array.
         /// </summary>
+        /// <param name="serializationInfo">The serialization information.</param>
         /// <returns>
-        /// The serialization info for the items.
+        ///   <c>true</c> if the serialization info exists; otherwise <c>false</c>.
         /// </returns>
-        public BsonSerializationInfo GetItemSerializationInfo()
+        public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)
         {
-            return BsonValueSerializer.Instance.GetItemSerializationInfo();
+            return BsonValueSerializer.Instance.TryGetItemSerializationInfo(out serializationInfo);
         }
     }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/BsonValueSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/BsonValueSerializer.cs
@@ -102,17 +102,19 @@ public bool TryGetMemberSerializationInfo(string memberName, out BsonSerializati
         }
 
         /// <summary>
-        /// Gets the serialization info for individual items of the array.
+        /// Tries to get the serialization info for the individual items of the array.
         /// </summary>
+        /// <param name="serializationInfo">The serialization information.</param>
         /// <returns>
-        /// The serialization info for the items.
+        ///   <c>true</c> if the serialization info exists; otherwise <c>false</c>.
         /// </returns>
-        public BsonSerializationInfo GetItemSerializationInfo()
+        public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)
         {
-            return new BsonSerializationInfo(
+            serializationInfo = new BsonSerializationInfo(
                 null,
                 BsonValueSerializer.Instance,
                 typeof(BsonValue));
+            return true;
         }
 
         /// <summary>
diff --git a/src/MongoDB.Bson/Serialization/Serializers/EnumerableSerializerBase.cs b/src/MongoDB.Bson/Serialization/Serializers/EnumerableSerializerBase.cs
@@ -110,13 +110,16 @@ public override TValue Deserialize(BsonDeserializationContext context, BsonDeser
         }
 
         /// <summary>
-        /// Gets the serialization info for individual items of an enumerable type.
+        /// Tries to get the serialization info for the individual items of the array.
         /// </summary>
-        /// <returns>The serialization info for the items.</returns>
-        public BsonSerializationInfo GetItemSerializationInfo()
+        /// <param name="serializationInfo">The serialization information.</param>
+        /// <returns>
+        ///   <c>true</c> if the serialization info exists; otherwise <c>false</c>.
+        /// </returns>
+        public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)
         {
-            string elementName = null;
-            return new BsonSerializationInfo(elementName, _itemSerializer, _itemSerializer.ValueType);
+            serializationInfo = new BsonSerializationInfo(null, _itemSerializer, _itemSerializer.ValueType);
+            return true;
         }
 
         /// <summary>
@@ -275,13 +278,16 @@ public override TValue Deserialize(BsonDeserializationContext context, BsonDeser
         }
 
         /// <summary>
-        /// Gets the serialization info for individual items of an enumerable type.
+        /// Tries to get the serialization info for the individual items of the array.
         /// </summary>
-        /// <returns>The serialization info for the items.</returns>
-        public BsonSerializationInfo GetItemSerializationInfo()
+        /// <param name="serializationInfo">The serialization information.</param>
+        /// <returns>
+        /// The serialization info for the items.
+        /// </returns>
+        public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)
         {
-            string elementName = null;
-            return new BsonSerializationInfo(elementName, _itemSerializer, _itemSerializer.ValueType);
+            serializationInfo = new BsonSerializationInfo(null, _itemSerializer, _itemSerializer.ValueType);
+            return true;
         }
 
         /// <summary>
diff --git a/src/MongoDB.Bson/Serialization/Serializers/ImpliedImplementationInterfaceSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ImpliedImplementationInterfaceSerializer.cs
@@ -168,20 +168,22 @@ public override TInterface Deserialize(BsonDeserializationContext context, BsonD
         }
 
         /// <summary>
-        /// Gets the serialization info for individual items of the array.
+        /// Tries to get the serialization info for the individual items of the array.
         /// </summary>
+        /// <param name="serializationInfo">The serialization information.</param>
         /// <returns>
-        /// The serialization info for the items.
+        ///   <c>true</c> if the serialization info exists; otherwise <c>false</c>.
         /// </returns>
-        public BsonSerializationInfo GetItemSerializationInfo()
+        public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)
         {
             var arraySerializer = _implementationSerializer as IBsonArraySerializer;
             if (arraySerializer != null)
             {
-                return arraySerializer.GetItemSerializationInfo();
+                return arraySerializer.TryGetItemSerializationInfo(out serializationInfo);
             }
 
-            return null;
+            serializationInfo = null;
+            return false;
         }
 
         /// <summary>
diff --git a/src/MongoDB.Driver.Legacy/Linq/Utils/BsonSerializationInfoFinder.cs b/src/MongoDB.Driver.Legacy/Linq/Utils/BsonSerializationInfoFinder.cs
@@ -108,20 +108,20 @@ protected override BsonSerializationInfo VisitBinary(BinaryExpression node)
                 return null;
             }
 
-            var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;
-            if (arraySerializer == null)
+            var indexEpression = node.Right as ConstantExpression;
+            if (indexEpression == null)
             {
                 return null;
             }
+            var index = Convert.ToInt32(indexEpression.Value);
 
-            var indexEpression = node.Right as ConstantExpression;
-            if (indexEpression == null)
+            var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;
+            BsonSerializationInfo itemSerializationInfo;
+            if (arraySerializer == null || !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))
             {
                 return null;
             }
-            var index = Convert.ToInt32(indexEpression.Value);
 
-            var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();
             itemSerializationInfo = new BsonSerializationInfo(
                 index.ToString(),
                 itemSerializationInfo.Serializer,
@@ -256,10 +256,9 @@ private BsonSerializationInfo VisitGetItem(MethodCallExpression node)
                 indexExpression.Type == typeof(ulong))
             {
                 var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;
-                if (arraySerializer != null)
+                BsonSerializationInfo itemSerializationInfo;
+                if (arraySerializer != null && arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))
                 {
-                    var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();
-
                     itemSerializationInfo = new BsonSerializationInfo(
                         indexName,
                         itemSerializationInfo.Serializer,
@@ -293,13 +292,13 @@ private BsonSerializationInfo VisitElementAt(MethodCallExpression node)
             }
 
             var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;
-            if (arraySerializer == null)
+            BsonSerializationInfo itemSerializationInfo;
+            if (arraySerializer == null || !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))
             {
                 return null;
             }
 
             var index = (int)((ConstantExpression)node.Arguments[1]).Value;
-            var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();
             itemSerializationInfo = new BsonSerializationInfo(
                 index.ToString(),
                 itemSerializationInfo.Serializer,
diff --git a/src/MongoDB.Driver.Legacy/Linq/Utils/BsonSerializationInfoHelper.cs b/src/MongoDB.Driver.Legacy/Linq/Utils/BsonSerializationInfoHelper.cs
@@ -89,13 +89,9 @@ public bool TryGetItemSerializationInfo(BsonSerializationInfo serializationInfo,
         {
             itemSerializationInfo = null;
             var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;
-            if (arraySerializer != null)
+            if (arraySerializer != null && arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))
             {
-                itemSerializationInfo = arraySerializer.GetItemSerializationInfo();
-                if (itemSerializationInfo != null)
-                {
-                    return true;
-                }
+                return true;
             }
 
             return false;
diff --git a/src/MongoDB.Driver/FieldDefinition.cs b/src/MongoDB.Driver/FieldDefinition.cs
@@ -365,9 +365,8 @@ public static void Resolve<TDocument>(string fieldName, IBsonSerializer<TDocumen
                 if (nameParts[i] == "$" || nameParts[i].All(char.IsDigit))
                 {
                     arraySerializer = resolvedFieldSerializer as IBsonArraySerializer;
-                    if (arraySerializer != null)
+                    if (arraySerializer != null && arraySerializer.TryGetItemSerializationInfo(out serializationInfo))
                     {
-                        serializationInfo = arraySerializer.GetItemSerializationInfo();
                         resolvedFieldSerializer = serializationInfo.Serializer;
                         continue;
                     }
@@ -381,9 +380,8 @@ public static void Resolve<TDocument>(string fieldName, IBsonSerializer<TDocumen
                 {
                     // need to check if this is an any element array match
                     arraySerializer = resolvedFieldSerializer as IBsonArraySerializer;
-                    if (arraySerializer != null)
+                    if (arraySerializer != null && arraySerializer.TryGetItemSerializationInfo(out serializationInfo))
                     {
-                        serializationInfo = arraySerializer.GetItemSerializationInfo();
                         documentSerializer = serializationInfo.Serializer as IBsonDocumentSerializer;
                         if (documentSerializer == null || !documentSerializer.TryGetMemberSerializationInfo(nameParts[i], out serializationInfo))
                         {
diff --git a/src/MongoDB.Driver/FilterDefinitionBuilder.cs b/src/MongoDB.Driver/FilterDefinitionBuilder.cs
@@ -1159,12 +1159,13 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
             if (renderedField.FieldSerializer != null)
             {
                 var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;
-                if (arraySerializer == null)
+                BsonSerializationInfo itemSerializationInfo;
+                if (arraySerializer == null || !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))
                 {
-                    var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer.", renderedField.FieldName);
+                    var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);
                     throw new InvalidOperationException(message);
                 }
-                itemSerializer = arraySerializer.GetItemSerializationInfo().Serializer;
+                itemSerializer = itemSerializationInfo.Serializer;
             }
             else
             {
@@ -1212,12 +1213,13 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
             if (renderedField.FieldSerializer != null)
             {
                 var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;
-                if (arraySerializer == null)
+                BsonSerializationInfo itemSerializationInfo;
+                if (arraySerializer == null || !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))
                 {
-                    var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer.", renderedField.FieldName);
+                    var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);
                     throw new InvalidOperationException(message);
                 }
-                itemSerializer = (IBsonSerializer<TItem>)arraySerializer.GetItemSerializationInfo().Serializer;
+                itemSerializer = (IBsonSerializer<TItem>)itemSerializationInfo.Serializer;
             }
             else
             {
@@ -1652,12 +1654,13 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
             if (renderedField.FieldSerializer != null)
             {
                 var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;
-                if (arraySerializer == null)
+                BsonSerializationInfo itemSerializationInfo;
+                if (arraySerializer == null || !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))
                 {
-                    var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer.", renderedField.FieldName);
+                    var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);
                     throw new InvalidOperationException(message);
                 }
-                itemSerializer = arraySerializer.GetItemSerializationInfo().Serializer;
+                itemSerializer = itemSerializationInfo.Serializer;
             }
             else
             {
@@ -1700,12 +1703,13 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
             if (renderedField.FieldSerializer != null)
             {
                 var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;
-                if (arraySerializer == null)
+                BsonSerializationInfo itemSerializationInfo;
+                if (arraySerializer == null || !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))
                 {
-                    var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer.", renderedField.FieldName);
+                    var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);
                     throw new InvalidOperationException(message);
                 }
-                itemSerializer = (IBsonSerializer<TItem>)arraySerializer.GetItemSerializationInfo().Serializer;
+                itemSerializer = (IBsonSerializer<TItem>)itemSerializationInfo.Serializer;
             }
             else
             {
diff --git a/src/MongoDB.Driver/Linq/Processors/SerializationInfoBinder.cs b/src/MongoDB.Driver/Linq/Processors/SerializationInfoBinder.cs
diff --git a/src/MongoDB.Driver/Linq/Translators/PredicateTranslator.cs b/src/MongoDB.Driver/Linq/Translators/PredicateTranslator.cs
diff --git a/src/MongoDB.Driver/ProjectionDefinitionBuilder.cs b/src/MongoDB.Driver/ProjectionDefinitionBuilder.cs
diff --git a/src/MongoDB.Driver/UpdateDefinitionBuilder.cs b/src/MongoDB.Driver/UpdateDefinitionBuilder.cs

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,12 @@ namespace MongoDB.Bson.Serialization`
`21`	`21`	`public interface IBsonArraySerializer : IBsonSerializer`
`22`	`22`	`{`
`23`	`23`	`/// <summary>`
`24`		`- /// Gets the serialization info for individual items of the array.`
	`24`	`+ /// Tries to get the serialization info for the individual items of the array.`
`25`	`25`	`/// </summary>`
`26`		`- /// <returns>The serialization info for the items.</returns>`
`27`		`- BsonSerializationInfo GetItemSerializationInfo();`
	`26`	`+ /// <param name="serializationInfo">The serialization information.</param>`
	`27`	`+ /// <returns>`
	`28`	`+ /// <c>true</c> if the serialization info exists; otherwise <c>false</c>.`
	`29`	`+ ///</returns>`
	`30`	`+ bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo);`
`28`	`31`	`}`
`29`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,14 +133,15 @@ public BsonValueCSharpNullArrayAndDocumentSerializer(IBsonSerializer<TBsonValue>`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/// <summary>`
`136`		`- /// Gets the serialization info for individual items of the array.`
	`136`	`+ /// Tries to get the serialization info for the individual items of the array.`
`137`	`137`	`/// </summary>`
	`138`	`+ /// <param name="serializationInfo">The serialization information.</param>`
`138`	`139`	`/// <returns>`
`139`	`140`	`/// The serialization info for the items.`
`140`	`141`	`/// </returns>`
`141`		`- public BsonSerializationInfo GetItemSerializationInfo()`
	`142`	`+ public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)`
`142`	`143`	`{`
`143`		`- return BsonValueSerializer.Instance.GetItemSerializationInfo();`
	`144`	`+ return BsonValueSerializer.Instance.TryGetItemSerializationInfo(out serializationInfo);`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`/// <summary>`
`@@ -175,14 +176,15 @@ public BsonValueCSharpNullArraySerializer(IBsonSerializer<TBsonValue> wrappedSer`
`175`	`176`	`}`
`176`	`177`
`177`	`178`	`/// <summary>`
`178`		`- /// Gets the serialization info for individual items of the array.`
	`179`	`+ /// Tries to get the serialization info for the individual items of the array.`
`179`	`180`	`/// </summary>`
	`181`	`+ /// <param name="serializationInfo">The serialization information.</param>`
`180`	`182`	`/// <returns>`
`181`		`- /// The serialization info for the items.`
	`183`	`+ /// <c>true</c> if the serialization info exists; otherwise <c>false</c>.`
`182`	`184`	`/// </returns>`
`183`		`- public BsonSerializationInfo GetItemSerializationInfo()`
	`185`	`+ public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)`
`184`	`186`	`{`
`185`		`- return BsonValueSerializer.Instance.GetItemSerializationInfo();`
	`187`	`+ return BsonValueSerializer.Instance.TryGetItemSerializationInfo(out serializationInfo);`
`186`	`188`	`}`
`187`	`189`	`}`
`188`	`190`
Original file line number	Diff line number	Diff line change
`@@ -168,20 +168,22 @@ public override TInterface Deserialize(BsonDeserializationContext context, BsonD`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/// <summary>`
`171`		`- /// Gets the serialization info for individual items of the array.`
	`171`	`+ /// Tries to get the serialization info for the individual items of the array.`
`172`	`172`	`/// </summary>`
	`173`	`+ /// <param name="serializationInfo">The serialization information.</param>`
`173`	`174`	`/// <returns>`
`174`		`- /// The serialization info for the items.`
	`175`	`+ /// <c>true</c> if the serialization info exists; otherwise <c>false</c>.`
`175`	`176`	`/// </returns>`
`176`		`- public BsonSerializationInfo GetItemSerializationInfo()`
	`177`	`+ public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)`
`177`	`178`	`{`
`178`	`179`	`var arraySerializer = _implementationSerializer as IBsonArraySerializer;`
`179`	`180`	`if (arraySerializer != null)`
`180`	`181`	`{`
`181`		`- return arraySerializer.GetItemSerializationInfo();`
	`182`	`+ return arraySerializer.TryGetItemSerializationInfo(out serializationInfo);`
`182`	`183`	`}`
`183`	`184`
`184`		`- return null;`
	`185`	`+ serializationInfo = null;`
	`186`	`+ return false;`
`185`	`187`	`}`
`186`	`188`
`187`	`189`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -108,20 +108,20 @@ protected override BsonSerializationInfo VisitBinary(BinaryExpression node)`
`108`	`108`	`return null;`
`109`	`109`	`}`
`110`	`110`
`111`		`- var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;`
`112`		`- if (arraySerializer == null)`
	`111`	`+ var indexEpression = node.Right as ConstantExpression;`
	`112`	`+ if (indexEpression == null)`
`113`	`113`	`{`
`114`	`114`	`return null;`
`115`	`115`	`}`
	`116`	`+ var index = Convert.ToInt32(indexEpression.Value);`
`116`	`117`
`117`		`- var indexEpression = node.Right as ConstantExpression;`
`118`		`- if (indexEpression == null)`
	`118`	`+ var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;`
	`119`	`+ BsonSerializationInfo itemSerializationInfo;`
	`120`	`+ if (arraySerializer == null \|\| !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))`
`119`	`121`	`{`
`120`	`122`	`return null;`
`121`	`123`	`}`
`122`		`- var index = Convert.ToInt32(indexEpression.Value);`
`123`	`124`
`124`		`- var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();`
`125`	`125`	`itemSerializationInfo = new BsonSerializationInfo(`
`126`	`126`	`index.ToString(),`
`127`	`127`	`itemSerializationInfo.Serializer,`
`@@ -256,10 +256,9 @@ private BsonSerializationInfo VisitGetItem(MethodCallExpression node)`
`256`	`256`	`indexExpression.Type == typeof(ulong))`
`257`	`257`	`{`
`258`	`258`	`var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;`
`259`		`- if (arraySerializer != null)`
	`259`	`+ BsonSerializationInfo itemSerializationInfo;`
	`260`	`+ if (arraySerializer != null && arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))`
`260`	`261`	`{`
`261`		`- var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();`
`262`		`-`
`263`	`262`	`itemSerializationInfo = new BsonSerializationInfo(`
`264`	`263`	`indexName,`
`265`	`264`	`itemSerializationInfo.Serializer,`
`@@ -293,13 +292,13 @@ private BsonSerializationInfo VisitElementAt(MethodCallExpression node)`
`293`	`292`	`}`
`294`	`293`
`295`	`294`	`var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;`
`296`		`- if (arraySerializer == null)`
	`295`	`+ BsonSerializationInfo itemSerializationInfo;`
	`296`	`+ if (arraySerializer == null \|\| !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))`
`297`	`297`	`{`
`298`	`298`	`return null;`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`var index = (int)((ConstantExpression)node.Arguments[1]).Value;`
`302`		`- var itemSerializationInfo = arraySerializer.GetItemSerializationInfo();`
`303`	`302`	`itemSerializationInfo = new BsonSerializationInfo(`
`304`	`303`	`index.ToString(),`
`305`	`304`	`itemSerializationInfo.Serializer,`
Original file line number	Diff line number	Diff line change
`@@ -89,13 +89,9 @@ public bool TryGetItemSerializationInfo(BsonSerializationInfo serializationInfo,`
`89`	`89`	`{`
`90`	`90`	`itemSerializationInfo = null;`
`91`	`91`	`var arraySerializer = serializationInfo.Serializer as IBsonArraySerializer;`
`92`		`- if (arraySerializer != null)`
	`92`	`+ if (arraySerializer != null && arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))`
`93`	`93`	`{`
`94`		`- itemSerializationInfo = arraySerializer.GetItemSerializationInfo();`
`95`		`- if (itemSerializationInfo != null)`
`96`		`- {`
`97`		`- return true;`
`98`		`- }`
	`94`	`+ return true;`
`99`	`95`	`}`
`100`	`96`
`101`	`97`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -365,9 +365,8 @@ public static void Resolve<TDocument>(string fieldName, IBsonSerializer<TDocumen`
`365`	`365`	`if (nameParts[i] == "$" \|\| nameParts[i].All(char.IsDigit))`
`366`	`366`	`{`
`367`	`367`	`arraySerializer = resolvedFieldSerializer as IBsonArraySerializer;`
`368`		`- if (arraySerializer != null)`
	`368`	`+ if (arraySerializer != null && arraySerializer.TryGetItemSerializationInfo(out serializationInfo))`
`369`	`369`	`{`
`370`		`- serializationInfo = arraySerializer.GetItemSerializationInfo();`
`371`	`370`	`resolvedFieldSerializer = serializationInfo.Serializer;`
`372`	`371`	`continue;`
`373`	`372`	`}`
`@@ -381,9 +380,8 @@ public static void Resolve<TDocument>(string fieldName, IBsonSerializer<TDocumen`
`381`	`380`	`{`
`382`	`381`	`// need to check if this is an any element array match`
`383`	`382`	`arraySerializer = resolvedFieldSerializer as IBsonArraySerializer;`
`384`		`- if (arraySerializer != null)`
	`383`	`+ if (arraySerializer != null && arraySerializer.TryGetItemSerializationInfo(out serializationInfo))`
`385`	`384`	`{`
`386`		`- serializationInfo = arraySerializer.GetItemSerializationInfo();`
`387`	`385`	`documentSerializer = serializationInfo.Serializer as IBsonDocumentSerializer;`
`388`	`386`	`if (documentSerializer == null \|\| !documentSerializer.TryGetMemberSerializationInfo(nameParts[i], out serializationInfo))`
`389`	`387`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1159,12 +1159,13 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`1159`	`1159`	`if (renderedField.FieldSerializer != null)`
`1160`	`1160`	`{`
`1161`	`1161`	`var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;`
`1162`		`- if (arraySerializer == null)`
	`1162`	`+ BsonSerializationInfo itemSerializationInfo;`
	`1163`	`+ if (arraySerializer == null \|\| !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))`
`1163`	`1164`	`{`
`1164`		`- var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer.", renderedField.FieldName);`
	`1165`	`+ var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);`
`1165`	`1166`	`throw new InvalidOperationException(message);`
`1166`	`1167`	`}`
`1167`		`- itemSerializer = arraySerializer.GetItemSerializationInfo().Serializer;`
	`1168`	`+ itemSerializer = itemSerializationInfo.Serializer;`
`1168`	`1169`	`}`
`1169`	`1170`	`else`
`1170`	`1171`	`{`
`@@ -1212,12 +1213,13 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`1212`	`1213`	`if (renderedField.FieldSerializer != null)`
`1213`	`1214`	`{`
`1214`	`1215`	`var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;`
`1215`		`- if (arraySerializer == null)`
	`1216`	`+ BsonSerializationInfo itemSerializationInfo;`
	`1217`	`+ if (arraySerializer == null \|\| !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))`
`1216`	`1218`	`{`
`1217`		`- var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer.", renderedField.FieldName);`
	`1219`	`+ var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);`
`1218`	`1220`	`throw new InvalidOperationException(message);`
`1219`	`1221`	`}`
`1220`		`- itemSerializer = (IBsonSerializer<TItem>)arraySerializer.GetItemSerializationInfo().Serializer;`
	`1222`	`+ itemSerializer = (IBsonSerializer<TItem>)itemSerializationInfo.Serializer;`
`1221`	`1223`	`}`
`1222`	`1224`	`else`
`1223`	`1225`	`{`
`@@ -1652,12 +1654,13 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`1652`	`1654`	`if (renderedField.FieldSerializer != null)`
`1653`	`1655`	`{`
`1654`	`1656`	`var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;`
`1655`		`- if (arraySerializer == null)`
	`1657`	`+ BsonSerializationInfo itemSerializationInfo;`
	`1658`	`+ if (arraySerializer == null \|\| !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))`
`1656`	`1659`	`{`
`1657`		`- var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer.", renderedField.FieldName);`
	`1660`	`+ var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);`
`1658`	`1661`	`throw new InvalidOperationException(message);`
`1659`	`1662`	`}`
`1660`		`- itemSerializer = arraySerializer.GetItemSerializationInfo().Serializer;`
	`1663`	`+ itemSerializer = itemSerializationInfo.Serializer;`
`1661`	`1664`	`}`
`1662`	`1665`	`else`
`1663`	`1666`	`{`
`@@ -1700,12 +1703,13 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`1700`	`1703`	`if (renderedField.FieldSerializer != null)`
`1701`	`1704`	`{`
`1702`	`1705`	`var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;`
`1703`		`- if (arraySerializer == null)`
	`1706`	`+ BsonSerializationInfo itemSerializationInfo;`
	`1707`	`+ if (arraySerializer == null \|\| !arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))`
`1704`	`1708`	`{`
`1705`		`- var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer.", renderedField.FieldName);`
	`1709`	`+ var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);`
`1706`	`1710`	`throw new InvalidOperationException(message);`
`1707`	`1711`	`}`
`1708`		`- itemSerializer = (IBsonSerializer<TItem>)arraySerializer.GetItemSerializationInfo().Serializer;`
	`1712`	`+ itemSerializer = (IBsonSerializer<TItem>)itemSerializationInfo.Serializer;`
`1709`	`1713`	`}`
`1710`	`1714`	`else`
`1711`	`1715`	`{`