diff --git a/modules/transport-netty4/src/test/java/org/elasticsearch/rest/Netty4BadRequestIT.java b/modules/transport-netty4/src/test/java/org/elasticsearch/rest/Netty4BadRequestIT.java index bc89558d3c6..17a62b3a440 100644 --- a/modules/transport-netty4/src/test/java/org/elasticsearch/rest/Netty4BadRequestIT.java +++ b/modules/transport-netty4/src/test/java/org/elasticsearch/rest/Netty4BadRequestIT.java @@ -19,7 +19,8 @@ package org.elasticsearch.rest; -import org.apache.http.message.BasicHeader; +import org.elasticsearch.client.Request; +import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.Response; import org.elasticsearch.client.ResponseException; import org.elasticsearch.common.settings.Setting; @@ -43,7 +44,7 @@ import static org.hamcrest.Matchers.hasToString; public class Netty4BadRequestIT extends ESRestTestCase { public void testBadRequest() throws IOException { - final Response response = client().performRequest("GET", "/_nodes/settings", Collections.emptyMap()); + final Response response = client().performRequest(new Request("GET", "/_nodes/settings")); final ObjectPath objectPath = ObjectPath.createFromResponse(response); final Map map = objectPath.evaluate("nodes"); int maxMaxInitialLineLength = Integer.MIN_VALUE; @@ -77,9 +78,9 @@ public class Netty4BadRequestIT extends ESRestTestCase { } public void testInvalidParameterValue() throws IOException { - final ResponseException e = expectThrows( - ResponseException.class, - () -> client().performRequest("GET", "/_cluster/settings", Collections.singletonMap("pretty", "neither-true-nor-false"))); + final Request request = new Request("GET", "/_cluster/settings"); + request.addParameter("pretty", "neither-true-nor-false"); + final ResponseException e = expectThrows(ResponseException.class, () -> client().performRequest(request)); final Response response = e.getResponse(); assertThat(response.getStatusLine().getStatusCode(), equalTo(400)); final ObjectPath objectPath = ObjectPath.createFromResponse(response); @@ -89,9 +90,11 @@ public class Netty4BadRequestIT extends ESRestTestCase { } public void testInvalidHeaderValue() throws IOException { - final BasicHeader header = new BasicHeader("Content-Type", "\t"); - final ResponseException e = - expectThrows(ResponseException.class, () -> client().performRequest("GET", "/_cluster/settings", header)); + final Request request = new Request("GET", "/_cluster/settings"); + final RequestOptions.Builder options = request.getOptions().toBuilder(); + options.addHeader("Content-Type", "\t"); + request.setOptions(options); + final ResponseException e = expectThrows(ResponseException.class, () -> client().performRequest(request)); final Response response = e.getResponse(); assertThat(response.getStatusLine().getStatusCode(), equalTo(400)); final ObjectPath objectPath = ObjectPath.createFromResponse(response); diff --git a/modules/transport-netty4/src/test/java/org/elasticsearch/rest/Netty4HeadBodyIsEmptyIT.java b/modules/transport-netty4/src/test/java/org/elasticsearch/rest/Netty4HeadBodyIsEmptyIT.java index 20b18ebdadd..17b374ecb37 100644 --- a/modules/transport-netty4/src/test/java/org/elasticsearch/rest/Netty4HeadBodyIsEmptyIT.java +++ b/modules/transport-netty4/src/test/java/org/elasticsearch/rest/Netty4HeadBodyIsEmptyIT.java @@ -19,8 +19,7 @@ package org.elasticsearch.rest; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; +import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -57,8 +56,9 @@ public class Netty4HeadBodyIsEmptyIT extends ESRestTestCase { builder.field("test", "test"); } builder.endObject(); - client().performRequest("PUT", "/" + indexName + "/" + typeName + "/" + "1", emptyMap(), - new StringEntity(Strings.toString(builder), ContentType.APPLICATION_JSON)); + Request request = new Request("PUT", "/" + indexName + "/" + typeName + "/" + "1"); + request.setJsonEntity(Strings.toString(builder)); + client().performRequest(request); } } @@ -109,8 +109,9 @@ public class Netty4HeadBodyIsEmptyIT extends ESRestTestCase { } builder.endObject(); - client().performRequest("POST", "_aliases", emptyMap(), new StringEntity(Strings.toString(builder), - ContentType.APPLICATION_JSON)); + Request request = new Request("POST", "/_aliases"); + request.setJsonEntity(Strings.toString(builder)); + client().performRequest(request); headTestCase("/_alias/test_alias", emptyMap(), greaterThan(0)); headTestCase("/test/_alias/test_alias", emptyMap(), greaterThan(0)); } @@ -135,8 +136,9 @@ public class Netty4HeadBodyIsEmptyIT extends ESRestTestCase { } builder.endObject(); - client().performRequest("PUT", "/_template/template", emptyMap(), - new StringEntity(Strings.toString(builder), ContentType.APPLICATION_JSON)); + Request request = new Request("PUT", "/_template/template"); + request.setJsonEntity(Strings.toString(builder)); + client().performRequest(request); headTestCase("/_template/template", emptyMap(), greaterThan(0)); } } @@ -164,8 +166,10 @@ public class Netty4HeadBodyIsEmptyIT extends ESRestTestCase { builder.endObject(); } builder.endObject(); - client().performRequest("PUT", "/test-no-source", emptyMap(), new StringEntity(Strings.toString(builder), - ContentType.APPLICATION_JSON)); + + Request request = new Request("PUT", "/test-no-source"); + request.setJsonEntity(Strings.toString(builder)); + client().performRequest(request); createTestDoc("test-no-source", "test-no-source"); headTestCase("/test-no-source/test-no-source/1/_source", emptyMap(), NOT_FOUND.getStatus(), equalTo(0)); } @@ -190,7 +194,11 @@ public class Netty4HeadBodyIsEmptyIT extends ESRestTestCase { final Map params, final int expectedStatusCode, final Matcher matcher) throws IOException { - Response response = client().performRequest("HEAD", url, params); + Request request = new Request("HEAD", url); + for (Map.Entry param : params.entrySet()) { + request.addParameter(param.getKey(), param.getValue()); + } + Response response = client().performRequest(request); assertEquals(expectedStatusCode, response.getStatusLine().getStatusCode()); assertThat(Integer.valueOf(response.getHeader("Content-Length")), matcher); assertNull("HEAD requests shouldn't have a response body but " + url + " did", response.getEntity()); diff --git a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java index ce4fe9b6d3f..0248576b573 100644 --- a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java +++ b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java @@ -21,16 +21,13 @@ package org.elasticsearch.repositories.hdfs; import java.io.IOException; import java.net.InetSocketAddress; -import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Map; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.ha.BadFencingConfigurationException; @@ -42,9 +39,7 @@ import org.apache.hadoop.ha.protocolPB.HAServiceProtocolClientSideTranslatorPB; import org.apache.hadoop.hdfs.tools.DFSHAAdmin; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.http.Header; -import org.apache.http.message.BasicHeader; -import org.apache.http.nio.entity.NStringEntity; +import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.client.RestClient; import org.elasticsearch.common.io.PathUtils; @@ -58,8 +53,6 @@ public class HaHdfsFailoverTestSuiteIT extends ESRestTestCase { public void testHAFailoverWithRepository() throws Exception { RestClient client = client(); - Map emptyParams = Collections.emptyMap(); - Header contentHeader = new BasicHeader("Content-Type", "application/json"); String esKerberosPrincipal = System.getProperty("test.krb5.principal.es"); String hdfsKerberosPrincipal = System.getProperty("test.krb5.principal.hdfs"); @@ -106,7 +99,8 @@ public class HaHdfsFailoverTestSuiteIT extends ESRestTestCase { // Create repository { - Response response = client.performRequest("PUT", "/_snapshot/hdfs_ha_repo_read", emptyParams, new NStringEntity( + Request request = new Request("PUT", "/_snapshot/hdfs_ha_repo_read"); + request.setJsonEntity( "{" + "\"type\":\"hdfs\"," + "\"settings\":{" + @@ -121,15 +115,15 @@ public class HaHdfsFailoverTestSuiteIT extends ESRestTestCase { "\"conf.dfs.client.failover.proxy.provider.ha-hdfs\": " + "\"org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider\"" + "}" + - "}", - Charset.defaultCharset()), contentHeader); + "}"); + Response response = client.performRequest(request); Assert.assertEquals(200, response.getStatusLine().getStatusCode()); } // Get repository { - Response response = client.performRequest("GET", "/_snapshot/hdfs_ha_repo_read/_all", emptyParams); + Response response = client.performRequest(new Request("GET", "/_snapshot/hdfs_ha_repo_read/_all")); Assert.assertEquals(200, response.getStatusLine().getStatusCode()); } @@ -138,7 +132,7 @@ public class HaHdfsFailoverTestSuiteIT extends ESRestTestCase { // Get repository again { - Response response = client.performRequest("GET", "/_snapshot/hdfs_ha_repo_read/_all", emptyParams); + Response response = client.performRequest(new Request("GET", "/_snapshot/hdfs_ha_repo_read/_all")); Assert.assertEquals(200, response.getStatusLine().getStatusCode()); } } diff --git a/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java b/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java index a26237962bf..71fc9d09fe3 100644 --- a/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java +++ b/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java @@ -20,6 +20,7 @@ package org.elasticsearch.qa.verify_version_constants; import org.elasticsearch.Version; +import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.yaml.ObjectPath; @@ -32,7 +33,7 @@ import static org.hamcrest.CoreMatchers.equalTo; public class VerifyVersionConstantsIT extends ESRestTestCase { public void testLuceneVersionConstant() throws IOException, ParseException { - final Response response = client().performRequest("GET", "/"); + final Response response = client().performRequest(new Request("GET", "/")); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); final ObjectPath objectPath = ObjectPath.createFromResponse(response); final String elasticsearchVersionString = objectPath.evaluate("version.number").toString();