From d3d0dae571ac028e45ab5934262c3fe5aeb3a556 Mon Sep 17 00:00:00 2001 From: Vladimir Orany Date: Mon, 13 Jan 2025 14:11:55 +0100 Subject: [PATCH] kept the old RegionAndEndpointConfiguration configure method for binary compatibility (#277) --- .../awssdk/core/RegionAndEndpointConfiguration.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/subprojects/micronaut-amazon-awssdk-core/src/main/java/com/agorapulse/micronaut/amazon/awssdk/core/RegionAndEndpointConfiguration.java b/subprojects/micronaut-amazon-awssdk-core/src/main/java/com/agorapulse/micronaut/amazon/awssdk/core/RegionAndEndpointConfiguration.java index 743e29696..f8c54700a 100644 --- a/subprojects/micronaut-amazon-awssdk-core/src/main/java/com/agorapulse/micronaut/amazon/awssdk/core/RegionAndEndpointConfiguration.java +++ b/subprojects/micronaut-amazon-awssdk-core/src/main/java/com/agorapulse/micronaut/amazon/awssdk/core/RegionAndEndpointConfiguration.java @@ -40,6 +40,11 @@ public interface RegionAndEndpointConfiguration { String getAsyncClient(); + @Deprecated + default > B configure(B builder, AwsRegionProvider awsRegionProvider) { + return configure(builder, awsRegionProvider, null, Optional.empty()); + } + default > B configure(B builder, AwsRegionProvider awsRegionProvider, ClientBuilderProvider builderProvider, Optional httpClient) { builder.region(Optional.ofNullable(getRegion()).map(Region::of).orElseGet(awsRegionProvider::getRegion)); @@ -51,11 +56,11 @@ default > B configure(B builder, AwsRegionPr } } - if (getClient() != null && builder instanceof SdkSyncClientBuilder clientBuilder) { + if (builderProvider != null && getClient() != null && builder instanceof SdkSyncClientBuilder clientBuilder) { builderProvider.findHttpClientBuilder(getClient()).ifPresent(clientBuilder::httpClientBuilder); } - if (getAsyncClient() != null && builder instanceof AwsAsyncClientBuilder clientBuilder) { + if (builderProvider != null && getAsyncClient() != null && builder instanceof AwsAsyncClientBuilder clientBuilder) { builderProvider.findAsyncHttpClientBuilder(getClient()).ifPresent(clientBuilder::httpClientBuilder); } else if (httpClient.isPresent() && builder instanceof AwsAsyncClientBuilder clientBuilder) { clientBuilder.httpClient(httpClient.get());