Skip to content

Commit 93e4ef2

Browse files
spfinkspfink
committed
Updating CRR support
1 parent e344027 commit 93e4ef2

23 files changed

+163
-35
lines changed

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
4444
import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
4545
import software.amazon.awssdk.awscore.client.handler.AwsClientHandlerUtils;
46-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryRefreshCache;
4746
import software.amazon.awssdk.awscore.eventstream.EventStreamTaggedUnionJsonMarshaller;
4847
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
4948
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -60,6 +59,7 @@
6059
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
6160
import software.amazon.awssdk.core.client.config.SdkClientOption;
6261
import software.amazon.awssdk.core.client.handler.AsyncClientHandler;
62+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRefreshCache;
6363
import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
6464
import software.amazon.awssdk.utils.CompletableFutureUtils;
6565
import software.amazon.awssdk.utils.FunctionalUtils;

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import javax.lang.model.element.Modifier;
3333
import software.amazon.awssdk.annotations.SdkInternalApi;
3434
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
35-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryRefreshCache;
3635
import software.amazon.awssdk.codegen.docs.SimpleMethodOverload;
3736
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
3837
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -50,6 +49,7 @@
5049
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
5150
import software.amazon.awssdk.core.client.config.SdkClientOption;
5251
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
52+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRefreshCache;
5353

5454
//TODO Make SyncClientClass extend SyncClientInterface (similar to what we do in AsyncClientClass)
5555
public class SyncClientClass implements ClassSpec {

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
238238
".withResponseHandler($L)\n" +
239239
".withErrorResponseHandler(errorResponseHandler)\n" +
240240
hostPrefixExpression(opModel) +
241+
discoveredEndpoint(opModel) +
241242
asyncRequestBody +
242243
".withInput($L)$L)$L;",
243244
// If the operation has an event stream output we use a different future so we don't return the one

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
import java.time.temporal.ChronoUnit;
3131
import java.util.concurrent.CompletableFuture;
3232
import software.amazon.awssdk.annotations.SdkInternalApi;
33-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryCacheLoader;
34-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryEndpoint;
35-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryRequest;
3633
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
3734
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
3835
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
3936
import software.amazon.awssdk.codegen.poet.ClassSpec;
4037
import software.amazon.awssdk.codegen.poet.PoetExtensions;
4138
import software.amazon.awssdk.codegen.poet.PoetUtils;
39+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryCacheLoader;
40+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryEndpoint;
41+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
4242

4343
public class EndpointDiscoveryAsyncCacheLoaderGenerator implements ClassSpec {
4444

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
import java.time.temporal.ChronoUnit;
3131
import java.util.concurrent.CompletableFuture;
3232
import software.amazon.awssdk.annotations.SdkInternalApi;
33-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryCacheLoader;
34-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryEndpoint;
35-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryRequest;
3633
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
3734
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
3835
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
3936
import software.amazon.awssdk.codegen.poet.ClassSpec;
4037
import software.amazon.awssdk.codegen.poet.PoetExtensions;
4138
import software.amazon.awssdk.codegen.poet.PoetUtils;
39+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryCacheLoader;
40+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryEndpoint;
41+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
4242

4343
public class EndpointDiscoveryCacheLoaderGenerator implements ClassSpec {
4444

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.util.stream.Stream;
3939
import javax.lang.model.element.Modifier;
4040
import software.amazon.awssdk.annotations.SdkPublicApi;
41-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryRequest;
4241
import software.amazon.awssdk.codegen.docs.DocumentationBuilder;
4342
import software.amazon.awssdk.codegen.internal.Utils;
4443
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -54,6 +53,7 @@
5453
import software.amazon.awssdk.codegen.poet.eventstream.EventStreamUtils;
5554
import software.amazon.awssdk.core.SdkField;
5655
import software.amazon.awssdk.core.SdkPojo;
56+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
5757
import software.amazon.awssdk.core.runtime.TypeConverter;
5858
import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
5959

‎codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/PoetClientFunctionalTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,4 @@ public void asyncClientEndpointDiscovery() throws Exception {
8080
GeneratorTaskParams.create(ClientTestModels.endpointDiscoveryModels(), "sources/", "tests/"));
8181
assertThat(asyncClientEndpointDiscovery, generatesTo("test-endpoint-discovery-async.java"));
8282
}
83-
8483
}

‎codegen/src/test/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
package software.amazon.awssdk.codegen.poet.endpointdiscovery;
16+
17+
import static org.hamcrest.MatcherAssert.assertThat;
18+
import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
19+
20+
import org.junit.Test;
21+
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
22+
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
23+
import software.amazon.awssdk.codegen.poet.ClientTestModels;
24+
25+
public class EndpointDiscoveryCacheLoaderGeneratorTest {
26+
27+
@Test
28+
public void syncEndpointDiscoveryCacheLoaderGenerator() {
29+
IntermediateModel model = ClientTestModels.endpointDiscoveryModels();
30+
GeneratorTaskParams dependencies = GeneratorTaskParams.create(model, "sources/", "tests/");
31+
EndpointDiscoveryCacheLoaderGenerator cacheLoader = new EndpointDiscoveryCacheLoaderGenerator(dependencies);
32+
assertThat(cacheLoader, generatesTo("test-sync-cache-loader.java"));
33+
}
34+
35+
@Test
36+
public void asyncEndpointDiscoveryCacheLoaderGenerator() {
37+
IntermediateModel model = ClientTestModels.endpointDiscoveryModels();
38+
GeneratorTaskParams dependencies = GeneratorTaskParams.create(model, "sources/", "tests/");
39+
EndpointDiscoveryAsyncCacheLoaderGenerator cacheLoader = new EndpointDiscoveryAsyncCacheLoaderGenerator(dependencies);
40+
assertThat(cacheLoader, generatesTo("test-async-cache-loader.java"));
41+
}
42+
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import software.amazon.awssdk.annotations.SdkInternalApi;
1111
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
1212
import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
13-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryRefreshCache;
1413
import software.amazon.awssdk.awscore.exception.AwsServiceException;
1514
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
1615
import software.amazon.awssdk.core.client.config.SdkClientOption;
1716
import software.amazon.awssdk.core.client.handler.AsyncClientHandler;
1817
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
18+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRefreshCache;
1919
import software.amazon.awssdk.core.http.HttpResponseHandler;
2020
import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
2121
import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
@@ -146,7 +146,7 @@ public CompletableFuture<TestDiscoveryIdentifiersRequiredResponse> testDiscovery
146146
.withOperationName("TestDiscoveryIdentifiersRequired")
147147
.withMarshaller(new TestDiscoveryIdentifiersRequiredRequestMarshaller(protocolFactory))
148148
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
149-
.withInput(testDiscoveryIdentifiersRequiredRequest));
149+
.discoveredEndpoint(cachedEndpoint).withInput(testDiscoveryIdentifiersRequiredRequest));
150150
} catch (Throwable t) {
151151
return CompletableFutureUtils.failedFuture(t);
152152
}
@@ -190,7 +190,7 @@ public CompletableFuture<TestDiscoveryOptionalResponse> testDiscoveryOptional(
190190
.withOperationName("TestDiscoveryOptional")
191191
.withMarshaller(new TestDiscoveryOptionalRequestMarshaller(protocolFactory))
192192
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
193-
.withInput(testDiscoveryOptionalRequest));
193+
.discoveredEndpoint(cachedEndpoint).withInput(testDiscoveryOptionalRequest));
194194
} catch (Throwable t) {
195195
return CompletableFutureUtils.failedFuture(t);
196196
}
@@ -234,7 +234,7 @@ public CompletableFuture<TestDiscoveryRequiredResponse> testDiscoveryRequired(
234234
.withOperationName("TestDiscoveryRequired")
235235
.withMarshaller(new TestDiscoveryRequiredRequestMarshaller(protocolFactory))
236236
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
237-
.withInput(testDiscoveryRequiredRequest));
237+
.discoveredEndpoint(cachedEndpoint).withInput(testDiscoveryRequiredRequest));
238238
} catch (Throwable t) {
239239
return CompletableFutureUtils.failedFuture(t);
240240
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import software.amazon.awssdk.annotations.SdkInternalApi;
66
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
77
import software.amazon.awssdk.awscore.client.handler.AwsSyncClientHandler;
8-
import software.amazon.awssdk.awscore.endpointdiscovery.EndpointDiscoveryRefreshCache;
98
import software.amazon.awssdk.awscore.exception.AwsServiceException;
109
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
1110
import software.amazon.awssdk.core.client.config.SdkClientOption;
1211
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
1312
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
13+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRefreshCache;
1414
import software.amazon.awssdk.core.exception.SdkClientException;
1515
import software.amazon.awssdk.core.http.HttpResponseHandler;
1616
import software.amazon.awssdk.protocols.json.AwsJsonProtocol;

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-async-cache-loader.java

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package software.amazon.awssdk.services.endpointdiscoverytest;
2+
3+
import java.net.URI;
4+
import java.time.Instant;
5+
import java.time.temporal.ChronoUnit;
6+
import java.util.concurrent.CompletableFuture;
7+
import software.amazon.awssdk.annotations.Generated;
8+
import software.amazon.awssdk.annotations.SdkInternalApi;
9+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryCacheLoader;
10+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryEndpoint;
11+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
12+
import software.amazon.awssdk.services.endpointdiscoverytest.model.Endpoint;
13+
14+
@SdkInternalApi
15+
@Generated("software.amazon.awssdk:codegen")
16+
class EndpointDiscoveryTestAsyncEndpointDiscoveryCacheLoader implements EndpointDiscoveryCacheLoader {
17+
private final EndpointDiscoveryTestAsyncClient client;
18+
19+
EndpointDiscoveryTestAsyncEndpointDiscoveryCacheLoader(EndpointDiscoveryTestAsyncClient client) {
20+
this.client = client;
21+
}
22+
23+
public static EndpointDiscoveryTestAsyncEndpointDiscoveryCacheLoader create(EndpointDiscoveryTestAsyncClient client) {
24+
return new EndpointDiscoveryTestAsyncEndpointDiscoveryCacheLoader(client);
25+
}
26+
27+
@Override
28+
public CompletableFuture<EndpointDiscoveryEndpoint> discoverEndpoint(EndpointDiscoveryRequest endpointDiscoveryRequest) {
29+
return client.describeEndpoints(
30+
software.amazon.awssdk.services.endpointdiscoverytest.model.DescribeEndpointsRequest.builder().build())
31+
.thenApply(
32+
r -> {
33+
Endpoint endpoint = r.endpoints().get(0);
34+
return EndpointDiscoveryEndpoint.builder().endpoint(URI.create(endpoint.address()))
35+
.expirationTime(Instant.now().plus(endpoint.cachePeriodInMinutes(), ChronoUnit.MINUTES))
36+
.build();
37+
});
38+
}
39+
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-sync-cache-loader.java

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package software.amazon.awssdk.services.endpointdiscoverytest;
2+
3+
import java.net.URI;
4+
import java.time.Instant;
5+
import java.time.temporal.ChronoUnit;
6+
import java.util.concurrent.CompletableFuture;
7+
import software.amazon.awssdk.annotations.Generated;
8+
import software.amazon.awssdk.annotations.SdkInternalApi;
9+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryCacheLoader;
10+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryEndpoint;
11+
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
12+
import software.amazon.awssdk.services.endpointdiscoverytest.model.DescribeEndpointsResponse;
13+
import software.amazon.awssdk.services.endpointdiscoverytest.model.Endpoint;
14+
15+
@SdkInternalApi
16+
@Generated("software.amazon.awssdk:codegen")
17+
class EndpointDiscoveryTestEndpointDiscoveryCacheLoader implements EndpointDiscoveryCacheLoader {
18+
private final EndpointDiscoveryTestClient client;
19+
20+
private EndpointDiscoveryTestEndpointDiscoveryCacheLoader(EndpointDiscoveryTestClient client) {
21+
this.client = client;
22+
}
23+
24+
public static EndpointDiscoveryTestEndpointDiscoveryCacheLoader create(EndpointDiscoveryTestClient client) {
25+
return new EndpointDiscoveryTestEndpointDiscoveryCacheLoader(client);
26+
}
27+
28+
@Override
29+
public CompletableFuture<EndpointDiscoveryEndpoint> discoverEndpoint(EndpointDiscoveryRequest endpointDiscoveryRequest) {
30+
return CompletableFuture.supplyAsync(() -> {
31+
DescribeEndpointsResponse response = client
32+
.describeEndpoints(software.amazon.awssdk.services.endpointdiscoverytest.model.DescribeEndpointsRequest
33+
.builder().build());
34+
Endpoint endpoint = response.endpoints().get(0);
35+
return EndpointDiscoveryEndpoint.builder().endpoint(URI.create(endpoint.address()))
36+
.expirationTime(Instant.now().plus(endpoint.cachePeriodInMinutes(), ChronoUnit.MINUTES)).build();
37+
});
38+
}
39+
}

‎core/aws-core/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
<artifactId>auth</artifactId>
3434
<version>${awsjavasdk.version}</version>
3535
</dependency>
36-
<dependency>
37-
<groupId>software.amazon.awssdk</groupId>
38-
<artifactId>profiles</artifactId>
39-
<version>${awsjavasdk.version}</version>
40-
</dependency>
4136
<dependency>
4237
<artifactId>sdk-core</artifactId>
4338
<groupId>software.amazon.awssdk</groupId>

‎core/sdk-core/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
<artifactId>utils</artifactId>
4747
<version>${awsjavasdk.version}</version>
4848
</dependency>
49+
<dependency>
50+
<groupId>software.amazon.awssdk</groupId>
51+
<artifactId>profiles</artifactId>
52+
<version>${awsjavasdk.version}</version>
53+
</dependency>
4954

5055
<dependency>
5156
<groupId>org.slf4j</groupId>

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpointdiscovery/EndpointDiscoveryCacheLoader.java renamed to ‎core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryCacheLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.awssdk.awscore.endpointdiscovery;
16+
package software.amazon.awssdk.core.endpointdiscovery;
1717

1818
import java.util.concurrent.CompletableFuture;
1919
import software.amazon.awssdk.annotations.SdkInternalApi;

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpointdiscovery/EndpointDiscoveryEndpoint.java renamed to ‎core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryEndpoint.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.awssdk.awscore.endpointdiscovery;
16+
package software.amazon.awssdk.core.endpointdiscovery;
1717

1818
import java.net.URI;
1919
import java.time.Instant;
2020
import software.amazon.awssdk.annotations.SdkInternalApi;
21+
import software.amazon.awssdk.utils.builder.CopyableBuilder;
22+
import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
2123

2224
@SdkInternalApi
23-
public class EndpointDiscoveryEndpoint {
25+
public final class EndpointDiscoveryEndpoint implements
26+
ToCopyableBuilder<EndpointDiscoveryEndpoint.Builder, EndpointDiscoveryEndpoint> {
2427

2528
private final URI endpoint;
2629
private final Instant expirationTime;
@@ -46,7 +49,7 @@ public Builder toBuilder() {
4649
return builder().endpoint(endpoint).expirationTime(expirationTime);
4750
}
4851

49-
public interface Builder {
52+
public interface Builder extends CopyableBuilder<Builder, EndpointDiscoveryEndpoint> {
5053

5154
Builder endpoint(URI endpoint);
5255

@@ -78,13 +81,13 @@ public Builder expirationTime(Instant expirationTime) {
7881
return this;
7982
}
8083

84+
public void setExpirationTime(Instant expirationTime) {
85+
expirationTime(expirationTime);
86+
}
87+
8188
@Override
8289
public EndpointDiscoveryEndpoint build() {
8390
return new EndpointDiscoveryEndpoint(this);
8491
}
85-
86-
public void setExpirationTime(Instant expirationTime) {
87-
expirationTime(expirationTime);
88-
}
8992
}
9093
}

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpointdiscovery/EndpointDiscoveryRefreshCache.java renamed to ‎core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRefreshCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.awssdk.awscore.endpointdiscovery;
16+
package software.amazon.awssdk.core.endpointdiscovery;
1717

1818
import java.net.URI;
1919
import java.time.Instant;

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpointdiscovery/EndpointDiscoveryRequest.java renamed to ‎core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.awssdk.awscore.endpointdiscovery;
16+
package software.amazon.awssdk.core.endpointdiscovery;
1717

1818
import java.util.Map;
1919
import java.util.Optional;

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpointdiscovery/providers/DefaultEndpointDiscoveryProviderChain.java renamed to ‎core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/DefaultEndpointDiscoveryProviderChain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.awssdk.awscore.endpointdiscovery.providers;
16+
package software.amazon.awssdk.core.endpointdiscovery.providers;
1717

1818
import software.amazon.awssdk.annotations.SdkProtectedApi;
1919

0 commit comments

Comments
 (0)