Added support for the "contentMd5Required" C2J trait, which will inject the "Content-MD5" header when an operation requires it.

This functionality was previously hard-coded to certain operations within S3. It's now driven by a trait, so that Content-MD5 does not get
calculated when it isn't needed.

Other changes in this commit:
1. Cleaned up some of the code generation poet code around the content-md5-related logic.
2. Added support for empty async XML responses without content-lengths. These would previously throw an exception that they're invalid XML.
3. Fixed an issue where requestBody and asyncRequestBody were not visible in ExecutionInterceptor.afterMarshalling.

Author: millems

.changes/next-release/bugfix-AWSSDKforJavav2-3374d0a.json

@@ -0,0 +1,5 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "description": "Fixed an issue where requestBody and asyncRequestBody were not visible in ExecutionInterceptor.afterMarshalling."
+}

.changes/next-release/bugfix-AmazonS3-9878254.json

@@ -0,0 +1,5 @@
+{
+    "type": "bugfix",
+    "category": "Amazon S3",
+    "description": "Fixed an issue where metrics were not being collected for Amazon S3 (or other XML services)"
+}

.changes/next-release/feature-AmazonS3-544f82b.json

@@ -0,0 +1,5 @@
+{
+    "type": "feature",
+    "category": "Amazon S3",
+    "description": "Moved the logic for calculating the Content-MD5 checksums from s3 to sdk-core. As always, make sure to use a version of 'sdk-core' greater than or equal to your version of 's3'. If you use an old version of 'sdk-core' and a new version of 's3', you will receive errors that Content-MD5 is required."
+}

build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml

@@ -211,4 +211,11 @@
         <Method name="execute"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
     </Match>
+
+    <!-- For forward-compatibility with this having members (i.e. the checksum type) -->
+    <Match>
+        <Class name="software.amazon.awssdk.core.interceptor.trait.HttpChecksumRequired"/>
+        <Method name="create"/>
+        <Bug pattern="ISC_INSTANTIATE_STATIC_CLASS"/>
+    </Match>
 </FindBugsFilter>

codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java

@@ -162,6 +162,7 @@ public Map<String, OperationModel> constructOperations() {
             operationModel.setEndpointOperation(op.isEndpointoperation());
             operationModel.setEndpointDiscovery(op.getEndpointdiscovery());
             operationModel.setEndpointTrait(op.getEndpoint());
+            operationModel.setHttpChecksumRequired(op.isHttpChecksumRequired());
 
             Input input = op.getInput();
             if (input != null) {

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java

@@ -62,6 +62,8 @@ public class OperationModel extends DocumentationModel {
 
     private EndpointTrait endpointTrait;
 
+    private boolean httpChecksumRequired;
+
     public String getOperationName() {
         return operationName;
     }
@@ -272,4 +274,12 @@ private boolean containsEventStream(ShapeModel shapeModel) {
                             .filter(m -> m.getShape() != null)
                             .anyMatch(m -> m.getShape().isEventStream());
     }
+
+    public boolean isHttpChecksumRequired() {
+        return httpChecksumRequired;
+    }
+
+    public void setHttpChecksumRequired(boolean httpChecksumRequired) {
+        this.httpChecksumRequired = httpChecksumRequired;
+    }
 }

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

@@ -46,6 +46,8 @@ public class Operation {
 
     private AuthType authtype = AuthType.IAM;
 
+    private boolean httpChecksumRequired;
+
     public String getName() {
         return name;
     }
@@ -164,4 +166,12 @@ public EndpointTrait getEndpoint() {
     public void setEndpoint(EndpointTrait endpoint) {
         this.endpoint = endpoint;
     }
+
+    public boolean isHttpChecksumRequired() {
+        return httpChecksumRequired;
+    }
+
+    public void setHttpChecksumRequired(boolean httpChecksumRequired) {
+        this.httpChecksumRequired = httpChecksumRequired;
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/Ec2ProtocolSpec.java

@@ -29,54 +29,4 @@ public Ec2ProtocolSpec(IntermediateModel model, PoetExtensions poetExtensions) {
     protected Class<?> protocolFactoryClass() {
         return AwsEc2ProtocolFactory.class;
     }
-
-    /*
-    TODO Dry run support
-    private MethodSpec dryRunMethod() {
-        TypeVariableName typeVariableName = TypeVariableName.get("X", AmazonWebServiceRequest.class);
-        ClassName dryRunResult = poetExtensions.getModelClass("DryRunResult");
-        TypeName dryRunResultGeneric = ParameterizedTypeName.get(dryRunResult, typeVariableName);
-        ClassName dryRunRequest = poetExtensions.getModelClass("DryRunSupportedRequest");
-        TypeName dryRunRequestGeneric = ParameterizedTypeName.get(dryRunRequest, typeVariableName);
-        return MethodSpec.methodBuilder("dryRun")
-                .returns(dryRunResultGeneric)
-                .addModifiers(Modifier.PUBLIC)
-                .addParameter(dryRunRequestGeneric, "request")
-                .addTypeVariable(typeVariableName)
-                .addStatement("$T<X> dryRunRequest = request.getDryRunRequest()",
-                        Request.class)
-                .beginControlFlow("try")
-                .addStatement("$T<$T> responseHandler = new $T<$T>(new $T())",
-                        StaxResponseHandler.class,
-                        dryRunResult,
-                        StaxResponseHandler.class,
-                        dryRunResult,
-                        VoidStaxUnmarshaller.class)
-                .addStatement("\nclientHandler.execute(new $T<$T, $T>().marshaller($L).withResponseHandler($N)" +
-                                ".withInput($L))",
-                        ClientExecutionParams.class,
-                        Request.class,
-                        dryRunResult,
-                        "null",
-                        "responseHandler",
-                        "dryRunRequest")
-                .addStatement("throw new $T($S)", SdkClientException.class,
-                        "Unrecognized service response for the dry-run request.")
-                .endControlFlow()
-                .beginControlFlow("catch (AwsServiceException exception)")
-                .beginControlFlow("if (exception.errorCode().equals($S) && exception.statusCode() == 412)",
-                        "DryRunOperation")
-                .addStatement("return new $T(true, request, exception.getMessage(), exception)", dryRunResultGeneric)
-                .endControlFlow()
-                .beginControlFlow("else if (exception.errorCode().equals($S) && exception.statusCode() == 403)",
-                        "UnauthorizedOperation")
-                .addStatement("return new $T(false, request, exception.getMessage(), exception)", dryRunResultGeneric)
-                .endControlFlow()
-                .addStatement("throw new $T($S, exception)", SdkClientException.class,
-                        "Unrecognized service response for the dry-run request.")
-                .endControlFlow()
-                .build();
-
-    }
-    */
 }