Skip to content

Eliminate Per-Operation Lambdas for Constant Pool Overflow Fix #7150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
S-Saranya1 wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Eliminate Per-Operation Lambdas for Constant Pool Overflow Fix #7150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
897e1b8
Fix constant pool overflow issue
S-Saranya1 Jul 15, 2026
f081727
Update codegen fixture files
S-Saranya1 Jul 15, 2026
9ef6263
Fix tests
S-Saranya1 Jul 15, 2026
bacfd38
Remove @FunctionalInterface from EndpointResolver and AuthSchemeOptio…
S-Saranya1 Jul 15, 2026
f289343
Add changelog
S-Saranya1 Jul 15, 2026
15f1131
Remove unused import
S-Saranya1 Jul 15, 2026
b2268be
Address review comments
S-Saranya1 Jul 16, 2026
0851255
Update codegen fixture files
S-Saranya1 Jul 16, 2026
3418cea
remove japicmp exclusion - not needed now
S-Saranya1 Jul 16, 2026
2202031
Merge branch 'master' into somepal/fix-constant-pool-overflow-issue
S-Saranya1 Jul 16, 2026
e56a482
remove japicmp exclusion - not needed now
S-Saranya1 Jul 16, 2026
403a580
Fix tests
S-Saranya1 Jul 16, 2026
a88a22a
Fix tests
S-Saranya1 Jul 16, 2026
9bde08a
Fix checkstyle
S-Saranya1 Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-AWSSDKforJavav2-40c3de6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "AWS SDK for Java v2",
"contributor": "",
"description": "Eliminate per-operation lambdas for endpoint and auth scheme resolution in generated clients, permanently fixing constant pool overflow for large services like EC2 Internal."
}
7 changes: 4 additions & 3 deletions codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ protected void addFields(Builder type) {
.addField(protocolSpec.protocolFactory(model))
.addField(SdkClientConfiguration.class, "clientConfiguration", PRIVATE, FINAL);

type.addField(ClientClassUtils.authSchemeOptionsResolverField());
type.addField(ClientClassUtils.endpointResolverField());

// Kinesis doesn't support CBOR for STS yet so need another protocol factory for JSON
if (model.getMetadata().isCborProtocol()) {
type.addField(AwsJsonProtocolFactory.class, "jsonProtocolFactory", PRIVATE, FINAL);
Expand All @@ -173,9 +176,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(),
Expand Down
148 changes: 75 additions & 73 deletions codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientClassUtils.java
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ protected void addFields(TypeSpec.Builder type) {
.addField(SyncClientHandler.class, "clientHandler", PRIVATE, FINAL)
.addField(protocolSpec.protocolFactory(model))
.addField(SdkClientConfiguration.class, "clientConfiguration", PRIVATE, FINAL);

type.addField(ClientClassUtils.authSchemeOptionsResolverField());
type.addField(ClientClassUtils.endpointResolverField());
}

@Override
Expand All @@ -141,9 +144,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());
Expand Down
12 changes: 4 additions & 8 deletions codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(authSchemeOptionsResolver)\n")
.add(".withEndpointResolver(endpointResolverInstance)\n")
.add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
.add(HttpChecksumTrait.create(opModel));

Expand Down Expand Up @@ -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(authSchemeOptionsResolver)\n")
.add(".withEndpointResolver(endpointResolverInstance)\n")
.add(hostPrefixExpression(opModel))
.add(discoveredEndpoint(opModel))
.add(credentialType(opModel, model))
Expand Down
12 changes: 4 additions & 8 deletions ...gen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(authSchemeOptionsResolver)\n")
.add(".withEndpointResolver(endpointResolverInstance)\n")
.add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
.add(HttpChecksumTrait.create(opModel));

Expand Down Expand Up @@ -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(authSchemeOptionsResolver)\n")
.add(".withEndpointResolver(endpointResolverInstance)\n")
.add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
.add(HttpChecksumTrait.create(opModel));

Expand Down
12 changes: 4 additions & 8 deletions codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(authSchemeOptionsResolver)\n")
.add(".withEndpointResolver(endpointResolverInstance)\n")
.add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
.add(HttpChecksumTrait.create(opModel));

Expand Down Expand Up @@ -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(authSchemeOptionsResolver)\n")
.add(".withEndpointResolver(endpointResolverInstance)\n")
.add(asyncRequestBody(opModel))
.add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel))
.add(HttpChecksumTrait.create(opModel));
Expand Down
Loading
Loading