Adding an explicit isPresent check in SyncHttpChecksumInTrailerInterceptor to improve readibilty also to address sonarcloud bug

Author: joviegas

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/interceptor/SyncHttpChecksumInTrailerInterceptor.java

@@ -58,14 +58,7 @@ public Optional<RequestBody> modifyHttpContent(Context.ModifyHttpRequest context
         ChecksumSpecs checksumSpecs =
             HttpChecksumUtils.checksumSpecWithRequestAlgorithm(executionAttributes).orElse(null);
 
-        if (checksumSpecs == null
-            || ! context.requestBody().isPresent()
-            || !HttpChecksumUtils
-            .isTrailerBasedChecksumForClientType(
-                executionAttributes, context.httpRequest(),
-                ClientType.SYNC, checksumSpecs,
-                context.requestBody().isPresent(),
-                context.requestBody().map(requestBody -> requestBody.contentStreamProvider() != null).orElse(false))) {
+        if (!shouldAddTrailerBasedChecksumInRequest(context, executionAttributes, checksumSpecs)) {
             return context.requestBody();
         }
 
@@ -85,19 +78,26 @@ public Optional<RequestBody> modifyHttpContent(Context.ModifyHttpRequest context
                 requestBody.contentType()));
     }
 
+    private static boolean shouldAddTrailerBasedChecksumInRequest(Context.ModifyHttpRequest context,
+                                                                  ExecutionAttributes executionAttributes,
+                                                                  ChecksumSpecs checksumSpecs) {
+        return checksumSpecs != null
+               && context.requestBody().isPresent()
+               && HttpChecksumUtils.isTrailerBasedChecksumForClientType(
+                   executionAttributes,
+                   context.httpRequest(),
+                   ClientType.SYNC, checksumSpecs,
+                   context.requestBody().isPresent(),
+                   context.requestBody().map(requestBody -> requestBody.contentStreamProvider() != null).orElse(false));
+    }
+
     @Override
     public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
 
         ChecksumSpecs checksumSpecs =
             HttpChecksumUtils.checksumSpecWithRequestAlgorithm(executionAttributes).orElse(null);
-        if (checksumSpecs == null ||
-            !HttpChecksumUtils
-                .isTrailerBasedChecksumForClientType(
-                    executionAttributes,
-                    context.httpRequest(),
-                    ClientType.SYNC, checksumSpecs,
-                    context.requestBody().isPresent(),
-                    context.requestBody().map(requestBody -> requestBody.contentStreamProvider() != null).orElse(false))) {
+
+        if (!shouldAddTrailerBasedChecksumInRequest(context, executionAttributes, checksumSpecs)) {
             return context.httpRequest();
         }