Revert "Move QueryParametersToBodyInterceptor to front of interceptor…

… chain (#4109)" This reverts commit c7c731f.
aws · Jul 19, 2023 · 5ba7741 · 5ba7741
1 parent ec11a0e
commit 5ba7741
Show file tree

Hide file tree

Showing 10 changed files with 162 additions and 261 deletions.
diff --git a/...en/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java b/...en/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java
@@ -18,12 +18,8 @@
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import javax.lang.model.element.Modifier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
@@ -36,9 +32,6 @@
 import software.amazon.awssdk.codegen.utils.AuthUtils;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
-import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
-import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
-import software.amazon.awssdk.utils.CollectionUtils;
 
 public class AsyncClientBuilderClass implements ClassSpec {
     private final IntermediateModel model;
@@ -126,53 +119,26 @@ private MethodSpec endpointProviderMethod() {
     }
 
     private MethodSpec buildClientMethod() {
-        MethodSpec.Builder b = MethodSpec.methodBuilder("buildClient")
-                                         .addAnnotation(Override.class)
-                                         .addModifiers(Modifier.PROTECTED, Modifier.FINAL)
-                                         .returns(clientInterfaceName)
-                                         .addStatement("$T clientConfiguration = super.asyncClientConfiguration()",
-                                                       SdkClientConfiguration.class);
-
-        addQueryProtocolInterceptors(b);
-
-        return b.addStatement("this.validateClientOptions(clientConfiguration)")
-                .addStatement("$T endpointOverride = null", URI.class)
-                .addCode("if (clientConfiguration.option($T.ENDPOINT_OVERRIDDEN) != null"
-                         + "&& $T.TRUE.equals(clientConfiguration.option($T.ENDPOINT_OVERRIDDEN))) {"
-                         + "endpointOverride = clientConfiguration.option($T.ENDPOINT);"
-                         + "}",
-                         SdkClientOption.class, Boolean.class, SdkClientOption.class, SdkClientOption.class)
-                .addStatement("$T serviceClientConfiguration = $T.builder()"
-                              + ".overrideConfiguration(overrideConfiguration())"
-                              + ".region(clientConfiguration.option($T.AWS_REGION))"
-                              + ".endpointOverride(endpointOverride)"
-                              + ".build()",
-                              serviceConfigClassName, serviceConfigClassName, AwsClientOption.class)
-                .addStatement("return new $T(serviceClientConfiguration, clientConfiguration)", clientClassName)
-                .build();
-    }
-
-    private MethodSpec.Builder addQueryProtocolInterceptors(MethodSpec.Builder b) {
-        if (!model.getMetadata().isQueryProtocol()) {
-            return b;
-        }
-
-        TypeName listType = ParameterizedTypeName.get(List.class, ExecutionInterceptor.class);
-
-        b.addStatement("$T interceptors = clientConfiguration.option($T.EXECUTION_INTERCEPTORS)",
-                       listType, SdkClientOption.class)
-         .addStatement("$T queryParamsToBodyInterceptor = $T.singletonList(new $T())",
-                       listType, Collections.class, QueryParametersToBodyInterceptor.class)
-            .addStatement("$T customizationInterceptors = new $T<>()", listType, ArrayList.class);
-
-        List<String> customInterceptors = model.getCustomizationConfig().getInterceptors();
-        customInterceptors.forEach(i -> b.addStatement("customizationInterceptors.add(new $T())", ClassName.bestGuess(i)));
-
-        b.addStatement("interceptors = $T.mergeLists(queryParamsToBodyInterceptor, interceptors)", CollectionUtils.class)
-            .addStatement("interceptors = $T.mergeLists(customizationInterceptors, interceptors)", CollectionUtils.class);
-
-        return b.addStatement("clientConfiguration = clientConfiguration.toBuilder().option($T.EXECUTION_INTERCEPTORS, "
-                              + "interceptors).build()", SdkClientOption.class);
+        return MethodSpec.methodBuilder("buildClient")
+                         .addAnnotation(Override.class)
+                         .addModifiers(Modifier.PROTECTED, Modifier.FINAL)
+                         .returns(clientInterfaceName)
+                         .addStatement("$T clientConfiguration = super.asyncClientConfiguration()", SdkClientConfiguration.class)
+                         .addStatement("this.validateClientOptions(clientConfiguration)")
+                         .addStatement("$T endpointOverride = null", URI.class)
+                         .addCode("if (clientConfiguration.option($T.ENDPOINT_OVERRIDDEN) != null"
+                                  + "&& $T.TRUE.equals(clientConfiguration.option($T.ENDPOINT_OVERRIDDEN))) {"
+                                  + "endpointOverride = clientConfiguration.option($T.ENDPOINT);"
+                                  + "}",
+                                  SdkClientOption.class, Boolean.class, SdkClientOption.class, SdkClientOption.class)
+                         .addStatement("$T serviceClientConfiguration = $T.builder()"
+                                       + ".overrideConfiguration(overrideConfiguration())"
+                                       + ".region(clientConfiguration.option($T.AWS_REGION))"
+                                       + ".endpointOverride(endpointOverride)"
+                                       + ".build()",
+                                       serviceConfigClassName, serviceConfigClassName, AwsClientOption.class)
+                         .addStatement("return new $T(serviceClientConfiguration, clientConfiguration)", clientClassName)
+                         .build();
     }
 
     private MethodSpec bearerTokenProviderMethod() {

diff --git a/...gen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java b/...gen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
@@ -28,6 +28,7 @@
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -58,6 +59,7 @@
 import software.amazon.awssdk.core.signer.Signer;
 import software.amazon.awssdk.http.Protocol;
 import software.amazon.awssdk.http.SdkHttpConfigurationOption;
+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;
@@ -260,10 +262,8 @@ private MethodSpec finalizeServiceConfigurationMethod() {
         builtInInterceptors.add(endpointRulesSpecUtils.authSchemesInterceptorName());
         builtInInterceptors.add(endpointRulesSpecUtils.requestModifierInterceptorName());
 
-        if (!model.getMetadata().isQueryProtocol()) {
-            for (String interceptor : model.getCustomizationConfig().getInterceptors()) {
-                builtInInterceptors.add(ClassName.bestGuess(interceptor));
-            }
+        for (String interceptor : model.getCustomizationConfig().getInterceptors()) {
+            builtInInterceptors.add(ClassName.bestGuess(interceptor));
         }
 
         for (ClassName interceptor : builtInInterceptors) {
@@ -288,6 +288,16 @@ 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)

diff --git a/...gen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java b/...gen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java
@@ -18,12 +18,8 @@
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import javax.lang.model.element.Modifier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider;
@@ -36,9 +32,6 @@
 import software.amazon.awssdk.codegen.utils.AuthUtils;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
-import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
-import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
-import software.amazon.awssdk.utils.CollectionUtils;
 
 public class SyncClientBuilderClass implements ClassSpec {
     private final IntermediateModel model;
@@ -126,53 +119,26 @@ private MethodSpec endpointProviderMethod() {
 
 
     private MethodSpec buildClientMethod() {
-        MethodSpec.Builder b = MethodSpec.methodBuilder("buildClient")
-                                         .addAnnotation(Override.class)
-                                         .addModifiers(Modifier.PROTECTED, Modifier.FINAL)
-                                         .returns(clientInterfaceName)
-                                         .addStatement("$T clientConfiguration = super.syncClientConfiguration()",
-                                                       SdkClientConfiguration.class);
-
-        addQueryProtocolInterceptors(b);
-
-        return b.addStatement("this.validateClientOptions(clientConfiguration)")
-                .addStatement("$T endpointOverride = null", URI.class)
-                .addCode("if (clientConfiguration.option($T.ENDPOINT_OVERRIDDEN) != null"
-                         + "&& $T.TRUE.equals(clientConfiguration.option($T.ENDPOINT_OVERRIDDEN))) {"
-                         + "endpointOverride = clientConfiguration.option($T.ENDPOINT);"
-                         + "}",
-                         SdkClientOption.class, Boolean.class, SdkClientOption.class, SdkClientOption.class)
-                .addStatement("$T serviceClientConfiguration = $T.builder()"
-                              + ".overrideConfiguration(overrideConfiguration())"
-                              + ".region(clientConfiguration.option($T.AWS_REGION))"
-                              + ".endpointOverride(endpointOverride)"
-                              + ".build()",
-                              serviceConfigClassName, serviceConfigClassName, AwsClientOption.class)
-                .addStatement("return new $T(serviceClientConfiguration, clientConfiguration)", clientClassName)
-                .build();
-    }
-
-    private MethodSpec.Builder addQueryProtocolInterceptors(MethodSpec.Builder b) {
-        if (!model.getMetadata().isQueryProtocol()) {
-            return b;
-        }
-
-        TypeName listType = ParameterizedTypeName.get(List.class, ExecutionInterceptor.class);
-
-        b.addStatement("$T interceptors = clientConfiguration.option($T.EXECUTION_INTERCEPTORS)",
-                       listType, SdkClientOption.class)
-         .addStatement("$T queryParamsToBodyInterceptor = $T.singletonList(new $T())",
-                       listType, Collections.class, QueryParametersToBodyInterceptor.class)
-            .addStatement("$T customizationInterceptors = new $T<>()", listType, ArrayList.class);
-
-        List<String> customInterceptors = model.getCustomizationConfig().getInterceptors();
-        customInterceptors.forEach(i -> b.addStatement("customizationInterceptors.add(new $T())", ClassName.bestGuess(i)));
-
-        b.addStatement("interceptors = $T.mergeLists(queryParamsToBodyInterceptor, interceptors)", CollectionUtils.class)
-            .addStatement("interceptors = $T.mergeLists(customizationInterceptors, interceptors)", CollectionUtils.class);
-
-        return b.addStatement("clientConfiguration = clientConfiguration.toBuilder().option($T.EXECUTION_INTERCEPTORS, "
-                              + "interceptors).build()", SdkClientOption.class);
+        return MethodSpec.methodBuilder("buildClient")
+                         .addAnnotation(Override.class)
+                         .addModifiers(Modifier.PROTECTED, Modifier.FINAL)
+                         .returns(clientInterfaceName)
+                         .addStatement("$T clientConfiguration = super.syncClientConfiguration()", SdkClientConfiguration.class)
+                         .addStatement("this.validateClientOptions(clientConfiguration)")
+                         .addStatement("$T endpointOverride = null", URI.class)
+                         .addCode("if (clientConfiguration.option($T.ENDPOINT_OVERRIDDEN) != null"
+                                  + "&& $T.TRUE.equals(clientConfiguration.option($T.ENDPOINT_OVERRIDDEN))) {"
+                                  + "endpointOverride = clientConfiguration.option($T.ENDPOINT);"
+                                  + "}",
+                                  SdkClientOption.class, Boolean.class, SdkClientOption.class, SdkClientOption.class)
+                         .addStatement("$T serviceClientConfiguration = $T.builder()"
+                                       + ".overrideConfiguration(overrideConfiguration())"
+                                       + ".region(clientConfiguration.option($T.AWS_REGION))"
+                                       + ".endpointOverride(endpointOverride)"
+                                       + ".build()",
+                                       serviceConfigClassName, serviceConfigClassName, AwsClientOption.class)
+                         .addStatement("return new $T(serviceClientConfiguration, clientConfiguration)", clientClassName)
+                         .build();
     }
 
     private MethodSpec tokenProviderMethodImpl() {

diff --git a/...test/java/software/amazon/awssdk/codegen/internal/QueryProtocolCustomTestInterceptor.java b/...test/java/software/amazon/awssdk/codegen/internal/QueryProtocolCustomTestInterceptor.java
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java
@@ -58,16 +58,6 @@ public void baseQueryClientBuilderClass() throws Exception {
         validateQueryGeneration(BaseClientBuilderClass::new, "test-query-client-builder-class.java");
     }
 
-    @Test
-    public void syncQueryClientBuilderClass() throws Exception {
-        validateQueryGeneration(SyncClientBuilderClass::new, "test-query-sync-client-builder-class.java");
-    }
-
-    @Test
-    public void asyncQueryClientBuilderClass() throws Exception {
-        validateQueryGeneration(AsyncClientBuilderClass::new, "test-query-async-client-builder-class.java");
-    }
-
     @Test
     public void syncClientBuilderInterface() throws Exception {
         validateGeneration(SyncClientBuilderInterface::new, "test-sync-client-builder-interface.java");

diff --git a/...es/software/amazon/awssdk/codegen/poet/builder/test-query-async-client-builder-class.java b/...es/software/amazon/awssdk/codegen/poet/builder/test-query-async-client-builder-class.java