Bug Fix to support Document Type for Explicit Payload members (aws#2736)

Author: joviegas

.changes/next-release/bugfix-AWSSDKforJavav2-bd6fc5c.json

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "bugfix", 
+    "description": "Bug fix to handle DocumentType for Explicit payload members."
+}

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.protocols.json.internal.marshall;
 
 import static software.amazon.awssdk.core.internal.util.Mimetype.MIMETYPE_EVENT_STREAM;
+import static software.amazon.awssdk.core.protocol.MarshallingType.DOCUMENT;
 import static software.amazon.awssdk.http.Header.CHUNKED;
 import static software.amazon.awssdk.http.Header.CONTENT_LENGTH;
 import static software.amazon.awssdk.http.Header.CONTENT_TYPE;
@@ -177,6 +178,8 @@ void doMarshall(SdkPojo pojo) {
             Object val = field.getValueOrDefault(pojo);
             if (isBinary(field, val)) {
                 request.contentStreamProvider(((SdkBytes) val)::asInputStream);
+            } else if (isDocumentType(field) && val != null) {
+                marshalDocumentType(field, val);
             } else {
                 if (val != null && field.containsTrait(PayloadTrait.class)) {
                     jsonGenerator.writeStartObject();
@@ -248,4 +251,19 @@ private SdkHttpFullRequest finishMarshalling() {
         return request.build();
     }
 
+    private boolean isDocumentType(SdkField<?> field) {
+        return DOCUMENT.equals(field.marshallingType());
+    }
+
+    private void marshalDocumentType(SdkField<?> field, Object val) {
+        boolean isExplicitPayloadField = hasExplicitPayloadMember && field.containsTrait(PayloadTrait.class);
+        if (isExplicitPayloadField) {
+            jsonGenerator.writeStartObject();
+        }
+        MARSHALLER_REGISTRY.getMarshaller(field.location(), field.marshallingType(), val)
+                           .marshall(val, marshallerContext, field.locationName(), (SdkField<Object>) field);
+        if (isExplicitPayloadField) {
+            jsonGenerator.writeEndObject();
+        }
+    }
 }

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonProtocolUnmarshaller.java

@@ -127,7 +127,10 @@ private static SdkPojo unmarshallStructured(JsonUnmarshallerContext context, Jso
     private static Document unmarshallDocument(JsonUnmarshallerContext context,
                                                JsonNode jsonContent,
                                                SdkField<Document> field) {
-        return jsonContent != null && !jsonContent.isNull() ? getDocumentFromJsonContent(jsonContent) : null;
+        if (jsonContent == null) {
+            return null;
+        }
+        return jsonContent.isNull() ? Document.fromNull() : getDocumentFromJsonContent(jsonContent);
     }
 
     private static Document getDocumentFromJsonContent(JsonNode jsonContent) {
@@ -238,8 +241,11 @@ private static JsonNode getJsonNode(JsonNode jsonContent, SdkField<?> field) {
         if (jsonContent == null) {
             return null;
         }
-        return isExplicitPayloadMember(field) ? jsonContent : jsonContent.field(field.locationName())
-                                                                         .orElse(null);
+        return isFieldExplicitlyTransferredAsJson(field) ? jsonContent : jsonContent.field(field.locationName()).orElse(null);
+    }
+
+    private static boolean isFieldExplicitlyTransferredAsJson(SdkField<?> field) {
+        return isExplicitPayloadMember(field) && !MarshallingType.DOCUMENT.equals(field.marshallingType());
     }
 
     /**