Skip to content

Commit f7eb0ab

Browse files
maciejwalkowiakmaciejwalkowiak
authored
Reformat code (#942)
1 parent e8019c3 commit f7eb0ab

File tree

29 files changed

+71
-88
lines changed

29 files changed

+71
-88
lines changed

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLoaderIntegrationTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.mockito.ArgumentMatchers.any;
2121
import static org.mockito.Mockito.mock;
2222
import static org.mockito.Mockito.when;
23-
import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SSM;
2423
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
2524

2625
import io.awspring.cloud.autoconfigure.ConfiguredAwsClient;

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.mockito.ArgumentMatchers.any;
2121
import static org.mockito.Mockito.mock;
2222
import static org.mockito.Mockito.when;
23-
import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SECRETSMANAGER;
2423
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
2524

2625
import io.awspring.cloud.autoconfigure.ConfiguredAwsClient;
@@ -272,8 +271,7 @@ void serviceSpecificEndpointTakesPrecedenceOverGlobalAwsRegion() {
272271
"--spring.config.import=aws-secretsmanager:/config/spring;/config/second",
273272
"--spring.cloud.aws.secretsmanager.region=" + REGION,
274273
"--spring.cloud.aws.endpoint=http://non-existing-host/",
275-
"--spring.cloud.aws.secretsmanager.endpoint="
276-
+ localstack.getEndpoint(),
274+
"--spring.cloud.aws.secretsmanager.endpoint=" + localstack.getEndpoint(),
277275
"--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop",
278276
"--spring.cloud.aws.region.static=eu-west-1")) {
279277
assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests");
@@ -290,8 +288,8 @@ void secretsManagerClientUsesStsCredentials() throws IOException {
290288

291289
try (ConfigurableApplicationContext context = application.run(
292290
"--spring.config.import=optional:aws-secretsmanager:/config/spring;/config/second",
293-
"--spring.cloud.aws.endpoint=" + localstack.getEndpoint(),
294-
"--spring.cloud.aws.region.static=" + REGION, "--spring.cloud.aws.credentials.sts.role-arn=develop",
291+
"--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.region.static=" + REGION,
292+
"--spring.cloud.aws.credentials.sts.role-arn=develop",
295293
"--spring.cloud.aws.credentials.sts.enabled=true",
296294
"--spring.cloud.aws.credentials.sts.web-identity-token-file=" + tempFile.getAbsolutePath())) {
297295
assertThat(context.getBean(AwsCredentialsProvider.class))

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/metrics/CloudWatchExportAutoConfigurationIntegrationTests.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
package io.awspring.cloud.autoconfigure.metrics;
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.testcontainers.containers.localstack.LocalStackContainer.Service.CLOUDWATCH;
20-
import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SSM;
2119
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
2220

2321
import io.micrometer.core.instrument.Counter;
@@ -59,8 +57,7 @@ class CloudWatchExportAutoConfigurationIntegrationTests {
5957

6058
@DynamicPropertySource
6159
static void registerProperties(DynamicPropertyRegistry registry) {
62-
registry.add("spring.cloud.aws.cloudwatch.endpoint",
63-
() -> localstack.getEndpoint());
60+
registry.add("spring.cloud.aws.cloudwatch.endpoint", () -> localstack.getEndpoint());
6461
}
6562

6663
@Test

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/s3/ConfiguredTransferManager.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@ public class ConfiguredTransferManager {
3232

3333
ConfiguredTransferManager(S3TransferManager s3TransferManager) {
3434
// todo: this is getting too hacky
35-
if (s3TransferManager.getClass().getName().equals("software.amazon.awssdk.transfer.s3.internal.CrtS3TransferManager")) {
36-
S3TransferManager delegate = (S3TransferManager) ReflectionTestUtils.getField(s3TransferManager, "delegate");
35+
if (s3TransferManager.getClass().getName()
36+
.equals("software.amazon.awssdk.transfer.s3.internal.CrtS3TransferManager")) {
37+
S3TransferManager delegate = (S3TransferManager) ReflectionTestUtils.getField(s3TransferManager,
38+
"delegate");
3739
this.transferConfiguration = (TransferManagerConfiguration) ReflectionTestUtils.getField(delegate,
3840
"transferConfiguration");
3941
this.client = (S3AsyncClient) ReflectionTestUtils.getField(s3TransferManager, "s3AsyncClient");
40-
} else {
42+
}
43+
else {
4144
this.transferConfiguration = (TransferManagerConfiguration) ReflectionTestUtils.getField(s3TransferManager,
4245
"transferConfiguration");
4346
this.client = (S3AsyncClient) ReflectionTestUtils.getField(s3TransferManager, "s3AsyncClient");

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/sqs/SqsAutoConfigurationIntegrationTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package io.awspring.cloud.autoconfigure.sqs;
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
2019

2120
import io.awspring.cloud.autoconfigure.core.AwsAutoConfiguration;
2221
import io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration;

‎spring-cloud-aws-dynamodb/src/test/java/io/awspring/cloud/dynamodb/DynamoDbTemplateIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public class DynamoDbTemplateIntegrationTest {
6464

6565
@BeforeAll
6666
public static void createTable() {
67-
DynamoDbClient dynamoDbClient = DynamoDbClient.builder()
68-
.endpointOverride(localstack.getEndpoint()).region(Region.of(localstack.getRegion()))
67+
DynamoDbClient dynamoDbClient = DynamoDbClient.builder().endpointOverride(localstack.getEndpoint())
68+
.region(Region.of(localstack.getRegion()))
6969
.credentialsProvider(StaticCredentialsProvider
7070
.create(AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())))
7171
.build();

‎spring-cloud-aws-parameter-store/src/main/java/io/awspring/cloud/parameterstore/ParameterStorePropertySource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public Object getProperty(String name) {
8787
private void getParameters(GetParametersByPathRequest paramsRequest) {
8888
GetParametersByPathResponse paramsResult = this.source.getParametersByPath(paramsRequest);
8989
for (Parameter parameter : paramsResult.parameters()) {
90-
String key = parameter.name().replace(this.parameterPath, "").replace('/', '.')
91-
.replaceAll("_(\\d)_", "[$1]");
90+
String key = parameter.name().replace(this.parameterPath, "").replace('/', '.').replaceAll("_(\\d)_",
91+
"[$1]");
9292
LOG.debug("Populating property retrieved from AWS Parameter Store: " + key);
9393
String propertyKey = prefix != null ? prefix + key : key;
9494
this.properties.put(propertyKey, parameter.value());

‎spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientIntegrationTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ static void beforeAll() {
5555
// test work on environments without AWS cli configured
5656
StaticCredentialsProvider credentialsProvider = StaticCredentialsProvider
5757
.create(AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey()));
58-
client = new CrossRegionS3Client(
59-
S3Client.builder().region(Region.of(localstack.getRegion())).credentialsProvider(credentialsProvider)
60-
.endpointOverride(localstack.getEndpoint()));
58+
client = new CrossRegionS3Client(S3Client.builder().region(Region.of(localstack.getRegion()))
59+
.credentialsProvider(credentialsProvider).endpointOverride(localstack.getEndpoint()));
6160
}
6261

6362
@Test

‎spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3PathMatchingResourcePatternResolver.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ private Resource[] findResourcesInBucketsWithPatterns(String locationPattern) {
180180
String s3KeyPattern = substringAfter(locationPattern, s3BucketNamePattern + "/");
181181
LOGGER.debug("The s3 key pattern is {}", s3KeyPattern);
182182
return (pathMatcher.isPattern(s3BucketNamePattern) ? findMatchingBuckets(s3BucketNamePattern)
183-
: List.of(s3BucketNamePattern)).stream().flatMap(
184-
s3BucketName -> findResourcesInBucketWithKeyPattern(s3BucketName, s3KeyPattern).stream())
185-
.toArray(Resource[]::new);
183+
: List.of(s3BucketNamePattern)).stream()
184+
.flatMap(s3BucketName -> findResourcesInBucketWithKeyPattern(s3BucketName, s3KeyPattern).stream())
185+
.toArray(Resource[]::new);
186186
}
187187

188188
/**

‎spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/main/java/io/awspring/cloud/s3/S3Template.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
2828
import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
2929
import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
30-
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
3130
import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
31+
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
3232
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
3333
import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
3434
import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
@@ -80,7 +80,8 @@ public boolean bucketExists(String bucketName) {
8080
Assert.notNull(bucketName, "bucketName is required");
8181
try {
8282
s3Client.headBucket(request -> request.bucket(bucketName));
83-
} catch (NoSuchBucketException e) {
83+
}
84+
catch (NoSuchBucketException e) {
8485
return false;
8586
}
8687
return true;

0 commit comments

Comments
 (0)