Skip to content

Commit 91a64bd

Browse files
krimszkrimsz
committed
Reformat code
1 parent aa40fb7 commit 91a64bd

File tree

8 files changed

+840
-624
lines changed

8 files changed

+840
-624
lines changed

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/core/AwsAutoConfiguration.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,12 @@
1515
*/
1616
package io.awspring.cloud.autoconfigure.core;
1717

18-
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
19-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
20-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2118
import org.springframework.boot.context.properties.EnableConfigurationProperties;
22-
import org.springframework.boot.context.properties.PropertyMapper;
2319
import org.springframework.context.annotation.Bean;
2420
import org.springframework.context.annotation.Configuration;
2521
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
26-
import software.amazon.awssdk.metrics.MetricPublisher;
27-
import software.amazon.awssdk.metrics.publishers.cloudwatch.CloudWatchMetricPublisher;
2822
import software.amazon.awssdk.regions.providers.AwsRegionProvider;
2923

30-
import java.time.Duration;
31-
3224
/**
3325
* Autoconfigures AWS environment.
3426
*

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/core/AwsClientBuilderConfigurer.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,13 @@
2020
import io.awspring.cloud.core.SpringCloudClientConfiguration;
2121
import java.time.Duration;
2222
import java.util.Optional;
23-
24-
import org.springframework.beans.factory.ObjectProvider;
2523
import org.springframework.boot.context.properties.PropertyMapper;
2624
import org.springframework.lang.Nullable;
2725
import org.springframework.util.Assert;
2826
import org.springframework.util.ClassUtils;
2927
import org.springframework.util.StringUtils;
3028
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
3129
import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
32-
import software.amazon.awssdk.core.client.builder.SdkClientBuilder;
3330
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
3431
import software.amazon.awssdk.metrics.MetricPublisher;
3532
import software.amazon.awssdk.metrics.publishers.cloudwatch.CloudWatchMetricPublisher;
@@ -103,9 +100,11 @@ public Region resolveRegion(@Nullable AwsClientProperties clientProperties) {
103100

104101
CloudWatchAsyncClientBuilder cloudWatchAsyncClientBuilder = CloudWatchAsyncClient.builder();
105102
CloudWatchProperties cloudWatchProperties = new CloudWatchProperties();
106-
propertyMapper.from(cloudWatchProperties.getEndpoint()).whenNonNull().to(cloudWatchProperties::setEndpoint);
103+
propertyMapper.from(cloudWatchProperties.getEndpoint()).whenNonNull()
104+
.to(cloudWatchProperties::setEndpoint);
107105
propertyMapper.from(cloudWatchProperties.getRegion()).whenNonNull().to(cloudWatchProperties::setRegion);
108-
CloudWatchAsyncClient cloudWatchAsyncClient = awsClientBuilderConfigurer.configure(cloudWatchAsyncClientBuilder, cloudWatchProperties, null, null).build();
106+
CloudWatchAsyncClient cloudWatchAsyncClient = awsClientBuilderConfigurer
107+
.configure(cloudWatchAsyncClientBuilder, cloudWatchProperties, null, null).build();
109108

110109
CloudWatchMetricPublisher.Builder builder = CloudWatchMetricPublisher.builder();
111110
builder.cloudWatchClient(cloudWatchAsyncClient);

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/core/CloudWatchMetricsPublisherAutoConfiguration.java

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
1+
/*
2+
* Copyright 2013-2022 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package io.awspring.cloud.autoconfigure.core;
217

3-
import io.awspring.cloud.autoconfigure.AwsClientProperties;
418
import io.awspring.cloud.autoconfigure.metrics.CloudWatchProperties;
19+
import java.time.Duration;
520
import org.springframework.beans.factory.ObjectProvider;
621
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
722
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -13,18 +28,13 @@
1328
import org.springframework.context.annotation.Configuration;
1429
import software.amazon.awssdk.metrics.MetricPublisher;
1530
import software.amazon.awssdk.metrics.publishers.cloudwatch.CloudWatchMetricPublisher;
16-
import software.amazon.awssdk.regions.providers.AwsRegionProvider;
1731
import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;
1832
import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClientBuilder;
19-
import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
20-
21-
import java.time.Duration;
22-
import java.util.Optional;
2333

2434
@Configuration(proxyBeanMethods = false)
2535
@EnableConfigurationProperties(AwsProperties.class)
2636
@ConditionalOnClass({ CloudWatchMetricPublisher.class })
27-
@AutoConfigureAfter({ CredentialsProviderAutoConfiguration.class, RegionProviderAutoConfiguration.class})
37+
@AutoConfigureAfter({ CredentialsProviderAutoConfiguration.class, RegionProviderAutoConfiguration.class })
2838
public class CloudWatchMetricsPublisherAutoConfiguration {
2939

3040
private final AwsProperties awsProperties;
@@ -36,22 +46,25 @@ public CloudWatchMetricsPublisherAutoConfiguration(AwsProperties awsProperties)
3646
@Bean
3747
@ConditionalOnMissingBean
3848
@ConditionalOnProperty(name = "spring.cloud.aws.metrics.enabled", havingValue = "true", matchIfMissing = true)
39-
MetricPublisher cloudWatchMetricPublisher(AwsClientBuilderConfigurer awsClientBuilderConfigurer, ObjectProvider<AwsClientCustomizer<CloudWatchAsyncClientBuilder>> configurer) {
49+
MetricPublisher cloudWatchMetricPublisher(AwsClientBuilderConfigurer awsClientBuilderConfigurer,
50+
ObjectProvider<AwsClientCustomizer<CloudWatchAsyncClientBuilder>> configurer) {
4051
PropertyMapper propertyMapper = PropertyMapper.get();
4152

4253
CloudWatchAsyncClientBuilder cloudWatchAsyncClientBuilder = CloudWatchAsyncClient.builder();
4354
CloudWatchProperties cloudWatchProperties = new CloudWatchProperties();
4455
propertyMapper.from(cloudWatchProperties.getEndpoint()).whenNonNull().to(cloudWatchProperties::setEndpoint);
4556
propertyMapper.from(cloudWatchProperties.getRegion()).whenNonNull().to(cloudWatchProperties::setRegion);
46-
CloudWatchAsyncClient cloudWatchAsyncClient = awsClientBuilderConfigurer.configure(cloudWatchAsyncClientBuilder, cloudWatchProperties, configurer.getIfAvailable(), null).build();
57+
CloudWatchAsyncClient cloudWatchAsyncClient = awsClientBuilderConfigurer
58+
.configure(cloudWatchAsyncClientBuilder, cloudWatchProperties, configurer.getIfAvailable(), null)
59+
.build();
4760

4861
CloudWatchMetricPublisher.Builder builder = CloudWatchMetricPublisher.builder();
4962
builder.cloudWatchClient(cloudWatchAsyncClient);
5063

5164
if (awsProperties.getMetrics() != null) {
5265
propertyMapper.from(awsProperties.getMetrics()::getNamespace).whenNonNull().to(builder::namespace);
5366
propertyMapper.from(awsProperties.getMetrics()::getUploadFrequencyInSeconds).whenNonNull()
54-
.to(v -> builder.uploadFrequency(Duration.ofSeconds(v)));
67+
.to(v -> builder.uploadFrequency(Duration.ofSeconds(v)));
5568
}
5669
return builder.build();
5770
}

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/core/CloudWatchMetricsPublisherAutoConfigurationTests.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@
1515
*/
1616
package io.awspring.cloud.autoconfigure.core;
1717

18+
import static org.assertj.core.api.Assertions.assertThat;
19+
1820
import org.junit.jupiter.api.Test;
1921
import org.springframework.boot.autoconfigure.AutoConfigurations;
2022
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2123
import software.amazon.awssdk.metrics.MetricPublisher;
2224

23-
import static org.assertj.core.api.Assertions.assertThat;
24-
2525
class CloudWatchMetricsPublisherAutoConfigurationTests {
2626

2727
private static ApplicationContextRunner contextRunner = new ApplicationContextRunner()
28-
.withPropertyValues("spring.cloud.aws.region.static:eu-west-1")
29-
.withConfiguration(AutoConfigurations.of(RegionProviderAutoConfiguration.class,
30-
CredentialsProviderAutoConfiguration.class,
31-
CloudWatchMetricsPublisherAutoConfiguration.class,
32-
AwsAutoConfiguration.class));
28+
.withPropertyValues("spring.cloud.aws.region.static:eu-west-1")
29+
.withConfiguration(AutoConfigurations.of(RegionProviderAutoConfiguration.class,
30+
CredentialsProviderAutoConfiguration.class, CloudWatchMetricsPublisherAutoConfiguration.class,
31+
AwsAutoConfiguration.class));
3332

3433
@Test
3534
void createsMetricsPublisherByDefaultWhenDependencyInClasspath() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class DynamoDbAutoConfigurationTest {
5757
.withPropertyValues("spring.cloud.aws.region.static:eu-west-1")
5858
.withConfiguration(AutoConfigurations.of(RegionProviderAutoConfiguration.class,
5959
CredentialsProviderAutoConfiguration.class, CloudWatchMetricsPublisherAutoConfiguration.class,
60-
DynamoDbAutoConfiguration.class, AwsAutoConfiguration.class));
60+
DynamoDbAutoConfiguration.class, AwsAutoConfiguration.class));
6161

6262
@Test
6363
void dynamoDBAutoConfigurationIsDisabled() {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ class S3AutoConfigurationTests {
6868
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
6969
.withPropertyValues("spring.cloud.aws.region.static:eu-west-1")
7070
.withConfiguration(AutoConfigurations.of(AwsAutoConfiguration.class, RegionProviderAutoConfiguration.class,
71-
CloudWatchMetricsPublisherAutoConfiguration.class, CredentialsProviderAutoConfiguration.class, S3AutoConfiguration.class));
71+
CloudWatchMetricsPublisherAutoConfiguration.class, CredentialsProviderAutoConfiguration.class,
72+
S3AutoConfiguration.class));
7273

7374
@Test
7475
void createsS3ClientBean() {

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/ses/SesAutoConfigurationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ class SesAutoConfigurationTest {
5555
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5656
.withPropertyValues("spring.cloud.aws.region.static:eu-west-1")
5757
.withConfiguration(AutoConfigurations.of(AwsAutoConfiguration.class, RegionProviderAutoConfiguration.class,
58-
CloudWatchMetricsPublisherAutoConfiguration.class, CredentialsProviderAutoConfiguration.class, SesAutoConfiguration.class));
58+
CloudWatchMetricsPublisherAutoConfiguration.class, CredentialsProviderAutoConfiguration.class,
59+
SesAutoConfiguration.class));
5960

6061
@Test
6162
void mailSenderWithJavaMail() {

0 commit comments

Comments
 (0)