From b0c7096e2fa5fb1674cc683bcac5ea2127137245 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Wed, 20 Jan 2016 16:00:44 +0100 Subject: [PATCH] changed delete pipeline request to getters and setters in right format and validate the provided id in the setId(...) method --- .../action/ingest/DeletePipelineRequest.java | 7 ++++--- .../action/ingest/DeletePipelineRequestBuilder.java | 2 +- .../main/java/org/elasticsearch/ingest/PipelineStore.java | 8 ++++---- .../rest/action/ingest/RestDeletePipelineAction.java | 2 +- .../java/org/elasticsearch/ingest/IngestClientIT.java | 2 +- .../java/org/elasticsearch/ingest/PipelineStoreTests.java | 5 ++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java b/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java index f0188c663d6..0931e30fdd0 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java @@ -25,6 +25,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; +import java.util.Objects; import static org.elasticsearch.action.ValidateActions.addValidationError; @@ -32,11 +33,11 @@ public class DeletePipelineRequest extends AcknowledgedRequest listener) { - clusterService.submitStateUpdateTask("delete-pipeline-" + request.id(), new AckedClusterStateUpdateTask(request, listener) { + clusterService.submitStateUpdateTask("delete-pipeline-" + request.getId(), new AckedClusterStateUpdateTask(request, listener) { @Override protected WritePipelineResponse newResponse(boolean acknowledged) { @@ -133,11 +133,11 @@ public class PipelineStore extends AbstractComponent implements Closeable, Clust return currentState; } Map pipelines = currentIngestMetadata.getPipelines(); - if (pipelines.containsKey(request.id()) == false) { - throw new ResourceNotFoundException("pipeline [{}] is missing", request.id()); + if (pipelines.containsKey(request.getId()) == false) { + throw new ResourceNotFoundException("pipeline [{}] is missing", request.getId()); } else { pipelines = new HashMap<>(pipelines); - pipelines.remove(request.id()); + pipelines.remove(request.getId()); ClusterState.Builder newState = ClusterState.builder(currentState); newState.metaData(MetaData.builder(currentState.getMetaData()) .putCustom(IngestMetadata.TYPE, new IngestMetadata(pipelines)) diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java b/core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java index 723e3eb6840..d880fa23b2e 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java @@ -40,7 +40,7 @@ public class RestDeletePipelineAction extends BaseRestHandler { @Override protected void handleRequest(RestRequest restRequest, RestChannel channel, Client client) throws Exception { DeletePipelineRequest request = new DeletePipelineRequest(); - request.id(restRequest.param("id")); + request.setId(restRequest.param("id")); request.masterNodeTimeout(restRequest.paramAsTime("master_timeout", request.masterNodeTimeout())); request.timeout(restRequest.paramAsTime("timeout", request.timeout())); client.deletePipeline(request, new AcknowledgedRestListener<>(channel)); diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java b/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java index 0bc79dd3aec..57a429f9b50 100644 --- a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java +++ b/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java @@ -200,7 +200,7 @@ public class IngestClientIT extends ESIntegTestCase { assertThat(doc.get("processed"), equalTo(true)); DeletePipelineRequest deletePipelineRequest = new DeletePipelineRequest(); - deletePipelineRequest.id("_id"); + deletePipelineRequest.setId("_id"); WritePipelineResponse response = client().deletePipeline(deletePipelineRequest).get(); assertThat(response.isAcknowledged(), is(true)); diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java b/core/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java index cd3e78c822e..798749fe72e 100644 --- a/core/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java +++ b/core/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java @@ -23,7 +23,6 @@ import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.action.ingest.DeletePipelineRequest; import org.elasticsearch.action.ingest.PutPipelineRequest; import org.elasticsearch.cluster.ClusterName; -import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.bytes.BytesArray; @@ -120,7 +119,7 @@ public class PipelineStoreTests extends ESTestCase { // Delete pipeline: DeletePipelineRequest deleteRequest = new DeletePipelineRequest(); - deleteRequest.id("_id"); + deleteRequest.setId("_id"); clusterState = store.innerDelete(deleteRequest, clusterState); store.innerUpdatePipelines(clusterState); assertThat(store.get("_id"), nullValue()); @@ -181,7 +180,7 @@ public class PipelineStoreTests extends ESTestCase { assertThat(pipeline.getProcessors().get(0).getType(), equalTo("set")); DeletePipelineRequest deleteRequest = new DeletePipelineRequest(); - deleteRequest.id(id); + deleteRequest.setId(id); clusterState = store.innerDelete(deleteRequest, clusterState); store.innerUpdatePipelines(clusterState); pipeline = store.get(id);