Update only host instead of entire uri to make sure other uri params are unchanged.

Author: varunnvs92

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

@@ -27,7 +27,6 @@
 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.internal.util.UriResourcePathUtils;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.utils.StringUtils;
 
@@ -51,7 +50,7 @@ static <InputT extends SdkRequest, OutputT> InterceptorContext finalizeSdkHttpFu
 
         runBeforeMarshallingInterceptors(executionContext);
         SdkHttpFullRequest request = executionParams.getMarshaller().marshall(inputT);
-        request = modifyEndpointIfNeeded(request, clientConfiguration, executionParams.hostPrefixExpression());
+        request = modifyEndpointHostIfNeeded(request, clientConfiguration, executionParams.hostPrefixExpression());
 
         addHttpRequest(executionContext, request);
         runAfterMarshallingInterceptors(executionContext);
@@ -77,19 +76,19 @@ private static void runBeforeMarshallingInterceptors(ExecutionContext executionC
     }
 
     /**
-     * Modifies the given {@link SdkHttpFullRequest} with new endpoint if host prefix is enabled and set.
+     * Modifies the given {@link SdkHttpFullRequest} with new host if host prefix is enabled and set.
      */
-    private static SdkHttpFullRequest modifyEndpointIfNeeded(SdkHttpFullRequest originalRequest,
-                                                             SdkClientConfiguration clientConfiguration,
-                                                             String hostPrefix) {
+    private static SdkHttpFullRequest modifyEndpointHostIfNeeded(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 originalRequest;
         }
 
         return originalRequest.toBuilder()
-                              .uri(UriResourcePathUtils.updateUriHost(originalRequest.getUri(), hostPrefix))
+                              .host(hostPrefix + originalRequest.host())
                               .build();
     }
 

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

@@ -139,7 +139,7 @@ public Optional<ContentStreamProvider> contentStreamProvider() {
 
     @Override
     public SdkHttpFullRequest.Builder toBuilder() {
-        return (SdkHttpFullRequest.Builder) new Builder()
+        return new Builder()
                 .contentStreamProvider(contentStreamProvider)
                 .protocol(protocol)
                 .host(host)

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

@@ -29,7 +29,7 @@
       "name":"EndpointTraitTwo",
       "http":{
         "method":"POST",
-        "requestUri":"/"
+        "requestUri":"/{PathParam}"
       },
       "endpoint": {
         "hostPrefix": "{StringMember}-"
@@ -53,6 +53,13 @@
         "StringMember":{
           "shape":"String",
           "hostLabel": true
+        },
+        "PathIdempotentToken":{
+          "shape":"String",
+          "idempotencyToken":true,
+          "location":"uri",
+          "locationName":"PathParam",
+          "hostLabel": true
         }
       }
     },

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

@@ -21,6 +21,7 @@
 import static org.mockito.Mockito.when;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -33,8 +34,8 @@
 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.ExecuteRequest;
-import software.amazon.awssdk.http.InvokeableHttpRequest;
+import software.amazon.awssdk.http.ExecutableHttpRequest;
+import software.amazon.awssdk.http.HttpExecuteRequest;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.regions.Region;
@@ -50,7 +51,7 @@ public class EndpointTraitTest {
     private SdkHttpClient mockHttpClient;
 
     @Mock
-    private InvokeableHttpRequest abortableCallable;
+    private ExecutableHttpRequest abortableCallable;
 
     private ProtocolJsonEndpointTraitClient client;
 
@@ -71,32 +72,39 @@ public void setup() throws Exception {
     }
 
     @Test
-    public void hostExpression_withoutInputMemberLabel() {
+    public void hostExpression_withoutInputMemberLabel() throws URISyntaxException {
         try {
             client.endpointTraitOne(EndpointTraitOneRequest.builder().build());
             Assert.fail("Expected an exception");
         } catch (SdkClientException exception) {
-            ArgumentCaptor<ExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(ExecuteRequest.class);
+            ArgumentCaptor<HttpExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(HttpExecuteRequest.class);
             verify(mockHttpClient).prepareRequest(httpRequestCaptor.capture());
 
             SdkHttpRequest request = httpRequestCaptor.getAllValues().get(0).httpRequest();
             assertThat(request.host()).isEqualTo("data.localhost.com");
+            assertThat(request.port()).isEqualTo(443);
+            assertThat(request.encodedPath()).isEqualTo("/");
+            assertThat(request.getUri()).isEqualTo(new URI("http://data.localhost.com:443/"));
         }
     }
 
     @Test
-    public void hostExpression_withInputMemberLabel() {
+    public void hostExpression_withInputMemberLabel() throws URISyntaxException {
         try {
             client.endpointTraitTwo(EndpointTraitTwoRequest.builder()
                                                            .stringMember("123456")
+                                                           .pathIdempotentToken("dummypath")
                                                            .build());
             Assert.fail("Expected an exception");
         } catch (SdkClientException exception) {
-            ArgumentCaptor<ExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(ExecuteRequest.class);
+            ArgumentCaptor<HttpExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(HttpExecuteRequest.class);
             verify(mockHttpClient).prepareRequest(httpRequestCaptor.capture());
 
             SdkHttpRequest request = httpRequestCaptor.getAllValues().get(0).httpRequest();
             assertThat(request.host()).isEqualTo("123456-localhost.com");
+            assertThat(request.port()).isEqualTo(443);
+            assertThat(request.encodedPath()).isEqualTo("/dummypath");
+            assertThat(request.getUri()).isEqualTo(new URI("http://123456-localhost.com:443/dummypath"));
         }
     }
 
@@ -116,7 +124,7 @@ public void clientWithDisabledHostPrefix_withoutInputMemberLabel_usesOriginalUri
             clientWithDisabledHostPrefix.endpointTraitOne(EndpointTraitOneRequest.builder().build());
             Assert.fail("Expected an exception");
         } catch (SdkClientException exception) {
-            ArgumentCaptor<ExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(ExecuteRequest.class);
+            ArgumentCaptor<HttpExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(HttpExecuteRequest.class);
             verify(mockHttpClient).prepareRequest(httpRequestCaptor.capture());
 
             SdkHttpRequest request = httpRequestCaptor.getAllValues().get(0).httpRequest();
@@ -132,7 +140,7 @@ public void clientWithDisabledHostPrefix_withInputMemberLabel_usesOriginalUri()
                                                                                  .build());
             Assert.fail("Expected an exception");
         } catch (SdkClientException exception) {
-            ArgumentCaptor<ExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(ExecuteRequest.class);
+            ArgumentCaptor<HttpExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(HttpExecuteRequest.class);
             verify(mockHttpClient).prepareRequest(httpRequestCaptor.capture());
 
             SdkHttpRequest request = httpRequestCaptor.getAllValues().get(0).httpRequest();
@@ -145,7 +153,7 @@ private StaticCredentialsProvider mockCredentials() {
     }
 
     private String getEndpoint() {
-        return "http://localhost.com";
+        return "http://localhost.com:443";
     }
 
     private ProtocolJsonEndpointTraitClientBuilder clientBuilder() {