From 618cb2a1a07bd65d37dfa5f50458aa01c58791e2 Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Mon, 30 Jan 2017 10:00:23 +0000 Subject: [PATCH] Make all action names cluster actions Original commit: elastic/x-pack-elasticsearch@815d8f0aac7c5540f3df9c2ee32e434d3d2b9dd2 --- .../elasticsearch/xpack/ml/action/GetBucketsAction.java | 6 +++--- .../xpack/ml/action/GetInfluencersAction.java | 6 +++--- .../elasticsearch/xpack/ml/action/GetRecordsAction.java | 6 +++--- .../xpack/ml/action/RevertModelSnapshotAction.java | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetBucketsAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetBucketsAction.java index eff99847f7a..024260872ce 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetBucketsAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetBucketsAction.java @@ -28,12 +28,12 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.xpack.ml.action.util.PageParams; +import org.elasticsearch.xpack.ml.action.util.QueryPage; import org.elasticsearch.xpack.ml.job.config.Job; import org.elasticsearch.xpack.ml.job.persistence.BucketsQueryBuilder; import org.elasticsearch.xpack.ml.job.persistence.JobProvider; -import org.elasticsearch.xpack.ml.action.util.QueryPage; import org.elasticsearch.xpack.ml.job.results.Bucket; -import org.elasticsearch.xpack.ml.action.util.PageParams; import org.elasticsearch.xpack.ml.utils.ExceptionsHelper; import java.io.IOException; @@ -42,7 +42,7 @@ import java.util.Objects; public class GetBucketsAction extends Action { public static final GetBucketsAction INSTANCE = new GetBucketsAction(); - public static final String NAME = "indices:admin/ml/results/buckets/get"; + public static final String NAME = "cluster:admin/ml/results/buckets/get"; private GetBucketsAction() { super(NAME); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetInfluencersAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetInfluencersAction.java index 57b61e7367b..91c540d6f4a 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetInfluencersAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetInfluencersAction.java @@ -28,12 +28,12 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.xpack.ml.action.util.PageParams; +import org.elasticsearch.xpack.ml.action.util.QueryPage; import org.elasticsearch.xpack.ml.job.config.Job; import org.elasticsearch.xpack.ml.job.persistence.InfluencersQueryBuilder; import org.elasticsearch.xpack.ml.job.persistence.JobProvider; -import org.elasticsearch.xpack.ml.action.util.QueryPage; import org.elasticsearch.xpack.ml.job.results.Influencer; -import org.elasticsearch.xpack.ml.action.util.PageParams; import org.elasticsearch.xpack.ml.utils.ExceptionsHelper; import java.io.IOException; @@ -43,7 +43,7 @@ public class GetInfluencersAction extends Action { public static final GetInfluencersAction INSTANCE = new GetInfluencersAction(); - public static final String NAME = "indices:admin/ml/results/influencers/get"; + public static final String NAME = "cluster:admin/ml/results/influencers/get"; private GetInfluencersAction() { super(NAME); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetRecordsAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetRecordsAction.java index e8447251a0d..6a6be3d637f 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetRecordsAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/GetRecordsAction.java @@ -28,13 +28,13 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.xpack.ml.action.util.PageParams; +import org.elasticsearch.xpack.ml.action.util.QueryPage; import org.elasticsearch.xpack.ml.job.config.Job; import org.elasticsearch.xpack.ml.job.persistence.JobProvider; -import org.elasticsearch.xpack.ml.action.util.QueryPage; import org.elasticsearch.xpack.ml.job.persistence.RecordsQueryBuilder; import org.elasticsearch.xpack.ml.job.results.AnomalyRecord; import org.elasticsearch.xpack.ml.job.results.Influencer; -import org.elasticsearch.xpack.ml.action.util.PageParams; import org.elasticsearch.xpack.ml.utils.ExceptionsHelper; import java.io.IOException; @@ -43,7 +43,7 @@ import java.util.Objects; public class GetRecordsAction extends Action { public static final GetRecordsAction INSTANCE = new GetRecordsAction(); - public static final String NAME = "indices:admin/ml/results/records/get"; + public static final String NAME = "cluster:admin/ml/results/records/get"; private GetRecordsAction() { super(NAME); diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/RevertModelSnapshotAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/RevertModelSnapshotAction.java index b06d97ebb85..c7dd1f34f68 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/RevertModelSnapshotAction.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/action/RevertModelSnapshotAction.java @@ -35,16 +35,16 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.xpack.ml.action.util.QueryPage; +import org.elasticsearch.xpack.ml.job.JobManager; import org.elasticsearch.xpack.ml.job.config.Job; import org.elasticsearch.xpack.ml.job.config.JobStatus; -import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSnapshot; -import org.elasticsearch.xpack.ml.job.JobManager; import org.elasticsearch.xpack.ml.job.messages.Messages; import org.elasticsearch.xpack.ml.job.metadata.Allocation; import org.elasticsearch.xpack.ml.job.persistence.JobDataCountsPersister; import org.elasticsearch.xpack.ml.job.persistence.JobDataDeleter; import org.elasticsearch.xpack.ml.job.persistence.JobProvider; -import org.elasticsearch.xpack.ml.action.util.QueryPage; +import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSnapshot; import org.elasticsearch.xpack.ml.utils.ExceptionsHelper; import java.io.IOException; @@ -57,7 +57,7 @@ public class RevertModelSnapshotAction extends Action { public static final RevertModelSnapshotAction INSTANCE = new RevertModelSnapshotAction(); - public static final String NAME = "indices:admin/ml/model_snapshots/revert"; + public static final String NAME = "cluster:admin/ml/model_snapshots/revert"; private RevertModelSnapshotAction() { super(NAME);