Skip to content
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

Jump to bottom

Move QueryParametersToBodyInterceptor to pipeline stage #4561

Merged
merged 14 commits into from
Oct 23, 2023
Merged

Move QueryParametersToBodyInterceptor to pipeline stage #4561

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
189cfa5
Move QueryParamtersToBodyInterceptor to pipeline stage
davidh44 Oct 6, 2023
dd1c105
Add unit test
davidh44 Oct 6, 2023
07be293
Fix checkstyle
davidh44 Oct 6, 2023
d074cb6
Fix test
davidh44 Oct 7, 2023
505b2a3
Add serviceProtocol ExecutionAttribute and check in stage
davidh44 Oct 11, 2023
7dd620e
Update codegenerated test classes
davidh44 Oct 11, 2023
3665eb2
Add back XML test case
davidh44 Oct 11, 2023
2ab2c0e
Fix test name typo
davidh44 Oct 11, 2023
351eefe
Refactoring and add tests
davidh44 Oct 12, 2023
a384e9b
Merge from master and resolve conflicts
davidh44 Oct 13, 2023
e29ea36
Add ProtocolMetadata class
davidh44 Oct 16, 2023
2c5d7a8
Update codegenerated test classes
davidh44 Oct 16, 2023
9aa46d0
Move PROTOCOL_METADATA to SdkInternalExecutionAttribute
davidh44 Oct 20, 2023
f305bac
Change SdkProtocolMetadata from internal to protected api
davidh44 Oct 23, 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
1 change: 1 addition & 0 deletions codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ public Map<String, OperationModel> constructOperations() {
OperationModel operationModel = new OperationModel();

operationModel.setOperationName(operationName);
operationModel.setServiceProtocol(serviceModel.getMetadata().getProtocol());
operationModel.setDeprecated(op.isDeprecated());
operationModel.setDeprecatedMessage(op.getDeprecatedMessage());
operationModel.setDocumentation(op.getDocumentation());
Expand Down
10 changes: 10 additions & 0 deletions codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ public class OperationModel extends DocumentationModel {

private String operationName;

private String serviceProtocol;

private boolean deprecated;

private String deprecatedMessage;
Expand Down Expand Up @@ -93,6 +95,14 @@ public String getMethodName() {
return Utils.unCapitalize(operationName);
}

public String getServiceProtocol() {
return serviceProtocol;
}

public void setServiceProtocol(String serviceProtocol) {
this.serviceProtocol = serviceProtocol;
}

public boolean isDeprecated() {
return deprecated;
}
Expand Down
12 changes: 0 additions & 12 deletions ...gen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
import software.amazon.awssdk.utils.AttributeMap;
import software.amazon.awssdk.utils.CollectionUtils;
import software.amazon.awssdk.utils.StringUtils;
Expand Down Expand Up @@ -343,17 +342,6 @@ private MethodSpec finalizeServiceConfigurationMethod() {

builder.addCode("interceptors = $T.mergeLists(interceptors, config.option($T.EXECUTION_INTERCEPTORS));\n",
CollectionUtils.class, SdkClientOption.class);

if (model.getMetadata().isQueryProtocol()) {
TypeName listType = ParameterizedTypeName.get(List.class, ExecutionInterceptor.class);
builder.addStatement("$T protocolInterceptors = $T.singletonList(new $T())",
listType,
Collections.class,
QueryParametersToBodyInterceptor.class);
builder.addStatement("interceptors = $T.mergeLists(interceptors, protocolInterceptors)",
CollectionUtils.class);
}

if (model.getEndpointOperation().isPresent()) {
builder.beginControlFlow("if (!endpointDiscoveryEnabled)")
.addStatement("$1T chain = new $1T(config)", DefaultEndpointDiscoveryProviderChain.class)
Expand Down
2 changes: 2 additions & 0 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 @@ -182,6 +182,7 @@ public CodeBlock executionHandler(OperationModel opModel) {
.add("\n\nreturn clientHandler.execute(new $T<$T, $T>()\n",
ClientExecutionParams.class, requestType, responseType)
.add(".withOperationName(\"$N\")\n", opModel.getOperationName())
.add(".withServiceProtocol($S)\n", opModel.getServiceProtocol())
.add(".withResponseHandler(responseHandler)\n")
.add(".withErrorResponseHandler(errorResponseHandler)\n")
.add(hostPrefixExpression(opModel))
Expand Down Expand Up @@ -254,6 +255,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
.add(opModel.getEndpointDiscovery() != null ? "endpointFuture.thenCompose(cachedEndpoint -> " : "")
.add("clientHandler.execute(new $T<$T, $T>()\n", ClientExecutionParams.class, requestType, responseType)
.add(".withOperationName(\"$N\")\n", opModel.getOperationName())
.add(".withServiceProtocol($S)\n", opModel.getServiceProtocol())
.add(".withMarshaller($L)\n", asyncMarshaller(model, opModel, marshaller, protocolFactory))
.add(asyncRequestBody(opModel))
.add(fullDuplex(opModel))
Expand Down
2 changes: 2 additions & 0 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 @@ -111,6 +111,7 @@ public CodeBlock executionHandler(OperationModel opModel) {
.add("\n\nreturn clientHandler.execute(new $T<$T, $T>()",
ClientExecutionParams.class, requestType, responseType)
.add(".withOperationName($S)\n", opModel.getOperationName())
.add(".withServiceProtocol($S)\n", opModel.getServiceProtocol())
.add(".withResponseHandler(responseHandler)\n")
.add(".withErrorResponseHandler(errorResponseHandler)\n")
.add(hostPrefixExpression(opModel))
Expand Down Expand Up @@ -152,6 +153,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
CompletableFuture.class, executeFutureValueType, ClientExecutionParams.class,
requestType, pojoResponseType)
.add(".withOperationName(\"$N\")\n", opModel.getOperationName())
.add(".withServiceProtocol($S)\n", opModel.getServiceProtocol())
.add(".withMarshaller($L)\n",
asyncMarshaller(intermediateModel, opModel, marshaller, "protocolFactory"))
.add(".withResponseHandler(responseHandler)\n")
Expand Down
2 changes: 2 additions & 0 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 @@ -128,6 +128,7 @@ public CodeBlock executionHandler(OperationModel opModel) {
.add("\n\nreturn clientHandler.execute(new $T<$T, $T>()\n",
ClientExecutionParams.class, requestType, responseType)
.add(".withOperationName($S)\n", opModel.getOperationName())
.add(".withServiceProtocol($S)\n", opModel.getServiceProtocol())
.add(".withCombinedResponseHandler(responseHandler)\n")
.add(".withMetricCollector(apiCallMetricCollector)\n" +
hostPrefixExpression(opModel) +
Expand Down Expand Up @@ -204,6 +205,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
ClientExecutionParams.class, requestType, pojoResponseType)
.add(".withOperationName(\"$N\")\n", opModel.getOperationName())
.add(".withRequestConfiguration(clientConfiguration)")
.add(".withServiceProtocol($S)\n", opModel.getServiceProtocol())
.add(".withMarshaller($L)\n", asyncMarshaller(intermediateModel, opModel, marshaller, "protocolFactory"));

if (opModel.hasEventStreamOutput()) {
Expand Down
3 changes: 0 additions & 3 deletions ...are/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-endpoints-auth-params.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
import software.amazon.awssdk.services.query.auth.scheme.QueryAuthSchemeProvider;
import software.amazon.awssdk.services.query.auth.scheme.internal.QueryAuthSchemeInterceptor;
import software.amazon.awssdk.services.query.endpoints.QueryClientContextParams;
Expand Down Expand Up @@ -76,8 +75,6 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
interceptors = CollectionUtils.mergeLists(endpointInterceptors, interceptors);
interceptors = CollectionUtils.mergeLists(interceptors, additionalInterceptors);
interceptors = CollectionUtils.mergeLists(interceptors, config.option(SdkClientOption.EXECUTION_INTERCEPTORS));
List<ExecutionInterceptor> protocolInterceptors = Collections.singletonList(new QueryParametersToBodyInterceptor());
interceptors = CollectionUtils.mergeLists(interceptors, protocolInterceptors);
SdkClientConfiguration.Builder builder = config.toBuilder();
IdentityProvider<? extends TokenIdentity> identityProvider = config.option(AwsClientOption.TOKEN_IDENTITY_PROVIDER);
if (identityProvider != null) {
Expand Down
3 changes: 0 additions & 3 deletions ...rces/software/amazon/awssdk/codegen/poet/builder/sra/test-query-client-builder-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
import software.amazon.awssdk.services.query.auth.scheme.QueryAuthSchemeProvider;
import software.amazon.awssdk.services.query.auth.scheme.internal.QueryAuthSchemeInterceptor;
import software.amazon.awssdk.services.query.endpoints.QueryClientContextParams;
Expand Down Expand Up @@ -75,8 +74,6 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
interceptors = CollectionUtils.mergeLists(endpointInterceptors, interceptors);
interceptors = CollectionUtils.mergeLists(interceptors, additionalInterceptors);
interceptors = CollectionUtils.mergeLists(interceptors, config.option(SdkClientOption.EXECUTION_INTERCEPTORS));
List<ExecutionInterceptor> protocolInterceptors = Collections.singletonList(new QueryParametersToBodyInterceptor());
interceptors = CollectionUtils.mergeLists(interceptors, protocolInterceptors);
SdkClientConfiguration.Builder builder = config.toBuilder();
IdentityProvider<? extends TokenIdentity> identityProvider = config.option(AwsClientOption.TOKEN_IDENTITY_PROVIDER);
if (identityProvider != null) {
Expand Down
4 changes: 0 additions & 4 deletions ...oftware/amazon/awssdk/codegen/poet/builder/test-client-builder-endpoints-auth-params.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package software.amazon.awssdk.services.query;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
Expand All @@ -21,7 +20,6 @@
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
import software.amazon.awssdk.services.query.endpoints.QueryClientContextParams;
import software.amazon.awssdk.services.query.endpoints.QueryEndpointProvider;
import software.amazon.awssdk.services.query.endpoints.internal.QueryRequestSetEndpointInterceptor;
Expand Down Expand Up @@ -68,8 +66,6 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
interceptors = CollectionUtils.mergeLists(endpointInterceptors, interceptors);
interceptors = CollectionUtils.mergeLists(interceptors, additionalInterceptors);
interceptors = CollectionUtils.mergeLists(interceptors, config.option(SdkClientOption.EXECUTION_INTERCEPTORS));
List<ExecutionInterceptor> protocolInterceptors = Collections.singletonList(new QueryParametersToBodyInterceptor());
interceptors = CollectionUtils.mergeLists(interceptors, protocolInterceptors);
SdkClientConfiguration.Builder builder = config.toBuilder();
IdentityProvider<? extends TokenIdentity> identityProvider = config.option(AwsClientOption.TOKEN_IDENTITY_PROVIDER);
if (identityProvider != null) {
Expand Down
4 changes: 0 additions & 4 deletions ...es/software/amazon/awssdk/codegen/poet/builder/test-query-async-client-builder-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import software.amazon.awssdk.core.client.config.SdkClientOption;
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
import software.amazon.awssdk.endpoints.EndpointProvider;
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
import software.amazon.awssdk.services.query.endpoints.QueryEndpointProvider;
import software.amazon.awssdk.utils.CollectionUtils;

Expand Down Expand Up @@ -42,11 +41,8 @@ protected final QueryAsyncClient buildClient() {
this.validateClientOptions(clientConfiguration);
QueryServiceClientConfiguration serviceClientConfiguration = initializeServiceClientConfig(clientConfiguration);
List<ExecutionInterceptor> interceptors = clientConfiguration.option(SdkClientOption.EXECUTION_INTERCEPTORS);
List<ExecutionInterceptor> queryParamsToBodyInterceptor = Collections
.singletonList(new QueryParametersToBodyInterceptor());
List<ExecutionInterceptor> customizationInterceptors = new ArrayList<>();
customizationInterceptors.add(new QueryProtocolCustomTestInterceptor());
interceptors = CollectionUtils.mergeLists(queryParamsToBodyInterceptor, interceptors);
interceptors = CollectionUtils.mergeLists(customizationInterceptors, interceptors);
clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.EXECUTION_INTERCEPTORS, interceptors)
.build();
Expand Down
4 changes: 0 additions & 4 deletions ...esources/software/amazon/awssdk/codegen/poet/builder/test-query-client-builder-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package software.amazon.awssdk.services.query;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
Expand All @@ -21,7 +20,6 @@
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
import software.amazon.awssdk.services.query.endpoints.QueryClientContextParams;
import software.amazon.awssdk.services.query.endpoints.QueryEndpointProvider;
import software.amazon.awssdk.services.query.endpoints.internal.QueryRequestSetEndpointInterceptor;
Expand Down Expand Up @@ -68,8 +66,6 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
interceptors = CollectionUtils.mergeLists(endpointInterceptors, interceptors);
interceptors = CollectionUtils.mergeLists(interceptors, additionalInterceptors);
interceptors = CollectionUtils.mergeLists(interceptors, config.option(SdkClientOption.EXECUTION_INTERCEPTORS));
List<ExecutionInterceptor> protocolInterceptors = Collections.singletonList(new QueryParametersToBodyInterceptor());
interceptors = CollectionUtils.mergeLists(interceptors, protocolInterceptors);
SdkClientConfiguration.Builder builder = config.toBuilder();
IdentityProvider<? extends TokenIdentity> identityProvider = config.option(AwsClientOption.TOKEN_IDENTITY_PROVIDER);
if (identityProvider != null) {
Expand Down
Loading
Loading