-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'es/6.x' into ccr-6.x
- Loading branch information
Showing
213 changed files
with
5,243 additions
and
2,238 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.client; | ||
|
|
||
| import org.apache.http.Header; | ||
| import org.elasticsearch.action.ActionListener; | ||
| import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; | ||
| import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
|
|
||
| /** | ||
| * A wrapper for the {@link RestHighLevelClient} that provides methods for accessing the Indices API. | ||
| * | ||
| * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices.html">Indices API on elastic.co</a> | ||
| */ | ||
| public final class IndicesClient { | ||
| private final RestHighLevelClient restHighLevelClient; | ||
|
|
||
| public IndicesClient(RestHighLevelClient restHighLevelClient) { | ||
| this.restHighLevelClient = restHighLevelClient; | ||
| } | ||
|
|
||
| /** | ||
| * Deletes an index using the Delete Index API | ||
| * <p> | ||
| * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-delete-index.html"> | ||
| * Delete Index API on elastic.co</a> | ||
| */ | ||
| public DeleteIndexResponse deleteIndex(DeleteIndexRequest deleteIndexRequest, Header... headers) throws IOException { | ||
| return restHighLevelClient.performRequestAndParseEntity(deleteIndexRequest, Request::deleteIndex, DeleteIndexResponse::fromXContent, | ||
| Collections.emptySet(), headers); | ||
| } | ||
|
|
||
| /** | ||
| * Asynchronously deletes an index using the Delete Index API | ||
| * <p> | ||
| * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-delete-index.html"> | ||
| * Delete Index API on elastic.co</a> | ||
| */ | ||
| public void deleteIndexAsync(DeleteIndexRequest deleteIndexRequest, ActionListener<DeleteIndexResponse> listener, Header... headers) { | ||
| restHighLevelClient.performRequestAsyncAndParseEntity(deleteIndexRequest, Request::deleteIndex, DeleteIndexResponse::fromXContent, | ||
| listener, Collections.emptySet(), headers); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.client; | ||
|
|
||
| import org.elasticsearch.ElasticsearchException; | ||
| import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; | ||
| import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; | ||
| import org.elasticsearch.rest.RestStatus; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class IndicesClientIT extends ESRestHighLevelClientTestCase { | ||
|
|
||
| public void testDeleteIndex() throws IOException { | ||
| { | ||
| // Delete index if exists | ||
| String indexName = "test_index"; | ||
| createIndex(indexName); | ||
|
|
||
| DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(indexName); | ||
| DeleteIndexResponse deleteIndexResponse = | ||
| execute(deleteIndexRequest, highLevelClient().indices()::deleteIndex, highLevelClient().indices()::deleteIndexAsync); | ||
| assertTrue(deleteIndexResponse.isAcknowledged()); | ||
|
|
||
| assertFalse(indexExists(indexName)); | ||
| } | ||
| { | ||
| // Return 404 if index doesn't exist | ||
| String nonExistentIndex = "non_existent_index"; | ||
| assertFalse(indexExists(nonExistentIndex)); | ||
|
|
||
| DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(nonExistentIndex); | ||
|
|
||
| ElasticsearchException exception = expectThrows(ElasticsearchException.class, | ||
| () -> execute(deleteIndexRequest, highLevelClient().indices()::deleteIndex, highLevelClient().indices()::deleteIndexAsync)); | ||
| assertEquals(RestStatus.NOT_FOUND, exception.status()); | ||
| } | ||
| } | ||
|
|
||
| private static void createIndex(String index) throws IOException { | ||
| Response response = client().performRequest("PUT", index); | ||
|
|
||
| assertEquals(200, response.getStatusLine().getStatusCode()); | ||
| } | ||
|
|
||
| private static boolean indexExists(String index) throws IOException { | ||
| Response response = client().performRequest("HEAD", index); | ||
|
|
||
| return response.getStatusLine().getStatusCode() == 200; | ||
| } | ||
| } |
Oops, something went wrong.