Switch remaining tests to new style Requests

In elastic#29623 we added `Request` object flavored requests to the low level REST client and in elastic#30315 we deprecated the old `performRequest`s. This changes all calls in the `client` and `distribution` projects to use the new versions.
nik9000 · Aug 23, 2018 · 3f580db · 3f580db
1 parent 8f16696
commit 3f580db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 25 deletions.
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java
@@ -17,9 +17,6 @@
  * under the License.
  */
 
-
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest;
@@ -35,7 +32,6 @@
 
 import java.util.Collections;
 
-import static java.util.Collections.emptyMap;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -52,12 +48,9 @@ public void testGetStoredScript() throws Exception {
  final String script = Strings.toString(scriptSource.toXContent(jsonBuilder(), ToXContent.EMPTY_PARAMS));
  // TODO: change to HighLevel PutStoredScriptRequest when it will be ready
  // so far - using low-level REST API
- Response putResponse =
- adminClient()
- .performRequest("PUT", "/_scripts/calculate-score", emptyMap(),
- new StringEntity("{\"script\":" + script + "}",
- ContentType.APPLICATION_JSON));
- assertEquals(putResponse.getStatusLine().getReasonPhrase(), 200, putResponse.getStatusLine().getStatusCode());
+ Request putRequest = new Request("PUT", "/_scripts/calculate-score");
+ putRequest.setJsonEntity("{\"script\":" + script + "}");
+ Response putResponse = adminClient().performRequest(putRequest);
  assertEquals("{\"acknowledged\":true}", EntityUtils.toString(putResponse.getEntity()));
 
  GetStoredScriptRequest getRequest = new GetStoredScriptRequest("calculate-score");
@@ -78,12 +71,9 @@ public void testDeleteStoredScript() throws Exception {
  final String script = Strings.toString(scriptSource.toXContent(jsonBuilder(), ToXContent.EMPTY_PARAMS));
  // TODO: change to HighLevel PutStoredScriptRequest when it will be ready
  // so far - using low-level REST API
- Response putResponse =
- adminClient()
- .performRequest("PUT", "/_scripts/" + id, emptyMap(),
- new StringEntity("{\"script\":" + script + "}",
- ContentType.APPLICATION_JSON));
- assertEquals(putResponse.getStatusLine().getReasonPhrase(), 200, putResponse.getStatusLine().getStatusCode());
+ Request putRequest = new Request("PUT", "/_scripts/" + id);
+ putRequest.setJsonEntity("{\"script\":" + script + "}");
+ Response putResponse = adminClient().performRequest(putRequest);
  assertEquals("{\"acknowledged\":true}", EntityUtils.toString(putResponse.getEntity()));
 
  DeleteStoredScriptRequest deleteRequest = new DeleteStoredScriptRequest(id);

diff --git a/...el/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java b/...el/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.LatchedActionListener;
@@ -27,6 +25,7 @@
 import org.elasticsearch.action.admin.cluster.storedscripts.GetStoredScriptResponse;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.client.ESRestHighLevelClientTestCase;
+import org.elasticsearch.client.Request;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.RestHighLevelClient;
@@ -43,7 +42,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static java.util.Collections.emptyMap;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -193,11 +191,9 @@ private void putStoredScript(String id, StoredScriptSource scriptSource) throws
  final String script = Strings.toString(scriptSource.toXContent(jsonBuilder(), ToXContent.EMPTY_PARAMS));
  // TODO: change to HighLevel PutStoredScriptRequest when it will be ready
  // so far - using low-level REST API
- Response putResponse =
- adminClient()
- .performRequest("PUT", "/_scripts/" + id, emptyMap(),
- new StringEntity("{\"script\":" + script + "}",
- ContentType.APPLICATION_JSON));
+ Request request = new Request("PUT", "/_scripts/" + id);
+ request.setJsonEntity("{\"script\":" + script + "}");
+ Response putResponse = adminClient().performRequest(request);
  assertEquals(putResponse.getStatusLine().getReasonPhrase(), 200, putResponse.getStatusLine().getStatusCode());
  assertEquals("{\"acknowledged\":true}", EntityUtils.toString(putResponse.getEntity()));
  }

diff --git a/...integ-test-zip/src/test/java/org/elasticsearch/test/rest/WaitForRefreshAndCloseTests.java b/...integ-test-zip/src/test/java/org/elasticsearch/test/rest/WaitForRefreshAndCloseTests.java
@@ -53,7 +53,7 @@ public void setupIndex() throws IOException {
 
  @After
  public void cleanupIndex() throws IOException {
- client().performRequest("DELETE", indexName());
+ client().performRequest(new Request("DELETE", indexName()));
  }
 
  private String indexName() {