From 6ed037a0b1ec26d235a9407a99808e4a957f6e40 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Mon, 26 Nov 2018 20:04:22 +0100 Subject: [PATCH] dedup ID fields --- .../action/RestDeleteFeatureIndexBuilderJobAction.java | 5 ++--- .../rest/action/RestGetDataFrameJobsAction.java | 7 +++---- .../rest/action/RestPutFeatureIndexBuilderJobAction.java | 6 ++---- .../rest/action/RestStartFeatureIndexBuilderJobAction.java | 1 - 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestDeleteFeatureIndexBuilderJobAction.java b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestDeleteFeatureIndexBuilderJobAction.java index 8fc1375499edd..1e504987f51a6 100644 --- a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestDeleteFeatureIndexBuilderJobAction.java +++ b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestDeleteFeatureIndexBuilderJobAction.java @@ -7,7 +7,6 @@ import org.elasticsearch.client.node.NodeClient; -import org.elasticsearch.common.ParseField; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestController; @@ -15,11 +14,11 @@ import org.elasticsearch.rest.action.RestToXContentListener; import org.elasticsearch.xpack.ml.featureindexbuilder.FeatureIndexBuilder; import org.elasticsearch.xpack.ml.featureindexbuilder.action.DeleteFeatureIndexBuilderJobAction; +import org.elasticsearch.xpack.ml.featureindexbuilder.job.FeatureIndexBuilderJob; import java.io.IOException; public class RestDeleteFeatureIndexBuilderJobAction extends BaseRestHandler { - public static final ParseField ID = new ParseField("id"); public RestDeleteFeatureIndexBuilderJobAction(Settings settings, RestController controller) { super(settings); @@ -28,7 +27,7 @@ public RestDeleteFeatureIndexBuilderJobAction(Settings settings, RestController @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { - String id = restRequest.param(ID.getPreferredName()); + String id = restRequest.param(FeatureIndexBuilderJob.ID.getPreferredName()); DeleteFeatureIndexBuilderJobAction.Request request = new DeleteFeatureIndexBuilderJobAction.Request(id); return channel -> client.execute(DeleteFeatureIndexBuilderJobAction.INSTANCE, request, new RestToXContentListener<>(channel)); diff --git a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestGetDataFrameJobsAction.java b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestGetDataFrameJobsAction.java index 712a10ae5fbe5..2d18c63b0b0e6 100644 --- a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestGetDataFrameJobsAction.java +++ b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestGetDataFrameJobsAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.ml.featureindexbuilder.rest.action; import org.elasticsearch.client.node.NodeClient; -import org.elasticsearch.common.ParseField; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.RestController; @@ -15,9 +14,9 @@ import org.elasticsearch.rest.action.RestToXContentListener; import org.elasticsearch.xpack.ml.featureindexbuilder.FeatureIndexBuilder; import org.elasticsearch.xpack.ml.featureindexbuilder.action.GetDataFrameJobsAction; +import org.elasticsearch.xpack.ml.featureindexbuilder.job.FeatureIndexBuilderJob; public class RestGetDataFrameJobsAction extends BaseRestHandler { - public static final ParseField ID = new ParseField("id"); public RestGetDataFrameJobsAction(Settings settings, RestController controller) { super(settings); @@ -26,13 +25,13 @@ public RestGetDataFrameJobsAction(Settings settings, RestController controller) @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) { - String id = restRequest.param(ID.getPreferredName()); + String id = restRequest.param(FeatureIndexBuilderJob.ID.getPreferredName()); GetDataFrameJobsAction.Request request = new GetDataFrameJobsAction.Request(id); return channel -> client.execute(GetDataFrameJobsAction.INSTANCE, request, new RestToXContentListener<>(channel)); } @Override public String getName() { - return "data_frame_get_job_action"; + return "data_frame_get_jobs_action"; } } diff --git a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestPutFeatureIndexBuilderJobAction.java b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestPutFeatureIndexBuilderJobAction.java index 1b4bb4311bc40..45d05452c819d 100644 --- a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestPutFeatureIndexBuilderJobAction.java +++ b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestPutFeatureIndexBuilderJobAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.ml.featureindexbuilder.rest.action; import org.elasticsearch.client.node.NodeClient; -import org.elasticsearch.common.ParseField; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.rest.BaseRestHandler; @@ -16,11 +15,11 @@ import org.elasticsearch.rest.action.RestToXContentListener; import org.elasticsearch.xpack.ml.featureindexbuilder.FeatureIndexBuilder; import org.elasticsearch.xpack.ml.featureindexbuilder.action.PutFeatureIndexBuilderJobAction; +import org.elasticsearch.xpack.ml.featureindexbuilder.job.FeatureIndexBuilderJob; import java.io.IOException; public class RestPutFeatureIndexBuilderJobAction extends BaseRestHandler { - public static final ParseField ID = new ParseField("id"); public RestPutFeatureIndexBuilderJobAction(Settings settings, RestController controller) { super(settings); @@ -34,12 +33,11 @@ public String getName() { @Override protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException { - String id = restRequest.param(ID.getPreferredName()); + String id = restRequest.param(FeatureIndexBuilderJob.ID.getPreferredName()); XContentParser parser = restRequest.contentParser(); PutFeatureIndexBuilderJobAction.Request request = PutFeatureIndexBuilderJobAction.Request.fromXContent(parser, id); return channel -> client.execute(PutFeatureIndexBuilderJobAction.INSTANCE, request, new RestToXContentListener<>(channel)); } - } diff --git a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestStartFeatureIndexBuilderJobAction.java b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestStartFeatureIndexBuilderJobAction.java index 206e2691670cc..2a43d4fd04630 100644 --- a/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestStartFeatureIndexBuilderJobAction.java +++ b/x-pack/plugin/ml-feature-index-builder/src/main/java/org/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestStartFeatureIndexBuilderJobAction.java @@ -37,5 +37,4 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient public String getName() { return "ml_feature_index_builder_start_job_action"; } - }