Skip to content

Commit 8caab68

Browse files
committed
Fix ordering of *contexParams
Per the implementation standard, the order in highest precedence is - static context params - context params - client context params
1 parent 02ee676 commit 8caab68

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,6 @@ private MethodSpec ruleParams() {
148148

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

151-
b.addStatement("setStaticContextParams(builder, executionAttributes.getAttribute($T.OPERATION_NAME))",
152-
AwsExecutionAttribute.class);
153-
154-
b.addStatement("setContextParams(builder, executionAttributes.getAttribute($T.OPERATION_NAME), context.request())",
155-
AwsExecutionAttribute.class);
156-
157-
if (hasClientContextParams()) {
158-
b.addStatement("setClientContextParams(builder, executionAttributes)");
159-
}
160-
161151
Map<String, ParameterModel> parameters = model.getEndpointRuleSetModel().getParameters();
162152

163153
parameters.forEach((n, m) -> {
@@ -201,6 +191,14 @@ private MethodSpec ruleParams() {
201191
endpointRulesSpecUtils.rulesRuntimeClassName("AwsEndpointProviderUtils"), builtInFn);
202192
});
203193

194+
if (hasClientContextParams()) {
195+
b.addStatement("setClientContextParams(builder, executionAttributes)");
196+
}
197+
b.addStatement("setContextParams(builder, executionAttributes.getAttribute($T.OPERATION_NAME), context.request())",
198+
AwsExecutionAttribute.class);
199+
b.addStatement("setStaticContextParams(builder, executionAttributes.getAttribute($T.OPERATION_NAME))",
200+
AwsExecutionAttribute.class);
201+
204202
b.addStatement("return builder.build()");
205203
return b.build();
206204
}

0 commit comments

Comments
 (0)