diff options
Diffstat (limited to 'core/src/test/java/org/elasticsearch/plugins')
| -rw-r--r-- | core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java b/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java index 4b905d7b1a..0fd21651ac 100644 --- a/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java +++ b/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java @@ -21,7 +21,6 @@ package org.elasticsearch.plugins; import org.apache.http.message.BasicHeader; import org.elasticsearch.client.ElasticsearchResponse; import org.elasticsearch.client.ElasticsearchResponseException; -import org.elasticsearch.client.RestClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.responseheader.TestResponseHeaderPlugin; import org.elasticsearch.test.ESIntegTestCase; @@ -56,21 +55,19 @@ public class ResponseHeaderPluginIT extends ESIntegTestCase { public void testThatSettingHeadersWorks() throws Exception { ensureGreen(); - try (RestClient client = restClient()) { - try { - client.performRequest("GET", "/_protected", Collections.emptyMap(), null); - fail("request should have failed"); - } catch(ElasticsearchResponseException e) { - ElasticsearchResponse response = e.getElasticsearchResponse(); - assertThat(response, hasStatus(UNAUTHORIZED)); - assertThat(response.getFirstHeader("Secret"), equalTo("required")); - } + try { + getRestClient().performRequest("GET", "/_protected", Collections.emptyMap(), null); + fail("request should have failed"); + } catch(ElasticsearchResponseException e) { + ElasticsearchResponse response = e.getElasticsearchResponse(); + assertThat(response, hasStatus(UNAUTHORIZED)); + assertThat(response.getFirstHeader("Secret"), equalTo("required")); + } - try (ElasticsearchResponse authResponse = client.performRequest("GET", "/_protected", Collections.emptyMap(), null, - new BasicHeader("Secret", "password"))) { - assertThat(authResponse, hasStatus(OK)); - assertThat(authResponse.getFirstHeader("Secret"), equalTo("granted")); - } + try (ElasticsearchResponse authResponse = getRestClient().performRequest("GET", "/_protected", Collections.emptyMap(), null, + new BasicHeader("Secret", "password"))) { + assertThat(authResponse, hasStatus(OK)); + assertThat(authResponse.getFirstHeader("Secret"), equalTo("granted")); } } } |