Move endpoints up

.github/workflows/fuzz-testing.yml

@@ -57,7 +57,7 @@ jobs:
         env:
           JAZZER_FUZZ: "1"
         run: |
-          ./gradlew :client:client-rulesengine:test --tests "*FuzzTest*" -Djazzer.max_duration=1h --stacktrace
+          ./gradlew :rulesengine:test --tests "*FuzzTest*" -Djazzer.max_duration=1h --stacktrace
 
       - name: Save fuzz corpus cache
         uses: actions/cache/save@v5

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

@@ -23,10 +23,10 @@
 import software.amazon.smithy.java.client.core.ProtocolSettings;
 import software.amazon.smithy.java.client.core.RequestOverrideConfig;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthScheme;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.client.core.interceptors.CallHook;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.server.ProxyService;
 import software.amazon.smithy.model.knowledge.ServiceIndex;
 import software.amazon.smithy.model.shapes.ShapeId;

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

@@ -13,10 +13,10 @@
 import org.junit.jupiter.api.Test;
 import software.amazon.smithy.java.aws.client.awsjson.AwsJson1Protocol;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.client.http.mock.MockPlugin;
 import software.amazon.smithy.java.client.http.mock.MockQueue;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.http.api.HttpResponse;
 import software.amazon.smithy.java.io.datastream.DataStream;
 import software.amazon.smithy.java.retries.api.AcquireInitialTokenRequest;

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

@@ -14,12 +14,12 @@
 import software.amazon.smithy.java.aws.client.awsjson.AwsJson1Protocol;
 import software.amazon.smithy.java.client.core.ClientPlugin;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.client.core.interceptors.RequestHook;
 import software.amazon.smithy.java.client.http.mock.MockPlugin;
 import software.amazon.smithy.java.client.http.mock.MockQueue;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.http.api.HttpHeaders;
 import software.amazon.smithy.java.http.api.HttpRequest;
 import software.amazon.smithy.java.http.api.HttpResponse;

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

@@ -16,14 +16,14 @@
 import org.openjdk.jmh.annotations.State;
 import software.amazon.smithy.java.aws.client.core.settings.EndpointSettings;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolverParams;
 import software.amazon.smithy.java.client.rulesengine.EndpointRulesPlugin;
-import software.amazon.smithy.java.client.rulesengine.RulesEngineBuilder;
-import software.amazon.smithy.java.client.rulesengine.RulesEngineSettings;
 import software.amazon.smithy.java.context.Context;
 import software.amazon.smithy.java.core.serde.document.Document;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
+import software.amazon.smithy.java.endpoints.EndpointResolverParams;
+import software.amazon.smithy.java.rulesengine.RulesEngineBuilder;
+import software.amazon.smithy.java.rulesengine.RulesEngineSettings;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.loader.ModelAssembler;
 import software.amazon.smithy.model.pattern.UriPattern;
@@ -75,7 +75,7 @@ public void setup() {
 
         var ctx = Context.create();
         ctx.put(EndpointSettings.REGION, "us-east-1");
-        //ctx.put(EndpointRulesPlugin.ADDITIONAL_ENDPOINT_PARAMS, Map.of("UseFIPS", true, "UseDualStack", true));
+        //ctx.put(RulesEngineSettings.ADDITIONAL_ENDPOINT_PARAMS, Map.of("UseFIPS", true, "UseDualStack", true));
 
         endpointParams = EndpointResolverParams.builder()
                 .context(ctx)

aws/client/aws-client-rulesengine/src/main/java/software/amazon/smithy/java/aws/client/rulesengine/AwsRulesExtension.java

@@ -12,9 +12,9 @@
 import software.amazon.smithy.java.aws.client.core.settings.RegionSetting;
 import software.amazon.smithy.java.aws.client.core.settings.S3EndpointSettings;
 import software.amazon.smithy.java.aws.client.core.settings.StsEndpointSettings;
-import software.amazon.smithy.java.client.rulesengine.RulesExtension;
-import software.amazon.smithy.java.client.rulesengine.RulesFunction;
 import software.amazon.smithy.java.context.Context;
+import software.amazon.smithy.java.rulesengine.RulesExtension;
+import software.amazon.smithy.java.rulesengine.RulesFunction;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 
 /**

aws/client/aws-client-rulesengine/src/main/java/software/amazon/smithy/java/aws/client/rulesengine/AwsRulesFunction.java

@@ -8,7 +8,7 @@
 import java.util.AbstractMap;
 import java.util.Map;
 import java.util.Set;
-import software.amazon.smithy.java.client.rulesengine.RulesFunction;
+import software.amazon.smithy.java.rulesengine.RulesFunction;
 import software.amazon.smithy.rulesengine.aws.language.functions.AwsArn;
 import software.amazon.smithy.rulesengine.aws.language.functions.AwsPartition;
 import software.amazon.smithy.rulesengine.aws.language.functions.IsVirtualHostableS3Bucket;

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

@@ -21,18 +21,18 @@
 import software.amazon.smithy.java.client.core.CallContext;
 import software.amazon.smithy.java.client.core.RequestOverrideConfig;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.Endpoint;
-import software.amazon.smithy.java.client.core.endpoint.EndpointContext;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.client.core.interceptors.RequestHook;
 import software.amazon.smithy.java.client.rulesengine.EndpointRulesPlugin;
-import software.amazon.smithy.java.client.rulesengine.EndpointUtils;
-import software.amazon.smithy.java.client.rulesengine.RulesEngineBuilder;
-import software.amazon.smithy.java.client.rulesengine.RulesEngineSettings;
-import software.amazon.smithy.java.client.rulesengine.RulesEvaluationError;
 import software.amazon.smithy.java.core.serde.document.Document;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.Endpoint;
+import software.amazon.smithy.java.endpoints.EndpointContext;
 import software.amazon.smithy.java.http.api.HttpRequest;
+import software.amazon.smithy.java.rulesengine.EndpointUtils;
+import software.amazon.smithy.java.rulesengine.RulesEngineBuilder;
+import software.amazon.smithy.java.rulesengine.RulesEngineSettings;
+import software.amazon.smithy.java.rulesengine.RulesEvaluationError;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.loader.ModelAssembler;
 import software.amazon.smithy.model.pattern.UriPattern;
@@ -197,7 +197,7 @@ public void readBeforeTransmit(RequestHook<?, ?, ?> hook) {
         });
 
         overrideMap = (Map<String, Object>) EndpointUtils.convertNode(test.getParams(), true);
-        override.putConfig(EndpointRulesPlugin.ADDITIONAL_ENDPOINT_PARAMS, overrideMap);
+        override.putConfig(RulesEngineSettings.ADDITIONAL_ENDPOINT_PARAMS, overrideMap);
 
         try {
             var document = Document.ofObject(inputParams);

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

@@ -22,10 +22,10 @@
 import software.amazon.smithy.aws.traits.protocols.RestJson1Trait;
 import software.amazon.smithy.java.aws.client.restjson.RestJsonClientProtocol;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.core.schema.SerializableStruct;
 import software.amazon.smithy.java.core.serde.document.Document;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.io.ByteBufferUtils;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.ShapeId;

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

@@ -35,7 +35,7 @@
 import software.amazon.smithy.java.aws.client.restxml.RestXmlClientProtocol;
 import software.amazon.smithy.java.aws.sdkv2.auth.SdkCredentialsResolver;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.client.rpcv2.RpcV2CborProtocol;
 import software.amazon.smithy.java.core.serde.ShapeSerializer;
 import software.amazon.smithy.java.core.serde.document.Document;

client/client-core/build.gradle.kts

@@ -10,6 +10,7 @@ extra["moduleName"] = "software.amazon.smithy.java.client.core"
 dependencies {
     api(project(":context"))
     api(project(":core"))
+    api(project(":endpoints"))
     api(project(":auth-api"))
     api(project(":client:client-auth-api"))
     api(project(":retries-api"))

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

@@ -8,9 +8,9 @@
 import java.util.HashSet;
 import java.util.Set;
 import software.amazon.smithy.java.auth.api.identity.Identity;
-import software.amazon.smithy.java.client.core.endpoint.Endpoint;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.context.Context;
+import software.amazon.smithy.java.endpoints.Endpoint;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 
 /**
  * Context parameters made available to underlying transports like HTTP clients.

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

@@ -15,8 +15,6 @@
 import software.amazon.smithy.java.auth.api.identity.IdentityResolvers;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthScheme;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.Endpoint;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.client.core.interceptors.CallHook;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.client.core.plugins.AutoPlugin;
@@ -26,6 +24,9 @@
 import software.amazon.smithy.java.core.serde.TypeRegistry;
 import software.amazon.smithy.java.core.serde.event.Frame;
 import software.amazon.smithy.java.core.serde.event.ProtocolEventStreamWriter;
+import software.amazon.smithy.java.endpoints.Endpoint;
+import software.amazon.smithy.java.endpoints.EndpointContext;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.retries.api.RetryStrategy;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
@@ -249,7 +250,7 @@ public B endpointResolver(EndpointResolver endpointResolver) {
          */
         @SuppressWarnings("unchecked")
         public B endpoint(Endpoint customEndpoint) {
-            putConfig(ClientContext.CUSTOM_ENDPOINT, customEndpoint);
+            putConfig(EndpointContext.CUSTOM_ENDPOINT, customEndpoint);
             return (B) this;
         }
 
@@ -262,7 +263,7 @@ public B endpoint(Endpoint customEndpoint) {
          */
         @SuppressWarnings("unchecked")
         public B endpoint(String customEndpoint) {
-            putConfig(ClientContext.CUSTOM_ENDPOINT, Endpoint.builder().uri(customEndpoint).build());
+            putConfig(EndpointContext.CUSTOM_ENDPOINT, Endpoint.builder().uri(customEndpoint).build());
             return (B) this;
         }
 

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

@@ -14,14 +14,14 @@
 import software.amazon.smithy.java.auth.api.identity.IdentityResolvers;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthScheme;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.context.Context;
 import software.amazon.smithy.java.core.schema.ApiOperation;
 import software.amazon.smithy.java.core.schema.SerializableStruct;
 import software.amazon.smithy.java.core.serde.TypeRegistry;
 import software.amazon.smithy.java.core.serde.event.Frame;
 import software.amazon.smithy.java.core.serde.event.ProtocolEventStreamWriter;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.io.datastream.DataStream;
 import software.amazon.smithy.java.retries.api.RetryStrategy;
 import software.amazon.smithy.java.retries.api.RetryToken;

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

@@ -19,11 +19,12 @@
 import software.amazon.smithy.java.auth.api.identity.IdentityResolver;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthScheme;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.client.core.plugins.DefaultPlugin;
 import software.amazon.smithy.java.context.Context;
 import software.amazon.smithy.java.core.schema.ApiService;
+import software.amazon.smithy.java.endpoints.EndpointContext;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.logging.InternalLogger;
 import software.amazon.smithy.java.retries.api.RetryStrategy;
 
@@ -71,8 +72,8 @@ private ClientConfig(Builder builder) {
             // Things like the Smithy rules engine based resolver look for this property to know if a custom endpoint
             // was provided in this manner.
             var customEndpoint = Objects.requireNonNull(
-                    builder.context.get(ClientContext.CUSTOM_ENDPOINT),
-                    "One of endpointResolver or ClientContext.CUSTOM_ENDPOINT must be set");
+                    builder.context.get(EndpointContext.CUSTOM_ENDPOINT),
+                    "One of endpointResolver or EndpointContext.CUSTOM_ENDPOINT must be set");
             this.endpointResolver = EndpointResolver.staticEndpoint(customEndpoint);
         }
 

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

@@ -6,8 +6,6 @@
 package software.amazon.smithy.java.client.core;
 
 import java.time.Duration;
-import software.amazon.smithy.java.client.core.endpoint.Endpoint;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.context.Context;
 
 /**
@@ -16,15 +14,6 @@
  * <p>Other per/call settings can be found in {@link CallContext}.
  */
 public final class ClientContext {
-    /**
-     * A custom endpoint used in each request.
-     *
-     * <p>This can be used in lieu of setting something like {@link EndpointResolver#staticEndpoint}, allowing
-     * endpoint resolvers like the Smithy Rules Engine resolver to still process and validate endpoints even when a
-     * custom endpoint is provided.
-     */
-    public static final Context.Key<Endpoint> CUSTOM_ENDPOINT = Context.key("Custom endpoint to use with requests");
-
     /**
      * The name of the application, used in things like user-agent headers.
      *

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

@@ -18,8 +18,6 @@
 import software.amazon.smithy.java.client.core.auth.scheme.AuthScheme;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeOption;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolverParams;
-import software.amazon.smithy.java.client.core.endpoint.Endpoint;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolverParams;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.client.core.interceptors.InputHook;
 import software.amazon.smithy.java.client.core.interceptors.OutputHook;
@@ -31,6 +29,8 @@
 import software.amazon.smithy.java.core.schema.SerializableStruct;
 import software.amazon.smithy.java.core.serde.event.Frame;
 import software.amazon.smithy.java.core.serde.event.FrameProcessor;
+import software.amazon.smithy.java.endpoints.Endpoint;
+import software.amazon.smithy.java.endpoints.EndpointResolverParams;
 import software.amazon.smithy.java.logging.InternalLogger;
 import software.amazon.smithy.java.retries.api.AcquireInitialTokenRequest;
 import software.amazon.smithy.java.retries.api.RecordSuccessRequest;

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

@@ -6,13 +6,13 @@
 package software.amazon.smithy.java.client.core;
 
 import java.net.URI;
-import software.amazon.smithy.java.client.core.endpoint.Endpoint;
 import software.amazon.smithy.java.context.Context;
 import software.amazon.smithy.java.core.error.CallException;
 import software.amazon.smithy.java.core.schema.ApiOperation;
 import software.amazon.smithy.java.core.schema.SerializableStruct;
 import software.amazon.smithy.java.core.serde.Codec;
 import software.amazon.smithy.java.core.serde.TypeRegistry;
+import software.amazon.smithy.java.endpoints.Endpoint;
 import software.amazon.smithy.model.shapes.ShapeId;
 
 /**

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

@@ -12,9 +12,9 @@
 import software.amazon.smithy.java.auth.api.identity.IdentityResolver;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthScheme;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.context.Context;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.retries.api.RetryStrategy;
 
 /**

client/client-core/src/test/java/software/amazon/smithy/java/client/core/ClientPipelineTest.java

@@ -26,15 +26,15 @@
 import software.amazon.smithy.java.client.core.auth.scheme.AuthScheme;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeOption;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.client.core.endpoint.Endpoint;
-import software.amazon.smithy.java.client.core.endpoint.EndpointAuthScheme;
-import software.amazon.smithy.java.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.client.http.JavaHttpClientTransport;
 import software.amazon.smithy.java.client.http.mock.MockPlugin;
 import software.amazon.smithy.java.client.http.mock.MockQueue;
 import software.amazon.smithy.java.context.Context;
 import software.amazon.smithy.java.core.serde.document.Document;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.Endpoint;
+import software.amazon.smithy.java.endpoints.EndpointAuthScheme;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.http.api.HttpRequest;
 import software.amazon.smithy.java.http.api.HttpResponse;
 import software.amazon.smithy.java.io.datastream.DataStream;