Skip to content

Commit 7024b85

Browse files
committed
Additional changes:
Refactoring BaseEc2MetadataClient constructor
1 parent f7c7c59 commit 7024b85

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

core/imds/src/main/java/software/amazon/awssdk/imds/internal/BaseEc2MetadataClient.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public abstract class BaseEc2MetadataClient {
4444
protected final RequestMarshaller requestMarshaller;
4545
protected final Duration tokenTtl;
4646

47-
private BaseEc2MetadataClient(Ec2MetadataRetryPolicy retryPolicy, Duration tokenTtl, URI endpoint,
48-
EndpointMode endpointMode) {
47+
protected BaseEc2MetadataClient(Ec2MetadataRetryPolicy retryPolicy, Duration tokenTtl, URI endpoint,
48+
EndpointMode endpointMode) {
4949
this.retryPolicy = Validate.getOrDefault(retryPolicy, Ec2MetadataRetryPolicy.builder()::build);
5050
this.tokenTtl = Validate.getOrDefault(tokenTtl, () -> DEFAULT_TOKEN_TTL);
5151
this.endpoint = getEndpoint(endpoint, endpointMode);
@@ -60,9 +60,6 @@ protected BaseEc2MetadataClient(DefaultEc2MetadataAsyncClient.Ec2MetadataAsyncBu
6060
this(builder.getRetryPolicy(), builder.getTokenTtl(), builder.getEndpoint(), builder.getEndpointMode());
6161
}
6262

63-
protected BaseEc2MetadataClient(DefaultEc2MetadataClientWithFallback.Ec2MetadataBuilder builder) {
64-
this(builder.getRetryPolicy(), builder.getTokenTtl(), builder.getEndpoint(), builder.getEndpointMode());
65-
}
6663

6764
private URI getEndpoint(URI builderEndpoint, EndpointMode builderEndpointMode) {
6865
Validate.mutuallyExclusive("Only one of 'endpoint' or 'endpointMode' must be specified, but not both",

core/imds/src/main/java/software/amazon/awssdk/imds/internal/DefaultEc2MetadataClientWithFallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public final class DefaultEc2MetadataClientWithFallback extends BaseEc2MetadataC
7070
private final boolean imdsV1FallbackEnabled;
7171

7272
private DefaultEc2MetadataClientWithFallback(Ec2MetadataBuilder builder) {
73-
super(builder);
73+
super(builder.getRetryPolicy(), builder.getTokenTtl(), builder.getEndpoint(), builder.getEndpointMode());
7474

7575
Validate.isTrue(builder.httpClient == null || builder.httpClientBuilder == null,
7676
"The httpClient and the httpClientBuilder can't both be configured.");

0 commit comments

Comments
 (0)