Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-29 15:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-753 - Reactive Elasticsearch repository: Bulk update fails on empty entity list.

Browse Source 
Original PR: #398
This commit is contained in:
Peter-Josef Meisch 2020-02-26 21:50:42 +01:00 committed by GitHub
parent 6a4a7483aa
commit bf51de3805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/data/elasticsearch/core/ReactiveDocumentOperations.java
View File

@ -88,7 +88,7 @@ public interface ReactiveDocumentOperations {
/** /**
* Index entities under the given {@literal type} in the given {@literal index}. If the {@literal index} is * Index entities under the given {@literal type} in the given {@literal index}. If the {@literal index} is
* {@literal null} or empty the index name provided via entity metadata is used. Same for the {@literal type}. * {@literal null} or empty the index name provided via entity metadata is used.
* *
* @param entities must not be {@literal null}. * @param entities must not be {@literal null}.
* @param index the target index, must not be {@literal null} * @param index the target index, must not be {@literal null}
@ -104,7 +104,7 @@ public interface ReactiveDocumentOperations {
/** /**
* Index entities under the given {@literal type} in the given {@literal index}. If the {@literal index} is * Index entities under the given {@literal type} in the given {@literal index}. If the {@literal index} is
* {@literal null} or empty the index name provided via entity metadata is used. Same for the {@literal type}. * {@literal null} or empty the index name provided via entity metadata is used.
* *
* @param entities must not be {@literal null}. * @param entities must not be {@literal null}.
* @param index the target index, must not be {@literal null} * @param index the target index, must not be {@literal null}

5
src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java
View File

@ -160,6 +160,11 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
List<AdaptibleEntity<? extends T>> adaptibleEntities = entityList.stream() // List<AdaptibleEntity<? extends T>> adaptibleEntities = entityList.stream() //
.map(e -> operations.forEntity(e, converter.getConversionService())) // .map(e -> operations.forEntity(e, converter.getConversionService())) //
.collect(Collectors.toList()); .collect(Collectors.toList());
if (adaptibleEntities.isEmpty()) {
return Flux.empty();
}
Iterator<AdaptibleEntity<? extends T>> iterator = adaptibleEntities.iterator(); Iterator<AdaptibleEntity<? extends T>> iterator = adaptibleEntities.iterator();
List<IndexQuery> indexRequests = adaptibleEntities.stream() // List<IndexQuery> indexRequests = adaptibleEntities.stream() //
.map(e -> getIndexQuery(e.getBean(), e)) // .map(e -> getIndexQuery(e.getBean(), e)) //

7
src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateTests.java
View File

@ -811,6 +811,13 @@ public class ReactiveElasticsearchTemplateTests {
.verifyComplete(); .verifyComplete();
} }
@Test // DATAES-753
void shouldReturnEmptyFluxOnSaveAllWithEmptyInput() {
template.saveAll(Collections.emptyList(), IndexCoordinates.of(DEFAULT_INDEX)) //
.as(StepVerifier::create) //
.verifyComplete();
}
@Data @Data
@Document(indexName = "marvel") @Document(indexName = "marvel")
static class Person { static class Person {