From a34f067a38bff2f3d95afa1b64df7f856c923bd8 Mon Sep 17 00:00:00 2001 From: Ed Savage Date: Mon, 20 Jul 2020 14:09:06 +0100 Subject: [PATCH] [ML] Remove deprecated _xpack endpoints Extends the work done in #48170 to the ml module --- .../xpack/ml/MachineLearning.java | 1 - .../ml/rest/RestDeleteExpiredDataAction.java | 14 +++------- .../ml/rest/RestFindFileStructureAction.java | 9 +------ .../xpack/ml/rest/RestMlInfoAction.java | 9 +------ .../ml/rest/RestSetUpgradeModeAction.java | 9 +------ .../calendar/RestDeleteCalendarAction.java | 9 +------ .../RestDeleteCalendarEventAction.java | 11 ++------ .../calendar/RestDeleteCalendarJobAction.java | 10 +------ .../calendar/RestGetCalendarEventsAction.java | 9 +------ .../rest/calendar/RestGetCalendarsAction.java | 19 +++----------- .../calendar/RestPostCalendarEventAction.java | 9 +------ .../rest/calendar/RestPutCalendarAction.java | 9 +------ .../calendar/RestPutCalendarJobAction.java | 14 +++------- .../datafeeds/RestDeleteDatafeedAction.java | 9 +------ .../datafeeds/RestGetDatafeedStatsAction.java | 15 +++-------- .../datafeeds/RestGetDatafeedsAction.java | 15 +++-------- .../datafeeds/RestPreviewDatafeedAction.java | 9 +------ .../rest/datafeeds/RestPutDatafeedAction.java | 9 +------ .../datafeeds/RestStartDatafeedAction.java | 9 +------ .../datafeeds/RestStopDatafeedAction.java | 9 +------ .../datafeeds/RestUpdateDatafeedAction.java | 9 +------ .../rest/filter/RestDeleteFilterAction.java | 9 +------ .../ml/rest/filter/RestGetFiltersAction.java | 13 ++-------- .../ml/rest/filter/RestPutFilterAction.java | 9 +------ .../rest/filter/RestUpdateFilterAction.java | 11 ++------ .../xpack/ml/rest/job/RestCloseJobAction.java | 9 +------ .../ml/rest/job/RestDeleteForecastAction.java | 15 +++-------- .../ml/rest/job/RestDeleteJobAction.java | 9 +------ .../xpack/ml/rest/job/RestFlushJobAction.java | 9 +------ .../ml/rest/job/RestForecastJobAction.java | 9 +------ .../ml/rest/job/RestGetJobStatsAction.java | 13 ++-------- .../xpack/ml/rest/job/RestGetJobsAction.java | 13 ++-------- .../xpack/ml/rest/job/RestOpenJobAction.java | 9 +------ .../xpack/ml/rest/job/RestPostDataAction.java | 9 +------ .../ml/rest/job/RestPostJobUpdateAction.java | 9 +------ .../xpack/ml/rest/job/RestPutJobAction.java | 9 +------ .../RestDeleteModelSnapshotAction.java | 12 ++------- .../RestGetModelSnapshotsAction.java | 23 +++------------- .../RestRevertModelSnapshotAction.java | 10 +------ .../RestUpdateModelSnapshotAction.java | 10 +------ .../ml/rest/results/RestGetBucketsAction.java | 23 +++------------- .../rest/results/RestGetCategoriesAction.java | 26 +++++-------------- .../results/RestGetInfluencersAction.java | 17 +++--------- .../results/RestGetOverallBucketsAction.java | 17 +++--------- .../ml/rest/results/RestGetRecordsAction.java | 15 ++--------- .../validate/RestValidateDetectorAction.java | 9 +------ .../validate/RestValidateJobConfigAction.java | 9 +------ 47 files changed, 83 insertions(+), 459 deletions(-) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java index fed111f22bdf9..96e2a34e50448 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java @@ -360,7 +360,6 @@ public class MachineLearning extends Plugin implements SystemIndexPlugin, SearchPlugin { public static final String NAME = "ml"; public static final String BASE_PATH = "/_ml/"; - public static final String PRE_V7_BASE_PATH = "/_xpack/ml/"; public static final String DATAFEED_THREAD_POOL_NAME = NAME + "_datafeed"; public static final String JOB_COMMS_THREAD_POOL_NAME = NAME + "_job_comms"; public static final String UTILITY_THREAD_POOL_NAME = NAME + "_utility"; diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java index 21529f1800804..c3439df7b5142 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestDeleteExpiredDataAction.java @@ -14,7 +14,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.DELETE; @@ -23,16 +22,9 @@ public class RestDeleteExpiredDataAction extends BaseRestHandler { @Override public List routes() { - return Collections.singletonList( - new Route(DELETE, MachineLearning.BASE_PATH + "_delete_expired_data/{" + Job.ID.getPreferredName() + "}")); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 - return Collections.singletonList( - new ReplacedRoute(DELETE, MachineLearning.BASE_PATH + "_delete_expired_data", - DELETE, MachineLearning.PRE_V7_BASE_PATH + "_delete_expired_data") + return List.of( + new Route(DELETE, MachineLearning.BASE_PATH + "_delete_expired_data/{" + Job.ID.getPreferredName() + "}"), + new Route(DELETE, MachineLearning.BASE_PATH + "_delete_expired_data") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestFindFileStructureAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestFindFileStructureAction.java index 3ac75f7970a24..66e97a9bac9ce 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestFindFileStructureAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestFindFileStructureAction.java @@ -30,15 +30,8 @@ public class RestFindFileStructureAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "find_file_structure", - POST, MachineLearning.PRE_V7_BASE_PATH + "find_file_structure") + new Route(POST, MachineLearning.BASE_PATH + "find_file_structure") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestMlInfoAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestMlInfoAction.java index 0d9c9fed19fcf..a228f49c43d46 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestMlInfoAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestMlInfoAction.java @@ -22,15 +22,8 @@ public class RestMlInfoAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "info", - GET, MachineLearning.PRE_V7_BASE_PATH + "info") + new Route(GET, MachineLearning.BASE_PATH + "info") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestSetUpgradeModeAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestSetUpgradeModeAction.java index 7b9654db22854..459edfd69f2aa 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestSetUpgradeModeAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/RestSetUpgradeModeAction.java @@ -22,15 +22,8 @@ public class RestSetUpgradeModeAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "set_upgrade_mode", - POST, MachineLearning.PRE_V7_BASE_PATH + "set_upgrade_mode") + new Route(POST, MachineLearning.BASE_PATH + "set_upgrade_mode") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarAction.java index c076ee44ce6f4..a14c038d1e881 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarAction.java @@ -23,15 +23,8 @@ public class RestDeleteCalendarAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(DELETE, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", - DELETE, MachineLearning.PRE_V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}") + new Route(DELETE, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarEventAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarEventAction.java index 4747f2d640501..4ba3d8a2dd017 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarEventAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarEventAction.java @@ -22,18 +22,11 @@ public class RestDeleteCalendarEventAction extends BaseRestHandler { - @Override - public List routes() { - return Collections.emptyList(); - } @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 + public List routes() { return Collections.singletonList( - new ReplacedRoute(DELETE, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events/{" + - ScheduledEvent.EVENT_ID.getPreferredName() + "}", - DELETE, MachineLearning.PRE_V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events/{" + + new Route(DELETE, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events/{" + ScheduledEvent.EVENT_ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarJobAction.java index e40f4b684a5b3..996da67162ead 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestDeleteCalendarJobAction.java @@ -24,16 +24,8 @@ public class RestDeleteCalendarJobAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(DELETE, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + - Job.ID.getPreferredName() + "}", - DELETE, MachineLearning.PRE_V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + + new Route(DELETE, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + Job.ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarEventsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarEventsAction.java index 223bf7de17513..f62a6e750fa97 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarEventsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarEventsAction.java @@ -26,15 +26,8 @@ public class RestGetCalendarEventsAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events", - GET, MachineLearning.PRE_V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events") + new Route(GET, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarsAction.java index 47a0e4d68f66d..3c9adb3532192 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestGetCalendarsAction.java @@ -17,7 +17,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -27,21 +26,11 @@ public class RestGetCalendarsAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", - GET, MachineLearning.PRE_V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}"), - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "calendars/", - GET, MachineLearning.PRE_V7_BASE_PATH + "calendars/"), - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", - POST, MachineLearning.PRE_V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}"), - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "calendars/", - POST, MachineLearning.PRE_V7_BASE_PATH + "calendars/") + new Route(GET, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}"), + new Route(GET, MachineLearning.BASE_PATH + "calendars/"), + new Route(POST, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}"), + new Route(POST, MachineLearning.BASE_PATH + "calendars/") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPostCalendarEventAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPostCalendarEventAction.java index 6ff5332c455f0..cb932a5cd84a1 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPostCalendarEventAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPostCalendarEventAction.java @@ -24,15 +24,8 @@ public class RestPostCalendarEventAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events", - POST, MachineLearning.PRE_V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events") + new Route(POST, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/events") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarAction.java index 4d2fa79f93fc9..a1fb252016e3b 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarAction.java @@ -24,15 +24,8 @@ public class RestPutCalendarAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(PUT, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}", - PUT, MachineLearning.PRE_V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}") + new Route(PUT, MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarJobAction.java index 43d20b54314c6..6ff3cc289b570 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/calendar/RestPutCalendarJobAction.java @@ -24,18 +24,10 @@ public class RestPutCalendarJobAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(PUT, - MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + Job.ID.getPreferredName() + "}", - PUT, - MachineLearning.PRE_V7_BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + - Job.ID.getPreferredName() + "}") + new Route(PUT, + MachineLearning.BASE_PATH + "calendars/{" + Calendar.ID.getPreferredName() + "}/jobs/{" + Job.ID.getPreferredName() + + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java index 1294906f0dc31..b4a9f551be478 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestDeleteDatafeedAction.java @@ -24,15 +24,8 @@ public class RestDeleteDatafeedAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(DELETE, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}", - DELETE, MachineLearning.PRE_V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}") + new Route(DELETE, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java index d2fb23ae9b696..85e109f5433f6 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedStatsAction.java @@ -15,26 +15,17 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; public class RestGetDatafeedStatsAction extends BaseRestHandler { - @Override + @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_stats", - GET, MachineLearning.PRE_V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_stats"), - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "datafeeds/_stats", - GET, MachineLearning.PRE_V7_BASE_PATH + "datafeeds/_stats") + new Route(GET, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_stats"), + new Route(GET, MachineLearning.BASE_PATH + "datafeeds/_stats") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java index e00c571fb2021..0b53965518869 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestGetDatafeedsAction.java @@ -14,26 +14,17 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; public class RestGetDatafeedsAction extends BaseRestHandler { - @Override + @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}", - GET, MachineLearning.PRE_V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}"), - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "datafeeds", - GET, MachineLearning.PRE_V7_BASE_PATH + "datafeeds") + new Route(GET, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}"), + new Route(GET, MachineLearning.BASE_PATH + "datafeeds") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java index 7df1b79e266d2..68fa8cc017d27 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPreviewDatafeedAction.java @@ -23,15 +23,8 @@ public class RestPreviewDatafeedAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_preview", - GET, MachineLearning.PRE_V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_preview") + new Route(GET, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_preview") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java index 4b79abdfef662..ff1859f1dc86d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestPutDatafeedAction.java @@ -26,15 +26,8 @@ public class RestPutDatafeedAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(PUT, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}", - PUT, MachineLearning.PRE_V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}") + new Route(PUT, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java index d3bc49d05d6ab..8b7481a56ca40 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStartDatafeedAction.java @@ -32,15 +32,8 @@ public class RestStartDatafeedAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_start", - POST, MachineLearning.PRE_V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_start") + new Route(POST, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_start") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java index ea5035fbffe9d..231e5879a5201 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestStopDatafeedAction.java @@ -30,15 +30,8 @@ public class RestStopDatafeedAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_stop", - POST, MachineLearning.PRE_V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_stop") + new Route(POST, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_stop") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java index cf8046921336a..f172487ee1517 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/datafeeds/RestUpdateDatafeedAction.java @@ -26,15 +26,8 @@ public class RestUpdateDatafeedAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_update", - POST, MachineLearning.PRE_V7_BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_update") + new Route(POST, MachineLearning.BASE_PATH + "datafeeds/{" + DatafeedConfig.ID.getPreferredName() + "}/_update") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java index 9ada7999a9f61..9857d587b50a7 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestDeleteFilterAction.java @@ -23,15 +23,8 @@ public class RestDeleteFilterAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(DELETE, MachineLearning.BASE_PATH + "filters/{" + Request.FILTER_ID.getPreferredName() + "}", - DELETE, MachineLearning.PRE_V7_BASE_PATH + "filters/{" + Request.FILTER_ID.getPreferredName() + "}") + new Route(DELETE, MachineLearning.BASE_PATH + "filters/{" + Request.FILTER_ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java index 267b37a589fed..8e13cb9540463 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java @@ -16,7 +16,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -25,17 +24,9 @@ public class RestGetFiltersAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}", - GET, MachineLearning.PRE_V7_BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}"), - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "filters/", - GET, MachineLearning.PRE_V7_BASE_PATH + "filters/") + new Route(GET, MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}"), + new Route(GET, MachineLearning.BASE_PATH + "filters/") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java index 2ec99070aaefe..11dc0fbe42867 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestPutFilterAction.java @@ -24,15 +24,8 @@ public class RestPutFilterAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(PUT, MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}", - PUT, MachineLearning.PRE_V7_BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}") + new Route(PUT, MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestUpdateFilterAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestUpdateFilterAction.java index 9a5aa4b46e3af..7e138112ed607 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestUpdateFilterAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestUpdateFilterAction.java @@ -22,17 +22,10 @@ public class RestUpdateFilterAction extends BaseRestHandler { - @Override + @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}/_update", - POST, MachineLearning.PRE_V7_BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}/_update") + new Route(POST, MachineLearning.BASE_PATH + "filters/{" + MlFilter.ID.getPreferredName() + "}/_update") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java index 9e343bebcc069..b07798903b712 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestCloseJobAction.java @@ -25,15 +25,8 @@ public class RestCloseJobAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_close", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_close") + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_close") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteForecastAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteForecastAction.java index a47c5f2930294..71b71fd4b1ea4 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteForecastAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteForecastAction.java @@ -18,24 +18,15 @@ import java.io.IOException; import java.util.List; -import static java.util.Collections.singletonList; import static org.elasticsearch.rest.RestRequest.Method.DELETE; public class RestDeleteForecastAction extends BaseRestHandler { @Override public List routes() { - return singletonList( - new Route(DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_forecast/")); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 - return singletonList( - new ReplacedRoute(DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + - "}/_forecast/{" + Forecast.FORECAST_ID.getPreferredName() + "}", - DELETE, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + + return List.of( + new Route(DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_forecast/"), + new Route(DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_forecast/{" + Forecast.FORECAST_ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java index 94b41cf769354..2c9a66b177472 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java @@ -29,15 +29,8 @@ public class RestDeleteJobAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", - DELETE, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}") + new Route(DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java index 606e8d341e585..07a24b2b2be3c 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestFlushJobAction.java @@ -30,15 +30,8 @@ public class RestFlushJobAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_flush", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_flush") + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_flush") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestForecastJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestForecastJobAction.java index 754e004f924c4..d1a13c6427d5a 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestForecastJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestForecastJobAction.java @@ -25,15 +25,8 @@ public class RestForecastJobAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_forecast", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_forecast") + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_forecast") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java index 0a73116bb3cb6..723dbfe9acb0a 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobStatsAction.java @@ -16,7 +16,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -25,17 +24,9 @@ public class RestGetJobStatsAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_stats", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_stats"), - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "anomaly_detectors/_stats", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/_stats") + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_stats"), + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors/_stats") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java index 5495cb234e07f..a05e056453014 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestGetJobsAction.java @@ -16,7 +16,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -25,17 +24,9 @@ public class RestGetJobsAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}"), - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "anomaly_detectors", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors") + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}"), + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java index 082e6d14e9d5e..aedf7266c33bb 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestOpenJobAction.java @@ -29,15 +29,8 @@ public class RestOpenJobAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_open", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_open") + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_open") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java index 01ac45eb4f2b8..ad2483a3ee8ce 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostDataAction.java @@ -26,15 +26,8 @@ public class RestPostDataAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_data", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_data") + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_data") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java index 14756178ea9c3..f72f16650c668 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPostJobUpdateAction.java @@ -24,15 +24,8 @@ public class RestPostJobUpdateAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_update", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_update") + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/_update") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java index af0f7cc510299..3f80d85124d87 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestPutJobAction.java @@ -24,15 +24,8 @@ public class RestPutJobAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(PUT, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}", - PUT, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}") + new Route(PUT, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java index 02920345e84d6..0a9e30167870d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestDeleteModelSnapshotAction.java @@ -22,18 +22,10 @@ public class RestDeleteModelSnapshotAction extends BaseRestHandler { - @Override + @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + - "}/model_snapshots/{" + ModelSnapshotField.SNAPSHOT_ID.getPreferredName() + "}", - DELETE, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + + new Route(DELETE, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + ModelSnapshotField.SNAPSHOT_ID.getPreferredName() + "}") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java index 135b7ba597986..591ef12a8d29e 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestGetModelSnapshotsAction.java @@ -18,7 +18,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -37,28 +36,14 @@ public class RestGetModelSnapshotsAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" - + Job.ID.getPreferredName() + "}/model_snapshots/{" + Request.SNAPSHOT_ID.getPreferredName() + "}", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + Request.SNAPSHOT_ID.getPreferredName() + "}"), - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" - + Job.ID.getPreferredName() + "}/model_snapshots/{" + Request.SNAPSHOT_ID.getPreferredName() + "}", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + Request.SNAPSHOT_ID.getPreferredName() + "}"), - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" - + Job.ID.getPreferredName() + "}/model_snapshots", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots"), - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" - + Job.ID.getPreferredName() + "}/model_snapshots", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java index d01ba85bcce24..2f698979a5aef 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestRevertModelSnapshotAction.java @@ -26,17 +26,9 @@ public class RestRevertModelSnapshotAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute( + new Route( POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + - RevertModelSnapshotAction.Request.SNAPSHOT_ID.getPreferredName() + "}/_revert", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + RevertModelSnapshotAction.Request.SNAPSHOT_ID.getPreferredName() + "}/_revert") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java index 9f1db32b327d1..64df1c3bad848 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/modelsnapshots/RestUpdateModelSnapshotAction.java @@ -25,16 +25,8 @@ public class RestUpdateModelSnapshotAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" - + Job.ID.getPreferredName() + "}/model_snapshots/{" + ModelSnapshotField.SNAPSHOT_ID +"}/_update", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/model_snapshots/{" + ModelSnapshotField.SNAPSHOT_ID +"}/_update") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java index 43d051d70d1c8..8bbf9bf765b4d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetBucketsAction.java @@ -18,7 +18,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -28,28 +27,14 @@ public class RestGetBucketsAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() - + "}/results/buckets/{" + Result.TIMESTAMP.getPreferredName() + "}", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets/{" + Result.TIMESTAMP.getPreferredName() + "}"), - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() - + "}/results/buckets/{" + Result.TIMESTAMP.getPreferredName() + "}", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets/{" + Result.TIMESTAMP.getPreferredName() + "}"), - new ReplacedRoute(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() - + "}/results/buckets", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets"), - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() - + "}/results/buckets", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/buckets") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java index 20f4d490e5aef..08b56f20fb3af 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetCategoriesAction.java @@ -17,7 +17,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -27,28 +26,15 @@ public class RestGetCategoriesAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute( - GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories/{" - + Request.CATEGORY_ID.getPreferredName() + "}", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories/{" + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories/{" + Request.CATEGORY_ID.getPreferredName() + "}"), - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + - "}/results/categories/{" + Request.CATEGORY_ID.getPreferredName() + "}", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories/{" + Request.CATEGORY_ID.getPreferredName() + "}"), - new ReplacedRoute( - GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories"), - new ReplacedRoute( - POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories") + new Route( + GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories"), + new Route( + POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/categories") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java index 25d294d62cef1..4d5ea4fb9b405 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetInfluencersAction.java @@ -16,7 +16,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -26,19 +25,11 @@ public class RestGetInfluencersAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute( - GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers"), - new ReplacedRoute( - POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers") + new Route( + GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers"), + new Route( + POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/influencers") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetOverallBucketsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetOverallBucketsAction.java index 9e76ab49bb456..fcf43987837db 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetOverallBucketsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetOverallBucketsAction.java @@ -16,7 +16,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -26,19 +25,11 @@ public class RestGetOverallBucketsAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute( - GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets"), - new ReplacedRoute( - POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets") + new Route( + GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets"), + new Route( + POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/overall_buckets") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java index fd72485d554f9..4932ba691f42f 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/results/RestGetRecordsAction.java @@ -16,7 +16,6 @@ import org.elasticsearch.xpack.ml.MachineLearning; import java.io.IOException; -import java.util.Collections; import java.util.List; import static org.elasticsearch.rest.RestRequest.Method.GET; @@ -26,19 +25,9 @@ public class RestGetRecordsAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return List.of( - new ReplacedRoute( - GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/records", - GET, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/records"), - new ReplacedRoute( - POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/records", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/records") + new Route(GET, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/records"), + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/{" + Job.ID.getPreferredName() + "}/results/records") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java index 0f6e86c0b664d..fbe17bfed9c51 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateDetectorAction.java @@ -23,15 +23,8 @@ public class RestValidateDetectorAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/_validate/detector", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/_validate/detector") + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/_validate/detector") ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java index c0665ffc46941..975cbccfe97a6 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/validate/RestValidateJobConfigAction.java @@ -23,15 +23,8 @@ public class RestValidateJobConfigAction extends BaseRestHandler { @Override public List routes() { - return Collections.emptyList(); - } - - @Override - public List replacedRoutes() { - // TODO: remove deprecated endpoint in 8.0.0 return Collections.singletonList( - new ReplacedRoute(POST, MachineLearning.BASE_PATH + "anomaly_detectors/_validate", - POST, MachineLearning.PRE_V7_BASE_PATH + "anomaly_detectors/_validate") + new Route(POST, MachineLearning.BASE_PATH + "anomaly_detectors/_validate") ); }