From 52105fcdccbf401288f22c672c49423299e13f9f Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Fri, 27 Sep 2019 21:35:28 +0200 Subject: [PATCH] DATAES-227 - Polishing. --- .../data/elasticsearch/core/ElasticsearchRestTemplate.java | 5 ++--- .../data/elasticsearch/core/ElasticsearchTemplate.java | 5 +++-- .../data/elasticsearch/core/ElasticsearchTemplateTests.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java index 47e3b3e4c..48becc952 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java @@ -55,7 +55,6 @@ import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.action.update.UpdateRequest; -import org.elasticsearch.action.update.UpdateRequestBuilder; import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.Requests; @@ -149,7 +148,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate implements ElasticsearchOperations, EsClient, ApplicationContextAware { private static final Logger logger = LoggerFactory.getLogger(ElasticsearchRestTemplate.class); - + private RestHighLevelClient client; private ResultsMapper resultsMapper; private String searchTimeout; @@ -178,7 +177,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate public ElasticsearchRestTemplate(RestHighLevelClient client, ElasticsearchConverter elasticsearchConverter, ResultsMapper resultsMapper) { - + super(elasticsearchConverter); Assert.notNull(client, "Client must not be null!"); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java index a68b64f9a..e71727c0b 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java @@ -124,7 +124,8 @@ import org.springframework.util.StringUtils; * @author Farid Azaza * @author Gyula Attila Csorogi */ -public class ElasticsearchTemplate extends AbstractElasticsearchTemplate implements ElasticsearchOperations, EsClient, ApplicationContextAware { +public class ElasticsearchTemplate extends AbstractElasticsearchTemplate + implements ElasticsearchOperations, EsClient, ApplicationContextAware { private static final Logger QUERY_LOGGER = LoggerFactory .getLogger("org.springframework.data.elasticsearch.core.QUERY"); @@ -158,7 +159,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate impleme public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearchConverter, ResultsMapper resultsMapper) { - + super(elasticsearchConverter); Assert.notNull(client, "Client must not be null!"); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java index 5f5664e0f..7d5b28150 100755 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java @@ -3121,20 +3121,20 @@ public class ElasticsearchTemplateTests { @Test // DATAES-541 public void shouldRemoveAlias() { - + // given String aliasName = "test-alias"; AliasQuery aliasQuery = new AliasBuilder() // .withIndexName(INDEX_NAME_SAMPLE_ENTITY) // .withAliasName(aliasName) // .build(); - + // when elasticsearchTemplate.addAlias(aliasQuery); List aliases = elasticsearchTemplate.queryForAlias(INDEX_NAME_SAMPLE_ENTITY); assertThat(aliases).isNotNull(); assertThat(aliases.get(0).alias()).isEqualTo(aliasName); - + // then elasticsearchTemplate.removeAlias(aliasQuery); aliases = elasticsearchTemplate.queryForAlias(INDEX_NAME_SAMPLE_ENTITY);