Defer use of ProjectIdResolver in REST handlers to keep tests happy

Author: PeteGillinElastic

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

@@ -44,7 +44,7 @@ public class RestNodesStatsAction extends BaseRestHandler {
 
     private static final Set<String> SUPPORTED_CAPABILITIES = Set.of("dense_vector_off_heap_stats");
 
-    private final Map<String, String> xContentParams;
+    private final ProjectIdResolver projectIdResolver;
 
     @Override
     public List<Route> routes() {
@@ -69,10 +69,7 @@ public List<Route> routes() {
     }
 
     public RestNodesStatsAction(ProjectIdResolver projectIdResolver) {
-        this.xContentParams = Map.of(
-            NodeStats.MULTI_PROJECT_ENABLED_XCONTENT_PARAM_KEY,
-            Boolean.toString(projectIdResolver.supportsMultipleProjects())
-        );
+        this.projectIdResolver = projectIdResolver;
     }
 
     @Override
@@ -191,10 +188,14 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
 
         return channel -> new RestCancellableNodeClient(client, request.getHttpChannel()).admin()
             .cluster()
-            .nodesStats(
-                nodesStatsRequest,
-                new RestRefCountedChunkedToXContentListener<>(channel, new ToXContent.DelegatingMapParams(xContentParams, request))
-            );
+            .nodesStats(nodesStatsRequest, new RestRefCountedChunkedToXContentListener<>(channel, xContentParamsForRequest(request)));
+    }
+
+    private ToXContent.DelegatingMapParams xContentParamsForRequest(RestRequest request) {
+        return new ToXContent.DelegatingMapParams(
+            Map.of(NodeStats.MULTI_PROJECT_ENABLED_XCONTENT_PARAM_KEY, Boolean.toString(projectIdResolver.supportsMultipleProjects())),
+            request
+        );
     }
 
     private final Set<String> RESPONSE_PARAMS = Collections.singleton("level");

server/src/main/java/org/elasticsearch/rest/action/info/RestClusterInfoAction.java

@@ -78,12 +78,10 @@ public class RestClusterInfoAction extends BaseRestHandler {
     static final Set<Metric> AVAILABLE_TARGETS = RESPONSE_MAPPER.keySet();
     static final Set<String> AVAILABLE_TARGET_NAMES = AVAILABLE_TARGETS.stream().map(Metric::metricName).collect(toUnmodifiableSet());
 
-    private final ToXContent.Params xContentParams;
+    private final ProjectIdResolver projectIdResolver;
 
     public RestClusterInfoAction(ProjectIdResolver projectIdResolver) {
-        this.xContentParams = new ToXContent.MapParams(
-            Map.of(NodeStats.MULTI_PROJECT_ENABLED_XCONTENT_PARAM_KEY, Boolean.toString(projectIdResolver.supportsMultipleProjects()))
-        );
+        this.projectIdResolver = projectIdResolver;
     }
 
     @Override
@@ -146,12 +144,18 @@ public RestResponse buildResponse(NodesStatsResponse response) throws Exception
                                 Iterators.flatMap(chunkedResponses, chunk -> chunk.toXContentChunked(outerParams)),
                                 ChunkedToXContentHelper.endObject()
                             ),
-                            xContentParams,
+                            xContentParams(),
                             channel
                         ),
                         null
                     );
                 }
             });
     }
+
+    private ToXContent.MapParams xContentParams() {
+        return new ToXContent.MapParams(
+            Map.of(NodeStats.MULTI_PROJECT_ENABLED_XCONTENT_PARAM_KEY, Boolean.toString(projectIdResolver.supportsMultipleProjects()))
+        );
+    }
 }