Various fixes + start adding new query tests

Author: alextwoods

codegen/src/main/java/software/amazon/awssdk/codegen/model/service/XmlNamespace.java

@@ -17,6 +17,12 @@
 
 public class XmlNamespace {
 
+    public XmlNamespace() {}
+
+    public XmlNamespace(String uri) {
+        this.uri = uri;
+    }
+
     private String prefix;
 
     private String uri;

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

@@ -21,6 +21,7 @@
 
 import com.github.tomakehurst.wiremock.http.HttpHeaders;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -64,6 +65,9 @@ private void assertHeadersContains(HttpHeaders actual) {
             assertTrue(String.format("Header '%s' was expected to be present. Actual headers: %s", expectedKey, actual),
                        actual.getHeader(expectedKey).isPresent());
             List<String> actualValues = actual.getHeader(expectedKey).values();
+            if (expectedKey.equalsIgnoreCase("Content-Type") && actualValues.size() == 1) {
+                actualValues = Collections.singletonList(actualValues.get(0).replace("; charset=UTF-8", ""));
+            }
             assertEquals(expectedValues, actualValues);
         });
     }

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Then.java

@@ -29,13 +29,16 @@ public class Then {
     private final MarshallingAssertion serializedAs;
     private final UnmarshallingAssertion deserializedAs;
     private final UnmarshallingAssertion errorDeserializedAs;
+    private final String errorCode;
 
     @JsonCreator
     public Then(@JsonProperty("serializedAs") SerializedAs serializedAs,
-                @JsonProperty("deserializedAs") JsonNode deserializedAs) {
+                @JsonProperty("deserializedAs") JsonNode deserializedAs,
+                @JsonProperty("errorCode") String errorCode) {
         this.serializedAs = serializedAs;
         this.deserializedAs = new UnmarshalledResultAssertion(deserializedAs);
         this.errorDeserializedAs = new UnmarshalledErrorAssertion(deserializedAs);
+        this.errorCode = errorCode;
     }
 
     /**
@@ -53,10 +56,16 @@ public UnmarshallingAssertion getUnmarshallingAssertion() {
     }
 
     /**
-     *
      * @return The assertion object to use for error unmarshalling tests
      */
     public UnmarshallingAssertion getErrorUnmarshallingAssertion() {
         return errorDeserializedAs;
     }
+
+    /**
+     * @return The error code to assert.
+     */
+    public String getErrorCode() {
+        return errorCode;
+    }
 }