Code generate execution interceptors into clients instead of relying on runtime discovery. (#3550)

This does not disable runtime discovery. It just stops using it for internal SDK purposes. This was a common source of errors when customers would shade the SDK.

Author: millems

.changes/next-release/feature-AWSSDKforJavav2-229603a.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Stop using execution.interceptors reflective loading for internal interceptors. This will reduce the chance of shading errors."
+}

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

@@ -218,6 +218,8 @@ public class CustomizationConfig {
      */
     private boolean useRuleBasedEndpoints = false;
 
+    private List<String> interceptors = new ArrayList<>();
+
     private CustomizationConfig() {
     }
 
@@ -562,4 +564,12 @@ public boolean useRuleBasedEndpoints() {
     public void setUseRuleBasedEndpoints(boolean useRuleBasedEndpoints) {
         this.useRuleBasedEndpoints = useRuleBasedEndpoints;
     }
+
+    public List<String> getInterceptors() {
+        return interceptors;
+    }
+
+    public void setInterceptors(List<String> interceptors) {
+        this.interceptors = interceptors;
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

@@ -257,12 +257,23 @@ private MethodSpec finalizeServiceConfigurationMethod() {
                              ParameterizedTypeName.get(List.class, ExecutionInterceptor.class),
                              ArrayList.class);
 
+        List<ClassName> builtInInterceptors = new ArrayList<>();
+
         if (endpointRulesSpecUtils.isEndpointRulesEnabled()) {
-            builder.addStatement("endpointInterceptors.add(new $T())", endpointRulesSpecUtils.resolverInterceptorName());
-            builder.addStatement("endpointInterceptors.add(new $T())", endpointRulesSpecUtils.authSchemesInterceptorName());
-            builder.addStatement("endpointInterceptors.add(new $T())", endpointRulesSpecUtils.requestModifierInterceptorName());
+            builtInInterceptors.add(endpointRulesSpecUtils.resolverInterceptorName());
+            builtInInterceptors.add(endpointRulesSpecUtils.authSchemesInterceptorName());
+            builtInInterceptors.add(endpointRulesSpecUtils.requestModifierInterceptorName());
+        }
+
+        for (String interceptor : model.getCustomizationConfig().getInterceptors()) {
+            builtInInterceptors.add(ClassName.bestGuess(interceptor));
         }
 
+        for (ClassName interceptor : builtInInterceptors) {
+            builder.addStatement("endpointInterceptors.add(new $T())", interceptor);
+        }
+
+
         builder.addCode("$1T interceptorFactory = new $1T();\n", ClasspathInterceptorChainFactory.class)
                .addCode("$T<$T> interceptors = interceptorFactory.getInterceptors($S);\n",
                         List.class, ExecutionInterceptor.class, requestHandlerPath);

services/apigateway/src/main/resources/META-INF/native-image/software.amazon.awssdk/apigateway/reflect-config.json

@@ -20,5 +20,8 @@
     "getVpcLinks",
     "createApiKey",
     "generateClientCertificate"
+  ],
+  "interceptors": [
+    "software.amazon.awssdk.services.apigateway.internal.AcceptJsonInterceptor"
   ]
 }

services/apigateway/src/main/resources/codegen-resources/customization.config

@@ -21,5 +21,8 @@
                 }
             ]
         }
-    }
+    },
+    "interceptors": [
+        "software.amazon.awssdk.services.cloudsearchdomain.internal.SwitchToPostInterceptor"
+    ]
 }