Address review comments

Author: varunnvs92

protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/AwsXmlProtocolFactory.java

@@ -85,4 +85,4 @@ public AwsXmlProtocolFactory build() {
             return new AwsXmlProtocolFactory(this);
         }
     }
-}
+}

protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlPayloadMarshaller.java

@@ -51,13 +51,7 @@ public class XmlPayloadMarshaller {
     public static final XmlMarshaller<Instant> INSTANT =
         new BasePayloadMarshaller<>(XmlProtocolMarshaller.INSTANT_VALUE_TO_STRING);
 
-    public static final XmlMarshaller<SdkBytes> SDK_BYTES = new BasePayloadMarshaller<SdkBytes>(null) {
-        @Override
-        public void marshall(SdkBytes val, XmlMarshallerContext context, String paramName, SdkField<SdkBytes> sdkField,
-                             ValueToStringConverter.ValueToString<SdkBytes> converter) {
-            context.xmlGenerator().xmlWriter().value(val.asByteBuffer());
-        }
-    };
+    public static final XmlMarshaller<SdkBytes> SDK_BYTES = new BasePayloadMarshaller<>(ValueToStringConverter.FROM_SDK_BYTES);
 
     public static final XmlMarshaller<SdkPojo> SDK_POJO = new BasePayloadMarshaller<SdkPojo>(null) {
         @Override

services/s3/src/main/java/software/amazon/awssdk/services/s3/handlers/AddContentMd5HeaderInterceptor.java

@@ -20,21 +20,32 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.util.Arrays;
+import java.util.List;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.Md5Utils;
 
 @SdkProtectedApi
 public class AddContentMd5HeaderInterceptor implements ExecutionInterceptor {
 
+    // List of operations that should be ignored by this interceptor.
+    // These are costly operations, so adding the md5 header will take a performance hit
+    private static final List<Class> BLACKLIST_METHODS = Arrays.asList(PutObjectRequest.class, UploadPartRequest.class);
+
     @Override
     public SdkHttpFullRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
         SdkHttpFullRequest request = context.httpRequest();
-        if (request.contentStreamProvider().isPresent() && !request.firstMatchingHeader(CONTENT_MD5).isPresent()) {
+
+        if (!BLACKLIST_METHODS.contains(context.request().getClass()) && request.contentStreamProvider().isPresent()
+            && !request.firstMatchingHeader(CONTENT_MD5).isPresent()) {
+
             try {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 IoUtils.copy(request.contentStreamProvider().get().newStream(), baos);