Update PR after internaly sync up about the approach

aws · Oct 3, 2023 · d2b7722 · d2b7722
1 parent 084e6b3
commit d2b7722
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 34 deletions.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java
@@ -301,7 +301,7 @@ protected static MethodSpec updateSdkClientConfigurationMethod(TypeName serviceC
                .addStatement("return serviceConfigBuilder.buildSdkClientConfiguration()")
                .addCode("$<};\n");
         builder.addStatement("$T plugins = request.overrideConfiguration()\n"
-                             + ".map(c -> c.registeredPlugins()).orElse(Collections.emptyList())",
+                             + ".map(c -> c.plugins()).orElse(Collections.emptyList())",
                              ParameterizedTypeName.get(List.class, SdkPlugin.class));
         builder.addStatement("return $T.invokePlugins(clientConfiguration, plugins, configurationUpdater)",
                              SdkClientConfigurationUtil.class);

diff --git a/...rces/software/amazon/awssdk/codegen/poet/client/sra/test-aws-json-async-client-class.java b/...rces/software/amazon/awssdk/codegen/poet/client/sra/test-aws-json-async-client-class.java
@@ -1158,7 +1158,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...esources/software/amazon/awssdk/codegen/poet/client/sra/test-json-async-client-class.java b/...esources/software/amazon/awssdk/codegen/poet/client/sra/test-json-async-client-class.java
@@ -1335,7 +1335,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-json-client-class.java b/...test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-json-client-class.java
@@ -905,7 +905,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...sources/software/amazon/awssdk/codegen/poet/client/sra/test-query-async-client-class.java b/...sources/software/amazon/awssdk/codegen/poet/client/sra/test-query-async-client-class.java
@@ -912,7 +912,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...est/resources/software/amazon/awssdk/codegen/poet/client/sra/test-query-client-class.java b/...est/resources/software/amazon/awssdk/codegen/poet/client/sra/test-query-client-class.java
@@ -780,7 +780,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...resources/software/amazon/awssdk/codegen/poet/client/sra/test-xml-async-client-class.java b/...resources/software/amazon/awssdk/codegen/poet/client/sra/test-xml-async-client-class.java
@@ -873,7 +873,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/.../test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-xml-client-class.java b/.../test/resources/software/amazon/awssdk/codegen/poet/client/sra/test-xml-client-class.java
@@ -655,7 +655,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...esources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java b/...esources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java
@@ -1189,7 +1189,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/.../amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-async-client-class.java b/.../amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-async-client-class.java
@@ -174,7 +174,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...e/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-sync-client-class.java b/...e/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-sync-client-class.java
@@ -149,7 +149,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...esources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-async.java b/...esources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-async.java
@@ -157,7 +157,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-sync.java b/...resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-sync.java
@@ -138,7 +138,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...t/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java b/...t/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java
@@ -411,7 +411,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...st/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java b/...st/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java
@@ -354,7 +354,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...st/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-class.java b/...st/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-class.java
@@ -1370,7 +1370,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java b/...src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java
@@ -925,7 +925,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...t/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java b/...t/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java
@@ -941,7 +941,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...rc/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java b/...rc/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java
@@ -798,7 +798,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...est/resources/software/amazon/awssdk/codegen/poet/client/test-xml-async-client-class.java b/...est/resources/software/amazon/awssdk/codegen/poet/client/test-xml-async-client-class.java
@@ -902,7 +902,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/.../src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-client-class.java b/.../src/test/resources/software/amazon/awssdk/codegen/poet/client/test-xml-client-class.java
@@ -673,7 +673,7 @@ protected SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request
             consumer.accept(serviceConfigBuilder);
             return serviceConfigBuilder.buildSdkClientConfiguration();
         };
-        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.registeredPlugins()).orElse(Collections.emptyList());
+        List<SdkPlugin> plugins = request.overrideConfiguration().map(c -> c.plugins()).orElse(Collections.emptyList());
         return SdkClientConfigurationUtil.invokePlugins(clientConfiguration, plugins, configurationUpdater);
     }
 

diff --git a/...re/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsAsyncClientHandler.java b/...re/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsAsyncClientHandler.java
@@ -58,8 +58,8 @@ public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> Complet
 
     @Override
     protected <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext
-        invokeInterceptorsAndCreateExecutionContext(ClientExecutionParams<InputT, OutputT> executionParams,
-                                                    SdkClientConfiguration clientConfiguration) {
+        invokeInterceptorsAndCreateExecutionContext(ClientExecutionParams<InputT, OutputT> executionParams) {
+        SdkClientConfiguration clientConfiguration = resolveRequestConfiguration(executionParams);
         return AwsExecutionContextBuilder.invokeInterceptorsAndCreateExecutionContext(executionParams, clientConfiguration);
     }
 }
diff --git a/...ore/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsSyncClientHandler.java b/...ore/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsSyncClientHandler.java
@@ -62,8 +62,8 @@ public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> ReturnT
 
     @Override
     protected <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext
-        invokeInterceptorsAndCreateExecutionContext(ClientExecutionParams<InputT, OutputT> executionParams,
-                                                    SdkClientConfiguration clientConfiguration) {
+        invokeInterceptorsAndCreateExecutionContext(ClientExecutionParams<InputT, OutputT> executionParams) {
+        SdkClientConfiguration clientConfiguration = resolveRequestConfiguration(executionParams);
         return AwsExecutionContextBuilder.invokeInterceptorsAndCreateExecutionContext(executionParams, clientConfiguration);
     }
 

diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOverrideConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOverrideConfiguration.java
@@ -153,7 +153,7 @@ public List<MetricPublisher> metricPublishers() {
     /**
      * Return the plugins that will be used to update the configuration used by the request.
      */
-    public List<SdkPlugin> registeredPlugins() {
+    public List<SdkPlugin> plugins() {
         return plugins;
     }
 

diff --git a/...dk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseClientHandler.java b/...dk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseClientHandler.java
@@ -193,14 +193,6 @@ private static InterceptorContext runModifyHttpRequestAndHttpContentInterceptors
         invokeInterceptorsAndCreateExecutionContext(
         ClientExecutionParams<InputT, OutputT> params) {
         SdkClientConfiguration clientConfiguration = resolveRequestConfiguration(params);
-        return invokeInterceptorsAndCreateExecutionContext(params, clientConfiguration);
-    }
-
-    // This method is only called from tests, since the subclasses in aws-core override it.
-    protected <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext
-        invokeInterceptorsAndCreateExecutionContext(
-        ClientExecutionParams<InputT, OutputT> params,
-        SdkClientConfiguration clientConfiguration) {
         SdkRequest originalRequest = params.getInput();
 
         ExecutionAttributes executionAttributes = params.executionAttributes();