Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAMONGO-1728 - Fix NPE in ExecutableFindOperation.first().

Browse Source 
Original pull request: #476.
This commit is contained in:
Christoph Strobl
2017-07-03 17:12:34 +02:00
committed by Mark Paluch
parent 697f5ad7c6
commit 270d373083
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupport.java
View File

@@ -186,8 +186,7 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
@Override
public FindIterable<Document> prepare(FindIterable<Document> cursor) {
FindIterable<Document> target = delegate.prepare(cursor);
FindIterable<Document> target = delegate != null ? delegate.prepare(cursor) : cursor;
return limit.map(target::limit).orElse(target);
}

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupportTests.java
View File

@@ -213,6 +213,11 @@ public class ExecutableFindOperationSupportTests {
assertThat(results.getContent().get(0).getContent().getId()).isEqualTo("alderan");
}
@Test // DATAMONGO-1728
public void firstShouldReturnFirstEntryInCollection() {
assertThat(template.query(Person.class).first()).isNotEmpty();
}
@Data
@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
static class Person {