[REST Compatible API] Route refactoring (addendum) (#70168)

Followup to #69573

qa/smoke-test-http/src/test/java/org/elasticsearch/http/SystemIndexRestIT.java

@@ -43,6 +43,7 @@ import java.util.Map;
 import java.util.function.Supplier;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.rest.RestRequest.Method.POST;
 import static org.elasticsearch.test.rest.ESRestTestCase.entityAsMap;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasKey;
@@ -196,7 +197,7 @@ public class SystemIndexRestIT extends HttpSmokeTestCase {
 
             @Override
             public List<Route> routes() {
-                return List.of(new Route(RestRequest.Method.POST, "/_sys_index_test/add_doc/{id}"));
+                return List.of(new Route(POST, "/_sys_index_test/add_doc/{id}"));
             }
 
             @Override

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshottableFeaturesAction.java

@@ -18,10 +18,12 @@ import org.elasticsearch.rest.action.RestToXContentListener;
 import java.io.IOException;
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.GET;
+
 public class RestSnapshottableFeaturesAction extends BaseRestHandler {
     @Override
     public List<Route> routes() {
-        return List.of(new Route(RestRequest.Method.GET, "/_features"));
+        return List.of(new Route(GET, "/_features"));
     }
 
     @Override

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestResolveIndexAction.java

@@ -19,6 +19,8 @@ import org.elasticsearch.rest.action.RestToXContentListener;
 import java.io.IOException;
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.GET;
+
 public class RestResolveIndexAction extends BaseRestHandler {
 
     @Override
@@ -29,7 +31,7 @@ public class RestResolveIndexAction extends BaseRestHandler {
     @Override
     public List<Route> routes() {
         return List.of(
-            new Route(RestRequest.Method.GET, "/_resolve/index/{name}")
+            new Route(GET, "/_resolve/index/{name}")
         );
     }
 

server/src/test/java/org/elasticsearch/rest/RestControllerTests.java

@@ -10,10 +10,10 @@ package org.elasticsearch.rest;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.RestApiVersion;
 import org.elasticsearch.common.breaker.CircuitBreaker;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.RestApiVersion;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;
@@ -183,18 +183,18 @@ public class RestControllerTests extends ESTestCase {
         String path = "/_" + randomAlphaOfLengthBetween(1, 6);
         RestHandler handler = (request, channel, client) -> {};
         String deprecationMessage = randomAlphaOfLengthBetween(1, 10);
-        RestApiVersion previous = RestApiVersion.current().previous();
+        RestApiVersion deprecatedInVersion = RestApiVersion.current();
 
         Route route = Route.builder(method, path)
-            .deprecated(deprecationMessage, previous).build();
+            .deprecated(deprecationMessage, deprecatedInVersion).build();
 
         // don't want to test everything -- just that it actually wraps the handler
         doCallRealMethod().when(controller).registerHandler(route, handler);
-        doCallRealMethod().when(controller).registerAsDeprecatedHandler(method, path, previous, handler, deprecationMessage);
+        doCallRealMethod().when(controller).registerAsDeprecatedHandler(method, path, deprecatedInVersion, handler, deprecationMessage);
 
         controller.registerHandler(route, handler);
 
-        verify(controller).registerHandler(eq(method), eq(path), eq(previous), any(DeprecationRestHandler.class));
+        verify(controller).registerHandler(eq(method), eq(path), eq(deprecatedInVersion), any(DeprecationRestHandler.class));
     }
 
     public void testRegisterAsReplacedHandler() {

x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/rest/RestCreateDataStreamAction.java

@@ -15,6 +15,8 @@ import org.elasticsearch.rest.action.RestToXContentListener;
 import java.io.IOException;
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.PUT;
+
 public class RestCreateDataStreamAction extends BaseRestHandler {
 
     @Override
@@ -24,7 +26,7 @@ public class RestCreateDataStreamAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return List.of(new Route(RestRequest.Method.PUT, "/_data_stream/{name}"));
+        return List.of(new Route(PUT, "/_data_stream/{name}"));
     }
 
     @Override

x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/rest/RestDataStreamsStatsAction.java

@@ -17,6 +17,8 @@ import org.elasticsearch.xpack.core.action.DataStreamsStatsAction;
 import java.io.IOException;
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.GET;
+
 public class RestDataStreamsStatsAction extends BaseRestHandler {
     @Override
     public String getName() {
@@ -25,10 +27,7 @@ public class RestDataStreamsStatsAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return List.of(
-            new Route(RestRequest.Method.GET, "/_data_stream/_stats"),
-            new Route(RestRequest.Method.GET, "/_data_stream/{name}/_stats")
-        );
+        return List.of(new Route(GET, "/_data_stream/_stats"), new Route(GET, "/_data_stream/{name}/_stats"));
     }
 
     @Override

x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/rest/RestDeleteDataStreamAction.java

@@ -16,6 +16,8 @@ import org.elasticsearch.xpack.core.action.DeleteDataStreamAction;
 
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.DELETE;
+
 public class RestDeleteDataStreamAction extends BaseRestHandler {
 
     @Override
@@ -25,7 +27,7 @@ public class RestDeleteDataStreamAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return List.of(new Route(RestRequest.Method.DELETE, "/_data_stream/{name}"));
+        return List.of(new Route(DELETE, "/_data_stream/{name}"));
     }
 
     @Override

x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/rest/RestGetDataStreamsAction.java

@@ -16,6 +16,8 @@ import org.elasticsearch.xpack.core.action.GetDataStreamAction;
 
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.GET;
+
 public class RestGetDataStreamsAction extends BaseRestHandler {
 
     @Override
@@ -25,7 +27,7 @@ public class RestGetDataStreamsAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return List.of(new Route(RestRequest.Method.GET, "/_data_stream"), new Route(RestRequest.Method.GET, "/_data_stream/{name}"));
+        return List.of(new Route(GET, "/_data_stream"), new Route(GET, "/_data_stream/{name}"));
     }
 
     @Override

x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/rest/RestMigrateToDataStreamAction.java

@@ -16,6 +16,8 @@ import org.elasticsearch.xpack.core.MigrateToDataStreamAction;
 import java.io.IOException;
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.POST;
+
 public class RestMigrateToDataStreamAction extends BaseRestHandler {
 
     @Override
@@ -25,7 +27,7 @@ public class RestMigrateToDataStreamAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return List.of(new Route(RestRequest.Method.POST, "/_data_stream/_migrate/{name}"));
+        return List.of(new Route(POST, "/_data_stream/_migrate/{name}"));
     }
 
     @Override

x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/rest/RestPromoteDataStreamAction.java

@@ -15,6 +15,8 @@ import org.elasticsearch.xpack.core.action.PromoteDataStreamAction;
 import java.io.IOException;
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.POST;
+
 public class RestPromoteDataStreamAction extends BaseRestHandler {
     @Override
     public String getName() {
@@ -23,7 +25,7 @@ public class RestPromoteDataStreamAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return List.of(new Route(RestRequest.Method.POST, "/_data_stream/_promote/{name}"));
+        return List.of(new Route(POST, "/_data_stream/_promote/{name}"));
     }
 
     @Override

x-pack/plugin/repositories-metering-api/src/main/java/org/elasticsearch/xpack/repositories/metering/rest/RestClearRepositoriesMeteringArchiveAction.java

@@ -17,6 +17,8 @@ import org.elasticsearch.xpack.repositories.metering.action.ClearRepositoriesMet
 
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.DELETE;
+
 public class RestClearRepositoriesMeteringArchiveAction extends BaseRestHandler {
     @Override
     public String getName() {
@@ -25,7 +27,7 @@ public class RestClearRepositoriesMeteringArchiveAction extends BaseRestHandler
 
     @Override
     public List<Route> routes() {
-        return List.of(new Route(RestRequest.Method.DELETE, "/_nodes/{nodeId}/_repositories_metering/{maxVersionToClear}"));
+        return List.of(new Route(DELETE, "/_nodes/{nodeId}/_repositories_metering/{maxVersionToClear}"));
     }
 
     @Override

x-pack/plugin/repositories-metering-api/src/main/java/org/elasticsearch/xpack/repositories/metering/rest/RestGetRepositoriesMeteringAction.java

@@ -17,6 +17,8 @@ import org.elasticsearch.xpack.repositories.metering.action.RepositoriesMetering
 
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.GET;
+
 public final class RestGetRepositoriesMeteringAction extends BaseRestHandler {
 
     @Override
@@ -26,7 +28,7 @@ public final class RestGetRepositoriesMeteringAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return List.of(new Route(RestRequest.Method.GET, "/_nodes/{nodeId}/_repositories_metering"));
+        return List.of(new Route(GET, "/_nodes/{nodeId}/_repositories_metering"));
     }
 
     @Override

x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/rest/RestClearSearchableSnapshotsCacheAction.java

@@ -17,13 +17,15 @@ import org.elasticsearch.xpack.searchablesnapshots.action.ClearSearchableSnapsho
 
 import java.util.List;
 
+import static org.elasticsearch.rest.RestRequest.Method.POST;
+
 public class RestClearSearchableSnapshotsCacheAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
         return List.of(
-            new Route(RestRequest.Method.POST, "/_searchable_snapshots/cache/clear"),
-            new Route(RestRequest.Method.POST, "/{index}/_searchable_snapshots/cache/clear")
+            new Route(POST, "/_searchable_snapshots/cache/clear"),
+            new Route(POST, "/{index}/_searchable_snapshots/cache/clear")
         );
     }
 

x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/rest/RestSearchableSnapshotsStatsAction.java

@@ -18,14 +18,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import static org.elasticsearch.rest.RestRequest.Method.GET;
+
 public class RestSearchableSnapshotsStatsAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return List.of(
-            new Route(RestRequest.Method.GET, "/_searchable_snapshots/stats"),
-            new Route(RestRequest.Method.GET, "/{index}/_searchable_snapshots/stats")
-        );
+        return List.of(new Route(GET, "/_searchable_snapshots/stats"), new Route(GET, "/{index}/_searchable_snapshots/stats"));
     }
 
     @Override