From 284f547e993748b0c420d79cfa36447b0cc7c43a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 15 Jan 2020 09:28:46 +0100 Subject: [PATCH] DATAMONGO-2437 - Polishing. Mention changes in Aggregation _id handling in what's new. Reformat code. Original pull request: #821. --- .../data/mongodb/core/aggregation/AggregationTests.java | 7 ++++--- src/main/asciidoc/new-features.adoc | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java index 87cd54848..06a068dc2 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java @@ -73,7 +73,7 @@ import org.springframework.data.mongodb.test.util.MongoVersion; import org.springframework.data.mongodb.test.util.MongoVersionRule; import org.springframework.data.util.CloseableIterator; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import com.mongodb.MongoException; import com.mongodb.client.MongoCollection; @@ -91,7 +91,7 @@ import com.mongodb.client.MongoCollection; * @author Sergey Shcherbakov * @author Minsu Kim */ -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @ContextConfiguration("classpath:infrastructure.xml") public class AggregationTests { @@ -1849,7 +1849,8 @@ public class AggregationTests { assertThat(bound0).containsEntry("count", 1).containsEntry("titles.[0]", "Dancer").containsEntry("_id.min", 680.0) .containsKey("_id.max"); - // { "_id" : { "min" : 820.0 , "max" : 1800.0 }, "count" : 1 , "titles" : [ "The Great Wave off Kanagawa"] , "sum" : 1673.0} + // { "_id" : { "min" : 820.0 , "max" : 1800.0 }, "count" : 1 , "titles" : [ "The Great Wave off Kanagawa"] , "sum" : + // 1673.0} Document bound1 = result.getMappedResults().get(1); assertThat(bound1).containsEntry("count", 1).containsEntry("_id.min", 820.0); assertThat((List) bound1.get("titles")).contains("The Great Wave off Kanagawa"); diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc index 1f0f4cac5..9b0a3d1ae 100644 --- a/src/main/asciidoc/new-features.adoc +++ b/src/main/asciidoc/new-features.adoc @@ -5,6 +5,7 @@ == What's New in Spring Data MongoDB 3.0 * Support for <>. +* Removal of `_id` flattening for composite Id's when using `MongoTemplate` aggregations. * Apply pagination when using GridFS `find(Query)`. [[new-features.2-2-0]]