Skip to content

Commit f2ecbf5

Browse files
committed
Move endpoints to upper level
1 parent 46f0510 commit f2ecbf5

64 files changed

Lines changed: 101 additions & 85 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

aws/aws-service-bundle/src/main/java/software/amazon/smithy/java/aws/servicebundle/provider/AwsServiceBundle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import software.amazon.smithy.java.client.core.ProtocolSettings;
2424
import software.amazon.smithy.java.client.core.RequestOverrideConfig;
2525
import software.amazon.smithy.java.client.core.auth.scheme.AuthScheme;
26-
import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
2726
import software.amazon.smithy.java.client.core.interceptors.CallHook;
2827
import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
2928
import software.amazon.smithy.java.dynamicclient.DynamicClient;
29+
import software.amazon.smithy.java.endpoints.EndpointResolver;
3030
import software.amazon.smithy.java.server.ProxyService;
3131
import software.amazon.smithy.model.knowledge.ServiceIndex;
3232
import software.amazon.smithy.model.shapes.ShapeId;

aws/client/aws-client-http/src/test/java/software/amazon/smithy/java/aws/client/http/AmzSdkRequestPluginTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.junit.jupiter.api.Test;
1414
import software.amazon.smithy.java.aws.client.awsjson.AwsJson1Protocol;
1515
import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
16-
import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
16+
import software.amazon.smithy.java.endpoints.EndpointResolver;
1717
import software.amazon.smithy.java.client.http.mock.MockPlugin;
1818
import software.amazon.smithy.java.client.http.mock.MockQueue;
1919
import software.amazon.smithy.java.dynamicclient.DynamicClient;

aws/client/aws-client-http/src/test/java/software/amazon/smithy/java/aws/client/http/RecursionDetectionPluginTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import software.amazon.smithy.java.aws.client.awsjson.AwsJson1Protocol;
1515
import software.amazon.smithy.java.client.core.ClientPlugin;
1616
import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
17-
import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
17+
import software.amazon.smithy.java.endpoints.EndpointResolver;
1818
import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
1919
import software.amazon.smithy.java.client.core.interceptors.RequestHook;
2020
import software.amazon.smithy.java.client.http.mock.MockPlugin;

aws/client/aws-client-rulesengine/src/jmh/java/software/amazon/smithy/java/aws/client/rulesengine/Bench.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import org.openjdk.jmh.annotations.State;
1717
import software.amazon.smithy.java.aws.client.core.settings.EndpointSettings;
1818
import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
19-
import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
20-
import software.amazon.smithy.java.client.core.endpoint.EndpointResolverParams;
19+
import software.amazon.smithy.java.endpoints.EndpointResolver;
20+
import software.amazon.smithy.java.endpoints.EndpointResolverParams;
2121
import software.amazon.smithy.java.client.rulesengine.EndpointRulesPlugin;
2222
import software.amazon.smithy.java.client.rulesengine.RulesEngineBuilder;
2323
import software.amazon.smithy.java.client.rulesengine.RulesEngineSettings;

aws/client/aws-client-rulesengine/src/test/java/software/amazon/smithy/java/aws/client/rulesengine/ResolverTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import software.amazon.smithy.java.client.core.CallContext;
2222
import software.amazon.smithy.java.client.core.RequestOverrideConfig;
2323
import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
24-
import software.amazon.smithy.java.client.core.endpoint.Endpoint;
25-
import software.amazon.smithy.java.client.core.endpoint.EndpointContext;
24+
import software.amazon.smithy.java.endpoints.Endpoint;
25+
import software.amazon.smithy.java.endpoints.EndpointContext;
2626
import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
2727
import software.amazon.smithy.java.client.core.interceptors.RequestHook;
2828
import software.amazon.smithy.java.client.rulesengine.EndpointRulesPlugin;

aws/sdkv2/aws-sdkv2-shapes/src/test/java/software/amazon/smithy/java/aws/sdkv2/shapes/SdkDocumentWriterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import software.amazon.smithy.aws.traits.protocols.RestJson1Trait;
2323
import software.amazon.smithy.java.aws.client.restjson.RestJsonClientProtocol;
2424
import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
25-
import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
25+
import software.amazon.smithy.java.endpoints.EndpointResolver;
2626
import software.amazon.smithy.java.core.schema.SerializableStruct;
2727
import software.amazon.smithy.java.core.serde.document.Document;
2828
import software.amazon.smithy.java.dynamicclient.DynamicClient;

cli/src/main/java/software/amazon/smithy/java/cli/SmithyCall.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import software.amazon.smithy.java.aws.client.restxml.RestXmlClientProtocol;
3636
import software.amazon.smithy.java.aws.sdkv2.auth.SdkCredentialsResolver;
3737
import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
38-
import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
38+
import software.amazon.smithy.java.endpoints.EndpointResolver;
3939
import software.amazon.smithy.java.client.rpcv2.RpcV2CborProtocol;
4040
import software.amazon.smithy.java.core.serde.ShapeSerializer;
4141
import software.amazon.smithy.java.core.serde.document.Document;

client/client-core/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ extra["moduleName"] = "software.amazon.smithy.java.client.core"
1010
dependencies {
1111
api(project(":context"))
1212
api(project(":core"))
13+
api(project(":endpoints"))
1314
api(project(":auth-api"))
1415
api(project(":client:client-auth-api"))
1516
api(project(":retries-api"))

client/client-core/src/main/java/software/amazon/smithy/java/client/core/CallContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import java.util.HashSet;
99
import java.util.Set;
1010
import software.amazon.smithy.java.auth.api.identity.Identity;
11-
import software.amazon.smithy.java.client.core.endpoint.Endpoint;
12-
import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
1311
import software.amazon.smithy.java.context.Context;
12+
import software.amazon.smithy.java.endpoints.Endpoint;
13+
import software.amazon.smithy.java.endpoints.EndpointResolver;
1414

1515
/**
1616
* Context parameters made available to underlying transports like HTTP clients.

client/client-core/src/main/java/software/amazon/smithy/java/client/core/Client.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import software.amazon.smithy.java.auth.api.identity.IdentityResolvers;
1616
import software.amazon.smithy.java.client.core.auth.scheme.AuthScheme;
1717
import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
18-
import software.amazon.smithy.java.client.core.endpoint.Endpoint;
19-
import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
2018
import software.amazon.smithy.java.client.core.interceptors.CallHook;
2119
import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
2220
import software.amazon.smithy.java.client.core.plugins.AutoPlugin;
@@ -26,6 +24,8 @@
2624
import software.amazon.smithy.java.core.serde.TypeRegistry;
2725
import software.amazon.smithy.java.core.serde.event.Frame;
2826
import software.amazon.smithy.java.core.serde.event.ProtocolEventStreamWriter;
27+
import software.amazon.smithy.java.endpoints.Endpoint;
28+
import software.amazon.smithy.java.endpoints.EndpointResolver;
2929
import software.amazon.smithy.java.retries.api.RetryStrategy;
3030
import software.amazon.smithy.utils.SmithyInternalApi;
3131

0 commit comments

Comments
 (0)