|
@@ -36,6 +36,7 @@ import org.elasticsearch.action.admin.cluster.repositories.delete.DeleteReposito
|
|
import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesRequest;
|
|
import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesRequest;
|
|
import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryRequest;
|
|
import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryRequest;
|
|
import org.elasticsearch.action.admin.cluster.repositories.verify.VerifyRepositoryRequest;
|
|
import org.elasticsearch.action.admin.cluster.repositories.verify.VerifyRepositoryRequest;
|
|
|
|
+import org.elasticsearch.action.admin.cluster.settings.ClusterGetSettingsRequest;
|
|
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
|
|
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
|
|
import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotRequest;
|
|
import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotRequest;
|
|
import org.elasticsearch.action.admin.cluster.snapshots.delete.DeleteSnapshotRequest;
|
|
import org.elasticsearch.action.admin.cluster.snapshots.delete.DeleteSnapshotRequest;
|
|
@@ -1374,42 +1375,42 @@ public class RequestConvertersTests extends ESTestCase {
|
|
assertEquals(Collections.emptyMap(), request.getParameters());
|
|
assertEquals(Collections.emptyMap(), request.getParameters());
|
|
assertToXContentBody(searchTemplateRequest, request.getEntity());
|
|
assertToXContentBody(searchTemplateRequest, request.getEntity());
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void testMultiSearchTemplate() throws Exception {
|
|
public void testMultiSearchTemplate() throws Exception {
|
|
final int numSearchRequests = randomIntBetween(1, 10);
|
|
final int numSearchRequests = randomIntBetween(1, 10);
|
|
MultiSearchTemplateRequest multiSearchTemplateRequest = new MultiSearchTemplateRequest();
|
|
MultiSearchTemplateRequest multiSearchTemplateRequest = new MultiSearchTemplateRequest();
|
|
-
|
|
|
|
|
|
+
|
|
for (int i = 0; i < numSearchRequests; i++) {
|
|
for (int i = 0; i < numSearchRequests; i++) {
|
|
// Create a random request.
|
|
// Create a random request.
|
|
String[] indices = randomIndicesNames(0, 5);
|
|
String[] indices = randomIndicesNames(0, 5);
|
|
SearchRequest searchRequest = new SearchRequest(indices);
|
|
SearchRequest searchRequest = new SearchRequest(indices);
|
|
-
|
|
|
|
|
|
+
|
|
Map<String, String> expectedParams = new HashMap<>();
|
|
Map<String, String> expectedParams = new HashMap<>();
|
|
setRandomSearchParams(searchRequest, expectedParams);
|
|
setRandomSearchParams(searchRequest, expectedParams);
|
|
-
|
|
|
|
|
|
+
|
|
// scroll is not supported in the current msearch or msearchtemplate api, so unset it:
|
|
// scroll is not supported in the current msearch or msearchtemplate api, so unset it:
|
|
searchRequest.scroll((Scroll) null);
|
|
searchRequest.scroll((Scroll) null);
|
|
// batched reduce size is currently not set-able on a per-request basis as it is a query string parameter only
|
|
// batched reduce size is currently not set-able on a per-request basis as it is a query string parameter only
|
|
searchRequest.setBatchedReduceSize(SearchRequest.DEFAULT_BATCHED_REDUCE_SIZE);
|
|
searchRequest.setBatchedReduceSize(SearchRequest.DEFAULT_BATCHED_REDUCE_SIZE);
|
|
-
|
|
|
|
|
|
+
|
|
setRandomIndicesOptions(searchRequest::indicesOptions, searchRequest::indicesOptions, expectedParams);
|
|
setRandomIndicesOptions(searchRequest::indicesOptions, searchRequest::indicesOptions, expectedParams);
|
|
-
|
|
|
|
|
|
+
|
|
SearchTemplateRequest searchTemplateRequest = new SearchTemplateRequest(searchRequest);
|
|
SearchTemplateRequest searchTemplateRequest = new SearchTemplateRequest(searchRequest);
|
|
-
|
|
|
|
|
|
+
|
|
searchTemplateRequest.setScript("{\"query\": { \"match\" : { \"{{field}}\" : \"{{value}}\" }}}");
|
|
searchTemplateRequest.setScript("{\"query\": { \"match\" : { \"{{field}}\" : \"{{value}}\" }}}");
|
|
searchTemplateRequest.setScriptType(ScriptType.INLINE);
|
|
searchTemplateRequest.setScriptType(ScriptType.INLINE);
|
|
searchTemplateRequest.setProfile(randomBoolean());
|
|
searchTemplateRequest.setProfile(randomBoolean());
|
|
-
|
|
|
|
|
|
+
|
|
Map<String, Object> scriptParams = new HashMap<>();
|
|
Map<String, Object> scriptParams = new HashMap<>();
|
|
scriptParams.put("field", "name");
|
|
scriptParams.put("field", "name");
|
|
scriptParams.put("value", randomAlphaOfLengthBetween(2, 5));
|
|
scriptParams.put("value", randomAlphaOfLengthBetween(2, 5));
|
|
searchTemplateRequest.setScriptParams(scriptParams);
|
|
searchTemplateRequest.setScriptParams(scriptParams);
|
|
-
|
|
|
|
- multiSearchTemplateRequest.add(searchTemplateRequest);
|
|
|
|
|
|
+
|
|
|
|
+ multiSearchTemplateRequest.add(searchTemplateRequest);
|
|
}
|
|
}
|
|
|
|
|
|
Request multiRequest = RequestConverters.multiSearchTemplate(multiSearchTemplateRequest);
|
|
Request multiRequest = RequestConverters.multiSearchTemplate(multiSearchTemplateRequest);
|
|
-
|
|
|
|
|
|
+
|
|
assertEquals(HttpPost.METHOD_NAME, multiRequest.getMethod());
|
|
assertEquals(HttpPost.METHOD_NAME, multiRequest.getMethod());
|
|
assertEquals("/_msearch/template", multiRequest.getEndpoint());
|
|
assertEquals("/_msearch/template", multiRequest.getEndpoint());
|
|
List<SearchTemplateRequest> searchRequests = multiSearchTemplateRequest.requests();
|
|
List<SearchTemplateRequest> searchRequests = multiSearchTemplateRequest.requests();
|
|
@@ -1418,9 +1419,9 @@ public class RequestConvertersTests extends ESTestCase {
|
|
HttpEntity actualEntity = multiRequest.getEntity();
|
|
HttpEntity actualEntity = multiRequest.getEntity();
|
|
byte[] expectedBytes = MultiSearchTemplateRequest.writeMultiLineFormat(multiSearchTemplateRequest, XContentType.JSON.xContent());
|
|
byte[] expectedBytes = MultiSearchTemplateRequest.writeMultiLineFormat(multiSearchTemplateRequest, XContentType.JSON.xContent());
|
|
assertEquals(XContentType.JSON.mediaTypeWithoutParameters(), actualEntity.getContentType().getValue());
|
|
assertEquals(XContentType.JSON.mediaTypeWithoutParameters(), actualEntity.getContentType().getValue());
|
|
- assertEquals(new BytesArray(expectedBytes), new BytesArray(EntityUtils.toByteArray(actualEntity)));
|
|
|
|
|
|
+ assertEquals(new BytesArray(expectedBytes), new BytesArray(EntityUtils.toByteArray(actualEntity)));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void testExistsAlias() {
|
|
public void testExistsAlias() {
|
|
GetAliasesRequest getAliasesRequest = new GetAliasesRequest();
|
|
GetAliasesRequest getAliasesRequest = new GetAliasesRequest();
|
|
String[] indices = randomBoolean() ? null : randomIndicesNames(0, 5);
|
|
String[] indices = randomBoolean() ? null : randomIndicesNames(0, 5);
|
|
@@ -1636,6 +1637,21 @@ public class RequestConvertersTests extends ESTestCase {
|
|
assertEquals(expectedParams, expectedRequest.getParameters());
|
|
assertEquals(expectedParams, expectedRequest.getParameters());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public void testClusterGetSettings() throws IOException {
|
|
|
|
+ ClusterGetSettingsRequest request = new ClusterGetSettingsRequest();
|
|
|
|
+ Map<String, String> expectedParams = new HashMap<>();
|
|
|
|
+ setRandomMasterTimeout(request, expectedParams);
|
|
|
|
+ request.includeDefaults(randomBoolean());
|
|
|
|
+ if (request.includeDefaults()) {
|
|
|
|
+ expectedParams.put("include_defaults", String.valueOf(true));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Request expectedRequest = RequestConverters.clusterGetSettings(request);
|
|
|
|
+ assertEquals("/_cluster/settings", expectedRequest.getEndpoint());
|
|
|
|
+ assertEquals(HttpGet.METHOD_NAME, expectedRequest.getMethod());
|
|
|
|
+ assertEquals(expectedParams, expectedRequest.getParameters());
|
|
|
|
+ }
|
|
|
|
+
|
|
public void testPutPipeline() throws IOException {
|
|
public void testPutPipeline() throws IOException {
|
|
String pipelineId = "some_pipeline_id";
|
|
String pipelineId = "some_pipeline_id";
|
|
PutPipelineRequest request = new PutPipelineRequest(
|
|
PutPipelineRequest request = new PutPipelineRequest(
|