|
@@ -61,7 +61,6 @@ import org.elasticsearch.action.admin.indices.shrink.ResizeRequest;
|
|
|
import org.elasticsearch.action.admin.indices.shrink.ResizeResponse;
|
|
|
import org.elasticsearch.action.admin.indices.shrink.ResizeType;
|
|
|
import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
|
|
|
-import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesRequest;
|
|
|
import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse;
|
|
|
import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest;
|
|
|
import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest;
|
|
@@ -73,6 +72,8 @@ import org.elasticsearch.action.support.broadcast.BroadcastResponse;
|
|
|
import org.elasticsearch.action.support.master.AcknowledgedResponse;
|
|
|
import org.elasticsearch.client.core.ShardsAcknowledgedResponse;
|
|
|
import org.elasticsearch.client.indices.FreezeIndexRequest;
|
|
|
+import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
|
|
|
+import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
|
|
|
import org.elasticsearch.client.indices.UnfreezeIndexRequest;
|
|
|
import org.elasticsearch.cluster.metadata.AliasMetaData;
|
|
|
import org.elasticsearch.cluster.metadata.IndexMetaData;
|
|
@@ -96,7 +97,9 @@ import java.io.IOException;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Collections;
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
|
|
|
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
|
|
@@ -107,7 +110,9 @@ import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
|
|
|
import static org.hamcrest.Matchers.contains;
|
|
|
import static org.hamcrest.Matchers.containsString;
|
|
|
import static org.hamcrest.Matchers.equalTo;
|
|
|
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
|
|
|
import static org.hamcrest.Matchers.hasEntry;
|
|
|
+import static org.hamcrest.Matchers.hasItems;
|
|
|
import static org.hamcrest.Matchers.hasSize;
|
|
|
import static org.hamcrest.Matchers.not;
|
|
|
import static org.hamcrest.Matchers.notNullValue;
|
|
@@ -1327,7 +1332,7 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
|
|
|
assertThat(execute(putTemplate2, client.indices()::putTemplate, client.indices()::putTemplateAsync).isAcknowledged(),
|
|
|
equalTo(true));
|
|
|
|
|
|
- GetIndexTemplatesResponse getTemplate1 = execute(new GetIndexTemplatesRequest().names("template-1"),
|
|
|
+ GetIndexTemplatesResponse getTemplate1 = execute(new GetIndexTemplatesRequest("template-1"),
|
|
|
client.indices()::getTemplate, client.indices()::getTemplateAsync);
|
|
|
assertThat(getTemplate1.getIndexTemplates(), hasSize(1));
|
|
|
IndexTemplateMetaData template1 = getTemplate1.getIndexTemplates().get(0);
|
|
@@ -1335,7 +1340,7 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
|
|
|
assertThat(template1.patterns(), contains("pattern-1", "name-1"));
|
|
|
assertTrue(template1.aliases().containsKey("alias-1"));
|
|
|
|
|
|
- GetIndexTemplatesResponse getTemplate2 = execute(new GetIndexTemplatesRequest().names("template-2"),
|
|
|
+ GetIndexTemplatesResponse getTemplate2 = execute(new GetIndexTemplatesRequest("template-2"),
|
|
|
client.indices()::getTemplate, client.indices()::getTemplateAsync);
|
|
|
assertThat(getTemplate2.getIndexTemplates(), hasSize(1));
|
|
|
IndexTemplateMetaData template2 = getTemplate2.getIndexTemplates().get(0);
|
|
@@ -1345,20 +1350,24 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
|
|
|
assertThat(template2.settings().get("index.number_of_shards"), equalTo("2"));
|
|
|
assertThat(template2.settings().get("index.number_of_replicas"), equalTo("0"));
|
|
|
|
|
|
- GetIndexTemplatesRequest getBothRequest = new GetIndexTemplatesRequest();
|
|
|
- if (randomBoolean()) {
|
|
|
- getBothRequest.names("*-1", "template-2");
|
|
|
- } else {
|
|
|
- getBothRequest.names("template-*");
|
|
|
- }
|
|
|
+ List<String> names = randomBoolean()
|
|
|
+ ? Arrays.asList("*-1", "template-2")
|
|
|
+ : Arrays.asList("template-*");
|
|
|
+ GetIndexTemplatesRequest getBothRequest = new GetIndexTemplatesRequest(names);
|
|
|
GetIndexTemplatesResponse getBoth = execute(getBothRequest, client.indices()::getTemplate, client.indices()::getTemplateAsync);
|
|
|
assertThat(getBoth.getIndexTemplates(), hasSize(2));
|
|
|
assertThat(getBoth.getIndexTemplates().stream().map(IndexTemplateMetaData::getName).toArray(),
|
|
|
arrayContainingInAnyOrder("template-1", "template-2"));
|
|
|
|
|
|
+ GetIndexTemplatesRequest getAllRequest = new GetIndexTemplatesRequest();
|
|
|
+ GetIndexTemplatesResponse getAll = execute(getAllRequest, client.indices()::getTemplate, client.indices()::getTemplateAsync);
|
|
|
+ assertThat(getAll.getIndexTemplates().size(), greaterThanOrEqualTo(2));
|
|
|
+ assertThat(getAll.getIndexTemplates().stream().map(IndexTemplateMetaData::getName).collect(Collectors.toList()),
|
|
|
+ hasItems("template-1", "template-2"));
|
|
|
+
|
|
|
assertTrue(execute(new DeleteIndexTemplateRequest("template-1"),
|
|
|
client.indices()::deleteTemplate, client.indices()::deleteTemplateAsync).isAcknowledged());
|
|
|
- assertThat(expectThrows(ElasticsearchException.class, () -> execute(new GetIndexTemplatesRequest().names("template-1"),
|
|
|
+ assertThat(expectThrows(ElasticsearchException.class, () -> execute(new GetIndexTemplatesRequest("template-1"),
|
|
|
client.indices()::getTemplate, client.indices()::getTemplateAsync)).status(), equalTo(RestStatus.NOT_FOUND));
|
|
|
assertThat(expectThrows(ElasticsearchException.class, () -> execute(new DeleteIndexTemplateRequest("template-1"),
|
|
|
client.indices()::deleteTemplate, client.indices()::deleteTemplateAsync)).status(), equalTo(RestStatus.NOT_FOUND));
|
|
@@ -1370,10 +1379,42 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
|
|
|
|
|
|
assertTrue(execute(new DeleteIndexTemplateRequest("template-*"),
|
|
|
client.indices()::deleteTemplate, client.indices()::deleteTemplateAsync).isAcknowledged());
|
|
|
- assertThat(expectThrows(ElasticsearchException.class, () -> execute(new GetIndexTemplatesRequest().names("template-*"),
|
|
|
+ assertThat(expectThrows(ElasticsearchException.class, () -> execute(new GetIndexTemplatesRequest("template-*"),
|
|
|
client.indices()::getTemplate, client.indices()::getTemplateAsync)).status(), equalTo(RestStatus.NOT_FOUND));
|
|
|
}
|
|
|
|
|
|
+ public void testIndexTemplatesExist() throws Exception {
|
|
|
+ final RestHighLevelClient client = highLevelClient();
|
|
|
+
|
|
|
+ {
|
|
|
+ for (String suffix : Arrays.asList("1", "2")) {
|
|
|
+
|
|
|
+ final PutIndexTemplateRequest putRequest = new PutIndexTemplateRequest()
|
|
|
+ .name("template-" + suffix)
|
|
|
+ .patterns(Arrays.asList("pattern-" + suffix, "name-" + suffix))
|
|
|
+ .alias(new Alias("alias-" + suffix));
|
|
|
+ assertTrue(execute(putRequest, client.indices()::putTemplate, client.indices()::putTemplateAsync).isAcknowledged());
|
|
|
+
|
|
|
+ final IndexTemplatesExistRequest existsRequest = new IndexTemplatesExistRequest("template-" + suffix);
|
|
|
+ assertTrue(execute(existsRequest, client.indices()::existsTemplate, client.indices()::existsTemplateAsync));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ {
|
|
|
+ final List<String> templateNames = randomBoolean()
|
|
|
+ ? Arrays.asList("*-1", "template-2")
|
|
|
+ : Arrays.asList("template-*");
|
|
|
+
|
|
|
+ final IndexTemplatesExistRequest bothRequest = new IndexTemplatesExistRequest(templateNames);
|
|
|
+ assertTrue(execute(bothRequest, client.indices()::existsTemplate, client.indices()::existsTemplateAsync));
|
|
|
+ }
|
|
|
+
|
|
|
+ {
|
|
|
+ final IndexTemplatesExistRequest neitherRequest = new IndexTemplatesExistRequest("neither-*");
|
|
|
+ assertFalse(execute(neitherRequest, client.indices()::existsTemplate, client.indices()::existsTemplateAsync));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
public void testAnalyze() throws Exception {
|
|
|
|
|
|
RestHighLevelClient client = highLevelClient();
|