Skip to content

Commit 00dcee0

Browse files
authored
Throw exception on index creation error.
Closes #1056 Original Pull Request #1637
1 parent 6913d80 commit 00dcee0

File tree

2 files changed

+12
-25
lines changed

2 files changed

+12
-25
lines changed

Diff for: src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,9 @@ public SimpleElasticsearchRepository(ElasticsearchEntityInformation<T, ID> metad
9090
this.entityClass = this.entityInformation.getJavaType();
9191
this.indexOperations = operations.indexOps(this.entityClass);
9292

93-
try {
94-
if (shouldCreateIndexAndMapping() && !indexOperations.exists()) {
95-
indexOperations.create();
96-
indexOperations.putMapping(entityClass);
97-
}
98-
} catch (Exception exception) {
99-
LOGGER.warn("Cannot create index: {}", exception.getMessage());
93+
if (shouldCreateIndexAndMapping() && !indexOperations.exists()) {
94+
indexOperations.create();
95+
indexOperations.putMapping(entityClass);
10096
}
10197
}
10298

Diff for: src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepository.java

+9-18
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@
1515
*/
1616
package org.springframework.data.elasticsearch.repository.support;
1717

18-
import org.elasticsearch.index.query.IdsQueryBuilder;
19-
import org.springframework.data.elasticsearch.core.RefreshPolicy;
2018
import reactor.core.publisher.Flux;
2119
import reactor.core.publisher.Mono;
2220

21+
import org.elasticsearch.index.query.IdsQueryBuilder;
2322
import org.reactivestreams.Publisher;
24-
import org.slf4j.Logger;
25-
import org.slf4j.LoggerFactory;
26-
2723
import org.springframework.data.domain.Pageable;
2824
import org.springframework.data.domain.Sort;
2925
import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
3026
import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate;
3127
import org.springframework.data.elasticsearch.core.ReactiveIndexOperations;
28+
import org.springframework.data.elasticsearch.core.RefreshPolicy;
3229
import org.springframework.data.elasticsearch.core.SearchHit;
3330
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
3431
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
@@ -46,14 +43,12 @@
4643
*/
4744
public class SimpleReactiveElasticsearchRepository<T, ID> implements ReactiveElasticsearchRepository<T, ID> {
4845

49-
private static final Logger LOGGER = LoggerFactory.getLogger(SimpleElasticsearchRepository.class);
50-
5146
private final ElasticsearchEntityInformation<T, ID> entityInformation;
5247
private final ReactiveElasticsearchOperations operations;
5348
private final ReactiveIndexOperations indexOperations;
5449

5550
public SimpleReactiveElasticsearchRepository(ElasticsearchEntityInformation<T, ID> entityInformation,
56-
ReactiveElasticsearchOperations operations) {
51+
ReactiveElasticsearchOperations operations) {
5752

5853
Assert.notNull(entityInformation, "EntityInformation must not be null!");
5954
Assert.notNull(operations, "ElasticsearchOperations must not be null!");
@@ -66,16 +61,12 @@ public SimpleReactiveElasticsearchRepository(ElasticsearchEntityInformation<T, I
6661
}
6762

6863
private void createIndexAndMappingIfNeeded() {
69-
try {
70-
71-
if (shouldCreateIndexAndMapping()) {
72-
indexOperations.exists() //
73-
.flatMap(exists -> exists ? Mono.empty() : indexOperations.create()) //
74-
.flatMap(success -> success ? indexOperations.putMapping() : Mono.empty()) //
75-
.block();
76-
}
77-
} catch (Exception exception) {
78-
LOGGER.warn("Cannot create index: {}", exception.getMessage());
64+
65+
if (shouldCreateIndexAndMapping()) {
66+
indexOperations.exists() //
67+
.flatMap(exists -> exists ? Mono.empty() : indexOperations.create()) //
68+
.flatMap(success -> success ? indexOperations.putMapping() : Mono.empty()) //
69+
.block();
7970
}
8071
}
8172

0 commit comments

Comments
 (0)