Fix constant pool overflow issue

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

@@ -173,9 +173,7 @@ protected void addAdditionalMethods(TypeSpec.Builder type) {
             .addMethod(protocolSpec.initProtocolFactory(model))
             .addMethod(resolveMetricPublishersMethod())
             .addMethod(ClientClassUtils.resolveAuthSchemeOptionsMethod(authSchemeSpecUtils, endpointRulesSpecUtils))
-            .addMethod(ClientClassUtils.resolveEndpointMethod(authSchemeSpecUtils, endpointRulesSpecUtils))
-            .addMethod(ClientClassUtils.authSchemeResolverFactoryMethod())
-            .addMethod(ClientClassUtils.endpointResolverFactoryMethod());
+            .addMethod(ClientClassUtils.resolveEndpointMethod(authSchemeSpecUtils, endpointRulesSpecUtils));
 
         type.addMethod(ClientClassUtils.updateRetryStrategyClientConfigurationMethod());
         type.addMethod(updateSdkClientConfigurationMethod(configurationUtils.serviceClientConfigurationBuilderClassName(),

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientClassUtils.java

@@ -62,6 +62,7 @@
 import software.amazon.awssdk.core.endpoint.EndpointResolver;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
 import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
 import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.signer.Signer;
@@ -368,11 +369,13 @@ static MethodSpec resolveAuthSchemeOptionsMethod(AuthSchemeSpecUtils authSchemeS
                 .addModifiers(PRIVATE)
                 .returns(ParameterizedTypeName.get(ClassName.get(List.class), ClassName.get(AuthSchemeOption.class)))
                 .addParameter(SdkRequest.class, "request")
-                .addParameter(String.class, "operationName")
-                .addParameter(SdkClientConfiguration.class, "clientConfiguration");
+                .addParameter(ExecutionAttributes.class, "executionAttributes");
 
         ClassName providerInterface = authSchemeSpecUtils.providerInterfaceName();
 
+        builder.addStatement("String operationName = executionAttributes.getAttribute($T.OPERATION_NAME)",
+                             SdkExecutionAttribute.class);
+
         // Check for request-level authSchemeProvider override
         builder.addStatement("$T requestAuthSchemeProvider = request.overrideConfiguration()"
                              + ".flatMap(c -> c.authSchemeProvider())"
@@ -446,24 +449,24 @@ private static void addEndpointBasedAuthSchemeResolution(MethodSpec.Builder buil
         ClassName sdkInternalExecutionAttribute = ClassName.get("software.amazon.awssdk.core.interceptor",
                                                                 "SdkInternalExecutionAttribute");
 
-        builder.addStatement("$T executionAttributes = new $T()", executionAttributesClass, executionAttributesClass);
-        builder.addStatement("executionAttributes.putAttribute($T.AWS_REGION, clientConfiguration.option($T.AWS_REGION))",
+        builder.addStatement("$T endpointAttrs = new $T()", executionAttributesClass, executionAttributesClass);
+        builder.addStatement("endpointAttrs.putAttribute($T.AWS_REGION, clientConfiguration.option($T.AWS_REGION))",
                              awsExecutionAttribute, awsClientOption);
-        builder.addStatement("executionAttributes.putAttribute($T.DUALSTACK_ENDPOINT_ENABLED, "
+        builder.addStatement("endpointAttrs.putAttribute($T.DUALSTACK_ENDPOINT_ENABLED, "
                              + "clientConfiguration.option($T.DUALSTACK_ENDPOINT_ENABLED))",
                              awsExecutionAttribute, awsClientOption);
-        builder.addStatement("executionAttributes.putAttribute($T.FIPS_ENDPOINT_ENABLED, "
+        builder.addStatement("endpointAttrs.putAttribute($T.FIPS_ENDPOINT_ENABLED, "
                              + "clientConfiguration.option($T.FIPS_ENDPOINT_ENABLED))",
                              awsExecutionAttribute, awsClientOption);
-        builder.addStatement("executionAttributes.putAttribute($T.OPERATION_NAME, operationName)", sdkExecutionAttribute);
-        builder.addStatement("executionAttributes.putAttribute($T.CLIENT_ENDPOINT_PROVIDER, "
+        builder.addStatement("endpointAttrs.putAttribute($T.OPERATION_NAME, operationName)", sdkExecutionAttribute);
+        builder.addStatement("endpointAttrs.putAttribute($T.CLIENT_ENDPOINT_PROVIDER, "
                              + "clientConfiguration.option($T.CLIENT_ENDPOINT_PROVIDER))",
                              sdkInternalExecutionAttribute, SdkClientOption.class);
-        builder.addStatement("executionAttributes.putAttribute($T.CLIENT_CONTEXT_PARAMS, "
+        builder.addStatement("endpointAttrs.putAttribute($T.CLIENT_CONTEXT_PARAMS, "
                              + "clientConfiguration.option($T.CLIENT_CONTEXT_PARAMS))",
                              sdkInternalExecutionAttribute, SdkClientOption.class);
 
-        builder.addStatement("$T endpointParams = $T.ruleParams(request, executionAttributes)",
+        builder.addStatement("$T endpointParams = $T.ruleParams(request, endpointAttrs)",
                              endpointParamsClass, endpointResolverUtils);
 
         builder.addStatement("$T.Builder paramsBuilder = $T.builder()", paramsInterface, paramsInterface);
@@ -497,8 +500,10 @@ private static void addEndpointBasedAuthSchemeResolution(MethodSpec.Builder buil
         ClassName endpointProviderInterface = endpointRulesSpecUtils.providerInterfaceName();
 
         builder.beginControlFlow("if (paramsBuilder instanceof $T)", paramsBuilderClass);
-        builder.addStatement("$T endpointProvider = clientConfiguration.option($T.ENDPOINT_PROVIDER)",
-                             ClassName.get("software.amazon.awssdk.endpoints", "EndpointProvider"), SdkClientOption.class);
+        builder.addStatement("$T endpointProvider = ($T) executionAttributes.getAttribute($T.ENDPOINT_PROVIDER)",
+                             ClassName.get("software.amazon.awssdk.endpoints", "EndpointProvider"),
+                             ClassName.get("software.amazon.awssdk.endpoints", "EndpointProvider"),
+                             sdkInternalExecutionAttribute);
         builder.beginControlFlow("if (endpointProvider instanceof $T)", endpointProviderInterface);
         builder.addStatement("(($T) paramsBuilder).endpointProvider(($T) endpointProvider)",
                              paramsBuilderClass, endpointProviderInterface);
@@ -555,8 +560,9 @@ static MethodSpec resolveEndpointMethod(AuthSchemeSpecUtils authSchemeSpecUtils,
                          .addModifiers(PRIVATE)
                          .returns(Endpoint.class)
                          .addParameter(SdkRequest.class, "request")
-                         .addParameter(ExecutionAttributes.class, "executionAttributes")
-                         .addParameter(String.class, "operationName");
+                         .addParameter(ExecutionAttributes.class, "executionAttributes");
+
+        b.addStatement("String operationName = executionAttributes.getAttribute($T.OPERATION_NAME)", SdkExecutionAttribute.class);
 
         b.addStatement("$1T provider = ($1T) executionAttributes.getAttribute($2T.ENDPOINT_PROVIDER)",
                        providerInterface, SdkInternalExecutionAttribute.class);

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

@@ -141,9 +141,7 @@ protected void addAdditionalMethods(TypeSpec.Builder type) {
             .addMethods(protocolSpec.additionalMethods())
             .addMethod(resolveMetricPublishersMethod())
             .addMethod(ClientClassUtils.resolveAuthSchemeOptionsMethod(authSchemeSpecUtils, endpointRulesSpecUtils))
-            .addMethod(ClientClassUtils.resolveEndpointMethod(authSchemeSpecUtils, endpointRulesSpecUtils))
-            .addMethod(ClientClassUtils.authSchemeResolverFactoryMethod())
-            .addMethod(ClientClassUtils.endpointResolverFactoryMethod());
+            .addMethod(ClientClassUtils.resolveEndpointMethod(authSchemeSpecUtils, endpointRulesSpecUtils));
 
         protocolSpec.createErrorResponseHandler().ifPresent(type::addMethod);
         type.addMethod(ClientClassUtils.updateRetryStrategyClientConfigurationMethod());

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

@@ -224,10 +224,8 @@ public CodeBlock executionHandler(OperationModel opModel) {
                      .add(".withRequestConfiguration(clientConfiguration)")
                      .add(".withInput($L)\n", opModel.getInput().getVariableName())
                      .add(".withMetricCollector(apiCallMetricCollector)\n")
-                     .add(".withAuthSchemeOptionsResolver(authSchemeResolver($S, clientConfiguration))\n",
-                          opModel.getOperationName())
-                     .add(".withEndpointResolver(endpointResolver($S))\n",
-                          opModel.getOperationName())
+                     .add(".withAuthSchemeOptionsResolver(this::resolveAuthSchemeOptions)\n")
+                     .add(".withEndpointResolver(this::resolveEndpoint)\n")
                      .add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
                      .add(HttpChecksumTrait.create(opModel));
 
@@ -302,10 +300,8 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
                .add(".withErrorResponseHandler(errorResponseHandler)\n")
                .add(".withRequestConfiguration(clientConfiguration)")
                .add(".withMetricCollector(apiCallMetricCollector)\n")
-               .add(".withAuthSchemeOptionsResolver(authSchemeResolver($S, clientConfiguration))\n",
-                    opModel.getOperationName())
-               .add(".withEndpointResolver(endpointResolver($S))\n",
-                    opModel.getOperationName())
+               .add(".withAuthSchemeOptionsResolver(this::resolveAuthSchemeOptions)\n")
+               .add(".withEndpointResolver(this::resolveEndpoint)\n")
                .add(hostPrefixExpression(opModel))
                .add(discoveredEndpoint(opModel))
                .add(credentialType(opModel, model))

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

@@ -116,10 +116,8 @@ public CodeBlock executionHandler(OperationModel opModel) {
                      .add(".withRequestConfiguration(clientConfiguration)")
                      .add(".withInput($L)", opModel.getInput().getVariableName())
                      .add(".withMetricCollector(apiCallMetricCollector)")
-                     .add(".withAuthSchemeOptionsResolver(authSchemeResolver($S, clientConfiguration))\n",
-                          opModel.getOperationName())
-                     .add(".withEndpointResolver(endpointResolver($S))\n",
-                          opModel.getOperationName())
+                     .add(".withAuthSchemeOptionsResolver(this::resolveAuthSchemeOptions)\n")
+                     .add(".withEndpointResolver(this::resolveEndpoint)\n")
                      .add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
                      .add(HttpChecksumTrait.create(opModel));
 
@@ -159,10 +157,8 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
                      .add(credentialType(opModel, intermediateModel))
                      .add(".withRequestConfiguration(clientConfiguration)")
                      .add(".withMetricCollector(apiCallMetricCollector)\n")
-                     .add(".withAuthSchemeOptionsResolver(authSchemeResolver($S, clientConfiguration))\n",
-                          opModel.getOperationName())
-                     .add(".withEndpointResolver(endpointResolver($S))\n",
-                          opModel.getOperationName())
+                     .add(".withAuthSchemeOptionsResolver(this::resolveAuthSchemeOptions)\n")
+                     .add(".withEndpointResolver(this::resolveEndpoint)\n")
                      .add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
                      .add(HttpChecksumTrait.create(opModel));
 

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

@@ -135,10 +135,8 @@ public CodeBlock executionHandler(OperationModel opModel) {
                                                .add(credentialType(opModel, model))
                                                .add(".withRequestConfiguration(clientConfiguration)")
                      .add(".withInput($L)", opModel.getInput().getVariableName())
-                     .add(".withAuthSchemeOptionsResolver(authSchemeResolver($S, clientConfiguration))\n",
-                          opModel.getOperationName())
-                     .add(".withEndpointResolver(endpointResolver($S))\n",
-                          opModel.getOperationName())
+                     .add(".withAuthSchemeOptionsResolver(this::resolveAuthSchemeOptions)\n")
+                     .add(".withEndpointResolver(this::resolveEndpoint)\n")
                                                .add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
                                                .add(HttpChecksumTrait.create(opModel));
 
@@ -217,10 +215,8 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
         builder.add(hostPrefixExpression(opModel))
                .add(credentialType(opModel, model))
                      .add(".withMetricCollector(apiCallMetricCollector)\n")
-                     .add(".withAuthSchemeOptionsResolver(authSchemeResolver($S, clientConfiguration))\n",
-                          opModel.getOperationName())
-                     .add(".withEndpointResolver(endpointResolver($S))\n",
-                          opModel.getOperationName())
+                     .add(".withAuthSchemeOptionsResolver(this::resolveAuthSchemeOptions)\n")
+                     .add(".withEndpointResolver(this::resolveEndpoint)\n")
                .add(asyncRequestBody(opModel))
                .add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
                .add(HttpChecksumTrait.create(opModel));