Skip to content

Commit 14e866b

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 4530015 commit 14e866b

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

modules/repository-s3/qa/third-party/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryThirdPartyTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
*/
99
package org.elasticsearch.repositories.s3;
1010

11-
import org.elasticsearch.cluster.metadata.ProjectId;
12-
1311
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
1412
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
1513
import software.amazon.awssdk.services.s3.model.ListMultipartUploadsRequest;
@@ -20,6 +18,7 @@
2018
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
2119

2220
import org.elasticsearch.action.support.master.AcknowledgedResponse;
21+
import org.elasticsearch.cluster.metadata.ProjectId;
2322
import org.elasticsearch.cluster.service.ClusterService;
2423
import org.elasticsearch.common.blobstore.OptionalBytesReference;
2524
import org.elasticsearch.common.bytes.BytesArray;

modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
package org.elasticsearch.repositories.s3;
1010

1111
import fixture.s3.S3HttpHandler;
12-
13-
import org.elasticsearch.cluster.metadata.ProjectId;
14-
1512
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
1613
import software.amazon.awssdk.core.internal.http.pipeline.stages.ApplyTransactionIdStage;
1714
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
@@ -25,6 +22,7 @@
2522
import org.apache.logging.log4j.core.LogEvent;
2623
import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
2724
import org.elasticsearch.action.support.broadcast.BroadcastResponse;
25+
import org.elasticsearch.cluster.metadata.ProjectId;
2826
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
2927
import org.elasticsearch.cluster.service.ClusterService;
3028
import org.elasticsearch.common.Strings;
@@ -608,7 +606,16 @@ protected S3Repository createRepository(
608606
RecoverySettings recoverySettings,
609607
S3RepositoriesMetrics s3RepositoriesMetrics
610608
) {
611-
return new S3Repository(ProjectId.DEFAULT, metadata, registry, getService(), clusterService, bigArrays, recoverySettings, s3RepositoriesMetrics) {
609+
return new S3Repository(
610+
ProjectId.DEFAULT,
611+
metadata,
612+
registry,
613+
getService(),
614+
clusterService,
615+
bigArrays,
616+
recoverySettings,
617+
s3RepositoriesMetrics
618+
) {
612619

613620
@Override
614621
public BlobStore blobStore() {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99

1010
package org.elasticsearch.repositories.s3;
1111

12-
import org.elasticsearch.cluster.metadata.ProjectId;
13-
14-
import org.elasticsearch.core.Nullable;
15-
1612
import software.amazon.awssdk.awscore.AwsRequest;
1713
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
1814
import software.amazon.awssdk.core.exception.SdkException;
@@ -31,6 +27,7 @@
3127
import org.apache.logging.log4j.Logger;
3228
import org.elasticsearch.ElasticsearchException;
3329
import org.elasticsearch.ExceptionsHelper;
30+
import org.elasticsearch.cluster.metadata.ProjectId;
3431
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
3532
import org.elasticsearch.common.BackoffPolicy;
3633
import org.elasticsearch.common.Strings;
@@ -42,6 +39,7 @@
4239
import org.elasticsearch.common.blobstore.OperationPurpose;
4340
import org.elasticsearch.common.unit.ByteSizeValue;
4441
import org.elasticsearch.common.util.BigArrays;
42+
import org.elasticsearch.core.Nullable;
4543
import org.elasticsearch.core.TimeValue;
4644
import org.elasticsearch.repositories.RepositoriesMetrics;
4745
import org.elasticsearch.rest.RestStatus;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99

1010
package org.elasticsearch.repositories.s3;
1111

12-
import org.elasticsearch.cluster.metadata.ProjectId;
13-
1412
import software.amazon.awssdk.regions.Region;
1513
import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
1614

1715
import org.apache.lucene.util.SetOnce;
16+
import org.elasticsearch.cluster.metadata.ProjectId;
1817
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
1918
import org.elasticsearch.cluster.service.ClusterService;
2019
import org.elasticsearch.common.settings.Setting;

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobContainerRetriesTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
package org.elasticsearch.repositories.s3;
1010

1111
import fixture.s3.S3HttpHandler;
12-
13-
import org.elasticsearch.cluster.metadata.ProjectId;
14-
1512
import software.amazon.awssdk.core.exception.SdkClientException;
1613
import software.amazon.awssdk.core.exception.SdkException;
1714
import software.amazon.awssdk.services.s3.model.S3Exception;
@@ -24,6 +21,7 @@
2421
import org.apache.http.conn.DnsResolver;
2522
import org.apache.logging.log4j.Level;
2623
import org.elasticsearch.ExceptionsHelper;
24+
import org.elasticsearch.cluster.metadata.ProjectId;
2725
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
2826
import org.elasticsearch.common.BackoffPolicy;
2927
import org.elasticsearch.common.Strings;

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99

1010
package org.elasticsearch.repositories.s3;
1111

12-
import org.elasticsearch.cluster.metadata.ProjectId;
13-
1412
import software.amazon.awssdk.http.SdkHttpClient;
1513
import software.amazon.awssdk.services.s3.S3Client;
1614

15+
import org.elasticsearch.cluster.metadata.ProjectId;
1716
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
1817
import org.elasticsearch.common.ReferenceDocs;
1918
import org.elasticsearch.common.settings.ClusterSettings;

0 commit comments

Comments
 (0)