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

DATAES-227 - Polishing.

Browse Source
This commit is contained in:
Peter-Josef Meisch 2019-09-27 21:35:28 +02:00
parent 8a1242fdbd
commit 52105fcdcc
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,6 @@ import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.action.search.SearchScrollRequest;
import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.action.update.UpdateRequestBuilder;
import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.Requests; import org.elasticsearch.client.Requests;
@ -149,7 +148,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate
implements ElasticsearchOperations, EsClient<RestHighLevelClient>, ApplicationContextAware { implements ElasticsearchOperations, EsClient<RestHighLevelClient>, ApplicationContextAware {
private static final Logger logger = LoggerFactory.getLogger(ElasticsearchRestTemplate.class); private static final Logger logger = LoggerFactory.getLogger(ElasticsearchRestTemplate.class);
private RestHighLevelClient client; private RestHighLevelClient client;
private ResultsMapper resultsMapper; private ResultsMapper resultsMapper;
private String searchTimeout; private String searchTimeout;
@ -178,7 +177,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate
public ElasticsearchRestTemplate(RestHighLevelClient client, ElasticsearchConverter elasticsearchConverter, public ElasticsearchRestTemplate(RestHighLevelClient client, ElasticsearchConverter elasticsearchConverter,
ResultsMapper resultsMapper) { ResultsMapper resultsMapper) {
super(elasticsearchConverter); super(elasticsearchConverter);
Assert.notNull(client, "Client must not be null!"); Assert.notNull(client, "Client must not be null!");

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

@ -124,7 +124,8 @@ import org.springframework.util.StringUtils;
* @author Farid Azaza * @author Farid Azaza
* @author Gyula Attila Csorogi * @author Gyula Attila Csorogi
*/ */
public class ElasticsearchTemplate extends AbstractElasticsearchTemplate implements ElasticsearchOperations, EsClient<Client>, ApplicationContextAware { public class ElasticsearchTemplate extends AbstractElasticsearchTemplate
implements ElasticsearchOperations, EsClient<Client>, ApplicationContextAware {
private static final Logger QUERY_LOGGER = LoggerFactory private static final Logger QUERY_LOGGER = LoggerFactory
.getLogger("org.springframework.data.elasticsearch.core.QUERY"); .getLogger("org.springframework.data.elasticsearch.core.QUERY");
@ -158,7 +159,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate impleme
public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearchConverter, public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearchConverter,
ResultsMapper resultsMapper) { ResultsMapper resultsMapper) {
super(elasticsearchConverter); super(elasticsearchConverter);
Assert.notNull(client, "Client must not be null!"); Assert.notNull(client, "Client must not be null!");

6
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java
View File

@ -3121,20 +3121,20 @@ public class ElasticsearchTemplateTests {
@Test // DATAES-541 @Test // DATAES-541
public void shouldRemoveAlias() { public void shouldRemoveAlias() {
// given // given
String aliasName = "test-alias"; String aliasName = "test-alias";
AliasQuery aliasQuery = new AliasBuilder() // AliasQuery aliasQuery = new AliasBuilder() //
.withIndexName(INDEX_NAME_SAMPLE_ENTITY) // .withIndexName(INDEX_NAME_SAMPLE_ENTITY) //
.withAliasName(aliasName) // .withAliasName(aliasName) //
.build(); .build();
// when // when
elasticsearchTemplate.addAlias(aliasQuery); elasticsearchTemplate.addAlias(aliasQuery);
List<AliasMetaData> aliases = elasticsearchTemplate.queryForAlias(INDEX_NAME_SAMPLE_ENTITY); List<AliasMetaData> aliases = elasticsearchTemplate.queryForAlias(INDEX_NAME_SAMPLE_ENTITY);
assertThat(aliases).isNotNull(); assertThat(aliases).isNotNull();
assertThat(aliases.get(0).alias()).isEqualTo(aliasName); assertThat(aliases.get(0).alias()).isEqualTo(aliasName);
// then // then
elasticsearchTemplate.removeAlias(aliasQuery); elasticsearchTemplate.removeAlias(aliasQuery);
aliases = elasticsearchTemplate.queryForAlias(INDEX_NAME_SAMPLE_ENTITY); aliases = elasticsearchTemplate.queryForAlias(INDEX_NAME_SAMPLE_ENTITY);