Skip to content

Commit feb2c41

Browse files
maciejwalkowiakmaciejwalkowiak
authored
Delete deprecated AwsClientCustomizer and it's usages. (#1410)
Fixes #1409
1 parent df8e793 commit feb2c41

23 files changed

+35
-715
lines changed

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

Lines changed: 0 additions & 28 deletions
This file was deleted.

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
1919
import io.awspring.cloud.autoconfigure.core.AwsAutoConfiguration;
2020
import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer;
21-
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
2221
import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails;
2322
import io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration;
2423
import io.awspring.cloud.autoconfigure.core.RegionProviderAutoConfiguration;
@@ -31,7 +30,6 @@
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.context.annotation.Bean;
3332
import software.amazon.awssdk.services.ssm.SsmClient;
34-
import software.amazon.awssdk.services.ssm.SsmClientBuilder;
3533

3634
/**
3735
* {@link AutoConfiguration Auto-Configuration} for AWS Parameter Store integration.
@@ -51,13 +49,13 @@ public class ParameterStoreAutoConfiguration {
5149
@ConditionalOnMissingBean
5250
public SsmClient ssmClient(ParameterStoreProperties properties,
5351
AwsClientBuilderConfigurer awsClientBuilderConfigurer,
54-
ObjectProvider<AwsClientCustomizer<SsmClientBuilder>> customizers,
5552
ObjectProvider<SsmClientCustomizer> ssmClientCustomizers,
5653
ObjectProvider<AwsSyncClientCustomizer> awsSyncClientCustomizers,
5754
ObjectProvider<AwsConnectionDetails> connectionDetails) {
58-
return awsClientBuilderConfigurer.configureSyncClient(SsmClient.builder(), properties,
59-
connectionDetails.getIfAvailable(), customizers.getIfAvailable(), ssmClientCustomizers.orderedStream(),
60-
awsSyncClientCustomizers.orderedStream()).build();
55+
return awsClientBuilderConfigurer
56+
.configureSyncClient(SsmClient.builder(), properties, connectionDetails.getIfAvailable(),
57+
ssmClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream())
58+
.build();
6159
}
6260

6361
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
1919
import io.awspring.cloud.autoconfigure.config.AbstractAwsConfigDataLocationResolver;
20-
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
2120
import io.awspring.cloud.autoconfigure.core.AwsProperties;
2221
import io.awspring.cloud.autoconfigure.core.CredentialsProperties;
2322
import io.awspring.cloud.autoconfigure.core.RegionProperties;
@@ -96,15 +95,6 @@ public List<ParameterStoreConfigDataResource> resolveProfileSpecific(
9695

9796
protected SsmClient createSimpleSystemManagementClient(BootstrapContext context) {
9897
SsmClientBuilder builder = configure(SsmClient.builder(), context.get(ParameterStoreProperties.class), context);
99-
try {
100-
AwsParameterStoreClientCustomizer configurer = context.get(AwsParameterStoreClientCustomizer.class);
101-
if (configurer != null) {
102-
AwsClientCustomizer.apply(configurer, builder);
103-
}
104-
}
105-
catch (IllegalStateException e) {
106-
log.debug("Bean of type AwsParameterStoreClientCustomizer is not registered: " + e.getMessage());
107-
}
10898

10999
try {
110100
AwsSyncClientCustomizer awsSyncClientCustomizer = context.get(AwsSyncClientCustomizer.class);

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

Lines changed: 0 additions & 28 deletions
This file was deleted.

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
1919
import io.awspring.cloud.autoconfigure.core.AwsAutoConfiguration;
2020
import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer;
21-
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
2221
import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails;
2322
import org.springframework.beans.factory.ObjectProvider;
2423
import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -29,7 +28,6 @@
2928
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3029
import org.springframework.context.annotation.Bean;
3130
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
32-
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClientBuilder;
3331

3432
/**
3533
* {@link AutoConfiguration Auto-Configuration} for Secrets Manager integration.
@@ -48,12 +46,12 @@ public class SecretsManagerAutoConfiguration {
4846
@Bean
4947
public SecretsManagerClient secretsManagerClient(SecretsManagerProperties properties,
5048
AwsClientBuilderConfigurer awsClientBuilderConfigurer,
51-
ObjectProvider<AwsClientCustomizer<SecretsManagerClientBuilder>> customizer,
5249
ObjectProvider<AwsConnectionDetails> connectionDetails,
5350
ObjectProvider<SecretsManagerClientCustomizer> secretsManagerClientCustomizers,
5451
ObjectProvider<AwsSyncClientCustomizer> awsSyncClientCustomizers) {
55-
return awsClientBuilderConfigurer.configureSyncClient(SecretsManagerClient.builder(), properties,
56-
connectionDetails.getIfAvailable(), customizer.getIfAvailable(),
57-
secretsManagerClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream()).build();
52+
return awsClientBuilderConfigurer
53+
.configureSyncClient(SecretsManagerClient.builder(), properties, connectionDetails.getIfAvailable(),
54+
secretsManagerClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream())
55+
.build();
5856
}
5957
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
1919
import io.awspring.cloud.autoconfigure.config.AbstractAwsConfigDataLocationResolver;
20-
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
2120
import io.awspring.cloud.autoconfigure.core.AwsProperties;
2221
import io.awspring.cloud.autoconfigure.core.CredentialsProperties;
2322
import io.awspring.cloud.autoconfigure.core.RegionProperties;
@@ -100,15 +99,6 @@ public List<SecretsManagerConfigDataResource> resolve(ConfigDataLocationResolver
10099
protected SecretsManagerClient createAwsSecretsManagerClient(BootstrapContext context) {
101100
SecretsManagerClientBuilder builder = configure(SecretsManagerClient.builder(),
102101
context.get(SecretsManagerProperties.class), context);
103-
try {
104-
AwsSecretsManagerClientCustomizer configurer = context.get(AwsSecretsManagerClientCustomizer.class);
105-
if (configurer != null) {
106-
AwsClientCustomizer.apply(configurer, builder);
107-
}
108-
}
109-
catch (IllegalStateException e) {
110-
log.debug("Bean of type AwsParameterStoreClientCustomizer is not registered: " + e.getMessage());
111-
}
112102

113103
try {
114104
AwsSyncClientCustomizer awsSyncClientCustomizer = context.get(AwsSyncClientCustomizer.class);

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

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -54,33 +54,11 @@ public AwsClientBuilderConfigurer(AwsCredentialsProvider credentialsProvider, Aw
5454
}
5555

5656
public <T extends AwsClientBuilder<T, ?>> T configure(T builder) {
57-
return configure(builder, null, null, null);
57+
return configure(builder, null, null);
5858
}
5959

60-
/**
61-
* @deprecated use
62-
* {@link #configureSyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)} for
63-
* sync client or
64-
* {@link #configureAsyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)} for
65-
* async client.
66-
*/
67-
@Deprecated
6860
public <T extends AwsClientBuilder<T, ?>> T configure(T builder, @Nullable AwsClientProperties clientProperties,
69-
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer) {
70-
return configure(builder, clientProperties, null, customizer);
71-
}
72-
73-
/**
74-
* @deprecated use
75-
* {@link #configureSyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)} for
76-
* sync client or
77-
* {@link #configureAsyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)} for
78-
* async client.
79-
*/
80-
@Deprecated
81-
public <T extends AwsClientBuilder<T, ?>> T configure(T builder, @Nullable AwsClientProperties clientProperties,
82-
@Nullable AwsConnectionDetails connectionDetails,
83-
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer) {
61+
@Nullable AwsConnectionDetails connectionDetails) {
8462
Assert.notNull(builder, "builder is required");
8563

8664
builder.credentialsProvider(this.credentialsProvider).region(resolveRegion(clientProperties, connectionDetails))
@@ -97,47 +75,14 @@ public AwsClientBuilderConfigurer(AwsCredentialsProvider credentialsProvider, Aw
9775
Optional.ofNullable(clientProperties).flatMap(it -> Optional.ofNullable(clientProperties.getDualstackEnabled()))
9876
.ifPresent(builder::dualstackEnabled);
9977

100-
if (customizer != null) {
101-
io.awspring.cloud.autoconfigure.core.AwsClientCustomizer.apply(customizer, builder);
102-
}
10378
return builder;
10479
}
10580

10681
public <T extends AwsClientBuilder<T, ?>> T configureSyncClient(T builder,
10782
@Nullable AwsClientProperties clientProperties, @Nullable AwsConnectionDetails connectionDetails,
10883
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer,
109-
@Nullable Stream<? extends AwsSyncClientCustomizer> commonCustomizers) {
110-
return configureSyncClient(builder, clientProperties, connectionDetails, null, clientBuilderCustomizer,
111-
commonCustomizers);
112-
}
113-
114-
public <T extends AwsClientBuilder<T, ?>> T configureAsyncClient(T builder,
115-
@Nullable AwsClientProperties clientProperties, @Nullable AwsConnectionDetails connectionDetails,
116-
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer,
117-
@Nullable Stream<? extends AwsAsyncClientCustomizer> commonCustomizers) {
118-
return configureAsyncClient(builder, clientProperties, connectionDetails, null, clientBuilderCustomizer,
119-
commonCustomizers);
120-
}
121-
122-
@Deprecated
123-
public <T extends AwsClientBuilder<T, ?>> T configure(T builder, @Nullable AwsClientProperties clientProperties,
124-
@Nullable AwsConnectionDetails connectionDetails,
125-
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer,
126-
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer) {
127-
return configure(builder, clientProperties, connectionDetails, null, clientBuilderCustomizer);
128-
}
129-
130-
/**
131-
* @deprecated use
132-
* {@link #configureSyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)}.
133-
*/
134-
@Deprecated
135-
public <T extends AwsClientBuilder<T, ?>> T configureSyncClient(T builder,
136-
@Nullable AwsClientProperties clientProperties, @Nullable AwsConnectionDetails connectionDetails,
137-
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer,
138-
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer,
13984
@Nullable Stream<? extends AwsSyncClientCustomizer> commonBuilderCustomizer) {
140-
T result = configure(builder, clientProperties, connectionDetails, customizer);
85+
T result = configure(builder, clientProperties, connectionDetails);
14186
if (commonBuilderCustomizer != null && builder instanceof AwsSyncClientBuilder<?, ?>) {
14287
commonBuilderCustomizer.forEach(it -> it.customize((AwsSyncClientBuilder<?, ?>) result));
14388
}
@@ -147,13 +92,11 @@ public AwsClientBuilderConfigurer(AwsCredentialsProvider credentialsProvider, Aw
14792
return result;
14893
}
14994

150-
@Deprecated
15195
public <T extends AwsClientBuilder<T, ?>> T configureAsyncClient(T builder,
15296
@Nullable AwsClientProperties clientProperties, @Nullable AwsConnectionDetails connectionDetails,
153-
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer,
15497
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer,
15598
@Nullable Stream<? extends AwsAsyncClientCustomizer> commonBuilderCustomizer) {
156-
T result = configure(builder, clientProperties, connectionDetails, customizer);
99+
T result = configure(builder, clientProperties, connectionDetails);
157100
if (commonBuilderCustomizer != null && builder instanceof AwsAsyncClientBuilder<?, ?>) {
158101
commonBuilderCustomizer.forEach(it -> it.customize((AwsAsyncClientBuilder<?, ?>) result));
159102
}

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

Lines changed: 0 additions & 82 deletions
This file was deleted.

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
1919
import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer;
20-
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
2120
import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails;
2221
import io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration;
2322
import io.awspring.cloud.autoconfigure.core.RegionProviderAutoConfiguration;
@@ -47,7 +46,6 @@
4746
import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
4847
import software.amazon.awssdk.regions.providers.AwsRegionProvider;
4948
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
50-
import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
5149
import software.amazon.dax.ClusterDaxClient;
5250

5351
/**
@@ -114,13 +112,13 @@ static class StandardDynamoDbClient {
114112
@ConditionalOnMissingBean
115113
@Bean
116114
public DynamoDbClient dynamoDbClient(AwsClientBuilderConfigurer awsClientBuilderConfigurer,
117-
ObjectProvider<AwsClientCustomizer<DynamoDbClientBuilder>> configurer,
118115
ObjectProvider<AwsConnectionDetails> connectionDetails, DynamoDbProperties properties,
119116
ObjectProvider<DynamoDbClientCustomizer> dynamoDbClientCustomizers,
120117
ObjectProvider<AwsSyncClientCustomizer> awsSyncClientCustomizers) {
121-
return awsClientBuilderConfigurer.configureSyncClient(DynamoDbClient.builder(), properties,
122-
connectionDetails.getIfAvailable(), configurer.getIfAvailable(),
123-
dynamoDbClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream()).build();
118+
return awsClientBuilderConfigurer
119+
.configureSyncClient(DynamoDbClient.builder(), properties, connectionDetails.getIfAvailable(),
120+
dynamoDbClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream())
121+
.build();
124122
}
125123

126124
}

0 commit comments

Comments
 (0)