Skip to content

[ML-Dataframe] Feature/fib cleanups #35995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2018
Merged

[ML-Dataframe] Feature/fib cleanups #35995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...arch/xpack/ml/featureindexbuilder/rest/action/RestDeleteFeatureIndexBuilderJobAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@


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;
import org.elasticsearch.rest.RestRequest;
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);
Expand All @@ -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));
Expand Down
7 changes: 3 additions & 4 deletions ...rg/elasticsearch/xpack/ml/featureindexbuilder/rest/action/RestGetDataFrameJobsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@
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;
import org.elasticsearch.rest.RestRequest;
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);
Expand All @@ -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";
}
}
6 changes: 2 additions & 4 deletions ...csearch/xpack/ml/featureindexbuilder/rest/action/RestPutFeatureIndexBuilderJobAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -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));
}

}
1 change: 0 additions & 1 deletion ...earch/xpack/ml/featureindexbuilder/rest/action/RestStartFeatureIndexBuilderJobAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,4 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient
public String getName() {
return "ml_feature_index_builder_start_job_action";
}

}