Address pr comments

Author: varunnvs92

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-async-client-class.java

@@ -146,14 +146,11 @@ public final String serviceName() {
     @Override
     public CompletableFuture<APostOperationResponse> aPostOperation(APostOperationRequest aPostOperationRequest) {
         try {
-<<<<<<< 69e57a64e16ab9b10a1294d60262502f8d3ac6d8
-            JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
-                                                                           .isPayloadJson(true).build();
-=======
             String hostPrefix = "{StringMember}-foo.";
             Validate.paramNotBlank(aPostOperationRequest.stringMember(), "StringMember");
             String resolvedHostExpression = String.format("%s-foo.", aPostOperationRequest.stringMember());
->>>>>>> Add support for endpoint trait
+            JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
+                                                                           .isPayloadJson(true).build();
 
             HttpResponseHandler<APostOperationResponse> responseHandler = protocolFactory.createResponseHandler(
                 operationMetadata, APostOperationResponse::builder);
@@ -832,4 +829,3 @@ private HttpResponseHandler<AwsServiceException> createErrorResponseHandler(Base
         return protocolFactory.createErrorResponseHandler(operationMetadata);
     }
 }
-

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java

@@ -102,14 +102,11 @@ public final String serviceName() {
     @Override
     public APostOperationResponse aPostOperation(APostOperationRequest aPostOperationRequest) throws InvalidInputException,
                                                                                                      AwsServiceException, SdkClientException, JsonException {
-<<<<<<< 69e57a64e16ab9b10a1294d60262502f8d3ac6d8
-        JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
-                                                                       .isPayloadJson(true).build();
-=======
         String hostPrefix = "{StringMember}-foo.";
         Validate.paramNotBlank(aPostOperationRequest.stringMember(), "StringMember");
         String resolvedHostExpression = String.format("%s-foo.", aPostOperationRequest.stringMember());
->>>>>>> Add support for endpoint trait
+        JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
+                                                                       .isPayloadJson(true).build();
 
         HttpResponseHandler<APostOperationResponse> responseHandler = protocolFactory.createResponseHandler(operationMetadata,
                                                                                                             APostOperationResponse::builder);

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseClientHandler.java

@@ -15,7 +15,6 @@
 
 package software.amazon.awssdk.core.client.handler;
 
-import java.net.URI;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkResponse;
@@ -28,7 +27,7 @@
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptorChain;
 import software.amazon.awssdk.core.interceptor.InterceptorContext;
 import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
-import software.amazon.awssdk.core.util.UriResourcePathUtils;
+import software.amazon.awssdk.core.internal.util.UriResourcePathUtils;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.utils.StringUtils;
 
@@ -52,6 +51,7 @@ static <InputT extends SdkRequest, OutputT> SdkHttpFullRequest finalizeSdkHttpFu
 
         runBeforeMarshallingInterceptors(executionContext);
         SdkHttpFullRequest request = executionParams.getMarshaller().marshall(inputT);
+        request = modifyEndpointIfNeeded(request, clientConfiguration, executionParams.hostPrefixExpression());
 
         executionContext.executionAttributes().putAttribute(SdkExecutionAttribute.SERVICE_NAME,
                                                             clientConfiguration.option(SdkClientOption.SERVICE_NAME));
@@ -80,19 +80,20 @@ private static void runBeforeMarshallingInterceptors(ExecutionContext executionC
     }
 
     /**
-     * Returns a new URI to be used for making the API call using the original URI and
-     * the hostPrefixExpression from the endpoint trait.
+     * Modifies the given {@link SdkHttpFullRequest} with new endpoint if host prefix is enabled and set.
      */
-    private static URI resolveEndpoint(SdkClientConfiguration clientConfiguration, String hostPrefix) {
-        URI originalEndpoint = clientConfiguration.option(SdkClientOption.ENDPOINT);
-
+    private static SdkHttpFullRequest modifyEndpointIfNeeded(SdkHttpFullRequest originalRequest,
+                                                             SdkClientConfiguration clientConfiguration,
+                                                             String hostPrefix) {
         Boolean disableHostPrefixInjection = clientConfiguration.option(SdkAdvancedClientOption.DISABLE_HOST_PREFIX_INJECTION);
         if ((disableHostPrefixInjection != null && disableHostPrefixInjection.equals(Boolean.TRUE)) ||
             StringUtils.isEmpty(hostPrefix)) {
-            return originalEndpoint;
+            return originalRequest;
         }
 
-        return UriResourcePathUtils.updateUriHost(originalEndpoint, hostPrefix);
+        return originalRequest.toBuilder()
+                              .uri(UriResourcePathUtils.updateUriHost(originalRequest.getUri(), hostPrefix))
+                              .build();
     }
 
     private static void addHttpRequest(ExecutionContext executionContext, SdkHttpFullRequest request) {

core/sdk-core/src/main/java/software/amazon/awssdk/core/util/UriResourcePathUtils.java renamed to core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/UriResourcePathUtils.java

@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.util;
+package software.amazon.awssdk.core.internal.util;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 
-@SdkProtectedApi
+@SdkInternalApi
 public final class UriResourcePathUtils {
 
     private UriResourcePathUtils() {

core/sdk-core/src/test/java/software/amazon/awssdk/core/util/UriResourcePathUtilsTest.java renamed to core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/UriResourcePathUtilsTest.java

@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.core.util;
+package software.amazon.awssdk.core.internal.util;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static software.amazon.awssdk.core.util.UriResourcePathUtils.updateUriHost;
+import static software.amazon.awssdk.core.internal.util.UriResourcePathUtils.updateUriHost;
 
 import java.net.URI;
 import java.net.URISyntaxException;

test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/endpoint/EndpointTraitTest.java

@@ -33,10 +33,9 @@
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
 import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.http.AbortableCallable;
 import software.amazon.awssdk.http.ExecuteRequest;
+import software.amazon.awssdk.http.InvokeableHttpRequest;
 import software.amazon.awssdk.http.SdkHttpClient;
-import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.protocoljsonendpointtrait.ProtocolJsonEndpointTraitClient;
@@ -51,7 +50,7 @@ public class EndpointTraitTest {
     private SdkHttpClient mockHttpClient;
 
     @Mock
-    private AbortableCallable<SdkHttpFullResponse> abortableCallable;
+    private InvokeableHttpRequest abortableCallable;
 
     private ProtocolJsonEndpointTraitClient client;