tweak

Author: ywangd

plugins/repository-hdfs/src/main/java/org/elasticsearch/repositories/hdfs/HdfsPlugin.java

@@ -115,7 +115,15 @@ public Map<String, Repository.Factory> getRepositories(
     ) {
         return Collections.singletonMap(
             "hdfs",
-            (projectId, metadata) -> new HdfsRepository(projectId, metadata, env, namedXContentRegistry, clusterService, bigArrays, recoverySettings)
+            (projectId, metadata) -> new HdfsRepository(
+                projectId,
+                metadata,
+                env,
+                namedXContentRegistry,
+                clusterService,
+                bigArrays,
+                recoverySettings
+            )
         );
     }
 }

server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsServiceIT.java

@@ -80,7 +80,15 @@ public Map<String, Repository.Factory> getRepositories(
         ) {
             return Collections.singletonMap(
                 TYPE,
-                (projectId, metadata) -> new FailingRepo(projectId, metadata, env, namedXContentRegistry, clusterService, bigArrays, recoverySettings)
+                (projectId, metadata) -> new FailingRepo(
+                    projectId,
+                    metadata,
+                    env,
+                    namedXContentRegistry,
+                    clusterService,
+                    bigArrays,
+                    recoverySettings
+                )
             );
         }
     }

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

@@ -18,7 +18,6 @@
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.core.CheckedConsumer;
-import org.elasticsearch.core.FixForMultiProject;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;

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

@@ -54,7 +54,15 @@ public RepositoriesModule(
         Map<String, Repository.Factory> factories = new HashMap<>();
         factories.put(
             FsRepository.TYPE,
-            (projectId, metadata) -> new FsRepository(projectId, metadata, env, namedXContentRegistry, clusterService, bigArrays, recoverySettings)
+            (projectId, metadata) -> new FsRepository(
+                projectId,
+                metadata,
+                env,
+                namedXContentRegistry,
+                clusterService,
+                bigArrays,
+                recoverySettings
+            )
         );
 
         for (RepositoryPlugin repoPlugin : repoPlugins) {

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

@@ -69,7 +69,6 @@
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -846,7 +845,6 @@ private static Repository createRepository(
         BiFunction<ProjectId, RepositoryMetadata, Repository> defaultFactory
     ) {
         logger.debug("creating repository [{}][{}]", repositoryMetadata.type(), repositoryMetadata.name());
-        @FixForMultiProject(description = "should defaultFactory handle projectId?")
         Repository.Factory factory = factories.get(repositoryMetadata.type());
         if (factory == null) {
             return defaultFactory.apply(projectId, repositoryMetadata);

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

@@ -18,7 +18,6 @@
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.core.CheckedConsumer;
-import org.elasticsearch.core.FixForMultiProject;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;

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

@@ -86,7 +86,6 @@
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.core.AbstractRefCounted;
 import org.elasticsearch.core.CheckedConsumer;
-import org.elasticsearch.core.FixForMultiProject;
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.RefCounted;

server/src/test/java/org/elasticsearch/health/node/tracker/RepositoriesHealthTrackerTests.java

@@ -68,7 +68,9 @@ public void testGetHealthCorrectRepo() {
 
     public void testGetHealthUnknownType() {
         var repo = createRepositoryMetadata();
-        when(repositoriesService.getRepositories()).thenReturn(Map.of(randomAlphaOfLength(10), new UnknownTypeRepository(randomProjectIdOrDefault(), repo)));
+        when(repositoriesService.getRepositories()).thenReturn(
+            Map.of(randomAlphaOfLength(10), new UnknownTypeRepository(randomProjectIdOrDefault(), repo))
+        );
 
         var health = repositoriesHealthTracker.determineCurrentHealth();
 

server/src/test/java/org/elasticsearch/repositories/UnknownTypeRepositoryTests.java

@@ -16,7 +16,10 @@
 
 public class UnknownTypeRepositoryTests extends ESTestCase {
 
-    private UnknownTypeRepository repository = new UnknownTypeRepository(randomProjectIdOrDefault(), new RepositoryMetadata("name", "type", Settings.EMPTY));
+    private UnknownTypeRepository repository = new UnknownTypeRepository(
+        randomProjectIdOrDefault(),
+        new RepositoryMetadata("name", "type", Settings.EMPTY)
+    );
 
     public void testShouldThrowWhenGettingMetadata() {
         expectThrows(RepositoryException.class, () -> repository.getSnapshotGlobalMetadata(new SnapshotId("name", "uuid")));

test/framework/src/main/java/org/elasticsearch/snapshots/mockstore/MockRepository.java

@@ -193,7 +193,15 @@ public MockRepository(
         BigArrays bigArrays,
         RecoverySettings recoverySettings
     ) {
-        super(projectId, overrideSettings(metadata, environment), environment, namedXContentRegistry, clusterService, bigArrays, recoverySettings);
+        super(
+            projectId,
+            overrideSettings(metadata, environment),
+            environment,
+            namedXContentRegistry,
+            clusterService,
+            bigArrays,
+            recoverySettings
+        );
         randomControlIOExceptionRate = metadata.settings().getAsDouble("random_control_io_exception_rate", 0.0);
         randomDataFileIOExceptionRate = metadata.settings().getAsDouble("random_data_file_io_exception_rate", 0.0);
         randomIOExceptionPattern = Pattern.compile(metadata.settings().get("random_io_exception_pattern", ".*")).asMatchPredicate();