Remove usages of Metadata.Builder#putDefaultProjectCustom

And replace it with appropriate calls to the equivalent method on
`ProjectMetadata.Builder`.
In most cases this _does not_ make the code project aware, but does
reduce the number of deprecated methods in use.

Author: nielsbauman

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

@@ -1716,13 +1716,6 @@ public Builder putCustom(String type, ProjectCustom custom) {
             return putProjectCustom(type, custom);
         }
 
-        @Deprecated(forRemoval = true)
-        public Builder putDefaultProjectCustom(String type, ProjectCustom custom) {
-            assert projectMetadata.containsKey(ProjectId.DEFAULT) : projectMetadata.keySet();
-            getProject(ProjectId.DEFAULT).putCustom(type, custom);
-            return this;
-        }
-
         public ClusterCustom getCustom(String type) {
             return customs.get(type);
         }

server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java

@@ -29,7 +29,6 @@
 import org.elasticsearch.cluster.SnapshotDeletionsInProgress;
 import org.elasticsearch.cluster.SnapshotsInProgress;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.metadata.RepositoriesMetadata;
@@ -288,8 +287,8 @@ public RegisterRepositoryTask(final RepositoriesService repositoriesService, fin
 
         @Override
         public ClusterState execute(ClusterState currentState) {
-            Metadata.Builder mdBuilder = Metadata.builder(currentState.metadata());
-            RepositoriesMetadata repositories = RepositoriesMetadata.get(currentState);
+            final var project = currentState.metadata().getDefaultProject();
+            RepositoriesMetadata repositories = RepositoriesMetadata.get(project);
             List<RepositoryMetadata> repositoriesMetadata = new ArrayList<>(repositories.repositories().size() + 1);
             for (RepositoryMetadata repositoryMetadata : repositories.repositories()) {
                 if (repositoryMetadata.name().equals(request.name())) {
@@ -347,10 +346,9 @@ public ClusterState execute(ClusterState currentState) {
             if (found == false) {
                 repositoriesMetadata.add(new RepositoryMetadata(request.name(), request.type(), request.settings()));
             }
-            repositories = new RepositoriesMetadata(repositoriesMetadata);
-            mdBuilder.putDefaultProjectCustom(RepositoriesMetadata.TYPE, repositories);
             changed = true;
-            return ClusterState.builder(currentState).metadata(mdBuilder).build();
+            var updatedRepositories = new RepositoriesMetadata(repositoriesMetadata);
+            return currentState.copyAndUpdateProject(project.id(), b -> b.putCustom(RepositoriesMetadata.TYPE, updatedRepositories));
         }
     }
 
@@ -445,16 +443,18 @@ public static void updateRepositoryUuidInMetadata(
             new ClusterStateUpdateTask() {
                 @Override
                 public ClusterState execute(ClusterState currentState) {
-                    final RepositoriesMetadata currentReposMetadata = RepositoriesMetadata.get(currentState);
+                    final var project = currentState.metadata().getProject();
+                    final RepositoriesMetadata currentReposMetadata = RepositoriesMetadata.get(project);
 
                     final RepositoryMetadata repositoryMetadata = currentReposMetadata.repository(repositoryName);
                     if (repositoryMetadata == null || repositoryMetadata.uuid().equals(repositoryUuid)) {
                         return currentState;
                     } else {
                         final RepositoriesMetadata newReposMetadata = currentReposMetadata.withUuid(repositoryName, repositoryUuid);
-                        final Metadata.Builder metadata = Metadata.builder(currentState.metadata())
-                            .putDefaultProjectCustom(RepositoriesMetadata.TYPE, newReposMetadata);
-                        return ClusterState.builder(currentState).metadata(metadata).build();
+                        return currentState.copyAndUpdateProject(
+                            project.id(),
+                            builder -> builder.putCustom(RepositoriesMetadata.TYPE, newReposMetadata)
+                        );
                     }
                 }
 
@@ -519,8 +519,8 @@ public UnregisterRepositoryTask(TimeValue dummyTimeout, String name) {
 
         @Override
         public ClusterState execute(ClusterState currentState) {
-            Metadata.Builder mdBuilder = Metadata.builder(currentState.metadata());
-            RepositoriesMetadata repositories = RepositoriesMetadata.get(currentState);
+            final var project = currentState.metadata().getDefaultProject();
+            RepositoriesMetadata repositories = RepositoriesMetadata.get(project);
             if (repositories.repositories().size() > 0) {
                 List<RepositoryMetadata> repositoriesMetadata = new ArrayList<>(repositories.repositories().size());
                 boolean changed = false;
@@ -535,9 +535,11 @@ public ClusterState execute(ClusterState currentState) {
                     }
                 }
                 if (changed) {
-                    repositories = new RepositoriesMetadata(repositoriesMetadata);
-                    mdBuilder.putDefaultProjectCustom(RepositoriesMetadata.TYPE, repositories);
-                    return ClusterState.builder(currentState).metadata(mdBuilder).build();
+                    final var updatedRepositories = new RepositoriesMetadata(repositoriesMetadata);
+                    return currentState.copyAndUpdateProject(
+                        project.id(),
+                        builder -> builder.putCustom(RepositoriesMetadata.TYPE, updatedRepositories)
+                    );
                 }
             }
             if (Regex.isMatchAllPattern(request.name())) { // we use a wildcard so we don't barf if it's not present.

server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java

@@ -2406,16 +2406,10 @@ private ClusterState getClusterStateWithUpdatedRepositoryGeneration(ClusterState
         if (repoMetadata.generation() != RepositoryData.UNKNOWN_REPO_GEN) {
             throw new RepositoryException(repoMetadata.name(), "Found unexpected initialized repo metadata [" + repoMetadata + "]");
         }
-        return ClusterState.builder(currentState)
-            .metadata(
-                Metadata.builder(currentState.getMetadata())
-                    .putDefaultProjectCustom(
-                        RepositoriesMetadata.TYPE,
-                        RepositoriesMetadata.get(currentState)
-                            .withUpdatedGeneration(repoMetadata.name(), repoData.getGenId(), repoData.getGenId())
-                    )
-            )
-            .build();
+        final var project = currentState.metadata().getDefaultProject();
+        final var updatedMetadata = RepositoriesMetadata.get(project)
+            .withUpdatedGeneration(repoMetadata.name(), repoData.getGenId(), repoData.getGenId());
+        return currentState.copyAndUpdateProject(project.id(), builder -> builder.putCustom(RepositoriesMetadata.TYPE, updatedMetadata));
     }
 
     /**
@@ -2925,17 +2919,14 @@ public ClusterState execute(ClusterState currentState) {
                                 + "]"
                         );
                     }
-                    final RepositoriesMetadata withGenerations = RepositoriesMetadata.get(currentState)
+                    final var project = currentState.metadata().getProject();
+                    final RepositoriesMetadata withGenerations = RepositoriesMetadata.get(project)
                         .withUpdatedGeneration(metadata.name(), newGen, newGen);
                     final RepositoriesMetadata withUuid = meta.uuid().equals(newRepositoryData.getUuid())
                         ? withGenerations
                         : withGenerations.withUuid(metadata.name(), newRepositoryData.getUuid());
                     final ClusterState newClusterState = stateFilter.apply(
-                        ClusterState.builder(currentState)
-                            .metadata(
-                                Metadata.builder(currentState.getMetadata()).putDefaultProjectCustom(RepositoriesMetadata.TYPE, withUuid)
-                            )
-                            .build()
+                        currentState.copyAndUpdateProject(project.id(), b -> b.putCustom(RepositoriesMetadata.TYPE, withUuid))
                     );
                     return updateRepositoryGenerationsIfNecessary(newClusterState, expectedGen, newGen);
                 }