From 5251300fb5124b4a47d91302dd6ac2dd58c9ee50 Mon Sep 17 00:00:00 2001
From: Michael Basnight <mbasnight@gmail.com>
Date: Thu, 6 Sep 2018 11:33:26 -0500
Subject: [PATCH] HLRC: split graph request converters (#33429)
In an effort to encapsulate the different clients, the request
converters are being shuffled around. This splits the GraphClient
request converters.
---
.../org/elasticsearch/client/GraphClient.java | 4 +-
.../client/GraphRequestConverters.java | 35 ++++++++++
.../client/RequestConverters.java | 8 ---
.../client/GrapRequestConvertersTests.java | 67 +++++++++++++++++++
.../client/RequestConvertersTests.java | 32 ---------
5 files changed, 104 insertions(+), 42 deletions(-)
create mode 100644 client/rest-high-level/src/main/java/org/elasticsearch/client/GraphRequestConverters.java
create mode 100644 client/rest-high-level/src/test/java/org/elasticsearch/client/GrapRequestConvertersTests.java
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphClient.java
index 293105f5abe..5099bf8d51d 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphClient.java
@@ -43,7 +43,7 @@ public class GraphClient {
*/
public final GraphExploreResponse explore(GraphExploreRequest graphExploreRequest,
RequestOptions options) throws IOException {
- return restHighLevelClient.performRequestAndParseEntity(graphExploreRequest, RequestConverters::xPackGraphExplore,
+ return restHighLevelClient.performRequestAndParseEntity(graphExploreRequest, GraphRequestConverters::explore,
options, GraphExploreResponse::fromXContext, emptySet());
}
@@ -56,7 +56,7 @@ public class GraphClient {
public final void exploreAsync(GraphExploreRequest graphExploreRequest,
RequestOptions options,
ActionListener<GraphExploreResponse> listener) {
- restHighLevelClient.performRequestAsyncAndParseEntity(graphExploreRequest, RequestConverters::xPackGraphExplore,
+ restHighLevelClient.performRequestAsyncAndParseEntity(graphExploreRequest, GraphRequestConverters::explore,
options, GraphExploreResponse::fromXContext, listener, emptySet());
}
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphRequestConverters.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphRequestConverters.java
new file mode 100644
index 00000000000..c1f1e1d115f
--- /dev/null
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/GraphRequestConverters.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.client;
+
+import org.apache.http.client.methods.HttpGet;
+import org.elasticsearch.protocol.xpack.graph.GraphExploreRequest;
+
+import java.io.IOException;
+
+public class GraphRequestConverters {
+
+ static Request explore(GraphExploreRequest exploreRequest) throws IOException {
+ String endpoint = RequestConverters.endpoint(exploreRequest.indices(), exploreRequest.types(), "_xpack/graph/_explore");
+ Request request = new Request(HttpGet.METHOD_NAME, endpoint);
+ request.setEntity(RequestConverters.createEntity(exploreRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
+ return request;
+ }
+}
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 89521b5e9b0..cfd3b71c698 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
@@ -117,7 +117,6 @@ import org.elasticsearch.protocol.xpack.license.PutLicenseRequest;
import org.elasticsearch.protocol.xpack.migration.IndexUpgradeInfoRequest;
import org.elasticsearch.protocol.xpack.watcher.DeleteWatchRequest;
import org.elasticsearch.protocol.xpack.watcher.PutWatchRequest;
-import org.elasticsearch.protocol.xpack.graph.GraphExploreRequest;
import org.elasticsearch.rest.action.search.RestSearchAction;
import org.elasticsearch.script.mustache.MultiSearchTemplateRequest;
import org.elasticsearch.script.mustache.SearchTemplateRequest;
@@ -1152,13 +1151,6 @@ final class RequestConverters {
return request;
}
- static Request xPackGraphExplore(GraphExploreRequest exploreRequest) throws IOException {
- String endpoint = endpoint(exploreRequest.indices(), exploreRequest.types(), "_xpack/graph/_explore");
- Request request = new Request(HttpGet.METHOD_NAME, endpoint);
- request.setEntity(createEntity(exploreRequest, REQUEST_BODY_CONTENT_TYPE));
- return request;
- }
-
static Request xPackWatcherPutWatch(PutWatchRequest putWatchRequest) {
String endpoint = new EndpointBuilder()
.addPathPartAsIs("_xpack")
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/GrapRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/GrapRequestConvertersTests.java
new file mode 100644
index 00000000000..6598800d76e
--- /dev/null
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/GrapRequestConvertersTests.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.client;
+
+import org.apache.http.client.methods.HttpGet;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.TermQueryBuilder;
+import org.elasticsearch.protocol.xpack.graph.GraphExploreRequest;
+import org.elasticsearch.protocol.xpack.graph.Hop;
+import org.elasticsearch.test.ESTestCase;
+import org.junit.Assert;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.Matchers.is;
+
+public class GrapRequestConvertersTests extends ESTestCase{
+
+ public void testGraphExplore() throws Exception {
+ Map<String, String> expectedParams = new HashMap<>();
+
+ GraphExploreRequest graphExploreRequest = new GraphExploreRequest();
+ graphExploreRequest.sampleDiversityField("diversity");
+ graphExploreRequest.indices("index1", "index2");
+ graphExploreRequest.types("type1", "type2");
+ int timeout = ESTestCase.randomIntBetween(10000, 20000);
+ graphExploreRequest.timeout(TimeValue.timeValueMillis(timeout));
+ graphExploreRequest.useSignificance(ESTestCase.randomBoolean());
+ int numHops = ESTestCase.randomIntBetween(1, 5);
+ for (int i = 0; i < numHops; i++) {
+ int hopNumber = i + 1;
+ QueryBuilder guidingQuery = null;
+ if (ESTestCase.randomBoolean()) {
+ guidingQuery = new TermQueryBuilder("field" + hopNumber, "value" + hopNumber);
+ }
+ Hop hop = graphExploreRequest.createNextHop(guidingQuery);
+ hop.addVertexRequest("field" + hopNumber);
+ hop.getVertexRequest(0).addInclude("value" + hopNumber, hopNumber);
+ }
+ Request request = GraphRequestConverters.explore(graphExploreRequest);
+ Assert.assertEquals(HttpGet.METHOD_NAME, request.getMethod());
+ Assert.assertEquals("/index1,index2/type1,type2/_xpack/graph/_explore", request.getEndpoint());
+ Assert.assertEquals(expectedParams, request.getParameters());
+ Assert.assertThat(request.getEntity().getContentType().getValue(), is(XContentType.JSON.mediaTypeWithoutParameters()));
+ RequestConvertersTests.assertToXContentBody(graphExploreRequest, request.getEntity());
+ }
+}
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 a6845448b82..32c37450107 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
@@ -114,7 +114,6 @@ import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.index.RandomCreateIndexGenerator;
import org.elasticsearch.index.VersionType;
-import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.TermQueryBuilder;
import org.elasticsearch.index.rankeval.PrecisionAtK;
@@ -129,8 +128,6 @@ import org.elasticsearch.index.reindex.UpdateByQueryRequest;
import org.elasticsearch.protocol.xpack.XPackInfoRequest;
import org.elasticsearch.protocol.xpack.migration.IndexUpgradeInfoRequest;
import org.elasticsearch.protocol.xpack.watcher.DeleteWatchRequest;
-import org.elasticsearch.protocol.xpack.graph.GraphExploreRequest;
-import org.elasticsearch.protocol.xpack.graph.Hop;
import org.elasticsearch.protocol.xpack.watcher.PutWatchRequest;
import org.elasticsearch.repositories.fs.FsRepository;
import org.elasticsearch.rest.action.search.RestSearchAction;
@@ -2657,35 +2654,6 @@ public class RequestConvertersTests extends ESTestCase {
assertThat(bos.toString("UTF-8"), is(body));
}
- public void testGraphExplore() throws Exception {
- Map<String, String> expectedParams = new HashMap<>();
-
- GraphExploreRequest graphExploreRequest = new GraphExploreRequest();
- graphExploreRequest.sampleDiversityField("diversity");
- graphExploreRequest.indices("index1", "index2");
- graphExploreRequest.types("type1", "type2");
- int timeout = randomIntBetween(10000, 20000);
- graphExploreRequest.timeout(TimeValue.timeValueMillis(timeout));
- graphExploreRequest.useSignificance(randomBoolean());
- int numHops = randomIntBetween(1, 5);
- for (int i = 0; i < numHops; i++) {
- int hopNumber = i + 1;
- QueryBuilder guidingQuery = null;
- if (randomBoolean()) {
- guidingQuery = new TermQueryBuilder("field" + hopNumber, "value" + hopNumber);
- }
- Hop hop = graphExploreRequest.createNextHop(guidingQuery);
- hop.addVertexRequest("field" + hopNumber);
- hop.getVertexRequest(0).addInclude("value" + hopNumber, hopNumber);
- }
- Request request = RequestConverters.xPackGraphExplore(graphExploreRequest);
- assertEquals(HttpGet.METHOD_NAME, request.getMethod());
- assertEquals("/index1,index2/type1,type2/_xpack/graph/_explore", request.getEndpoint());
- assertEquals(expectedParams, request.getParameters());
- assertThat(request.getEntity().getContentType().getValue(), is(XContentType.JSON.mediaTypeWithoutParameters()));
- assertToXContentBody(graphExploreRequest, request.getEntity());
- }
-
public void testXPackDeleteWatch() {
DeleteWatchRequest deleteWatchRequest = new DeleteWatchRequest();
String watchId = randomAlphaOfLength(10);