Merge project builders

Author: nielsbauman

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java

@@ -881,13 +881,6 @@ private ClusterState createClusterState(
     // ------------- functionality unit test --------
 
     public void testFindRolloverTargetDataStreams() {
-        ProjectMetadata project = ProjectMetadata.builder(randomProjectIdOrDefault())
-            .put(DataStreamTestHelper.newInstance("ds1", Collections.singletonList(new Index(".ds-ds1-000001", "ds1i"))))
-            .put(DataStreamTestHelper.newInstance("ds2", Collections.singletonList(new Index(".ds-ds2-000001", "ds2i"))))
-            .put(DataStreamTestHelper.newInstance("ds3", Collections.singletonList(new Index(".ds-ds3-000001", "ds3i"))))
-            .put(DataStreamTestHelper.newInstance("ds4", Collections.singletonList(new Index(".ds-ds4-000001", "ds4i"))))
-            .build();
-
         ComposableIndexTemplate it1 = ComposableIndexTemplate.builder()
             .indexPatterns(List.of("ds1*", "ds2*", "ds3*"))
             .priority(100L)
@@ -906,7 +899,15 @@ public void testFindRolloverTargetDataStreams() {
             .dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate())
             .build();
 
-        project = ProjectMetadata.builder(project).put("it1", it1).put("it2", it2).put("it5", it5).build();
+        ProjectMetadata project = ProjectMetadata.builder(randomProjectIdOrDefault())
+            .put(DataStreamTestHelper.newInstance("ds1", Collections.singletonList(new Index(".ds-ds1-000001", "ds1i"))))
+            .put(DataStreamTestHelper.newInstance("ds2", Collections.singletonList(new Index(".ds-ds2-000001", "ds2i"))))
+            .put(DataStreamTestHelper.newInstance("ds3", Collections.singletonList(new Index(".ds-ds3-000001", "ds3i"))))
+            .put(DataStreamTestHelper.newInstance("ds4", Collections.singletonList(new Index(".ds-ds4-000001", "ds4i"))))
+            .put("it1", it1)
+            .put("it2", it2)
+            .put("it5", it5)
+            .build();
 
         assertThat(IndexTemplateRegistry.findRolloverTargetDataStreams(project, "it1", it1), containsInAnyOrder("ds1", "ds3"));
         assertThat(IndexTemplateRegistry.findRolloverTargetDataStreams(project, "it2", it2), contains("ds2"));