CSHARP-5477: Rename AggregationExpression to TranslatedExpression.

Author: rstam

src/MongoDB.Driver/Linq/Linq3Implementation/Misc/ConvertHelper.cs

@@ -151,7 +151,7 @@ public static Expression RemoveConvertToObject(Expression expression)
             return expression;
         }
 
-        public static AstExpression RemoveWideningConvert(AggregationExpression translation)
+        public static AstExpression RemoveWideningConvert(TranslatedExpression translation)
         {
             if (translation.Expression is UnaryExpression convertExpression &&
                 convertExpression.NodeType == ExpressionType.Convert &&

src/MongoDB.Driver/Linq/Linq3Implementation/Misc/NestedAsQueryableHelper.cs

@@ -22,7 +22,7 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.Misc
 {
     internal static class NestedAsQueryableHelper
     {
-        public static void EnsureQueryableMethodHasNestedAsQueryableSource(MethodCallExpression expression, AggregationExpression sourceTranslation)
+        public static void EnsureQueryableMethodHasNestedAsQueryableSource(MethodCallExpression expression, TranslatedExpression sourceTranslation)
         {
             if (expression.Method.DeclaringType == typeof(Queryable) &&
                 sourceTranslation.Serializer is not INestedAsQueryableSerializer)
@@ -31,7 +31,7 @@ public static void EnsureQueryableMethodHasNestedAsQueryableSource(MethodCallExp
             }
         }
 
-        public static void EnsureQueryableMethodHasNestedAsOrderedQueryableSource(MethodCallExpression expression, AggregationExpression sourceTranslation)
+        public static void EnsureQueryableMethodHasNestedAsOrderedQueryableSource(MethodCallExpression expression, TranslatedExpression sourceTranslation)
         {
             if (expression.Method.DeclaringType == typeof(Queryable) &&
                 sourceTranslation.Serializer is not INestedAsOrderedQueryableSerializer)

src/MongoDB.Driver/Linq/Linq3Implementation/Misc/ProjectionHelper.cs

@@ -29,7 +29,7 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.Misc
     internal static class ProjectionHelper
     {
         // public static methods
-        public static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateAggregationProjection(AggregationExpression expression)
+        public static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateAggregationProjection(TranslatedExpression expression)
         {
             return expression.Ast.NodeType switch
             {
@@ -38,7 +38,7 @@ public static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) Cre
             };
         }
 
-        public static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateFindProjection(AggregationExpression expression)
+        public static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateFindProjection(TranslatedExpression expression)
         {
             return expression.Ast.NodeType switch
             {
@@ -47,15 +47,15 @@ public static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) Cre
             };
         }
 
-        public static (AstProjectStage, IBsonSerializer) CreateProjectStage(AggregationExpression expression)
+        public static (AstProjectStage, IBsonSerializer) CreateProjectStage(TranslatedExpression expression)
         {
             var (specifications, projectionSerializer) = CreateAggregationProjection(expression);
             var projectStage = AstStage.Project(specifications);
             return (projectStage, projectionSerializer);
         }
 
         // private static methods
-        private static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateComputedDocumentProjection(AggregationExpression expression)
+        private static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateComputedDocumentProjection(TranslatedExpression expression)
         {
             var computedDocument = (AstComputedDocumentExpression)expression.Ast;
 
@@ -76,7 +76,7 @@ private static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) Cr
             return (specifications, expression.Serializer);
         }
 
-        private static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateFindGetFieldProjection(AggregationExpression expression)
+        private static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateFindGetFieldProjection(TranslatedExpression expression)
         {
             var getFieldExpressionAst = (AstGetFieldExpression)expression.Ast;
             if (IsGetFieldChainWithSafeFieldNames(getFieldExpressionAst))
@@ -115,7 +115,7 @@ private static (string, IBsonSerializer) CreateGetFieldChainWithSafeFieldNamesPr
             throw new ArgumentException($"{nameof(CreateGetFieldChainWithSafeFieldNamesProjection)} called with an invalid getFieldExpression.", nameof(getFieldExpression));
         }
 
-        private static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateWrappedValueProjection(AggregationExpression expression)
+        private static (IReadOnlyList<AstProjectStageSpecification>, IBsonSerializer) CreateWrappedValueProjection(TranslatedExpression expression)
         {
             var wrappedValueSerializer = WrappedValueSerializer.Create("_v", expression.Serializer);
             var specifications = new List<AstProjectStageSpecification>

src/MongoDB.Driver/Linq/Linq3Implementation/Misc/SerializationHelper.cs

@@ -27,7 +27,7 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.Misc
 {
     internal static class SerializationHelper
     {
-        public static void EnsureArgumentSerializersAreEqual(Expression expression, AggregationExpression firstArgumentTranslation, AggregationExpression secondArgumentTranslation)
+        public static void EnsureArgumentSerializersAreEqual(Expression expression, TranslatedExpression firstArgumentTranslation, TranslatedExpression secondArgumentTranslation)
         {
             EnsureArgumentSerializersAreEqual(expression, firstArgumentTranslation.Serializer, secondArgumentTranslation.Serializer);
         }
@@ -49,7 +49,7 @@ public static void EnsureRepresentationIsArray(Expression expression, IBsonSeria
             }
         }
 
-        public static void EnsureRepresentationIsBoolean(Expression expression, Expression argumentExpression, AggregationExpression argumentTranslation)
+        public static void EnsureRepresentationIsBoolean(Expression expression, Expression argumentExpression, TranslatedExpression argumentTranslation)
         {
             EnsureRepresentationIsBoolean(expression, argumentExpression, argumentTranslation.Serializer);
         }
@@ -63,7 +63,7 @@ public static void EnsureRepresentationIsBoolean(Expression expression, Expressi
             }
         }
 
-        public static void EnsureRepresentationIsNumeric(Expression expression, Expression argumentExpression, AggregationExpression argumentTranslation)
+        public static void EnsureRepresentationIsNumeric(Expression expression, Expression argumentExpression, TranslatedExpression argumentTranslation)
         {
             EnsureRepresentationIsNumeric(expression, argumentExpression, argumentTranslation.Serializer);
         }
@@ -169,7 +169,7 @@ public static bool IsRepresentedAsInteger(IBsonSerializer serializer)
             return IsIntegerRepresentation(representation);
         }
 
-        public static bool IsRepresentedAsIntegerOrNullableInteger(AggregationExpression translation)
+        public static bool IsRepresentedAsIntegerOrNullableInteger(TranslatedExpression translation)
         {
             return IsRepresentedAsIntegerOrNullableInteger(translation.Serializer);
         }

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

@@ -21,7 +21,7 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggreg
 {
     internal static class ArrayIndexExpressionToAggregationExpressionTranslator
     {
-        public static AggregationExpression Translate(TranslationContext context, BinaryExpression expression)
+        public static TranslatedExpression Translate(TranslationContext context, BinaryExpression expression)
         {
             if (expression.NodeType == ExpressionType.ArrayIndex)
             {
@@ -31,7 +31,7 @@ public static AggregationExpression Translate(TranslationContext context, Binary
                 var indexTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, indexExpression);
                 var ast = AstExpression.ArrayElemAt(arrayTranslation.Ast, indexTranslation.Ast);
                 var itemSerializer = ArraySerializerHelper.GetItemSerializer(arrayTranslation.Serializer);
-                return new AggregationExpression(expression, ast, itemSerializer);
+                return new TranslatedExpression(expression, ast, itemSerializer);
             }
 
             throw new ExpressionNotSupportedException(expression);

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

@@ -21,15 +21,15 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggreg
 {
     internal static class ArrayLengthExpressionToAggregationExpressionTranslator
     {
-        public static AggregationExpression Translate(TranslationContext context, UnaryExpression expression)
+        public static TranslatedExpression Translate(TranslationContext context, UnaryExpression expression)
         {
             if (expression.NodeType == ExpressionType.ArrayLength)
             {
                 var arrayExpression = expression.Operand;
                 var arrayTranslation = ExpressionToAggregationExpressionTranslator.TranslateEnumerable(context, arrayExpression);
                 var ast = AstExpression.Size(arrayTranslation.Ast);
                 var serializer = BsonSerializer.LookupSerializer(expression.Type);
-                return new AggregationExpression(expression, ast, serializer);
+                return new TranslatedExpression(expression, ast, serializer);
             }
 
             throw new ExpressionNotSupportedException(expression);

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

@@ -28,7 +28,7 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggreg
 {
     internal static class BinaryExpressionToAggregationExpressionTranslator
     {
-        public static AggregationExpression Translate(TranslationContext context, BinaryExpression expression)
+        public static TranslatedExpression Translate(TranslationContext context, BinaryExpression expression)
         {
             if (StringConcatMethodToAggregationExpressionTranslator.CanTranslate(expression, out var method, out var arguments))
             {
@@ -63,7 +63,7 @@ public static AggregationExpression Translate(TranslationContext context, Binary
                 return TranslateCoalesceExpression(context, expression, leftExpression, rightExpression);
             }
 
-            AggregationExpression leftTranslation, rightTranslation;
+            TranslatedExpression leftTranslation, rightTranslation;
             if (leftExpression is ConstantExpression leftConstantExpresion)
             {
                 rightTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, rightExpression);
@@ -246,12 +246,12 @@ static bool IsEnumOrConvertEnumToUnderlyingType(Expression expression)
             return expression.Type.IsEnum || IsConvertEnumToUnderlyingType(expression);
         }
 
-        private static AggregationExpression TranslateArithmeticExpression(
+        private static TranslatedExpression TranslateArithmeticExpression(
             BinaryExpression expression,
             Expression leftExpression,
             Expression rightExpression,
-            AggregationExpression leftTranslation,
-            AggregationExpression rightTranslation)
+            TranslatedExpression leftTranslation,
+            TranslatedExpression rightTranslation)
         {
             SerializationHelper.EnsureRepresentationIsNumeric(expression, leftExpression, leftTranslation);
             SerializationHelper.EnsureRepresentationIsNumeric(expression, rightExpression, rightTranslation);
@@ -273,15 +273,15 @@ private static AggregationExpression TranslateArithmeticExpression(
             };
             var serializer = StandardSerializers.GetSerializer(expression.Type);
 
-            return new AggregationExpression(expression, ast, serializer);
+            return new TranslatedExpression(expression, ast, serializer);
         }
 
-        private static AggregationExpression TranslateBooleanExpression(
+        private static TranslatedExpression TranslateBooleanExpression(
             BinaryExpression expression,
             Expression leftExpression,
             Expression rightExpression,
-            AggregationExpression leftTranslation,
-            AggregationExpression rightTranslation)
+            TranslatedExpression leftTranslation,
+            TranslatedExpression rightTranslation)
         {
             SerializationHelper.EnsureRepresentationIsBoolean(expression, leftExpression, leftTranslation);
             SerializationHelper.EnsureRepresentationIsBoolean(expression, rightExpression, rightTranslation);
@@ -298,16 +298,16 @@ private static AggregationExpression TranslateBooleanExpression(
                 _ => throw new ExpressionNotSupportedException(expression)
             };
 
-            return new AggregationExpression(expression, ast, StandardSerializers.BooleanSerializer);
+            return new TranslatedExpression(expression, ast, StandardSerializers.BooleanSerializer);
         }
 
-        private static AggregationExpression TranslateCoalesceExpression(
+        private static TranslatedExpression TranslateCoalesceExpression(
             TranslationContext context,
             BinaryExpression expression,
             Expression leftExpression,
             Expression rightExpression)
         {
-            AggregationExpression leftTranslation, rightTranslation;
+            TranslatedExpression leftTranslation, rightTranslation;
             if (leftExpression is ConstantExpression leftConstantExpression)
             {
                 rightTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, rightExpression);
@@ -339,13 +339,13 @@ private static AggregationExpression TranslateCoalesceExpression(
             EnsureCoalesceArgumentSerializersAreCompatible(expression, leftTranslation.Serializer, rightTranslation.Serializer);
             var ast = AstExpression.IfNull(leftTranslation.Ast, rightTranslation.Ast);
 
-            return new AggregationExpression(expression, ast, rightTranslation.Serializer);
+            return new TranslatedExpression(expression, ast, rightTranslation.Serializer);
         }
 
-        private static AggregationExpression TranslateComparisonExpression(
+        private static TranslatedExpression TranslateComparisonExpression(
             BinaryExpression expression,
-            AggregationExpression leftTranslation,
-            AggregationExpression rightTranslation)
+            TranslatedExpression leftTranslation,
+            TranslatedExpression rightTranslation)
         {
             SerializationHelper.EnsureArgumentSerializersAreEqual(expression, leftTranslation, rightTranslation);
 
@@ -362,16 +362,16 @@ private static AggregationExpression TranslateComparisonExpression(
                 _ => throw new ExpressionNotSupportedException(expression)
             };
 
-            return new AggregationExpression(expression, ast, StandardSerializers.BooleanSerializer);
+            return new TranslatedExpression(expression, ast, StandardSerializers.BooleanSerializer);
         }
 
-        private static AggregationExpression TranslateConstant(BinaryExpression containingExpression, ConstantExpression constantExpression, IBsonSerializer otherSerializer)
+        private static TranslatedExpression TranslateConstant(BinaryExpression containingExpression, ConstantExpression constantExpression, IBsonSerializer otherSerializer)
         {
             var constantSerializer = GetConstantSerializer(containingExpression, otherSerializer, constantExpression.Type);
             return ConstantExpressionToAggregationExpressionTranslator.Translate(constantExpression, constantSerializer);
         }
 
-        private static AggregationExpression TranslateEnumArithmeticExpression(
+        private static TranslatedExpression TranslateEnumArithmeticExpression(
             TranslationContext context,
             BinaryExpression expression,
             Expression leftExpression,
@@ -380,7 +380,7 @@ private static AggregationExpression TranslateEnumArithmeticExpression(
             var leftTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, leftExpression);
             var rightTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, rightExpression);
 
-            AggregationExpression enumTranslation, operandTranslation;
+            TranslatedExpression enumTranslation, operandTranslation;
             if (IsEnumOrConvertEnumToUnderlyingType(leftExpression))
             {
                 enumTranslation = leftTranslation;
@@ -412,7 +412,7 @@ private static AggregationExpression TranslateEnumArithmeticExpression(
             };
             var serializer = enumTranslation.Serializer;
 
-            return new AggregationExpression(expression, ast, serializer);
+            return new TranslatedExpression(expression, ast, serializer);
         }
     }
 }

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

@@ -22,7 +22,7 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggreg
 {
     internal static class ConditionalExpressionToAggregationExpressionTranslator
     {
-        public static AggregationExpression Translate(TranslationContext context, ConditionalExpression expression)
+        public static TranslatedExpression Translate(TranslationContext context, ConditionalExpression expression)
         {
             if (expression.NodeType == ExpressionType.Conditional)
             {
@@ -32,8 +32,8 @@ public static AggregationExpression Translate(TranslationContext context, Condit
 
                 var testTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, testExpression);
 
-                AggregationExpression ifTrueTranslation;
-                AggregationExpression ifFalseTranslation;
+                TranslatedExpression ifTrueTranslation;
+                TranslatedExpression ifFalseTranslation;
                 IBsonSerializer resultSerializer;
                 if (ifTrueExpression is ConstantExpression ifTrueConstantExpression)
                 {
@@ -60,7 +60,7 @@ public static AggregationExpression Translate(TranslationContext context, Condit
                 }
 
                 var ast = AstExpression.Cond(testTranslation.Ast, ifTrueTranslation.Ast, ifFalseTranslation.Ast);
-                return new AggregationExpression(expression, ast, resultSerializer);
+                return new TranslatedExpression(expression, ast, resultSerializer);
             }
 
             throw new ExpressionNotSupportedException(expression);

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

@@ -23,19 +23,19 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggreg
 {
     internal static class ConstantExpressionToAggregationExpressionTranslator
     {
-        public static AggregationExpression Translate(ConstantExpression constantExpression)
+        public static TranslatedExpression Translate(ConstantExpression constantExpression)
         {
             var constantType = constantExpression.Type;
             var constantSerializer = StandardSerializers.TryGetSerializer(constantType, out var serializer) ? serializer : BsonSerializer.LookupSerializer(constantType);
             return Translate(constantExpression, constantSerializer);
        }
 
-        public static AggregationExpression Translate(ConstantExpression constantExpression, IBsonSerializer constantSerializer)
+        public static TranslatedExpression Translate(ConstantExpression constantExpression, IBsonSerializer constantSerializer)
         {
             var constantValue = constantExpression.Value;
             var serializedValue = constantSerializer.ToBsonValue(constantValue);
             var ast = AstExpression.Constant(serializedValue);
-            return new AggregationExpression(constantExpression, ast, constantSerializer);
+            return new TranslatedExpression(constantExpression, ast, constantSerializer);
         }
     }
 }