Skip to content

Fix ordering of *contexParams #3700

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

Merged
merged 5 commits into from
Feb 13, 2023
Merged

Fix ordering of *contexParams #3700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89b7136
Fix ordering of *contexParams
dagnir Jan 18, 2023
7b24e4c
Merge branch 'master' into dongie/fix-param-resolution-ordering
dagnir Feb 9, 2023
ea29e37
Merge branch 'master' into dongie/fix-param-resolution-ordering
dagnir Feb 9, 2023
a4afa34
Merge branch 'master' into dongie/fix-param-resolution-ordering
dagnir Feb 10, 2023
5c3c048
Merge branch 'master' into dongie/fix-param-resolution-ordering
dagnir Feb 13, 2023
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
18 changes: 8 additions & 10 deletions .../main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,16 +148,6 @@ private MethodSpec ruleParams() {

b.addStatement("$T builder = $T.builder()", paramsBuilderClass(), endpointRulesSpecUtils.parametersClassName());

b.addStatement("setStaticContextParams(builder, executionAttributes.getAttribute($T.OPERATION_NAME))",
AwsExecutionAttribute.class);

b.addStatement("setContextParams(builder, executionAttributes.getAttribute($T.OPERATION_NAME), context.request())",
AwsExecutionAttribute.class);

if (hasClientContextParams()) {
b.addStatement("setClientContextParams(builder, executionAttributes)");
}

Map<String, ParameterModel> parameters = model.getEndpointRuleSetModel().getParameters();

parameters.forEach((n, m) -> {
Expand Down Expand Up @@ -201,6 +191,14 @@ private MethodSpec ruleParams() {
endpointRulesSpecUtils.rulesRuntimeClassName("AwsEndpointProviderUtils"), builtInFn);
});

if (hasClientContextParams()) {
b.addStatement("setClientContextParams(builder, executionAttributes)");
}
b.addStatement("setContextParams(builder, executionAttributes.getAttribute($T.OPERATION_NAME), context.request())",
AwsExecutionAttribute.class);
b.addStatement("setStaticContextParams(builder, executionAttributes.getAttribute($T.OPERATION_NAME))",
AwsExecutionAttribute.class);

b.addStatement("return builder.build()");
return b.build();
}
Expand Down
6 changes: 3 additions & 3 deletions ...est/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttribut

private static QueryEndpointParams ruleParams(Context.ModifyRequest context, ExecutionAttributes executionAttributes) {
QueryEndpointParams.Builder builder = QueryEndpointParams.builder();
setStaticContextParams(builder, executionAttributes.getAttribute(AwsExecutionAttribute.OPERATION_NAME));
setContextParams(builder, executionAttributes.getAttribute(AwsExecutionAttribute.OPERATION_NAME), context.request());
setClientContextParams(builder, executionAttributes);
builder.region(AwsEndpointProviderUtils.regionBuiltIn(executionAttributes));
builder.useDualStackEndpoint(AwsEndpointProviderUtils.dualStackEnabledBuiltIn(executionAttributes));
builder.useFipsEndpoint(AwsEndpointProviderUtils.fipsEnabledBuiltIn(executionAttributes));
setClientContextParams(builder, executionAttributes);
setContextParams(builder, executionAttributes.getAttribute(AwsExecutionAttribute.OPERATION_NAME), context.request());
setStaticContextParams(builder, executionAttributes.getAttribute(AwsExecutionAttribute.OPERATION_NAME));
return builder.build();
}

Expand Down