Switch low level rest tests to new style Requests (#31938)

nik9000 · web-flow · commit eda6d182b541 · 2018-07-11T09:48:47.000-04:00
In #29623 we added `Request` object flavored requests to the low level REST client and in #30315 we deprecated the old `performRequest`s. This changes all calls in the `client/rest` project to use the new versions.
diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java
@@ -76,7 +76,7 @@ public void testBuilderUsesDefaultSSLContext() throws Exception {
         try {
             try (RestClient client = buildRestClient()) {
                 try {
-                    client.performRequest("GET", "/");
+                    client.performRequest(new Request("GET", "/"));
                     fail("connection should have been rejected due to SSL handshake");
                 } catch (Exception e) {
                     assertThat(e.getMessage(), containsString("General SSLEngine problem"));
@@ -85,7 +85,7 @@ public void testBuilderUsesDefaultSSLContext() throws Exception {
 
             SSLContext.setDefault(getSslContext());
             try (RestClient client = buildRestClient()) {
-                Response response = client.performRequest("GET", "/");
+                Response response = client.performRequest(new Request("GET", "/"));
                 assertEquals(200, response.getStatusLine().getStatusCode());
             }
         } finally {
diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostIntegTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostIntegTests.java
@@ -256,35 +256,51 @@ public void testGetWithBody() throws IOException {
 
     public void testEncodeParams() throws IOException {
         {
-            Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "this/is/the/routing"));
+            Request request = new Request("PUT", "/200");
+            request.addParameter("routing", "this/is/the/routing");
+            Response response = restClient.performRequest(request);
             assertEquals(pathPrefix + "/200?routing=this%2Fis%2Fthe%2Frouting", response.getRequestLine().getUri());
         }
         {
-            Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "this|is|the|routing"));
+            Request request = new Request("PUT", "/200");
+            request.addParameter("routing", "this|is|the|routing");
+            Response response = restClient.performRequest(request);
             assertEquals(pathPrefix + "/200?routing=this%7Cis%7Cthe%7Crouting", response.getRequestLine().getUri());
         }
         {
-            Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "routing#1"));
+            Request request = new Request("PUT", "/200");
+            request.addParameter("routing", "routing#1");
+            Response response = restClient.performRequest(request);
             assertEquals(pathPrefix + "/200?routing=routing%231", response.getRequestLine().getUri());
         }
         {
-            Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "中文"));
+            Request request = new Request("PUT", "/200");
+            request.addParameter("routing", "中文");
+            Response response = restClient.performRequest(request);
             assertEquals(pathPrefix + "/200?routing=%E4%B8%AD%E6%96%87", response.getRequestLine().getUri());
         }
         {
-            Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "foo bar"));
+            Request request = new Request("PUT", "/200");
+            request.addParameter("routing", "foo bar");
+            Response response = restClient.performRequest(request);
             assertEquals(pathPrefix + "/200?routing=foo+bar", response.getRequestLine().getUri());
         }
         {
-            Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "foo+bar"));
+            Request request = new Request("PUT", "/200");
+            request.addParameter("routing", "foo+bar");
+            Response response = restClient.performRequest(request);
             assertEquals(pathPrefix + "/200?routing=foo%2Bbar", response.getRequestLine().getUri());
         }
         {
-            Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "foo/bar"));
+            Request request = new Request("PUT", "/200");
+            request.addParameter("routing", "foo/bar");
+            Response response = restClient.performRequest(request);
             assertEquals(pathPrefix + "/200?routing=foo%2Fbar", response.getRequestLine().getUri());
         }
         {
-            Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "foo^bar"));
+            Request request = new Request("PUT", "/200");
+            request.addParameter("routing", "foo^bar");
+            Response response = restClient.performRequest(request);
             assertEquals(pathPrefix + "/200?routing=foo%5Ebar", response.getRequestLine().getUri());
         }
     }
@@ -341,14 +357,14 @@ public void testAuthCredentialsAreNotClearedOnAuthChallenge() throws IOException
     public void testUrlWithoutLeadingSlash() throws Exception {
         if (pathPrefix.length() == 0) {
             try {
-                restClient.performRequest("GET", "200");
+                restClient.performRequest(new Request("GET", "200"));
                 fail("request should have failed");
             } catch (ResponseException e) {
                 assertEquals(404, e.getResponse().getStatusLine().getStatusCode());
             }
         } else {
             {
-                Response response = restClient.performRequest("GET", "200");
+                Response response = restClient.performRequest(new Request("GET", "200"));
                 //a trailing slash gets automatically added if a pathPrefix is configured
                 assertEquals(200, response.getStatusLine().getStatusCode());
             }
@@ -357,7 +373,7 @@ public void testUrlWithoutLeadingSlash() throws Exception {
                 try (RestClient restClient = RestClient.builder(
                     new HttpHost(httpServer.getAddress().getHostString(), httpServer.getAddress().getPort()))
                     .setPathPrefix(pathPrefix.substring(1)).build()) {
-                    Response response = restClient.performRequest("GET", "200");
+                    Response response = restClient.performRequest(new Request("GET", "200"));
                     //a trailing slash gets automatically added if a pathPrefix is configured
                     assertEquals(200, response.getStatusLine().getStatusCode());
                 }
diff --git a/client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java b/client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java
@@ -267,7 +267,7 @@ public void onFailure(Exception exception) {
         }
         {
             //tag::rest-client-response2
-            Response response = restClient.performRequest("GET", "/");
+            Response response = restClient.performRequest(new Request("GET", "/"));
             RequestLine requestLine = response.getRequestLine(); // <1>
             HttpHost host = response.getHost(); // <2>
             int statusCode = response.getStatusLine().getStatusCode(); // <3>

Original file line number	Diff line number	Diff line change
`@@ -256,35 +256,51 @@ public void testGetWithBody() throws IOException {`
`256`	`256`
`257`	`257`	`public void testEncodeParams() throws IOException {`
`258`	`258`	`{`
`259`		`- Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "this/is/the/routing"));`
	`259`	`+ Request request = new Request("PUT", "/200");`
	`260`	`+ request.addParameter("routing", "this/is/the/routing");`
	`261`	`+ Response response = restClient.performRequest(request);`
`260`	`262`	`assertEquals(pathPrefix + "/200?routing=this%2Fis%2Fthe%2Frouting", response.getRequestLine().getUri());`
`261`	`263`	`}`
`262`	`264`	`{`
`263`		`- Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "this\|is\|the\|routing"));`
	`265`	`+ Request request = new Request("PUT", "/200");`
	`266`	`+ request.addParameter("routing", "this\|is\|the\|routing");`
	`267`	`+ Response response = restClient.performRequest(request);`
`264`	`268`	`assertEquals(pathPrefix + "/200?routing=this%7Cis%7Cthe%7Crouting", response.getRequestLine().getUri());`
`265`	`269`	`}`
`266`	`270`	`{`
`267`		`- Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "routing#1"));`
	`271`	`+ Request request = new Request("PUT", "/200");`
	`272`	`+ request.addParameter("routing", "routing#1");`
	`273`	`+ Response response = restClient.performRequest(request);`
`268`	`274`	`assertEquals(pathPrefix + "/200?routing=routing%231", response.getRequestLine().getUri());`
`269`	`275`	`}`
`270`	`276`	`{`
`271`		`- Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "中文"));`
	`277`	`+ Request request = new Request("PUT", "/200");`
	`278`	`+ request.addParameter("routing", "中文");`
	`279`	`+ Response response = restClient.performRequest(request);`
`272`	`280`	`assertEquals(pathPrefix + "/200?routing=%E4%B8%AD%E6%96%87", response.getRequestLine().getUri());`
`273`	`281`	`}`
`274`	`282`	`{`
`275`		`- Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "foo bar"));`
	`283`	`+ Request request = new Request("PUT", "/200");`
	`284`	`+ request.addParameter("routing", "foo bar");`
	`285`	`+ Response response = restClient.performRequest(request);`
`276`	`286`	`assertEquals(pathPrefix + "/200?routing=foo+bar", response.getRequestLine().getUri());`
`277`	`287`	`}`
`278`	`288`	`{`
`279`		`- Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "foo+bar"));`
	`289`	`+ Request request = new Request("PUT", "/200");`
	`290`	`+ request.addParameter("routing", "foo+bar");`
	`291`	`+ Response response = restClient.performRequest(request);`
`280`	`292`	`assertEquals(pathPrefix + "/200?routing=foo%2Bbar", response.getRequestLine().getUri());`
`281`	`293`	`}`
`282`	`294`	`{`
`283`		`- Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "foo/bar"));`
	`295`	`+ Request request = new Request("PUT", "/200");`
	`296`	`+ request.addParameter("routing", "foo/bar");`
	`297`	`+ Response response = restClient.performRequest(request);`
`284`	`298`	`assertEquals(pathPrefix + "/200?routing=foo%2Fbar", response.getRequestLine().getUri());`
`285`	`299`	`}`
`286`	`300`	`{`
`287`		`- Response response = restClient.performRequest("PUT", "/200", Collections.singletonMap("routing", "foo^bar"));`
	`301`	`+ Request request = new Request("PUT", "/200");`
	`302`	`+ request.addParameter("routing", "foo^bar");`
	`303`	`+ Response response = restClient.performRequest(request);`
`288`	`304`	`assertEquals(pathPrefix + "/200?routing=foo%5Ebar", response.getRequestLine().getUri());`
`289`	`305`	`}`
`290`	`306`	`}`
`@@ -341,14 +357,14 @@ public void testAuthCredentialsAreNotClearedOnAuthChallenge() throws IOException`
`341`	`357`	`public void testUrlWithoutLeadingSlash() throws Exception {`
`342`	`358`	`if (pathPrefix.length() == 0) {`
`343`	`359`	`try {`
`344`		`- restClient.performRequest("GET", "200");`
	`360`	`+ restClient.performRequest(new Request("GET", "200"));`
`345`	`361`	`fail("request should have failed");`
`346`	`362`	`} catch (ResponseException e) {`
`347`	`363`	`assertEquals(404, e.getResponse().getStatusLine().getStatusCode());`
`348`	`364`	`}`
`349`	`365`	`} else {`
`350`	`366`	`{`
`351`		`- Response response = restClient.performRequest("GET", "200");`
	`367`	`+ Response response = restClient.performRequest(new Request("GET", "200"));`
`352`	`368`	`//a trailing slash gets automatically added if a pathPrefix is configured`
`353`	`369`	`assertEquals(200, response.getStatusLine().getStatusCode());`
`354`	`370`	`}`
`@@ -357,7 +373,7 @@ public void testUrlWithoutLeadingSlash() throws Exception {`
`357`	`373`	`try (RestClient restClient = RestClient.builder(`
`358`	`374`	`new HttpHost(httpServer.getAddress().getHostString(), httpServer.getAddress().getPort()))`
`359`	`375`	`.setPathPrefix(pathPrefix.substring(1)).build()) {`
`360`		`- Response response = restClient.performRequest("GET", "200");`
	`376`	`+ Response response = restClient.performRequest(new Request("GET", "200"));`
`361`	`377`	`//a trailing slash gets automatically added if a pathPrefix is configured`
`362`	`378`	`assertEquals(200, response.getStatusLine().getStatusCode());`
`363`	`379`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ public void onFailure(Exception exception) {`
`267`	`267`	`}`
`268`	`268`	`{`
`269`	`269`	`//tag::rest-client-response2`
`270`		`- Response response = restClient.performRequest("GET", "/");`
	`270`	`+ Response response = restClient.performRequest(new Request("GET", "/"));`
`271`	`271`	`RequestLine requestLine = response.getRequestLine(); // <1>`
`272`	`272`	`HttpHost host = response.getHost(); // <2>`
`273`	`273`	`int statusCode = response.getStatusLine().getStatusCode(); // <3>`