diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java index 6bc2917c0..f7355058b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java @@ -90,13 +90,9 @@ public SimpleElasticsearchRepository(ElasticsearchEntityInformation metad this.entityClass = this.entityInformation.getJavaType(); this.indexOperations = operations.indexOps(this.entityClass); - try { - if (shouldCreateIndexAndMapping() && !indexOperations.exists()) { - indexOperations.create(); - indexOperations.putMapping(entityClass); - } - } catch (Exception exception) { - LOGGER.warn("Cannot create index: {}", exception.getMessage()); + if (shouldCreateIndexAndMapping() && !indexOperations.exists()) { + indexOperations.create(); + indexOperations.putMapping(entityClass); } } diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepository.java index 84f65ea17..f93693bea 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepository.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepository.java @@ -15,20 +15,17 @@ */ package org.springframework.data.elasticsearch.repository.support; -import org.elasticsearch.index.query.IdsQueryBuilder; -import org.springframework.data.elasticsearch.core.RefreshPolicy; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import org.elasticsearch.index.query.IdsQueryBuilder; import org.reactivestreams.Publisher; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations; import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate; import org.springframework.data.elasticsearch.core.ReactiveIndexOperations; +import org.springframework.data.elasticsearch.core.RefreshPolicy; import org.springframework.data.elasticsearch.core.SearchHit; import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity; import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates; @@ -46,14 +43,12 @@ */ public class SimpleReactiveElasticsearchRepository implements ReactiveElasticsearchRepository { - private static final Logger LOGGER = LoggerFactory.getLogger(SimpleElasticsearchRepository.class); - private final ElasticsearchEntityInformation entityInformation; private final ReactiveElasticsearchOperations operations; private final ReactiveIndexOperations indexOperations; public SimpleReactiveElasticsearchRepository(ElasticsearchEntityInformation entityInformation, - ReactiveElasticsearchOperations operations) { + ReactiveElasticsearchOperations operations) { Assert.notNull(entityInformation, "EntityInformation must not be null!"); Assert.notNull(operations, "ElasticsearchOperations must not be null!"); @@ -66,16 +61,12 @@ public SimpleReactiveElasticsearchRepository(ElasticsearchEntityInformation exists ? Mono.empty() : indexOperations.create()) // - .flatMap(success -> success ? indexOperations.putMapping() : Mono.empty()) // - .block(); - } - } catch (Exception exception) { - LOGGER.warn("Cannot create index: {}", exception.getMessage()); + + if (shouldCreateIndexAndMapping()) { + indexOperations.exists() // + .flatMap(exists -> exists ? Mono.empty() : indexOperations.create()) // + .flatMap(success -> success ? indexOperations.putMapping() : Mono.empty()) // + .block(); } }