From c3bde816fe4dfb8370eafd27b8fce3492b162745 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sun, 10 May 2020 20:08:05 +0200 Subject: [PATCH] DATES-821 - Fix code for adding an alias. Original PR: #452 --- .../core/ElasticsearchRestTemplate.java | 12 +++++++++--- .../elasticsearch/core/ElasticsearchTemplate.java | 13 ++++++++++--- 2 files changed, 19 insertions(+), 6 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 08d872fd4..891a20823 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java @@ -209,11 +209,17 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate aliasAction.filter(query.getFilterBuilder()); } else if (query.getFilter() != null) { aliasAction.filter(query.getFilter()); - } else if (hasText(query.getRouting())) { + } + + if (hasText(query.getRouting())) { aliasAction.routing(query.getRouting()); - } else if (hasText(query.getSearchRouting())) { + } + + if (hasText(query.getSearchRouting())) { aliasAction.searchRouting(query.getSearchRouting()); - } else if (hasText(query.getIndexRouting())) { + } + + if (hasText(query.getIndexRouting())) { aliasAction.indexRouting(query.getIndexRouting()); } 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 7be0ff058..bc747cab6 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java @@ -190,13 +190,20 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate aliasAction.filter(query.getFilterBuilder()); } else if (query.getFilter() != null) { aliasAction.filter(query.getFilter()); - } else if (!StringUtils.isEmpty(query.getRouting())) { + } + + if (!StringUtils.isEmpty(query.getRouting())) { aliasAction.routing(query.getRouting()); - } else if (!StringUtils.isEmpty(query.getSearchRouting())) { + } + + if (!StringUtils.isEmpty(query.getSearchRouting())) { aliasAction.searchRouting(query.getSearchRouting()); - } else if (!StringUtils.isEmpty(query.getIndexRouting())) { + } + + if (!StringUtils.isEmpty(query.getIndexRouting())) { aliasAction.indexRouting(query.getIndexRouting()); } + return client.admin().indices().prepareAliases().addAliasAction(aliasAction).execute().actionGet().isAcknowledged(); }