Move endpoint resolution from interceptors to pipeline stage

Author: S-Saranya1

codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AuthSchemeGeneratorTasks.java

@@ -20,7 +20,6 @@
 import software.amazon.awssdk.codegen.emitters.GeneratorTask;
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
 import software.amazon.awssdk.codegen.emitters.PoetGeneratorTask;
-import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeInterceptorSpec;
 import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeParamsSpec;
 import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeProviderSpec;
 import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeSpecUtils;
@@ -47,7 +46,6 @@ protected List<GeneratorTask> createTasks() {
         tasks.add(generateDefaultParamsImpl());
         tasks.add(generateModelBasedProvider());
         tasks.add(generatePreferenceProvider());
-        tasks.add(generateAuthSchemeInterceptor());
         if (authSchemeSpecUtils.useEndpointBasedAuthProvider()) {
             tasks.add(generateEndpointBasedProvider());
             tasks.add(generateEndpointAwareAuthSchemeParams());
@@ -86,10 +84,6 @@ private GeneratorTask generateEndpointAwareAuthSchemeParams() {
 
     }
 
-    private GeneratorTask generateAuthSchemeInterceptor() {
-        return new PoetGeneratorTask(authSchemeInternalDir(), model.getFileHeader(), new AuthSchemeInterceptorSpec(model));
-    }
-
     private String authSchemeDir() {
         return generatorTaskParams.getPathProvider().getAuthSchemeDirectory();
     }

codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/EndpointProviderTasks.java

@@ -32,9 +32,8 @@
 import software.amazon.awssdk.codegen.poet.rules.EndpointProviderInterfaceSpec;
 import software.amazon.awssdk.codegen.poet.rules.EndpointProviderSpec;
 import software.amazon.awssdk.codegen.poet.rules.EndpointProviderTestSpec;
-import software.amazon.awssdk.codegen.poet.rules.EndpointResolverInterceptorSpec;
+import software.amazon.awssdk.codegen.poet.rules.EndpointResolverUtilsSpec;
 import software.amazon.awssdk.codegen.poet.rules.EndpointRulesClientTestSpec;
-import software.amazon.awssdk.codegen.poet.rules.RequestEndpointInterceptorSpec;
 import software.amazon.awssdk.codegen.poet.rules2.EndpointProviderSpec2;
 
 public final class EndpointProviderTasks extends BaseGeneratorTasks {
@@ -103,8 +102,7 @@ private boolean shouldGenerateCompiledEndpointRules() {
 
     private Collection<GeneratorTask> generateInterceptors() {
         return Arrays.asList(
-            new PoetGeneratorTask(endpointRulesInternalDir(), model.getFileHeader(), new EndpointResolverInterceptorSpec(model)),
-            new PoetGeneratorTask(endpointRulesInternalDir(), model.getFileHeader(), new RequestEndpointInterceptorSpec(model)));
+            new PoetGeneratorTask(endpointRulesInternalDir(), model.getFileHeader(), new EndpointResolverUtilsSpec(model)));
     }
 
     private GeneratorTask generateClientTests() {

codegen/src/main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeInterceptorSpec.java

@@ -60,14 +60,42 @@ public TypeSpec poetSpec() {
                                       .addModifiers(Modifier.PUBLIC)
                                       .addAnnotation(SdkPublicApi.class)
                                       .addJavadoc(interfaceJavadoc())
-                                      .addMethod(builderMethod())
-                                      .addType(builderInterfaceSpec());
+                                      .addMethod(builderMethod());
+
+        if (authSchemeSpecUtils.generateEndpointBasedParams()) {
+            b.addMethod(fromEndpointParamsMethod());
+        }
+
+        b.addType(builderInterfaceSpec());
 
         addAccessorMethods(b);
         addToBuilder(b);
         return b.build();
     }
 
+    private MethodSpec fromEndpointParamsMethod() {
+        ClassName endpointParamsClass = endpointRulesSpecUtils.parametersClassName();
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("fromEndpointParams")
+                                               .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                                               .addParameter(endpointParamsClass, "endpointParams")
+                                               .returns(authSchemeSpecUtils.parametersInterfaceBuilderInterfaceName())
+                                               .addJavadoc("Create a builder pre-populated with endpoint parameters.\n"
+                                                           + "@param endpointParams the endpoint parameters to copy\n"
+                                                           + "@return a builder with values from the endpoint parameters");
+
+        builder.addStatement("$T builder = builder()", authSchemeSpecUtils.parametersInterfaceBuilderInterfaceName());
+
+        parameters().forEach((name, model) -> {
+            if (authSchemeSpecUtils.includeParamForProvider(name)) {
+                String methodName = endpointRulesSpecUtils.paramMethodName(name);
+                builder.addStatement("builder.$1N(endpointParams.$1N())", methodName);
+            }
+        });
+
+        builder.addStatement("return builder");
+        return builder.build();
+    }
+
     private CodeBlock interfaceJavadoc() {
         CodeBlock.Builder b = CodeBlock.builder();
 

codegen/src/main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeParamsSpec.java

@@ -370,10 +370,6 @@ private MethodSpec finalizeServiceConfigurationMethod() {
 
         List<ClassName> builtInInterceptors = new ArrayList<>();
 
-        builtInInterceptors.add(authSchemeSpecUtils.authSchemeInterceptor());
-        builtInInterceptors.add(endpointRulesSpecUtils.resolverInterceptorName());
-        builtInInterceptors.add(endpointRulesSpecUtils.requestModifierInterceptorName());
-
         for (String interceptor : model.getCustomizationConfig().getInterceptors()) {
             builtInInterceptors.add(ClassName.bestGuess(interceptor));
         }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

@@ -69,10 +69,12 @@
 import software.amazon.awssdk.codegen.poet.PoetExtension;
 import software.amazon.awssdk.codegen.poet.PoetUtils;
 import software.amazon.awssdk.codegen.poet.StaticImport;
+import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeSpecUtils;
 import software.amazon.awssdk.codegen.poet.client.specs.ProtocolSpec;
 import software.amazon.awssdk.codegen.poet.eventstream.EventStreamUtils;
 import software.amazon.awssdk.codegen.poet.model.EventStreamSpecHelper;
 import software.amazon.awssdk.codegen.poet.model.ServiceClientConfigurationUtils;
+import software.amazon.awssdk.codegen.poet.rules.EndpointRulesSpecUtils;
 import software.amazon.awssdk.core.RequestOverrideConfiguration;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.async.AsyncResponseTransformerUtils;
@@ -100,6 +102,8 @@ public final class AsyncClientClass extends AsyncClientInterface {
     private final ProtocolSpec protocolSpec;
     private final ClassName serviceClientConfigurationClassName;
     private final ServiceClientConfigurationUtils configurationUtils;
+    private final AuthSchemeSpecUtils authSchemeSpecUtils;
+    private final EndpointRulesSpecUtils endpointRulesSpecUtils;
     private boolean hasScheduledExecutor;
 
     public AsyncClientClass(GeneratorTaskParams dependencies) {
@@ -110,6 +114,8 @@ public AsyncClientClass(GeneratorTaskParams dependencies) {
         this.protocolSpec = getProtocolSpecs(poetExtensions, model);
         this.serviceClientConfigurationClassName = new PoetExtension(model).getServiceConfigClass();
         this.configurationUtils = new ServiceClientConfigurationUtils(model);
+        this.authSchemeSpecUtils = new AuthSchemeSpecUtils(model);
+        this.endpointRulesSpecUtils = new EndpointRulesSpecUtils(model);
     }
 
     @Override
@@ -165,7 +171,9 @@ protected void addAdditionalMethods(TypeSpec.Builder type) {
             .addMethod(nameMethod())
             .addMethods(protocolSpec.additionalMethods())
             .addMethod(protocolSpec.initProtocolFactory(model))
-            .addMethod(resolveMetricPublishersMethod());
+            .addMethod(resolveMetricPublishersMethod())
+            .addMethod(ClientClassUtils.resolveAuthSchemeOptionsMethod(authSchemeSpecUtils, endpointRulesSpecUtils))
+            .addMethod(ClientClassUtils.resolveEndpointMethod(authSchemeSpecUtils, endpointRulesSpecUtils));
 
         type.addMethod(ClientClassUtils.updateRetryStrategyClientConfigurationMethod());
         type.addMethod(updateSdkClientConfigurationMethod(configurationUtils.serviceClientConfigurationBuilderClassName(),