Update PR after internaly sync up about the approach

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

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
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/...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();