Fix tests

Author: alexey-ivanov-es

server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java

@@ -29,8 +29,10 @@
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.set.Sets;
+import org.elasticsearch.common.xcontent.ChunkedToXContent;
 import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
 import org.elasticsearch.xcontent.ToXContent;
+import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -365,6 +367,7 @@ public ProjectStateRegistry build() {
 
     private record Entry(Settings settings, ImmutableOpenMap<String, ReservedStateMetadata> reservedStateMetadata)
         implements
+            ToXContentFragment,
             Writeable,
             Diffable<Entry> {
 
@@ -410,11 +413,18 @@ public void writeTo(StreamOutput out) throws IOException {
             }
         }
 
-        public void toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {
+        @Override
+        public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {
             builder.startObject("settings");
             settings.toXContent(builder, new ToXContent.MapParams(Collections.singletonMap("flat_settings", "true")));
             builder.endObject();
-            ChunkedToXContentHelper.object("reserved_state", reservedStateMetadata().values().iterator());
+
+            builder.startObject("reserved_state");
+            for (ReservedStateMetadata reservedStateMetadata : reservedStateMetadata.values()) {
+                reservedStateMetadata.toXContent(builder, params);
+            }
+            builder.endObject();
+            return builder;
         }
 
         @Override

server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java

@@ -814,6 +814,17 @@ public void testToXContentWithMultipleProjects() throws IOException {
                           "project.setting": "42",
                           "project.setting2": "43"
                         },
+                        "reserved_state": {
+                          "file_settings": {
+                            "handlers": {
+                              "settings": {
+                                "keys": ["project.setting", "project.setting2"]
+                              }
+                            },
+                            "version": 42,
+                            "errors": null
+                          }
+                        },
                         "marked_for_deletion": true
                       }
                     ],
@@ -933,6 +944,11 @@ private static ClusterState buildMultiProjectClusterState(DiscoveryNode... nodes
                         projectId1,
                         Settings.builder().put(PROJECT_SETTING.getKey(), 42).put(PROJECT_SETTING2.getKey(), 43).build()
                     )
+                    .putReservedStateMetadata(projectId1, ReservedStateMetadata.builder("file_settings")
+                        .putHandler(new ReservedStateHandlerMetadata("settings",
+                            Set.of(PROJECT_SETTING.getKey(), PROJECT_SETTING2.getKey())))
+                        .version(42L)
+                        .build())
                     .markProjectForDeletion(projectId1)
                     .build()
             )