Skip to content

Commit 7f7427c

Browse files
nicktindallnicktindall
committed
Reduce surface area of change (?)
1 parent b8cc9f9 commit 7f7427c

File tree

34 files changed

+219
-221
lines changed

34 files changed

+219
-221
lines changed

‎modules/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureRepositoryPlugin.java‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
package org.elasticsearch.repositories.azure;
1111

1212
import org.apache.lucene.util.SetOnce;
13-
import org.elasticsearch.cluster.metadata.ProjectId;
14-
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
1513
import org.elasticsearch.cluster.node.DiscoveryNode;
1614
import org.elasticsearch.cluster.service.ClusterService;
1715
import org.elasticsearch.common.settings.Setting;
@@ -63,26 +61,23 @@ public Map<String, Repository.Factory> getRepositories(
6361
ClusterService clusterService,
6462
BigArrays bigArrays,
6563
RecoverySettings recoverySettings,
66-
RepositoriesMetrics repositoriesMetrics
64+
RepositoriesMetrics repositoriesMetrics,
65+
SnapshotMetrics snapshotMetrics
6766
) {
68-
return Collections.singletonMap(AzureRepository.TYPE, new Repository.SnapshotMetricsFactory() {
69-
70-
@Override
71-
public Repository create(ProjectId projectId, RepositoryMetadata metadata, SnapshotMetrics snapshotMetrics) {
72-
AzureStorageService storageService = azureStoreService.get();
73-
assert storageService != null;
74-
return new AzureRepository(
75-
projectId,
76-
metadata,
77-
namedXContentRegistry,
78-
storageService,
79-
clusterService,
80-
bigArrays,
81-
recoverySettings,
82-
repositoriesMetrics,
83-
snapshotMetrics
84-
);
85-
}
67+
return Collections.singletonMap(AzureRepository.TYPE, (projectId, metadata) -> {
68+
AzureStorageService storageService = azureStoreService.get();
69+
assert storageService != null;
70+
return new AzureRepository(
71+
projectId,
72+
metadata,
73+
namedXContentRegistry,
74+
storageService,
75+
clusterService,
76+
bigArrays,
77+
recoverySettings,
78+
repositoriesMetrics,
79+
snapshotMetrics
80+
);
8681
});
8782
}
8883

‎modules/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java‎

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import org.apache.lucene.util.BytesRef;
2424
import org.apache.lucene.util.BytesRefBuilder;
25-
import org.elasticsearch.cluster.metadata.ProjectId;
2625
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
2726
import org.elasticsearch.cluster.service.ClusterService;
2827
import org.elasticsearch.common.BackoffPolicy;
@@ -274,44 +273,42 @@ public Map<String, Repository.Factory> getRepositories(
274273
ClusterService clusterService,
275274
BigArrays bigArrays,
276275
RecoverySettings recoverySettings,
277-
RepositoriesMetrics repositoriesMetrics
276+
RepositoriesMetrics repositoriesMetrics,
277+
SnapshotMetrics snapshotMetrics
278278
) {
279-
return Collections.singletonMap(GoogleCloudStorageRepository.TYPE, new Repository.SnapshotMetricsFactory() {
280-
281-
@Override
282-
public Repository create(ProjectId projectId, RepositoryMetadata metadata, SnapshotMetrics snapshotMetrics) {
283-
return new GoogleCloudStorageRepository(
284-
projectId,
285-
metadata,
286-
registry,
287-
TestGoogleCloudStoragePlugin.this.storageService,
288-
clusterService,
289-
bigArrays,
290-
recoverySettings,
291-
new GcsRepositoryStatsCollector(),
292-
snapshotMetrics
293-
) {
294-
@Override
295-
protected GoogleCloudStorageBlobStore createBlobStore() {
296-
return new GoogleCloudStorageBlobStore(
297-
metadata.settings().get("bucket"),
298-
"test",
299-
metadata.name(),
300-
storageService,
301-
bigArrays,
302-
randomIntBetween(1, 8) * 1024,
303-
BackoffPolicy.noBackoff(),
304-
this.statsCollector()
305-
) {
306-
@Override
307-
long getLargeBlobThresholdInBytes() {
308-
return ByteSizeUnit.MB.toBytes(1);
309-
}
310-
};
311-
}
312-
};
279+
return Collections.singletonMap(
280+
GoogleCloudStorageRepository.TYPE,
281+
(projectId, metadata) -> new GoogleCloudStorageRepository(
282+
projectId,
283+
metadata,
284+
registry,
285+
this.storageService,
286+
clusterService,
287+
bigArrays,
288+
recoverySettings,
289+
new GcsRepositoryStatsCollector(),
290+
snapshotMetrics
291+
) {
292+
@Override
293+
protected GoogleCloudStorageBlobStore createBlobStore() {
294+
return new GoogleCloudStorageBlobStore(
295+
metadata.settings().get("bucket"),
296+
"test",
297+
metadata.name(),
298+
storageService,
299+
bigArrays,
300+
randomIntBetween(1, 8) * 1024,
301+
BackoffPolicy.noBackoff(),
302+
this.statsCollector()
303+
) {
304+
@Override
305+
long getLargeBlobThresholdInBytes() {
306+
return ByteSizeUnit.MB.toBytes(1);
307+
}
308+
};
309+
}
313310
}
314-
});
311+
);
315312
}
316313
}
317314

‎modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
package org.elasticsearch.repositories.gcs;
1111

12-
import org.elasticsearch.cluster.metadata.ProjectId;
13-
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
1412
import org.elasticsearch.cluster.node.DiscoveryNode;
1513
import org.elasticsearch.cluster.service.ClusterService;
1614
import org.elasticsearch.common.settings.Setting;
@@ -56,25 +54,23 @@ public Map<String, Repository.Factory> getRepositories(
5654
ClusterService clusterService,
5755
BigArrays bigArrays,
5856
RecoverySettings recoverySettings,
59-
RepositoriesMetrics repositoriesMetrics
57+
RepositoriesMetrics repositoriesMetrics,
58+
SnapshotMetrics snapshotMetrics
6059
) {
61-
return Collections.singletonMap(GoogleCloudStorageRepository.TYPE, new Repository.SnapshotMetricsFactory() {
62-
63-
@Override
64-
public Repository create(ProjectId projectId, RepositoryMetadata metadata, SnapshotMetrics snapshotMetrics) {
65-
return new GoogleCloudStorageRepository(
66-
projectId,
67-
metadata,
68-
namedXContentRegistry,
69-
GoogleCloudStoragePlugin.this.storageService,
70-
clusterService,
71-
bigArrays,
72-
recoverySettings,
73-
new GcsRepositoryStatsCollector(clusterService.threadPool(), metadata, repositoriesMetrics),
74-
snapshotMetrics
75-
);
76-
}
77-
});
60+
return Collections.singletonMap(
61+
GoogleCloudStorageRepository.TYPE,
62+
(projectId, metadata) -> new GoogleCloudStorageRepository(
63+
projectId,
64+
metadata,
65+
namedXContentRegistry,
66+
this.storageService,
67+
clusterService,
68+
bigArrays,
69+
recoverySettings,
70+
new GcsRepositoryStatsCollector(clusterService.threadPool(), metadata, repositoriesMetrics),
71+
snapshotMetrics
72+
)
73+
);
7874
}
7975

8076
@Override

‎modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -116,25 +116,23 @@ public Map<String, Repository.Factory> getRepositories(
116116
final ClusterService clusterService,
117117
final BigArrays bigArrays,
118118
final RecoverySettings recoverySettings,
119-
final RepositoriesMetrics repositoriesMetrics
119+
final RepositoriesMetrics repositoriesMetrics,
120+
final SnapshotMetrics snapshotMetrics
120121
) {
121122
final S3RepositoriesMetrics s3RepositoriesMetrics = new S3RepositoriesMetrics(repositoriesMetrics);
122-
return Collections.singletonMap(S3Repository.TYPE, new Repository.SnapshotMetricsFactory() {
123-
124-
@Override
125-
public Repository create(ProjectId projectId, RepositoryMetadata metadata, SnapshotMetrics snapshotMetrics) {
126-
return createRepository(
127-
projectId,
128-
metadata,
129-
registry,
130-
clusterService,
131-
bigArrays,
132-
recoverySettings,
133-
s3RepositoriesMetrics,
134-
snapshotMetrics
135-
);
136-
}
137-
});
123+
return Collections.singletonMap(
124+
S3Repository.TYPE,
125+
(projectId, metadata) -> createRepository(
126+
projectId,
127+
metadata,
128+
registry,
129+
clusterService,
130+
bigArrays,
131+
recoverySettings,
132+
s3RepositoriesMetrics,
133+
snapshotMetrics
134+
)
135+
);
138136
}
139137

140138
@Override

‎modules/repository-url/src/main/java/org/elasticsearch/plugin/repository/url/URLRepositoryPlugin.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.elasticsearch.plugins.RepositoryPlugin;
2121
import org.elasticsearch.repositories.RepositoriesMetrics;
2222
import org.elasticsearch.repositories.Repository;
23+
import org.elasticsearch.repositories.SnapshotMetrics;
2324
import org.elasticsearch.repositories.url.URLRepository;
2425
import org.elasticsearch.xcontent.NamedXContentRegistry;
2526

@@ -49,7 +50,8 @@ public Map<String, Repository.Factory> getRepositories(
4950
ClusterService clusterService,
5051
BigArrays bigArrays,
5152
RecoverySettings recoverySettings,
52-
RepositoriesMetrics repositoriesMetrics
53+
RepositoriesMetrics repositoriesMetrics,
54+
SnapshotMetrics snapshotMetrics
5355
) {
5456
return Collections.singletonMap(
5557
URLRepository.TYPE,

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.elasticsearch.plugins.RepositoryPlugin;
2020
import org.elasticsearch.repositories.RepositoriesMetrics;
2121
import org.elasticsearch.repositories.Repository;
22+
import org.elasticsearch.repositories.SnapshotMetrics;
2223
import org.elasticsearch.xcontent.NamedXContentRegistry;
2324

2425
import java.util.Collections;
@@ -67,7 +68,8 @@ public Map<String, Repository.Factory> getRepositories(
6768
ClusterService clusterService,
6869
BigArrays bigArrays,
6970
RecoverySettings recoverySettings,
70-
RepositoriesMetrics repositoriesMetrics
71+
RepositoriesMetrics repositoriesMetrics,
72+
SnapshotMetrics snapshotMetrics
7173
) {
7274
return Collections.singletonMap(
7375
"hdfs",

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.elasticsearch.repositories.RepositoryData;
3636
import org.elasticsearch.repositories.ShardGeneration;
3737
import org.elasticsearch.repositories.ShardSnapshotInfo;
38+
import org.elasticsearch.repositories.SnapshotMetrics;
3839
import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
3940
import org.elasticsearch.repositories.fs.FsRepository;
4041
import org.elasticsearch.snapshots.SnapshotException;
@@ -76,7 +77,8 @@ public Map<String, Repository.Factory> getRepositories(
7677
ClusterService clusterService,
7778
BigArrays bigArrays,
7879
RecoverySettings recoverySettings,
79-
RepositoriesMetrics repositoriesMetrics
80+
RepositoriesMetrics repositoriesMetrics,
81+
SnapshotMetrics snapshotMetrics
8082
) {
8183
return Collections.singletonMap(
8284
TYPE,

‎server/src/internalClusterTest/java/org/elasticsearch/repositories/InvalidRepositoryIT.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ public Map<String, Factory> getRepositories(
8383
ClusterService clusterService,
8484
BigArrays bigArrays,
8585
RecoverySettings recoverySettings,
86-
RepositoriesMetrics repositoriesMetrics
86+
RepositoriesMetrics repositoriesMetrics,
87+
SnapshotMetrics snapshotMetrics
8788
) {
8889
return Collections.singletonMap(
8990
TYPE,

‎server/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryOperationPurposeIT.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.elasticsearch.plugins.RepositoryPlugin;
3030
import org.elasticsearch.repositories.RepositoriesMetrics;
3131
import org.elasticsearch.repositories.Repository;
32+
import org.elasticsearch.repositories.SnapshotMetrics;
3233
import org.elasticsearch.repositories.fs.FsRepository;
3334
import org.elasticsearch.snapshots.AbstractSnapshotIntegTestCase;
3435
import org.elasticsearch.xcontent.NamedXContentRegistry;
@@ -97,7 +98,8 @@ public Map<String, Repository.Factory> getRepositories(
9798
ClusterService clusterService,
9899
BigArrays bigArrays,
99100
RecoverySettings recoverySettings,
100-
RepositoriesMetrics repositoriesMetrics
101+
RepositoriesMetrics repositoriesMetrics,
102+
SnapshotMetrics snapshotMetrics
101103
) {
102104
return Map.of(
103105
ASSERTING_REPO_TYPE,

‎server/src/internalClusterTest/java/org/elasticsearch/snapshots/MetadataLoadingDuringSnapshotRestoreIT.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ public Map<String, Repository.Factory> getRepositories(
224224
ClusterService clusterService,
225225
BigArrays bigArrays,
226226
RecoverySettings recoverySettings,
227-
RepositoriesMetrics repositoriesMetrics
227+
RepositoriesMetrics repositoriesMetrics,
228+
SnapshotMetrics snapshotMetrics
228229
) {
229230
return Collections.singletonMap(
230231
TYPE,

0 commit comments

Comments
 (0)