Remove deprecated Metadata.Builder#putProjectCustom

Replaces the deprecated method with appropriate substitute.

Author: nielsbauman

server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java

@@ -1210,7 +1210,7 @@ public static Metadata readFrom(StreamInput in) throws IOException {
             for (int i = 0; i < size; i++) {
                 projectBuilder.put(IndexTemplateMetadata.readFrom(in));
             }
-            readBwcCustoms(in, builder);
+            readBwcCustoms(in, builder, projectBuilder);
 
             int reservedStateSize = in.readVInt();
             for (int i = 0; i < reservedStateSize; i++) {
@@ -1229,7 +1229,7 @@ public static Metadata readFrom(StreamInput in) throws IOException {
         return builder.build();
     }
 
-    private static void readBwcCustoms(StreamInput in, Builder builder) throws IOException {
+    private static void readBwcCustoms(StreamInput in, Builder builder, ProjectMetadata.Builder projectBuilder) throws IOException {
         final Set<String> clusterScopedNames = in.namedWriteableRegistry().getReaders(ClusterCustom.class).keySet();
         final Set<String> projectScopedNames = in.namedWriteableRegistry().getReaders(ProjectCustom.class).keySet();
         final int count = in.readVInt();
@@ -1245,9 +1245,9 @@ private static void readBwcCustoms(StreamInput in, Builder builder) throws IOExc
                 if (custom instanceof PersistentTasksCustomMetadata persistentTasksCustomMetadata) {
                     final var tuple = persistentTasksCustomMetadata.split();
                     builder.putCustom(tuple.v1().getWriteableName(), tuple.v1());
-                    builder.putProjectCustom(tuple.v2().getWriteableName(), tuple.v2());
+                    projectBuilder.putCustom(tuple.v2().getWriteableName(), tuple.v2());
                 } else {
-                    builder.putProjectCustom(custom.getWriteableName(), custom);
+                    projectBuilder.putCustom(custom.getWriteableName(), custom);
                 }
             } else {
                 throw new IllegalArgumentException("Unknown custom name [" + name + "]");
@@ -1569,7 +1569,8 @@ public Builder putCustom(String type, ClusterCustom custom) {
 
         @Deprecated(forRemoval = true)
         public Builder putCustom(String type, ProjectCustom custom) {
-            return putProjectCustom(type, custom);
+            getSingleProject().putCustom(type, Objects.requireNonNull(custom, type));
+            return this;
         }
 
         public ClusterCustom getCustom(String type) {
@@ -1592,12 +1593,6 @@ public Builder customs(Map<String, ClusterCustom> clusterCustoms) {
             return this;
         }
 
-        @Deprecated(forRemoval = true)
-        public Builder putProjectCustom(String type, ProjectCustom custom) {
-            getSingleProject().putCustom(type, Objects.requireNonNull(custom, type));
-            return this;
-        }
-
         @Deprecated(forRemoval = true)
         public Builder projectCustoms(Map<String, ProjectCustom> projectCustoms) {
             projectCustoms.forEach((key, value) -> Objects.requireNonNull(value, key));

server/src/test/java/org/elasticsearch/cluster/metadata/MetadataPersistentTasksTests.java

@@ -306,13 +306,16 @@ private Tuple<Metadata, Metadata> randomMetadataAndUpdate() {
                     ClusterPersistentTasksCustomMetadata::new
                 )
             )
-            .putProjectCustom(
-                PersistentTasksCustomMetadata.TYPE,
-                mutatePersistentTasks(
-                    PersistentTasksCustomMetadata.get(before.getProject(Metadata.DEFAULT_PROJECT_ID)),
-                    MetadataPersistentTasksTests::oneProjectPersistentTask,
-                    PersistentTasksCustomMetadata::new
-                )
+            .put(
+                ProjectMetadata.builder(before.getProject(Metadata.DEFAULT_PROJECT_ID))
+                    .putCustom(
+                        PersistentTasksCustomMetadata.TYPE,
+                        mutatePersistentTasks(
+                            PersistentTasksCustomMetadata.get(before.getProject(Metadata.DEFAULT_PROJECT_ID)),
+                            MetadataPersistentTasksTests::oneProjectPersistentTask,
+                            PersistentTasksCustomMetadata::new
+                        )
+                    )
             )
             .build();
         return new Tuple<>(before, after);

server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java

@@ -1359,7 +1359,6 @@ public void testBuilderRejectsNullCustom() {
             expectThrows(NullPointerException.class, () -> builder.putCustom(key, (Metadata.ClusterCustom) null)).getMessage(),
             containsString(key)
         );
-        assertThat(expectThrows(NullPointerException.class, () -> builder.putProjectCustom(key, null)).getMessage(), containsString(key));
     }
 
     public void testBuilderRejectsNullInCustoms() {