Skip to content

Commit 772937a

Browse files
MatejNedicMatejNedic
authored
Spring Cloud AWS 4.0.0-M1 release upgrades (#1521)
1 parent 2e10f3f commit 772937a

File tree

56 files changed

+181
-197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+181
-197
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-build</artifactId>
9-
<version>5.0.0-M1</version>
9+
<version>5.0.0-RC1</version>
1010
<relativePath/><!-- lookup parent from repository -->
1111
</parent>
1212

‎spring-cloud-aws-autoconfigure/pom.xml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</dependency>
3232
<dependency>
3333
<groupId>org.springframework.boot</groupId>
34-
<artifactId>spring-boot-metrics</artifactId>
34+
<artifactId>spring-boot-micrometer-metrics</artifactId>
3535
<optional>true</optional>
3636
</dependency>
3737
<dependency>
@@ -138,12 +138,12 @@
138138
</dependency>
139139
<dependency>
140140
<groupId>org.testcontainers</groupId>
141-
<artifactId>localstack</artifactId>
141+
<artifactId>testcontainers-localstack</artifactId>
142142
<scope>test</scope>
143143
</dependency>
144144
<dependency>
145145
<groupId>org.testcontainers</groupId>
146-
<artifactId>junit-jupiter</artifactId>
146+
<artifactId>testcontainers-junit-jupiter</artifactId>
147147
<scope>test</scope>
148148
</dependency>
149149
<dependency>
@@ -161,14 +161,24 @@
161161
<artifactId>spring-cloud-commons</artifactId>
162162
<optional>true</optional>
163163
</dependency>
164+
<dependency>
165+
<groupId>org.springframework.boot</groupId>
166+
<artifactId>spring-boot-micrometer-metrics-test</artifactId>
167+
<scope>test</scope>
168+
</dependency>
169+
<dependency>
170+
<groupId>com.fasterxml.jackson.datatype</groupId>
171+
<artifactId>jackson-datatype-jsr310</artifactId>
172+
<scope>test</scope>
173+
</dependency>
164174
<dependency>
165175
<groupId>org.springframework.cloud</groupId>
166176
<artifactId>spring-cloud-context</artifactId>
167177
<optional>true</optional>
168178
</dependency>
169179
<dependency>
170180
<groupId>org.springframework.boot</groupId>
171-
<artifactId>spring-boot-starter-aop</artifactId>
181+
<artifactId>spring-boot-starter-aspectj</artifactId>
172182
<optional>true</optional>
173183
</dependency>
174184
<dependency>

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/AbstractAwsConfigDataLocationResolver.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import java.util.Arrays;
2727
import java.util.Collections;
2828
import java.util.List;
29-
import org.springframework.boot.BootstrapContext;
30-
import org.springframework.boot.BootstrapRegistry;
31-
import org.springframework.boot.ConfigurableBootstrapContext;
29+
import org.springframework.boot.bootstrap.BootstrapContext;
30+
import org.springframework.boot.bootstrap.BootstrapRegistry;
31+
import org.springframework.boot.bootstrap.ConfigurableBootstrapContext;
3232
import org.springframework.boot.context.config.ConfigDataLocation;
3333
import org.springframework.boot.context.config.ConfigDataLocationNotFoundException;
3434
import org.springframework.boot.context.config.ConfigDataLocationResolver;

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/BootstrapLoggingHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.ArrayList;
2121
import java.util.List;
2222
import org.apache.commons.logging.Log;
23-
import org.springframework.boot.BootstrapRegistry;
23+
import org.springframework.boot.bootstrap.BootstrapRegistry;
2424
import org.springframework.boot.logging.DeferredLogFactory;
2525
import org.springframework.util.ClassUtils;
2626
import org.springframework.util.ReflectionUtils;

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLocationResolver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.ArrayList;
2424
import java.util.List;
2525
import org.apache.commons.logging.Log;
26-
import org.springframework.boot.BootstrapContext;
26+
import org.springframework.boot.bootstrap.BootstrapContext;
2727
import org.springframework.boot.context.config.ConfigDataLocation;
2828
import org.springframework.boot.context.config.ConfigDataLocationNotFoundException;
2929
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/s3/S3ConfigDataLocationResolver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.ArrayList;
2424
import java.util.List;
2525
import org.apache.commons.logging.Log;
26-
import org.springframework.boot.BootstrapContext;
26+
import org.springframework.boot.bootstrap.BootstrapContext;
2727
import org.springframework.boot.context.config.ConfigDataLocation;
2828
import org.springframework.boot.context.config.ConfigDataLocationNotFoundException;
2929
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLocationResolver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.ArrayList;
2424
import java.util.List;
2525
import org.apache.commons.logging.Log;
26-
import org.springframework.boot.BootstrapContext;
26+
import org.springframework.boot.bootstrap.BootstrapContext;
2727
import org.springframework.boot.context.config.*;
2828
import org.springframework.boot.context.properties.bind.Bindable;
2929
import org.springframework.boot.context.properties.bind.Binder;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ private static AwsCredentialsProvider create(@Nullable StsProperties stsProperti
159159

160160
if (stsProperties != null) {
161161
builder.asyncCredentialUpdateEnabled(stsProperties.isAsyncCredentialsUpdate());
162-
propertyMapper.from(stsProperties::getRoleArn).whenNonNull().to(builder::roleArn);
163-
propertyMapper.from(stsProperties::getWebIdentityTokenFile).whenNonNull()
162+
propertyMapper.from(stsProperties::getRoleArn).to(builder::roleArn);
163+
propertyMapper.from(stsProperties::getWebIdentityTokenFile)
164164
.to(b -> builder.webIdentityTokenFile(Paths.get(b)));
165-
propertyMapper.from(stsProperties::getRoleSessionName).whenNonNull().to(builder::roleSessionName);
165+
propertyMapper.from(stsProperties::getRoleSessionName).to(builder::roleSessionName);
166166
}
167167
return builder.build();
168168
}

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/dynamodb/DynamoDbAutoConfiguration.java‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,20 @@ public DynamoDbClient dynamoDbClient(DynamoDbProperties properties, AwsCredentia
7777

7878
PropertyMapper propertyMapper = PropertyMapper.get();
7979
software.amazon.dax.Configuration.Builder configuration = software.amazon.dax.Configuration.builder();
80-
propertyMapper.from(daxProperties.getIdleTimeoutMillis()).whenNonNull()
81-
.to(configuration::idleTimeoutMillis);
82-
propertyMapper.from(daxProperties.getConnectionTtlMillis()).whenNonNull()
83-
.to(configuration::connectionTtlMillis);
84-
propertyMapper.from(daxProperties.getConnectTimeoutMillis()).whenNonNull()
85-
.to(configuration::connectTimeoutMillis);
86-
propertyMapper.from(daxProperties.getRequestTimeoutMillis()).whenNonNull()
87-
.to(configuration::requestTimeoutMillis);
88-
propertyMapper.from(daxProperties.getWriteRetries()).whenNonNull().to(configuration::writeRetries);
89-
propertyMapper.from(daxProperties.getReadRetries()).whenNonNull().to(configuration::readRetries);
90-
propertyMapper.from(daxProperties.getClusterUpdateIntervalMillis()).whenNonNull()
80+
propertyMapper.from(daxProperties.getIdleTimeoutMillis()).to(configuration::idleTimeoutMillis);
81+
propertyMapper.from(daxProperties.getConnectionTtlMillis()).to(configuration::connectionTtlMillis);
82+
propertyMapper.from(daxProperties.getConnectTimeoutMillis()).to(configuration::connectTimeoutMillis);
83+
propertyMapper.from(daxProperties.getRequestTimeoutMillis()).to(configuration::requestTimeoutMillis);
84+
propertyMapper.from(daxProperties.getWriteRetries()).to(configuration::writeRetries);
85+
propertyMapper.from(daxProperties.getReadRetries()).to(configuration::readRetries);
86+
propertyMapper.from(daxProperties.getClusterUpdateIntervalMillis())
9187
.to(configuration::clusterUpdateIntervalMillis);
92-
propertyMapper.from(daxProperties.getEndpointRefreshTimeoutMillis()).whenNonNull()
88+
propertyMapper.from(daxProperties.getEndpointRefreshTimeoutMillis())
9389
.to(configuration::endpointRefreshTimeoutMillis);
94-
propertyMapper.from(daxProperties.getMaxConcurrency()).whenNonNull().to(configuration::maxConcurrency);
95-
propertyMapper.from(daxProperties.getMaxPendingConnectionAcquires()).whenNonNull()
90+
propertyMapper.from(daxProperties.getMaxConcurrency()).to(configuration::maxConcurrency);
91+
propertyMapper.from(daxProperties.getMaxPendingConnectionAcquires())
9692
.to(configuration::maxPendingConnectionAcquires);
97-
propertyMapper.from(daxProperties.getSkipHostNameVerification()).whenNonNull()
93+
propertyMapper.from(daxProperties.getSkipHostNameVerification())
9894
.to(configuration::skipHostNameVerification);
9995

10096
configuration.region(AwsClientBuilderConfigurer.resolveRegion(properties,

‎spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/metrics/CloudWatchExportAutoConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3232
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3333
import org.springframework.boot.context.properties.EnableConfigurationProperties;
34-
import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
35-
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
36-
import org.springframework.boot.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
34+
import org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
35+
import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
36+
import org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
3737
import org.springframework.context.annotation.Bean;
3838
import software.amazon.awssdk.regions.providers.AwsRegionProvider;
3939
import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;

0 commit comments

Comments
 (0)