diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java index 91fbf5b9e..f5d512131 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java @@ -1407,7 +1407,7 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation { protected List getOperationArguments(AggregationOperationContext context) { List result = new ArrayList(values.size()); - result.add(context.getReference(getField().getName()).toString()); + result.add(context.getReference(getField()).toString()); for (Object element : values) { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java index ba36ee760..e6f6d378a 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java @@ -559,6 +559,16 @@ public class AggregationUnitTests { assertThat(getAsDocument(fields, "foosum"), isBsonObject().containing("$first.$cond.else", "no-answer")); } + @Test // DATAMONGO-1756 + public void projectOperationShouldRenderNestedFieldNamesCorrectly() { + + Document agg = newAggregation(project().and("value1.value").plus("value2.value").as("val")).toDocument("collection", + Aggregation.DEFAULT_CONTEXT); + + assertThat(extractPipelineElement(agg, 0, "$project"), + is(equalTo(new Document("val", new Document("$add", Arrays.asList("$value1.value", "$value2.value")))))); + } + private Document extractPipelineElement(Document agg, int index, String operation) { List pipeline = (List) agg.get("pipeline"); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContextUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContextUnitTests.java index f1d415e6a..7b73edfcf 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContextUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContextUnitTests.java @@ -338,6 +338,18 @@ public class TypeBasedAggregationOperationContextUnitTests { assertThat(age, isBsonObject().containing("$ifNull.[1]._class", Age.class.getName())); } + @Test // DATAMONGO-1756 + public void projectOperationShouldRenderNestedFieldNamesCorrectlyForTypedAggregation() { + + AggregationOperationContext context = getContext(Wrapper.class); + + Document agg = newAggregation(Wrapper.class, project().and("nested1.value1").plus("nested2.value2").as("val")) + .toDocument("collection", context); + + assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project"), is( + equalTo(new Document("val", new Document("$add", Arrays.asList("$nested1.value1", "$field2.nestedValue2")))))); + } + @org.springframework.data.mongodb.core.mapping.Document(collection = "person") public static class FooPerson { @@ -408,4 +420,15 @@ public class TypeBasedAggregationOperationContextUnitTests { String name; } + + static class Wrapper { + + Nested nested1; + @org.springframework.data.mongodb.core.mapping.Field("field2") Nested nested2; + } + + static class Nested { + String value1; + @org.springframework.data.mongodb.core.mapping.Field("nestedValue2") String value2; + } }