Add changelog + fix checkstyle

Author: alextwoods

.changes/next-release/bugfix-AWSQueryProtocol-3bb558c.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS Query Protocol",
+    "contributor": "",
+    "description": "Preserve the path set on a custom endpoint configured on the client."
+}

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/QueryBodyAssertion.java

@@ -64,7 +64,9 @@ private void assertParamsEqual(List<String> actual, List<String> expected) {
     }
 
     public static boolean isNumeric(String str) {
-        if (str == null || str.isEmpty()) return false;
+        if (str == null || str.isEmpty()) {
+            return false;
+        }
         try {
             Double.parseDouble(str);
             return true;

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/QueryParamsAssertion.java

@@ -24,15 +24,8 @@
 import static software.amazon.awssdk.protocol.asserts.marshalling.QueryUtils.parseQueryParamsFromBody;
 
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URLEncodedUtils;
-import software.amazon.awssdk.utils.StringUtils;
 
 /**
  * Asserts on the query parameters of the marshalled request.

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/QueryUtils.java

@@ -27,7 +27,8 @@
 import software.amazon.awssdk.utils.StringUtils;
 
 public final class QueryUtils {
-    private QueryUtils() {}
+    private QueryUtils() {
+    }
 
     public static Map<String, List<String>> parseQueryParamsFromBody(String body) {
         return toQueryParamMap(URLEncodedUtils.parse(body, StandardCharsets.UTF_8));

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/ResolvedHostAssertion.java

@@ -31,8 +31,6 @@ public ResolvedHostAssertion(String host) {
 
     @Override
     protected void doAssert(LoggedRequest actual) throws Exception {
-        // TODO:
-        // assertEquals(removeTrailingSlash(expectedUri), removeTrailingSlash(getActualPath(actual)));
+        assertEquals(expectedHost, actual.getHost());
     }
-
 }

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/MarshallingTestRunner.java

@@ -26,10 +26,7 @@
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URI;
 import java.util.List;
-import org.junit.Assert;
 import software.amazon.awssdk.awscore.AwsRequest;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.core.interceptor.Context;
@@ -41,7 +38,6 @@
 import software.amazon.awssdk.protocol.reflect.ClientReflector;
 import software.amazon.awssdk.protocol.reflect.ShapeModelReflector;
 import software.amazon.awssdk.protocol.wiremock.WireMockUtils;
-import software.amazon.awssdk.utils.StringUtils;
 
 /**
  * Test runner for test cases exercising the client marshallers.