Skip to content

Delete deprecated AwsClientCustomizer and it's usages. #1410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Delete deprecated AwsClientCustomizer and it's usages. #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions ...awspring/cloud/autoconfigure/config/parameterstore/AwsParameterStoreClientCustomizer.java
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions ...o/awspring/cloud/autoconfigure/config/parameterstore/ParameterStoreAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
import io.awspring.cloud.autoconfigure.core.AwsAutoConfiguration;
import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer;
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails;
import io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration;
import io.awspring.cloud.autoconfigure.core.RegionProviderAutoConfiguration;
Expand All @@ -31,7 +30,6 @@
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import software.amazon.awssdk.services.ssm.SsmClient;
import software.amazon.awssdk.services.ssm.SsmClientBuilder;

/**
* {@link AutoConfiguration Auto-Configuration} for AWS Parameter Store integration.
Expand All @@ -51,13 +49,13 @@ public class ParameterStoreAutoConfiguration {
@ConditionalOnMissingBean
public SsmClient ssmClient(ParameterStoreProperties properties,
AwsClientBuilderConfigurer awsClientBuilderConfigurer,
ObjectProvider<AwsClientCustomizer<SsmClientBuilder>> customizers,
ObjectProvider<SsmClientCustomizer> ssmClientCustomizers,
ObjectProvider<AwsSyncClientCustomizer> awsSyncClientCustomizers,
ObjectProvider<AwsConnectionDetails> connectionDetails) {
return awsClientBuilderConfigurer.configureSyncClient(SsmClient.builder(), properties,
connectionDetails.getIfAvailable(), customizers.getIfAvailable(), ssmClientCustomizers.orderedStream(),
awsSyncClientCustomizers.orderedStream()).build();
return awsClientBuilderConfigurer
.configureSyncClient(SsmClient.builder(), properties, connectionDetails.getIfAvailable(),
ssmClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream())
.build();
}

}
10 changes: 0 additions & 10 deletions ...g/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLocationResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
import io.awspring.cloud.autoconfigure.config.AbstractAwsConfigDataLocationResolver;
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
import io.awspring.cloud.autoconfigure.core.AwsProperties;
import io.awspring.cloud.autoconfigure.core.CredentialsProperties;
import io.awspring.cloud.autoconfigure.core.RegionProperties;
Expand Down Expand Up @@ -96,15 +95,6 @@ public List<ParameterStoreConfigDataResource> resolveProfileSpecific(

protected SsmClient createSimpleSystemManagementClient(BootstrapContext context) {
SsmClientBuilder builder = configure(SsmClient.builder(), context.get(ParameterStoreProperties.class), context);
try {
AwsParameterStoreClientCustomizer configurer = context.get(AwsParameterStoreClientCustomizer.class);
if (configurer != null) {
AwsClientCustomizer.apply(configurer, builder);
}
}
catch (IllegalStateException e) {
log.debug("Bean of type AwsParameterStoreClientCustomizer is not registered: " + e.getMessage());
}

try {
AwsSyncClientCustomizer awsSyncClientCustomizer = context.get(AwsSyncClientCustomizer.class);
Expand Down
28 changes: 0 additions & 28 deletions ...awspring/cloud/autoconfigure/config/secretsmanager/AwsSecretsManagerClientCustomizer.java
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions ...o/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
import io.awspring.cloud.autoconfigure.core.AwsAutoConfiguration;
import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer;
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
Expand All @@ -29,7 +28,6 @@
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClientBuilder;

/**
* {@link AutoConfiguration Auto-Configuration} for Secrets Manager integration.
Expand All @@ -48,12 +46,12 @@ public class SecretsManagerAutoConfiguration {
@Bean
public SecretsManagerClient secretsManagerClient(SecretsManagerProperties properties,
AwsClientBuilderConfigurer awsClientBuilderConfigurer,
ObjectProvider<AwsClientCustomizer<SecretsManagerClientBuilder>> customizer,
ObjectProvider<AwsConnectionDetails> connectionDetails,
ObjectProvider<SecretsManagerClientCustomizer> secretsManagerClientCustomizers,
ObjectProvider<AwsSyncClientCustomizer> awsSyncClientCustomizers) {
return awsClientBuilderConfigurer.configureSyncClient(SecretsManagerClient.builder(), properties,
connectionDetails.getIfAvailable(), customizer.getIfAvailable(),
secretsManagerClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream()).build();
return awsClientBuilderConfigurer
.configureSyncClient(SecretsManagerClient.builder(), properties, connectionDetails.getIfAvailable(),
secretsManagerClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream())
.build();
}
}
10 changes: 0 additions & 10 deletions ...g/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLocationResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
import io.awspring.cloud.autoconfigure.config.AbstractAwsConfigDataLocationResolver;
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
import io.awspring.cloud.autoconfigure.core.AwsProperties;
import io.awspring.cloud.autoconfigure.core.CredentialsProperties;
import io.awspring.cloud.autoconfigure.core.RegionProperties;
Expand Down Expand Up @@ -100,15 +99,6 @@ public List<SecretsManagerConfigDataResource> resolve(ConfigDataLocationResolver
protected SecretsManagerClient createAwsSecretsManagerClient(BootstrapContext context) {
SecretsManagerClientBuilder builder = configure(SecretsManagerClient.builder(),
context.get(SecretsManagerProperties.class), context);
try {
AwsSecretsManagerClientCustomizer configurer = context.get(AwsSecretsManagerClientCustomizer.class);
if (configurer != null) {
AwsClientCustomizer.apply(configurer, builder);
}
}
catch (IllegalStateException e) {
log.debug("Bean of type AwsParameterStoreClientCustomizer is not registered: " + e.getMessage());
}

try {
AwsSyncClientCustomizer awsSyncClientCustomizer = context.get(AwsSyncClientCustomizer.class);
Expand Down
65 changes: 4 additions & 61 deletions ...figure/src/main/java/io/awspring/cloud/autoconfigure/core/AwsClientBuilderConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,11 @@ public AwsClientBuilderConfigurer(AwsCredentialsProvider credentialsProvider, Aw
}

public <T extends AwsClientBuilder<T, ?>> T configure(T builder) {
return configure(builder, null, null, null);
return configure(builder, null, null);
}

/**
* @deprecated use
* {@link #configureSyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)} for
* sync client or
* {@link #configureAsyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)} for
* async client.
*/
@Deprecated
public <T extends AwsClientBuilder<T, ?>> T configure(T builder, @Nullable AwsClientProperties clientProperties,
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer) {
return configure(builder, clientProperties, null, customizer);
}

/**
* @deprecated use
* {@link #configureSyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)} for
* sync client or
* {@link #configureAsyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)} for
* async client.
*/
@Deprecated
public <T extends AwsClientBuilder<T, ?>> T configure(T builder, @Nullable AwsClientProperties clientProperties,
@Nullable AwsConnectionDetails connectionDetails,
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer) {
@Nullable AwsConnectionDetails connectionDetails) {
Assert.notNull(builder, "builder is required");

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

if (customizer != null) {
io.awspring.cloud.autoconfigure.core.AwsClientCustomizer.apply(customizer, builder);
}
return builder;
}

public <T extends AwsClientBuilder<T, ?>> T configureSyncClient(T builder,
@Nullable AwsClientProperties clientProperties, @Nullable AwsConnectionDetails connectionDetails,
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer,
@Nullable Stream<? extends AwsSyncClientCustomizer> commonCustomizers) {
return configureSyncClient(builder, clientProperties, connectionDetails, null, clientBuilderCustomizer,
commonCustomizers);
}

public <T extends AwsClientBuilder<T, ?>> T configureAsyncClient(T builder,
@Nullable AwsClientProperties clientProperties, @Nullable AwsConnectionDetails connectionDetails,
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer,
@Nullable Stream<? extends AwsAsyncClientCustomizer> commonCustomizers) {
return configureAsyncClient(builder, clientProperties, connectionDetails, null, clientBuilderCustomizer,
commonCustomizers);
}

@Deprecated
public <T extends AwsClientBuilder<T, ?>> T configure(T builder, @Nullable AwsClientProperties clientProperties,
@Nullable AwsConnectionDetails connectionDetails,
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer,
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer) {
return configure(builder, clientProperties, connectionDetails, null, clientBuilderCustomizer);
}

/**
* @deprecated use
* {@link #configureSyncClient(AwsClientBuilder, AwsClientProperties, AwsConnectionDetails, Stream, Stream)}.
*/
@Deprecated
public <T extends AwsClientBuilder<T, ?>> T configureSyncClient(T builder,
@Nullable AwsClientProperties clientProperties, @Nullable AwsConnectionDetails connectionDetails,
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer,
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer,
@Nullable Stream<? extends AwsSyncClientCustomizer> commonBuilderCustomizer) {
T result = configure(builder, clientProperties, connectionDetails, customizer);
T result = configure(builder, clientProperties, connectionDetails);
if (commonBuilderCustomizer != null && builder instanceof AwsSyncClientBuilder<?, ?>) {
commonBuilderCustomizer.forEach(it -> it.customize((AwsSyncClientBuilder<?, ?>) result));
}
Expand All @@ -147,13 +92,11 @@ public AwsClientBuilderConfigurer(AwsCredentialsProvider credentialsProvider, Aw
return result;
}

@Deprecated
public <T extends AwsClientBuilder<T, ?>> T configureAsyncClient(T builder,
@Nullable AwsClientProperties clientProperties, @Nullable AwsConnectionDetails connectionDetails,
@Nullable io.awspring.cloud.autoconfigure.core.AwsClientCustomizer<T> customizer,
@Nullable Stream<? extends AwsClientCustomizer<T>> clientBuilderCustomizer,
@Nullable Stream<? extends AwsAsyncClientCustomizer> commonBuilderCustomizer) {
T result = configure(builder, clientProperties, connectionDetails, customizer);
T result = configure(builder, clientProperties, connectionDetails);
if (commonBuilderCustomizer != null && builder instanceof AwsAsyncClientBuilder<?, ?>) {
commonBuilderCustomizer.forEach(it -> it.customize((AwsAsyncClientBuilder<?, ?>) result));
}
Expand Down
82 changes: 0 additions & 82 deletions ...autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/core/AwsClientCustomizer.java
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions ...ure/src/main/java/io/awspring/cloud/autoconfigure/dynamodb/DynamoDbAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import io.awspring.cloud.autoconfigure.AwsSyncClientCustomizer;
import io.awspring.cloud.autoconfigure.core.AwsClientBuilderConfigurer;
import io.awspring.cloud.autoconfigure.core.AwsClientCustomizer;
import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails;
import io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration;
import io.awspring.cloud.autoconfigure.core.RegionProviderAutoConfiguration;
Expand Down Expand Up @@ -47,7 +46,6 @@
import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
import software.amazon.awssdk.regions.providers.AwsRegionProvider;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder;
import software.amazon.dax.ClusterDaxClient;

/**
Expand Down Expand Up @@ -114,13 +112,13 @@ static class StandardDynamoDbClient {
@ConditionalOnMissingBean
@Bean
public DynamoDbClient dynamoDbClient(AwsClientBuilderConfigurer awsClientBuilderConfigurer,
ObjectProvider<AwsClientCustomizer<DynamoDbClientBuilder>> configurer,
ObjectProvider<AwsConnectionDetails> connectionDetails, DynamoDbProperties properties,
ObjectProvider<DynamoDbClientCustomizer> dynamoDbClientCustomizers,
ObjectProvider<AwsSyncClientCustomizer> awsSyncClientCustomizers) {
return awsClientBuilderConfigurer.configureSyncClient(DynamoDbClient.builder(), properties,
connectionDetails.getIfAvailable(), configurer.getIfAvailable(),
dynamoDbClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream()).build();
return awsClientBuilderConfigurer
.configureSyncClient(DynamoDbClient.builder(), properties, connectionDetails.getIfAvailable(),
dynamoDbClientCustomizers.orderedStream(), awsSyncClientCustomizers.orderedStream())
.build();
}

}
Expand Down
Loading