From 8826f63f6338c5366a40f446e367b0ce9984d80b Mon Sep 17 00:00:00 2001 From: Niko Schmuck Date: Fri, 19 Aug 2016 15:45:24 +0200 Subject: [PATCH 1/2] DATAMONGO-1476: Use collection name also for read --- .../org/springframework/data/mongodb/core/MongoTemplate.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java index bbb9ffc090..74ee776159 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java @@ -334,7 +334,7 @@ public CloseableIterator stream(final Query query, final Class entityT * @see org.springframework.data.mongodb.core.MongoOperations#stream(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String) */ @Override - public CloseableIterator stream(final Query query, final Class entityType, String collectionName) { + public CloseableIterator stream(final Query query, final Class entityType, final String collectionName) { Assert.notNull(query, "Query must not be null!"); Assert.notNull(entityType, "Entity type must not be null!"); @@ -353,8 +353,7 @@ public CloseableIterator doInCollection(DBCollection collection) throws Mongo DBCursor cursor = collection.find(mappedQuery, mappedFields); QueryCursorPreparer cursorPreparer = new QueryCursorPreparer(query, entityType); - ReadDbObjectCallback readCallback = new ReadDbObjectCallback(mongoConverter, entityType, - collection.getName()); + ReadDbObjectCallback readCallback = new ReadDbObjectCallback(mongoConverter, entityType, collectionName); return new CloseableIterableCursorAdapter(cursorPreparer.prepare(cursor), exceptionTranslator, readCallback); } From aaab40ca6e02edf6362a0b0d7f31c232f64d1dcc Mon Sep 17 00:00:00 2001 From: Niko Schmuck Date: Fri, 19 Aug 2016 15:51:17 +0200 Subject: [PATCH 2/2] DATAMONGO-1476: Added author according to CLA --- .../org/springframework/data/mongodb/core/MongoTemplate.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java index 74ee776159..78ccce2cf8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java @@ -138,6 +138,7 @@ * @author Chuong Ngo * @author Christoph Strobl * @author Doménique Tilleuil + * @author Niko Schmuck */ @SuppressWarnings("deprecation") public class MongoTemplate implements MongoOperations, ApplicationContextAware {