Fixing cloudsearchdomains marshalling

Author: shorea

services/cloudsearchdomain/src/main/java/software/amazon/awssdk/services/cloudsearchdomain/internal/SwitchToPostInterceptor.java

@@ -15,7 +15,6 @@
 
 package software.amazon.awssdk.services.cloudsearchdomain.internal;
 
-import static java.util.Collections.singletonList;
 import static software.amazon.awssdk.utils.StringUtils.lowerCase;
 
 import java.io.ByteArrayInputStream;
@@ -39,30 +38,28 @@ public final class SwitchToPostInterceptor implements ExecutionInterceptor {
 
     @Override
     public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
-        byte[] params = SdkHttpUtils.encodeAndFlattenFormData(context.httpRequest().rawQueryParameters()).orElse("")
-                .getBytes(StandardCharsets.UTF_8);
-
-        return context.httpRequest()
-                      .toBuilder()
-                      .method(SdkHttpMethod.POST)
-                      .putHeader("Content-Length", singletonList(String.valueOf(params.length)))
-                      .putHeader("Content-Type", singletonList("application/x-www-form-urlencoded; charset=" +
-                                                               lowerCase(StandardCharsets.UTF_8.toString()))).build();
+        SdkHttpRequest httpRequest = context.httpRequest();
+        if (context.request() instanceof SearchRequest) {
+            return httpRequest.toBuilder()
+                              .clearQueryParameters()
+                              .method(SdkHttpMethod.POST)
+                              .build();
+        }
+        return context.httpRequest();
     }
 
     @Override
     public Optional<RequestBody> modifyHttpContent(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
-        SdkHttpRequest request = context.httpRequest();
-        Object originalRequest = context.request();
-        if (originalRequest instanceof SearchRequest && request.method() == SdkHttpMethod.GET) {
-            byte[] params = SdkHttpUtils.encodeAndFlattenFormData(request.rawQueryParameters()).orElse("")
-                .getBytes(StandardCharsets.UTF_8);
+        if (context.request() instanceof SearchRequest) {
+            byte[] params = SdkHttpUtils.encodeAndFlattenFormData(context.httpRequest().rawQueryParameters()).orElse("")
+                                        .getBytes(StandardCharsets.UTF_8);
             return Optional.of(RequestBody.fromContentProvider(() -> new ByteArrayInputStream(params),
-                                                   params.length,
-                                                   "application/x-www-form-urlencoded; charset=" +
-                                                                 lowerCase(StandardCharsets.UTF_8.toString())));
+                                                               params.length,
+                                                               "application/x-www-form-urlencoded; charset=" +
+                                                               lowerCase(StandardCharsets.UTF_8.toString())));
         }
 
         return context.requestBody();
     }
+
 }

services/cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain/SearchRequestUnitTest.java

@@ -19,6 +19,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 
@@ -69,6 +70,7 @@ public void testPostUsedForSearchRequest() throws IOException {
 
         searchClient.search(SearchRequest.builder().query("Lord of the Rings").build());
 
-        verify(postRequestedFor(urlMatching("/.*")).withRequestBody(equalTo("format=sdk&pretty=true&q=Lord+of+the+Rings")));
+        verify(postRequestedFor(urlEqualTo("/2013-01-01/search"))
+                   .withRequestBody(equalTo("format=sdk&pretty=true&q=Lord+of+the+Rings")));
     }
 }