CSHARP-5779: Requested changes

Author: rstam

src/MongoDB.Driver/Linq/Linq3Implementation/Serializers/DictionaryKeyCollectionSerializer.cs

@@ -27,7 +27,7 @@ public static IBsonSerializer Create(IBsonSerializer keySerializer, IBsonSeriali
     {
         var keyType = keySerializer.ValueType;
         var valueType = valueSerializer.ValueType;
-        var serializerType  = typeof(DictionaryKeyCollectionSerializer<,>).MakeGenericType(keyType, valueType);
+        var serializerType = typeof(DictionaryKeyCollectionSerializer<,>).MakeGenericType(keyType, valueType);
         return (IBsonSerializer)Activator.CreateInstance(serializerType, [keySerializer]);
     }
 }

src/MongoDB.Driver/Linq/Linq3Implementation/Serializers/DictionaryValueCollectionSerializer.cs

@@ -27,7 +27,7 @@ public static IBsonSerializer Create(IBsonSerializer keySerializer, IBsonSeriali
     {
         var keyType = keySerializer.ValueType;
         var valueType = valueSerializer.ValueType;
-        var serializerType  = typeof(DictionaryValueCollectionSerializer<,>).MakeGenericType(keyType, valueType);
+        var serializerType = typeof(DictionaryValueCollectionSerializer<,>).MakeGenericType(keyType, valueType);
         return (IBsonSerializer)Activator.CreateInstance(serializerType, [keySerializer, valueSerializer]);
     }
 }

src/MongoDB.Driver/Linq/Linq3Implementation/Serializers/ICollectionSerializer.cs

@@ -26,7 +26,7 @@ internal static class ICollectionSerializer
     public static IBsonSerializer Create(IBsonSerializer itemSerializer)
     {
         var itemType = itemSerializer.ValueType;
-        var serializerType  = typeof(ICollectionSerializer<>).MakeGenericType(itemType);
+        var serializerType = typeof(ICollectionSerializer<>).MakeGenericType(itemType);
         return (IBsonSerializer)Activator.CreateInstance(serializerType, [itemSerializer]);
     }
 }

src/MongoDB.Driver/Linq/Linq3Implementation/Serializers/KeyValuePairWrappedValueSerializer.cs

@@ -27,7 +27,7 @@ public static IBsonSerializer Create(IBsonSerializer keySerializer, IBsonSeriali
     {
         var keyType = keySerializer.ValueType;
         var valueType = valueSerializer.ValueType;
-        var serializerType  = typeof(KeyValuePairWrappedValueSerializer<,>).MakeGenericType(keyType, valueType);
+        var serializerType = typeof(KeyValuePairWrappedValueSerializer<,>).MakeGenericType(keyType, valueType);
         return (IBsonSerializer)Activator.CreateInstance(serializerType, [keySerializer, valueSerializer]);
     }
 }

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MemberExpressionToAggregationExpressionTranslator.cs

@@ -243,7 +243,7 @@ private static bool TryTranslateDictionaryProperty(TranslationContext context, M
                                 {
                                     var valuesAst = dictionaryRepresentation switch
                                     {
-                                        DictionaryRepresentation.ArrayOfArrays => AstExpression.Map(containerAst, kvpVar, AstComputedArrayExpression.ArrayElemAt(kvpVar, 1)),
+                                        DictionaryRepresentation.ArrayOfArrays => AstExpression.Map(containerAst, kvpVar, AstExpression.ArrayElemAt(kvpVar, 1)),
                                         DictionaryRepresentation.ArrayOfDocuments => AstExpression.Map(containerAst, kvpVar, AstExpression.GetField(kvpVar, "v")),
                                         _ => throw new ExpressionNotSupportedException(expression, $"Unexpected dictionary representation: {dictionaryRepresentation}")
                                     };

tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp5779Tests.cs

@@ -264,7 +264,7 @@ public void IDictionaryAsArrayOfArrays_Values_First_with_predicate_should_work()
             .Select(x => x.IDictionaryAsArrayOfArrays.Values.First(v => v == 2));
 
         var stages = Translate(collection, queryable);
-        AssertStages(stages, "{ $project : { _v : { $arrayElemAt : [{ $filter : { input : { $map : { input : '$IDictionaryAsArrayOfArrays', as : 'kvp', in : { $arrayElemAt : ['$$kvp', 1] } } } , as : 'v', cond : { $eq : ['$$v', 2] } } }, 0] }, _id : 0 } }");
+        AssertStages(stages, "{ $project : { _v : { $arrayElemAt : [{ $filter : { input : { $map : { input : '$IDictionaryAsArrayOfArrays', as : 'kvp', in : { $arrayElemAt : ['$$kvp', 1] } } }, as : 'v', cond : { $eq : ['$$v', 2] } } }, 0] }, _id : 0 } }");
 
         var result = queryable.Single();
         result.Should().Be(2);