Add null checks and use fromContentProvider if content length not set

Author: davidh44

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3Streaming.java

@@ -52,10 +52,15 @@ void putObject_bucketKeyFile(String bucket, String key, File file) {
     }
 
     void putObject_bucketKeyStreamMetadata(String bucket, String key, InputStream stream) {
-        HeadObjectResponse metadata = HeadObjectResponse.builder()
+        HeadObjectResponse metadataWithLength = HeadObjectResponse.builder()
             .build();
         s3.putObject(PutObjectRequest.builder().bucket(bucket).key(key).contentLength(22L)
             .build(), RequestBody.fromInputStream(stream, 22L));
+
+
+        HeadObjectResponse metadataWithoutLength = HeadObjectResponse.builder()
+            .build();
+        /*AWS SDK for Java v2 migration: When using InputStream to upload with S3Client, Content-Length should be specified and used with RequestBody.fromInputStream(). Otherwise, the entire stream will be buffered in memory.*/s3.putObject(PutObjectRequest.builder().bucket(bucket).key(key).build(), RequestBody.fromContentProvider(() -> stream, "application/octet-stream"));
     }
 
     /**

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/before/src/main/java/foo/bar/S3Streaming.java

@@ -46,9 +46,13 @@ void putObject_bucketKeyFile(String bucket, String key, File file) {
     }
 
     void putObject_bucketKeyStreamMetadata(String bucket, String key, InputStream stream) {
-        ObjectMetadata metadata = new ObjectMetadata();
-        metadata.setContentLength(22);
-        s3.putObject(bucket, key, stream, metadata);
+        ObjectMetadata metadataWithLength = new ObjectMetadata();
+        metadataWithLength.setContentLength(22);
+        s3.putObject(bucket, key, stream, metadataWithLength);
+
+
+        ObjectMetadata metadataWithoutLength = new ObjectMetadata();
+        s3.putObject(bucket, key, stream, metadataWithoutLength);
     }
 
     /**

v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3PutObjectRequestToV2.java

@@ -33,6 +33,7 @@
 import java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.regex.Pattern;
@@ -43,6 +44,7 @@
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.MethodMatcher;
+import org.openrewrite.java.tree.Comment;
 import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.TypeUtils;
@@ -290,15 +292,13 @@ private J.MethodInvocation addInputStreamToPutObject(J.MethodInvocation method,
             String v2Method;
 
             if (contentLen == null) {
-                String comment = "When using InputStream to upload with S3Client, Content-Length should be specified and used "
-                                 + "with RequestBody.fromInputStream(). Otherwise, the entire stream will be buffered in memory.";
                 // CHECKSTYLE:OFF: Regexp
                 v2Method = "#{any()}, RequestBody.fromContentProvider(() -> #{any()}, \"application/octet-stream\")";
                 // CHECKSTYLE:ON: Regexp
                 return JavaTemplate.builder(v2Method).build()
                                    .apply(getCursor(), method.getCoordinates().replaceArguments(),
                                           method.getArguments().get(0), inputStream)
-                    .withComments(createComments(comment));
+                    .withComments(inputStreamBufferingWarningComment());
             }
 
             StringBuilder sb = new StringBuilder("#{any()}, RequestBody.fromInputStream(#{any()}, #{any()}");
@@ -327,18 +327,23 @@ private J.MethodInvocation transformPutObjectWithStreamAndMetadata(J.MethodInvoc
                                    method.getArguments().get(2)};
 
             if (contentLen == null) {
-                sb.append(".build(), RequestBody.fromInputStream(#{any()}, -1L)");
-            } else {
-                sb.append(".build(), RequestBody.fromInputStream(#{any()}, #{any()}");
+                // CHECKSTYLE:OFF: Regexp
+                sb.append(".build(), RequestBody.fromContentProvider(() -> #{any()}, \"application/octet-stream\")");
+                // CHECKSTYLE:ON: Regexp
+                return JavaTemplate.builder(sb.toString()).build()
+                                   .apply(getCursor(), method.getCoordinates().replaceArguments(), params)
+                                   .withComments(inputStreamBufferingWarningComment());
+            }
 
-                if (contentLen instanceof J.Literal) {
-                    sb.append("L");
-                }
-                sb.append(")");
+            sb.append(".build(), RequestBody.fromInputStream(#{any()}, #{any()}");
 
-                params = Arrays.copyOf(params, 4);
-                params[3] = contentLen;
+            if (contentLen instanceof J.Literal) {
+                sb.append("L");
             }
+            sb.append(")");
+
+            params = Arrays.copyOf(params, 4);
+            params[3] = contentLen;
 
             return JavaTemplate.builder(sb.toString()).build()
                                .apply(getCursor(), method.getCoordinates().replaceArguments(), params);
@@ -401,6 +406,9 @@ private String getMetadataForRequest(J.MethodInvocation method) {
 
         private Expression retrieveContentLengthForMetadataIfSet(String metadataName) {
             Map<String, Expression> map = metadataMap.get(metadataName);
+            if (map == null) {
+                return null;
+            }
             return map.get("contentLength");
         }
 
@@ -496,5 +504,11 @@ private void addTmImport(String pojoName) {
             String fqcn = V2_TM_MODEL_PKG + pojoName;
             doAfterVisit(new AddImport<>(fqcn, null, false));
         }
+
+        private List<Comment> inputStreamBufferingWarningComment() {
+            String warning = "When using InputStream to upload with S3Client, Content-Length should be specified and used "
+                             + "with RequestBody.fromInputStream(). Otherwise, the entire stream will be buffered in memory.";
+            return createComments(warning);
+        }
     }
 }

v2-migration/src/main/java/software/amazon/awssdk/v2migration/internal/utils/S3TransformUtils.java

@@ -77,6 +77,9 @@ public static MethodMatcher v2TmMethodMatcher(String methodSignature) {
     public static void addMetadataFields(StringBuilder sb, String metadataName,
                                          Map<String, Map<String, Expression>> metadataMap) {
         Map<String, Expression> map = metadataMap.get(metadataName);
+        if (map == null) {
+            return;
+        }
 
         Expression contentLen = map.get("contentLength");
         if (contentLen != null) {