Skip to content

Commit 87540bc

Browse files
committed
findAllById returns all requested documents.
Original Pull Request #2421 Closes #2417 (cherry picked from commit 28489ff) (cherry picked from commit 6551a80)
1 parent b896694 commit 87540bc

File tree

2 files changed

+113
-117
lines changed

2 files changed

+113
-117
lines changed

src/test/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryIntegrationTests.java

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -202,29 +202,27 @@ void shouldDeleteDocument() {
202202
assertThat(entityFromElasticSearch).isNotPresent();
203203
}
204204

205-
@Test // DATAES-82
205+
@Test // DATAES-82, #2417
206206
void shouldFindAllByIdQuery() {
207207

208-
// given
209-
String documentId = nextIdAsString();
210-
SampleEntity sampleEntity = new SampleEntity();
211-
sampleEntity.setId(documentId);
212-
sampleEntity.setMessage("hello world.");
213-
sampleEntity.setVersion(System.currentTimeMillis());
214-
repository.save(sampleEntity);
215-
216-
String documentId2 = nextIdAsString();
217-
SampleEntity sampleEntity2 = new SampleEntity();
218-
sampleEntity2.setId(documentId2);
219-
sampleEntity2.setMessage("hello world.");
220-
sampleEntity2.setVersion(System.currentTimeMillis());
221-
repository.save(sampleEntity2);
208+
// create more than 10 documents to see that the number of input ids is set as requested size
209+
int numEntities = 20;
210+
List<String> ids = new ArrayList<>(numEntities);
211+
List<SampleEntity> entities = new ArrayList<>(numEntities);
212+
for (int i = 0; i < numEntities; i++) {
213+
String documentId = nextIdAsString();
214+
ids.add(documentId);
215+
SampleEntity sampleEntity = new SampleEntity();
216+
sampleEntity.setId(documentId);
217+
sampleEntity.setMessage("hello world.");
218+
sampleEntity.setVersion(System.currentTimeMillis());
219+
entities.add(sampleEntity);
220+
}
221+
repository.saveAll(entities);
222222

223-
// when
224-
Iterable<SampleEntity> sampleEntities = repository.findAllById(Arrays.asList(documentId, documentId2));
223+
Iterable<SampleEntity> sampleEntities = repository.findAllById(ids);
225224

226-
// then
227-
assertThat(sampleEntities).isNotNull().hasSize(2);
225+
assertThat(sampleEntities).isNotNull().hasSize(numEntities);
228226
}
229227

230228
@Test

0 commit comments

Comments
 (0)