From 95100e05f97cc56e4fa30d1a7db3f9054885a4c0 Mon Sep 17 00:00:00 2001 From: Julie Tibshirani Date: Sun, 9 Sep 2018 20:02:35 -0700 Subject: [PATCH] Remove some duplicate request conversion methods. (#33538) --- .../client/RequestConverters.java | 71 ------------------- .../client/RequestConvertersTests.java | 44 ------------ .../client/WatcherRequestConvertersTests.java | 4 +- 3 files changed, 2 insertions(+), 117 deletions(-) diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java index 89f81512bc9..840bc4f0c4d 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java @@ -95,11 +95,6 @@ import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; import org.elasticsearch.index.reindex.DeleteByQueryRequest; import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.index.reindex.UpdateByQueryRequest; -import org.elasticsearch.protocol.xpack.license.DeleteLicenseRequest; -import org.elasticsearch.protocol.xpack.license.GetLicenseRequest; -import org.elasticsearch.protocol.xpack.license.PutLicenseRequest; -import org.elasticsearch.protocol.xpack.watcher.DeleteWatchRequest; -import org.elasticsearch.protocol.xpack.watcher.PutWatchRequest; import org.elasticsearch.rest.action.search.RestSearchAction; import org.elasticsearch.script.mustache.MultiSearchTemplateRequest; import org.elasticsearch.script.mustache.SearchTemplateRequest; @@ -930,72 +925,6 @@ final class RequestConverters { return request; } - static Request xPackWatcherPutWatch(PutWatchRequest putWatchRequest) { - String endpoint = new EndpointBuilder() - .addPathPartAsIs("_xpack") - .addPathPartAsIs("watcher") - .addPathPartAsIs("watch") - .addPathPart(putWatchRequest.getId()) - .build(); - - Request request = new Request(HttpPut.METHOD_NAME, endpoint); - Params params = new Params(request).withVersion(putWatchRequest.getVersion()); - if (putWatchRequest.isActive() == false) { - params.putParam("active", "false"); - } - ContentType contentType = createContentType(putWatchRequest.xContentType()); - BytesReference source = putWatchRequest.getSource(); - request.setEntity(new ByteArrayEntity(source.toBytesRef().bytes, 0, source.length(), contentType)); - return request; - } - - static Request xPackWatcherDeleteWatch(DeleteWatchRequest deleteWatchRequest) { - String endpoint = new EndpointBuilder() - .addPathPartAsIs("_xpack") - .addPathPartAsIs("watcher") - .addPathPartAsIs("watch") - .addPathPart(deleteWatchRequest.getId()) - .build(); - - Request request = new Request(HttpDelete.METHOD_NAME, endpoint); - return request; - } - - static Request putLicense(PutLicenseRequest putLicenseRequest) { - String endpoint = new EndpointBuilder() - .addPathPartAsIs("_xpack") - .addPathPartAsIs("license") - .build(); - Request request = new Request(HttpPut.METHOD_NAME, endpoint); - Params parameters = new Params(request); - parameters.withTimeout(putLicenseRequest.timeout()); - parameters.withMasterTimeout(putLicenseRequest.masterNodeTimeout()); - if (putLicenseRequest.isAcknowledge()) { - parameters.putParam("acknowledge", "true"); - } - request.setJsonEntity(putLicenseRequest.getLicenseDefinition()); - return request; - } - - static Request getLicense(GetLicenseRequest getLicenseRequest) { - String endpoint = new EndpointBuilder() - .addPathPartAsIs("_xpack") - .addPathPartAsIs("license") - .build(); - Request request = new Request(HttpGet.METHOD_NAME, endpoint); - Params parameters = new Params(request); - parameters.withLocal(getLicenseRequest.local()); - return request; - } - - static Request deleteLicense(DeleteLicenseRequest deleteLicenseRequest) { - Request request = new Request(HttpDelete.METHOD_NAME, "/_xpack/license"); - Params parameters = new Params(request); - parameters.withTimeout(deleteLicenseRequest.timeout()); - parameters.withMasterTimeout(deleteLicenseRequest.masterNodeTimeout()); - return request; - } - static HttpEntity createEntity(ToXContent toXContent, XContentType xContentType) throws IOException { BytesRef source = XContentHelper.toXContent(toXContent, xContentType, false).toBytesRef(); return new ByteArrayEntity(source.bytes, source.offset, source.length, createContentType(xContentType)); diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java index 6f48d305a77..4ef8e8542c9 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java @@ -109,8 +109,6 @@ import org.elasticsearch.index.reindex.DeleteByQueryRequest; import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.index.reindex.UpdateByQueryRequest; -import org.elasticsearch.protocol.xpack.watcher.DeleteWatchRequest; -import org.elasticsearch.protocol.xpack.watcher.PutWatchRequest; import org.elasticsearch.rest.action.search.RestSearchAction; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptType; @@ -129,7 +127,6 @@ import org.elasticsearch.search.suggest.completion.CompletionSuggestionBuilder; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.RandomObjects; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -160,7 +157,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXC import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasKey; -import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; public class RequestConvertersTests extends ESTestCase { @@ -2212,46 +2208,6 @@ public class RequestConvertersTests extends ESTestCase { + "previous requests have content-type [" + xContentType + "]", exception.getMessage()); } - public void testXPackPutWatch() throws Exception { - PutWatchRequest putWatchRequest = new PutWatchRequest(); - String watchId = randomAlphaOfLength(10); - putWatchRequest.setId(watchId); - String body = randomAlphaOfLength(20); - putWatchRequest.setSource(new BytesArray(body), XContentType.JSON); - - Map expectedParams = new HashMap<>(); - if (randomBoolean()) { - putWatchRequest.setActive(false); - expectedParams.put("active", "false"); - } - - if (randomBoolean()) { - long version = randomLongBetween(10, 100); - putWatchRequest.setVersion(version); - expectedParams.put("version", String.valueOf(version)); - } - - Request request = RequestConverters.xPackWatcherPutWatch(putWatchRequest); - assertEquals(HttpPut.METHOD_NAME, request.getMethod()); - assertEquals("/_xpack/watcher/watch/" + watchId, request.getEndpoint()); - assertEquals(expectedParams, request.getParameters()); - assertThat(request.getEntity().getContentType().getValue(), is(XContentType.JSON.mediaTypeWithoutParameters())); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - request.getEntity().writeTo(bos); - assertThat(bos.toString("UTF-8"), is(body)); - } - - public void testXPackDeleteWatch() { - DeleteWatchRequest deleteWatchRequest = new DeleteWatchRequest(); - String watchId = randomAlphaOfLength(10); - deleteWatchRequest.setId(watchId); - - Request request = RequestConverters.xPackWatcherDeleteWatch(deleteWatchRequest); - assertEquals(HttpDelete.METHOD_NAME, request.getMethod()); - assertEquals("/_xpack/watcher/watch/" + watchId, request.getEndpoint()); - assertThat(request.getEntity(), nullValue()); - } - /** * Randomize the {@link FetchSourceContext} request parameters. */ diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/WatcherRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/WatcherRequestConvertersTests.java index 203d0826c6d..cf5af1dd594 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/WatcherRequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/WatcherRequestConvertersTests.java @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.nullValue; public class WatcherRequestConvertersTests extends ESTestCase { - public void testXPackPutWatch() throws Exception { + public void testPutWatch() throws Exception { PutWatchRequest putWatchRequest = new PutWatchRequest(); String watchId = randomAlphaOfLength(10); putWatchRequest.setId(watchId); @@ -65,7 +65,7 @@ public class WatcherRequestConvertersTests extends ESTestCase { assertThat(bos.toString("UTF-8"), is(body)); } - public void testXPackDeleteWatch() { + public void testDeleteWatch() { DeleteWatchRequest deleteWatchRequest = new DeleteWatchRequest(); String watchId = randomAlphaOfLength(10); deleteWatchRequest.setId(watchId);