HLRC: split ingest request converters (#33435)
In an effort to encapsulate the different clients, the request converters are being shuffled around. This splits the IngestClient request converters.
This commit is contained in:
parent
190ea9a6de
commit
d6b40f4c7b
|
@ -55,7 +55,7 @@ public final class IngestClient {
|
||||||
* @throws IOException in case there is a problem sending the request or parsing back the response
|
* @throws IOException in case there is a problem sending the request or parsing back the response
|
||||||
*/
|
*/
|
||||||
public AcknowledgedResponse putPipeline(PutPipelineRequest request, RequestOptions options) throws IOException {
|
public AcknowledgedResponse putPipeline(PutPipelineRequest request, RequestOptions options) throws IOException {
|
||||||
return restHighLevelClient.performRequestAndParseEntity( request, RequestConverters::putPipeline, options,
|
return restHighLevelClient.performRequestAndParseEntity( request, IngestRequestConverters::putPipeline, options,
|
||||||
AcknowledgedResponse::fromXContent, emptySet());
|
AcknowledgedResponse::fromXContent, emptySet());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ public final class IngestClient {
|
||||||
* @param listener the listener to be notified upon request completion
|
* @param listener the listener to be notified upon request completion
|
||||||
*/
|
*/
|
||||||
public void putPipelineAsync(PutPipelineRequest request, RequestOptions options, ActionListener<AcknowledgedResponse> listener) {
|
public void putPipelineAsync(PutPipelineRequest request, RequestOptions options, ActionListener<AcknowledgedResponse> listener) {
|
||||||
restHighLevelClient.performRequestAsyncAndParseEntity( request, RequestConverters::putPipeline, options,
|
restHighLevelClient.performRequestAsyncAndParseEntity( request, IngestRequestConverters::putPipeline, options,
|
||||||
AcknowledgedResponse::fromXContent, listener, emptySet());
|
AcknowledgedResponse::fromXContent, listener, emptySet());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ public final class IngestClient {
|
||||||
* @throws IOException in case there is a problem sending the request or parsing back the response
|
* @throws IOException in case there is a problem sending the request or parsing back the response
|
||||||
*/
|
*/
|
||||||
public GetPipelineResponse getPipeline(GetPipelineRequest request, RequestOptions options) throws IOException {
|
public GetPipelineResponse getPipeline(GetPipelineRequest request, RequestOptions options) throws IOException {
|
||||||
return restHighLevelClient.performRequestAndParseEntity( request, RequestConverters::getPipeline, options,
|
return restHighLevelClient.performRequestAndParseEntity( request, IngestRequestConverters::getPipeline, options,
|
||||||
GetPipelineResponse::fromXContent, emptySet());
|
GetPipelineResponse::fromXContent, emptySet());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@ public final class IngestClient {
|
||||||
* @param listener the listener to be notified upon request completion
|
* @param listener the listener to be notified upon request completion
|
||||||
*/
|
*/
|
||||||
public void getPipelineAsync(GetPipelineRequest request, RequestOptions options, ActionListener<GetPipelineResponse> listener) {
|
public void getPipelineAsync(GetPipelineRequest request, RequestOptions options, ActionListener<GetPipelineResponse> listener) {
|
||||||
restHighLevelClient.performRequestAsyncAndParseEntity( request, RequestConverters::getPipeline, options,
|
restHighLevelClient.performRequestAsyncAndParseEntity( request, IngestRequestConverters::getPipeline, options,
|
||||||
GetPipelineResponse::fromXContent, listener, emptySet());
|
GetPipelineResponse::fromXContent, listener, emptySet());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ public final class IngestClient {
|
||||||
* @throws IOException in case there is a problem sending the request or parsing back the response
|
* @throws IOException in case there is a problem sending the request or parsing back the response
|
||||||
*/
|
*/
|
||||||
public AcknowledgedResponse deletePipeline(DeletePipelineRequest request, RequestOptions options) throws IOException {
|
public AcknowledgedResponse deletePipeline(DeletePipelineRequest request, RequestOptions options) throws IOException {
|
||||||
return restHighLevelClient.performRequestAndParseEntity( request, RequestConverters::deletePipeline, options,
|
return restHighLevelClient.performRequestAndParseEntity( request, IngestRequestConverters::deletePipeline, options,
|
||||||
AcknowledgedResponse::fromXContent, emptySet());
|
AcknowledgedResponse::fromXContent, emptySet());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -124,7 +124,7 @@ public final class IngestClient {
|
||||||
* @param listener the listener to be notified upon request completion
|
* @param listener the listener to be notified upon request completion
|
||||||
*/
|
*/
|
||||||
public void deletePipelineAsync(DeletePipelineRequest request, RequestOptions options, ActionListener<AcknowledgedResponse> listener) {
|
public void deletePipelineAsync(DeletePipelineRequest request, RequestOptions options, ActionListener<AcknowledgedResponse> listener) {
|
||||||
restHighLevelClient.performRequestAsyncAndParseEntity( request, RequestConverters::deletePipeline, options,
|
restHighLevelClient.performRequestAsyncAndParseEntity( request, IngestRequestConverters::deletePipeline, options,
|
||||||
AcknowledgedResponse::fromXContent, listener, emptySet());
|
AcknowledgedResponse::fromXContent, listener, emptySet());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@ public final class IngestClient {
|
||||||
* @throws IOException in case there is a problem sending the request or parsing back the response
|
* @throws IOException in case there is a problem sending the request or parsing back the response
|
||||||
*/
|
*/
|
||||||
public SimulatePipelineResponse simulate(SimulatePipelineRequest request, RequestOptions options) throws IOException {
|
public SimulatePipelineResponse simulate(SimulatePipelineRequest request, RequestOptions options) throws IOException {
|
||||||
return restHighLevelClient.performRequestAndParseEntity( request, RequestConverters::simulatePipeline, options,
|
return restHighLevelClient.performRequestAndParseEntity( request, IngestRequestConverters::simulatePipeline, options,
|
||||||
SimulatePipelineResponse::fromXContent, emptySet());
|
SimulatePipelineResponse::fromXContent, emptySet());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,7 +157,7 @@ public final class IngestClient {
|
||||||
public void simulateAsync(SimulatePipelineRequest request,
|
public void simulateAsync(SimulatePipelineRequest request,
|
||||||
RequestOptions options,
|
RequestOptions options,
|
||||||
ActionListener<SimulatePipelineResponse> listener) {
|
ActionListener<SimulatePipelineResponse> listener) {
|
||||||
restHighLevelClient.performRequestAsyncAndParseEntity( request, RequestConverters::simulatePipeline, options,
|
restHighLevelClient.performRequestAsyncAndParseEntity( request, IngestRequestConverters::simulatePipeline, options,
|
||||||
SimulatePipelineResponse::fromXContent, listener, emptySet());
|
SimulatePipelineResponse::fromXContent, listener, emptySet());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,89 @@
|
||||||
|
/*
|
||||||
|
* 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.HttpDelete;
|
||||||
|
import org.apache.http.client.methods.HttpGet;
|
||||||
|
import org.apache.http.client.methods.HttpPost;
|
||||||
|
import org.apache.http.client.methods.HttpPut;
|
||||||
|
import org.elasticsearch.action.ingest.DeletePipelineRequest;
|
||||||
|
import org.elasticsearch.action.ingest.GetPipelineRequest;
|
||||||
|
import org.elasticsearch.action.ingest.PutPipelineRequest;
|
||||||
|
import org.elasticsearch.action.ingest.SimulatePipelineRequest;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public class IngestRequestConverters {
|
||||||
|
|
||||||
|
static Request getPipeline(GetPipelineRequest getPipelineRequest) {
|
||||||
|
String endpoint = new RequestConverters.EndpointBuilder()
|
||||||
|
.addPathPartAsIs("_ingest/pipeline")
|
||||||
|
.addCommaSeparatedPathParts(getPipelineRequest.getIds())
|
||||||
|
.build();
|
||||||
|
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
|
||||||
|
|
||||||
|
RequestConverters.Params parameters = new RequestConverters.Params(request);
|
||||||
|
parameters.withMasterTimeout(getPipelineRequest.masterNodeTimeout());
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
|
||||||
|
static Request putPipeline(PutPipelineRequest putPipelineRequest) throws IOException {
|
||||||
|
String endpoint = new RequestConverters.EndpointBuilder()
|
||||||
|
.addPathPartAsIs("_ingest/pipeline")
|
||||||
|
.addPathPart(putPipelineRequest.getId())
|
||||||
|
.build();
|
||||||
|
Request request = new Request(HttpPut.METHOD_NAME, endpoint);
|
||||||
|
|
||||||
|
RequestConverters.Params parameters = new RequestConverters.Params(request);
|
||||||
|
parameters.withTimeout(putPipelineRequest.timeout());
|
||||||
|
parameters.withMasterTimeout(putPipelineRequest.masterNodeTimeout());
|
||||||
|
|
||||||
|
request.setEntity(RequestConverters.createEntity(putPipelineRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
|
||||||
|
static Request deletePipeline(DeletePipelineRequest deletePipelineRequest) {
|
||||||
|
String endpoint = new RequestConverters.EndpointBuilder()
|
||||||
|
.addPathPartAsIs("_ingest/pipeline")
|
||||||
|
.addPathPart(deletePipelineRequest.getId())
|
||||||
|
.build();
|
||||||
|
Request request = new Request(HttpDelete.METHOD_NAME, endpoint);
|
||||||
|
|
||||||
|
RequestConverters.Params parameters = new RequestConverters.Params(request);
|
||||||
|
parameters.withTimeout(deletePipelineRequest.timeout());
|
||||||
|
parameters.withMasterTimeout(deletePipelineRequest.masterNodeTimeout());
|
||||||
|
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
|
||||||
|
static Request simulatePipeline(SimulatePipelineRequest simulatePipelineRequest) throws IOException {
|
||||||
|
RequestConverters.EndpointBuilder builder = new RequestConverters.EndpointBuilder().addPathPartAsIs("_ingest/pipeline");
|
||||||
|
if (simulatePipelineRequest.getId() != null && !simulatePipelineRequest.getId().isEmpty()) {
|
||||||
|
builder.addPathPart(simulatePipelineRequest.getId());
|
||||||
|
}
|
||||||
|
builder.addPathPartAsIs("_simulate");
|
||||||
|
String endpoint = builder.build();
|
||||||
|
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
|
||||||
|
RequestConverters.Params params = new RequestConverters.Params(request);
|
||||||
|
params.putParam("verbose", Boolean.toString(simulatePipelineRequest.isVerbose()));
|
||||||
|
request.setEntity(RequestConverters.createEntity(simulatePipelineRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
}
|
|
@ -63,10 +63,6 @@ import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
|
||||||
import org.elasticsearch.action.get.GetRequest;
|
import org.elasticsearch.action.get.GetRequest;
|
||||||
import org.elasticsearch.action.get.MultiGetRequest;
|
import org.elasticsearch.action.get.MultiGetRequest;
|
||||||
import org.elasticsearch.action.index.IndexRequest;
|
import org.elasticsearch.action.index.IndexRequest;
|
||||||
import org.elasticsearch.action.ingest.DeletePipelineRequest;
|
|
||||||
import org.elasticsearch.action.ingest.GetPipelineRequest;
|
|
||||||
import org.elasticsearch.action.ingest.PutPipelineRequest;
|
|
||||||
import org.elasticsearch.action.ingest.SimulatePipelineRequest;
|
|
||||||
import org.elasticsearch.action.search.ClearScrollRequest;
|
import org.elasticsearch.action.search.ClearScrollRequest;
|
||||||
import org.elasticsearch.action.search.MultiSearchRequest;
|
import org.elasticsearch.action.search.MultiSearchRequest;
|
||||||
import org.elasticsearch.action.search.SearchRequest;
|
import org.elasticsearch.action.search.SearchRequest;
|
||||||
|
@ -694,47 +690,6 @@ final class RequestConverters {
|
||||||
return request;
|
return request;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Request getPipeline(GetPipelineRequest getPipelineRequest) {
|
|
||||||
String endpoint = new EndpointBuilder()
|
|
||||||
.addPathPartAsIs("_ingest/pipeline")
|
|
||||||
.addCommaSeparatedPathParts(getPipelineRequest.getIds())
|
|
||||||
.build();
|
|
||||||
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
|
|
||||||
|
|
||||||
Params parameters = new Params(request);
|
|
||||||
parameters.withMasterTimeout(getPipelineRequest.masterNodeTimeout());
|
|
||||||
return request;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Request putPipeline(PutPipelineRequest putPipelineRequest) throws IOException {
|
|
||||||
String endpoint = new EndpointBuilder()
|
|
||||||
.addPathPartAsIs("_ingest/pipeline")
|
|
||||||
.addPathPart(putPipelineRequest.getId())
|
|
||||||
.build();
|
|
||||||
Request request = new Request(HttpPut.METHOD_NAME, endpoint);
|
|
||||||
|
|
||||||
Params parameters = new Params(request);
|
|
||||||
parameters.withTimeout(putPipelineRequest.timeout());
|
|
||||||
parameters.withMasterTimeout(putPipelineRequest.masterNodeTimeout());
|
|
||||||
|
|
||||||
request.setEntity(createEntity(putPipelineRequest, REQUEST_BODY_CONTENT_TYPE));
|
|
||||||
return request;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Request deletePipeline(DeletePipelineRequest deletePipelineRequest) {
|
|
||||||
String endpoint = new EndpointBuilder()
|
|
||||||
.addPathPartAsIs("_ingest/pipeline")
|
|
||||||
.addPathPart(deletePipelineRequest.getId())
|
|
||||||
.build();
|
|
||||||
Request request = new Request(HttpDelete.METHOD_NAME, endpoint);
|
|
||||||
|
|
||||||
Params parameters = new Params(request);
|
|
||||||
parameters.withTimeout(deletePipelineRequest.timeout());
|
|
||||||
parameters.withMasterTimeout(deletePipelineRequest.masterNodeTimeout());
|
|
||||||
|
|
||||||
return request;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Request reindex(ReindexRequest reindexRequest) throws IOException {
|
static Request reindex(ReindexRequest reindexRequest) throws IOException {
|
||||||
String endpoint = new EndpointBuilder().addPathPart("_reindex").build();
|
String endpoint = new EndpointBuilder().addPathPart("_reindex").build();
|
||||||
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
|
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
|
||||||
|
@ -911,20 +866,6 @@ final class RequestConverters {
|
||||||
return request;
|
return request;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Request simulatePipeline(SimulatePipelineRequest simulatePipelineRequest) throws IOException {
|
|
||||||
EndpointBuilder builder = new EndpointBuilder().addPathPartAsIs("_ingest/pipeline");
|
|
||||||
if (simulatePipelineRequest.getId() != null && !simulatePipelineRequest.getId().isEmpty()) {
|
|
||||||
builder.addPathPart(simulatePipelineRequest.getId());
|
|
||||||
}
|
|
||||||
builder.addPathPartAsIs("_simulate");
|
|
||||||
String endpoint = builder.build();
|
|
||||||
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
|
|
||||||
Params params = new Params(request);
|
|
||||||
params.putParam("verbose", Boolean.toString(simulatePipelineRequest.isVerbose()));
|
|
||||||
request.setEntity(createEntity(simulatePipelineRequest, REQUEST_BODY_CONTENT_TYPE));
|
|
||||||
return request;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Request getAlias(GetAliasesRequest getAliasesRequest) {
|
static Request getAlias(GetAliasesRequest getAliasesRequest) {
|
||||||
String[] indices = getAliasesRequest.indices() == null ? Strings.EMPTY_ARRAY : getAliasesRequest.indices();
|
String[] indices = getAliasesRequest.indices() == null ? Strings.EMPTY_ARRAY : getAliasesRequest.indices();
|
||||||
String[] aliases = getAliasesRequest.aliases() == null ? Strings.EMPTY_ARRAY : getAliasesRequest.aliases();
|
String[] aliases = getAliasesRequest.aliases() == null ? Strings.EMPTY_ARRAY : getAliasesRequest.aliases();
|
||||||
|
|
|
@ -130,7 +130,8 @@ public abstract class ESRestHighLevelClientTestCase extends ESRestTestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static void createPipeline(PutPipelineRequest putPipelineRequest) throws IOException {
|
protected static void createPipeline(PutPipelineRequest putPipelineRequest) throws IOException {
|
||||||
assertOK(client().performRequest(RequestConverters.putPipeline(putPipelineRequest)));
|
assertTrue(execute(
|
||||||
|
putPipelineRequest, highLevelClient().ingest()::putPipeline, highLevelClient().ingest()::putPipelineAsync).isAcknowledged());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static void clusterUpdateSettings(Settings persistentSettings,
|
protected static void clusterUpdateSettings(Settings persistentSettings,
|
||||||
|
|
|
@ -0,0 +1,120 @@
|
||||||
|
/*
|
||||||
|
* 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.HttpDelete;
|
||||||
|
import org.apache.http.client.methods.HttpGet;
|
||||||
|
import org.apache.http.client.methods.HttpPost;
|
||||||
|
import org.apache.http.client.methods.HttpPut;
|
||||||
|
import org.elasticsearch.action.ingest.DeletePipelineRequest;
|
||||||
|
import org.elasticsearch.action.ingest.GetPipelineRequest;
|
||||||
|
import org.elasticsearch.action.ingest.PutPipelineRequest;
|
||||||
|
import org.elasticsearch.action.ingest.SimulatePipelineRequest;
|
||||||
|
import org.elasticsearch.action.support.master.AcknowledgedRequest;
|
||||||
|
import org.elasticsearch.common.bytes.BytesArray;
|
||||||
|
import org.elasticsearch.common.xcontent.XContentType;
|
||||||
|
import org.elasticsearch.test.ESTestCase;
|
||||||
|
import org.junit.Assert;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.StringJoiner;
|
||||||
|
|
||||||
|
public class IngestRequestConvertersTests extends ESTestCase {
|
||||||
|
|
||||||
|
public void testPutPipeline() throws IOException {
|
||||||
|
String pipelineId = "some_pipeline_id";
|
||||||
|
PutPipelineRequest request = new PutPipelineRequest(
|
||||||
|
"some_pipeline_id",
|
||||||
|
new BytesArray("{}".getBytes(StandardCharsets.UTF_8)),
|
||||||
|
XContentType.JSON
|
||||||
|
);
|
||||||
|
Map<String, String> expectedParams = new HashMap<>();
|
||||||
|
RequestConvertersTests.setRandomMasterTimeout(request, expectedParams);
|
||||||
|
RequestConvertersTests.setRandomTimeout(request::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams);
|
||||||
|
|
||||||
|
Request expectedRequest = IngestRequestConverters.putPipeline(request);
|
||||||
|
StringJoiner endpoint = new StringJoiner("/", "/", "");
|
||||||
|
endpoint.add("_ingest/pipeline");
|
||||||
|
endpoint.add(pipelineId);
|
||||||
|
Assert.assertEquals(endpoint.toString(), expectedRequest.getEndpoint());
|
||||||
|
Assert.assertEquals(HttpPut.METHOD_NAME, expectedRequest.getMethod());
|
||||||
|
Assert.assertEquals(expectedParams, expectedRequest.getParameters());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testGetPipeline() {
|
||||||
|
String pipelineId = "some_pipeline_id";
|
||||||
|
Map<String, String> expectedParams = new HashMap<>();
|
||||||
|
GetPipelineRequest request = new GetPipelineRequest("some_pipeline_id");
|
||||||
|
RequestConvertersTests.setRandomMasterTimeout(request, expectedParams);
|
||||||
|
Request expectedRequest = IngestRequestConverters.getPipeline(request);
|
||||||
|
StringJoiner endpoint = new StringJoiner("/", "/", "");
|
||||||
|
endpoint.add("_ingest/pipeline");
|
||||||
|
endpoint.add(pipelineId);
|
||||||
|
Assert.assertEquals(endpoint.toString(), expectedRequest.getEndpoint());
|
||||||
|
Assert.assertEquals(HttpGet.METHOD_NAME, expectedRequest.getMethod());
|
||||||
|
Assert.assertEquals(expectedParams, expectedRequest.getParameters());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDeletePipeline() {
|
||||||
|
String pipelineId = "some_pipeline_id";
|
||||||
|
Map<String, String> expectedParams = new HashMap<>();
|
||||||
|
DeletePipelineRequest request = new DeletePipelineRequest(pipelineId);
|
||||||
|
RequestConvertersTests.setRandomMasterTimeout(request, expectedParams);
|
||||||
|
RequestConvertersTests.setRandomTimeout(request::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams);
|
||||||
|
Request expectedRequest = IngestRequestConverters.deletePipeline(request);
|
||||||
|
StringJoiner endpoint = new StringJoiner("/", "/", "");
|
||||||
|
endpoint.add("_ingest/pipeline");
|
||||||
|
endpoint.add(pipelineId);
|
||||||
|
Assert.assertEquals(endpoint.toString(), expectedRequest.getEndpoint());
|
||||||
|
Assert.assertEquals(HttpDelete.METHOD_NAME, expectedRequest.getMethod());
|
||||||
|
Assert.assertEquals(expectedParams, expectedRequest.getParameters());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testSimulatePipeline() throws IOException {
|
||||||
|
String pipelineId = ESTestCase.randomBoolean() ? "some_pipeline_id" : null;
|
||||||
|
boolean verbose = ESTestCase.randomBoolean();
|
||||||
|
String json = "{\"pipeline\":{" +
|
||||||
|
"\"description\":\"_description\"," +
|
||||||
|
"\"processors\":[{\"set\":{\"field\":\"field2\",\"value\":\"_value\"}}]}," +
|
||||||
|
"\"docs\":[{\"_index\":\"index\",\"_type\":\"_doc\",\"_id\":\"id\",\"_source\":{\"foo\":\"rab\"}}]}";
|
||||||
|
SimulatePipelineRequest request = new SimulatePipelineRequest(
|
||||||
|
new BytesArray(json.getBytes(StandardCharsets.UTF_8)),
|
||||||
|
XContentType.JSON
|
||||||
|
);
|
||||||
|
request.setId(pipelineId);
|
||||||
|
request.setVerbose(verbose);
|
||||||
|
Map<String, String> expectedParams = new HashMap<>();
|
||||||
|
expectedParams.put("verbose", Boolean.toString(verbose));
|
||||||
|
|
||||||
|
Request expectedRequest = IngestRequestConverters.simulatePipeline(request);
|
||||||
|
StringJoiner endpoint = new StringJoiner("/", "/", "");
|
||||||
|
endpoint.add("_ingest/pipeline");
|
||||||
|
if (pipelineId != null && !pipelineId.isEmpty())
|
||||||
|
endpoint.add(pipelineId);
|
||||||
|
endpoint.add("_simulate");
|
||||||
|
Assert.assertEquals(endpoint.toString(), expectedRequest.getEndpoint());
|
||||||
|
Assert.assertEquals(HttpPost.METHOD_NAME, expectedRequest.getMethod());
|
||||||
|
Assert.assertEquals(expectedParams, expectedRequest.getParameters());
|
||||||
|
RequestConvertersTests.assertToXContentBody(request, expectedRequest.getEntity());
|
||||||
|
}
|
||||||
|
}
|
|
@ -65,10 +65,6 @@ import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
|
||||||
import org.elasticsearch.action.get.GetRequest;
|
import org.elasticsearch.action.get.GetRequest;
|
||||||
import org.elasticsearch.action.get.MultiGetRequest;
|
import org.elasticsearch.action.get.MultiGetRequest;
|
||||||
import org.elasticsearch.action.index.IndexRequest;
|
import org.elasticsearch.action.index.IndexRequest;
|
||||||
import org.elasticsearch.action.ingest.DeletePipelineRequest;
|
|
||||||
import org.elasticsearch.action.ingest.GetPipelineRequest;
|
|
||||||
import org.elasticsearch.action.ingest.PutPipelineRequest;
|
|
||||||
import org.elasticsearch.action.ingest.SimulatePipelineRequest;
|
|
||||||
import org.elasticsearch.action.search.ClearScrollRequest;
|
import org.elasticsearch.action.search.ClearScrollRequest;
|
||||||
import org.elasticsearch.action.search.MultiSearchRequest;
|
import org.elasticsearch.action.search.MultiSearchRequest;
|
||||||
import org.elasticsearch.action.search.SearchRequest;
|
import org.elasticsearch.action.search.SearchRequest;
|
||||||
|
@ -135,7 +131,6 @@ import org.elasticsearch.test.RandomObjects;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
@ -1809,83 +1804,6 @@ public class RequestConvertersTests extends ESTestCase {
|
||||||
assertToXContentBody(resizeRequest, request.getEntity());
|
assertToXContentBody(resizeRequest, request.getEntity());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testPutPipeline() throws IOException {
|
|
||||||
String pipelineId = "some_pipeline_id";
|
|
||||||
PutPipelineRequest request = new PutPipelineRequest(
|
|
||||||
"some_pipeline_id",
|
|
||||||
new BytesArray("{}".getBytes(StandardCharsets.UTF_8)),
|
|
||||||
XContentType.JSON
|
|
||||||
);
|
|
||||||
Map<String, String> expectedParams = new HashMap<>();
|
|
||||||
setRandomMasterTimeout(request, expectedParams);
|
|
||||||
setRandomTimeout(request::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams);
|
|
||||||
|
|
||||||
Request expectedRequest = RequestConverters.putPipeline(request);
|
|
||||||
StringJoiner endpoint = new StringJoiner("/", "/", "");
|
|
||||||
endpoint.add("_ingest/pipeline");
|
|
||||||
endpoint.add(pipelineId);
|
|
||||||
assertEquals(endpoint.toString(), expectedRequest.getEndpoint());
|
|
||||||
assertEquals(HttpPut.METHOD_NAME, expectedRequest.getMethod());
|
|
||||||
assertEquals(expectedParams, expectedRequest.getParameters());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testGetPipeline() {
|
|
||||||
String pipelineId = "some_pipeline_id";
|
|
||||||
Map<String, String> expectedParams = new HashMap<>();
|
|
||||||
GetPipelineRequest request = new GetPipelineRequest("some_pipeline_id");
|
|
||||||
setRandomMasterTimeout(request, expectedParams);
|
|
||||||
Request expectedRequest = RequestConverters.getPipeline(request);
|
|
||||||
StringJoiner endpoint = new StringJoiner("/", "/", "");
|
|
||||||
endpoint.add("_ingest/pipeline");
|
|
||||||
endpoint.add(pipelineId);
|
|
||||||
assertEquals(endpoint.toString(), expectedRequest.getEndpoint());
|
|
||||||
assertEquals(HttpGet.METHOD_NAME, expectedRequest.getMethod());
|
|
||||||
assertEquals(expectedParams, expectedRequest.getParameters());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testDeletePipeline() {
|
|
||||||
String pipelineId = "some_pipeline_id";
|
|
||||||
Map<String, String> expectedParams = new HashMap<>();
|
|
||||||
DeletePipelineRequest request = new DeletePipelineRequest(pipelineId);
|
|
||||||
setRandomMasterTimeout(request, expectedParams);
|
|
||||||
setRandomTimeout(request::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams);
|
|
||||||
Request expectedRequest = RequestConverters.deletePipeline(request);
|
|
||||||
StringJoiner endpoint = new StringJoiner("/", "/", "");
|
|
||||||
endpoint.add("_ingest/pipeline");
|
|
||||||
endpoint.add(pipelineId);
|
|
||||||
assertEquals(endpoint.toString(), expectedRequest.getEndpoint());
|
|
||||||
assertEquals(HttpDelete.METHOD_NAME, expectedRequest.getMethod());
|
|
||||||
assertEquals(expectedParams, expectedRequest.getParameters());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testSimulatePipeline() throws IOException {
|
|
||||||
String pipelineId = randomBoolean() ? "some_pipeline_id" : null;
|
|
||||||
boolean verbose = randomBoolean();
|
|
||||||
String json = "{\"pipeline\":{" +
|
|
||||||
"\"description\":\"_description\"," +
|
|
||||||
"\"processors\":[{\"set\":{\"field\":\"field2\",\"value\":\"_value\"}}]}," +
|
|
||||||
"\"docs\":[{\"_index\":\"index\",\"_type\":\"_doc\",\"_id\":\"id\",\"_source\":{\"foo\":\"rab\"}}]}";
|
|
||||||
SimulatePipelineRequest request = new SimulatePipelineRequest(
|
|
||||||
new BytesArray(json.getBytes(StandardCharsets.UTF_8)),
|
|
||||||
XContentType.JSON
|
|
||||||
);
|
|
||||||
request.setId(pipelineId);
|
|
||||||
request.setVerbose(verbose);
|
|
||||||
Map<String, String> expectedParams = new HashMap<>();
|
|
||||||
expectedParams.put("verbose", Boolean.toString(verbose));
|
|
||||||
|
|
||||||
Request expectedRequest = RequestConverters.simulatePipeline(request);
|
|
||||||
StringJoiner endpoint = new StringJoiner("/", "/", "");
|
|
||||||
endpoint.add("_ingest/pipeline");
|
|
||||||
if (pipelineId != null && !pipelineId.isEmpty())
|
|
||||||
endpoint.add(pipelineId);
|
|
||||||
endpoint.add("_simulate");
|
|
||||||
assertEquals(endpoint.toString(), expectedRequest.getEndpoint());
|
|
||||||
assertEquals(HttpPost.METHOD_NAME, expectedRequest.getMethod());
|
|
||||||
assertEquals(expectedParams, expectedRequest.getParameters());
|
|
||||||
assertToXContentBody(request, expectedRequest.getEntity());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testRollover() throws IOException {
|
public void testRollover() throws IOException {
|
||||||
RolloverRequest rolloverRequest = new RolloverRequest(randomAlphaOfLengthBetween(3, 10),
|
RolloverRequest rolloverRequest = new RolloverRequest(randomAlphaOfLengthBetween(3, 10),
|
||||||
randomBoolean() ? null : randomAlphaOfLengthBetween(3, 10));
|
randomBoolean() ? null : randomAlphaOfLengthBetween(3, 10));
|
||||||
|
|
Loading…
Reference in New Issue