Avoid some deprecated methods

Author: joegallo

x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/CopyLifecycleIndexMetadataTransportAction.java

@@ -23,6 +23,7 @@
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.LifecycleExecutionState;
 import org.elasticsearch.cluster.metadata.ProjectMetadata;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.cluster.service.MasterServiceTaskQueue;
 import org.elasticsearch.common.Priority;
@@ -49,7 +50,8 @@ public CopyLifecycleIndexMetadataTransportAction(
         TransportService transportService,
         ClusterService clusterService,
         ThreadPool threadPool,
-        ActionFilters actionFilters
+        ActionFilters actionFilters,
+        ProjectResolver projectResolver
     ) {
         super(
             CopyLifecycleIndexMetadataAction.NAME,
@@ -64,7 +66,8 @@ public CopyLifecycleIndexMetadataTransportAction(
         this.executor = new SimpleBatchedAckListenerTaskExecutor<>() {
             @Override
             public Tuple<ClusterState, ClusterStateAckListener> executeTask(UpdateIndexMetadataTask task, ClusterState clusterState) {
-                return new Tuple<>(applyUpdate(clusterState, task), task);
+                final ProjectMetadata projectMetadata = projectResolver.getProjectMetadata(clusterState);
+                return new Tuple<>(applyUpdate(clusterState, projectMetadata, task), task);
             }
         };
         this.taskQueue = clusterService.createTaskQueue("migrate-copy-index-metadata", Priority.NORMAL, this.executor);
@@ -89,8 +92,7 @@ protected ClusterBlockException checkBlock(CopyLifecycleIndexMetadataAction.Requ
         return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE);
     }
 
-    private static ClusterState applyUpdate(ClusterState state, UpdateIndexMetadataTask updateTask) {
-        final ProjectMetadata projectMetadata = state.metadata().getProject();
+    private static ClusterState applyUpdate(ClusterState state, ProjectMetadata projectMetadata, UpdateIndexMetadataTask updateTask) {
         IndexMetadata sourceMetadata = projectMetadata.index(updateTask.sourceIndex);
         if (sourceMetadata == null) {
             throw new IndexNotFoundException(updateTask.sourceIndex);

x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamIndexTransportAction.java

@@ -40,6 +40,7 @@
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.Randomness;
 import org.elasticsearch.common.settings.Setting;
@@ -108,6 +109,7 @@ public class ReindexDataStreamIndexTransportAction extends HandledTransportActio
     private final ClusterService clusterService;
     private final Client client;
     private final TransportService transportService;
+    private final ProjectResolver projectResolver;
     /*
      * The following is incremented in order to keep track of the current round-robin position for ingest nodes that we send sliced requests
      * to. We bound its random starting value to less than or equal to 2 ^ 30 (the default is Integer.MAX_VALUE or 2 ^ 31 - 1) only so that
@@ -121,7 +123,8 @@ public ReindexDataStreamIndexTransportAction(
         TransportService transportService,
         ClusterService clusterService,
         ActionFilters actionFilters,
-        Client client
+        Client client,
+        ProjectResolver projectResolver
     ) {
         super(
             ReindexDataStreamIndexAction.NAME,
@@ -134,6 +137,7 @@ public ReindexDataStreamIndexTransportAction(
         this.clusterService = clusterService;
         this.client = client;
         this.transportService = transportService;
+        this.projectResolver = projectResolver;
     }
 
     @Override
@@ -142,7 +146,7 @@ protected void doExecute(
         ReindexDataStreamIndexAction.Request request,
         ActionListener<ReindexDataStreamIndexAction.Response> listener
     ) {
-        var project = clusterService.state().projectState();
+        var project = projectResolver.getProjectState(clusterService.state());
         var sourceIndexName = request.getSourceIndex();
         var destIndexName = generateDestIndexName(sourceIndexName);
         TaskId taskId = new TaskId(clusterService.localNode().getId(), task.getId());