Add support for S3Object getObjectMetadata transform

Author: davidh44

.changes/next-release/bugfix-AWSSDKforJavav2MigrationTool-cd66430.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2 Migration Tool",
+    "contributor": "",
+    "description": "Add support for S3Object getObjectMetadata transform"
+}

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

@@ -43,6 +43,8 @@ void getObject(String bucket, String key, File file) throws Exception {
             .build());
         s3Object.close();
 
+        String cacheControl = s3Object.response().cacheControl();
+
         GetObjectResponse objectMetadata = s3.getObject(GetObjectRequest.builder().bucket(bucket).key(key)
                 .build(), file.toPath());
     }

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

@@ -48,17 +48,17 @@ public static ClientOverrideConfiguration customClientConfiguration() {
 
     public static SqsClient sqsClientWithAllSettings() {
         return SqsClient.builder()
-                .region(Region.of("us-west-2"))
-                .httpClientBuilder(ApacheHttpClient.builder()
-                    .connectionMaxIdleTime(Duration.ofMillis(1006))
-                    .tcpKeepAlive(true)
-                    .socketTimeout(Duration.ofMillis(1004))
-                    .connectionTimeToLive(Duration.ofMillis(1005))
-                    .connectionTimeout(Duration.ofMillis(1003))
-                    .maxConnections(1002))
-                .overrideConfiguration(customClientConfiguration())
+                                  .region(Region.of("us-west-2"))
+                                  .httpClientBuilder(ApacheHttpClient.builder()
+                                      .connectionMaxIdleTime(Duration.ofMillis(1006))
+                                      .tcpKeepAlive(true)
+                                      .socketTimeout(Duration.ofMillis(1004))
+                                      .connectionTimeToLive(Duration.ofMillis(1005))
+                                      .connectionTimeout(Duration.ofMillis(1003))
+                                      .maxConnections(1002))
+                                  .overrideConfiguration(customClientConfiguration())
             .credentialsProvider(CredentialsDependencyFactory.defaultCredentialsProviderChain())
-            .build();
+                              .build();
     }
 
     public static SqsClientBuilder sqsClientBuilder() {
@@ -90,6 +90,6 @@ public static SqsAsyncClient sqsAsyncClientWithAllSettings() {
             .httpClientBuilder(NettyNioAsyncHttpClient.builder()
                 .connectionTimeout(Duration.ofMillis(2004)))
             .overrideConfiguration(clientConfiguration)
-            .build();
+                                   .build();
     }
 }

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

@@ -40,6 +40,8 @@ void getObject(String bucket, String key, File file) throws Exception {
         S3Object s3Object = s3.getObject(bucket, key);
         s3Object.getObjectContent().close();
 
+        String cacheControl = s3Object.getObjectMetadata().getCacheControl();
+
         ObjectMetadata objectMetadata = s3.getObject(new GetObjectRequest(bucket, key), file);
     }
 

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

@@ -73,12 +73,14 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext executionContext) {
                                                   params.get(0), params.get(1), params.get(2),  params.get(3));
             }
             if (type.isAssignableFrom(OBJECT_TAGGING) && newClass.getArguments().size() == 1) {
+                addV2S3ModelImport("Tagging");
                 String v2Builder = "Tagging.builder().tagSet(#{any()}).build();";
                 return JavaTemplate.builder(v2Builder)
                                    .build().apply(getCursor(), newClass.getCoordinates().replace(),
                                                   newClass.getArguments().get(0));
             }
             if (type.isAssignableFrom(GET_OBJECT_TAGGING_RESULT) && newClass.getArguments().size() == 1) {
+                addV2S3ModelImport("GetObjectTaggingResponse");
                 String v2Builder = "GetObjectTaggingResponse.builder().tagSet(#{any()}).build();";
                 return JavaTemplate.builder(v2Builder)
                                    .build().apply(getCursor(), newClass.getCoordinates().replace(),

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

@@ -24,6 +24,7 @@
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.getArgumentName;
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.getSelectName;
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.inputStreamBufferingWarningComment;
+import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.isObjectMetadataGetter;
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.isObjectMetadataSetter;
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.isPayloadSetter;
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.isPutObjectRequestBuilderSetter;
@@ -95,6 +96,11 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
             if (isObjectMetadataSetter(method)) {
                 return saveMetadataValueAndRemoveStatement(method);
             }
+            if (isObjectMetadataGetter(method)) {
+                if (method.getSelect() != null) {
+                    return method.getSelect().withPrefix(method.getPrefix());
+                }
+            }
 
             if (isPutObjectRequestBuilderSetter(method)) {
                 if (isRequestMetadataSetter(method)) {

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

@@ -207,6 +207,20 @@ public static boolean isObjectMetadataSetter(J.MethodInvocation method) {
         return isSetterForClassType(method, V2_S3_MODEL_PKG + "HeadObjectResponse");
     }
 
+    public static boolean isObjectMetadataGetter(J.MethodInvocation method) {
+        if (!"objectMetadata".equals(method.getSimpleName()) || hasArguments(method)) {
+            return false;
+        }
+
+        Expression select = method.getSelect();
+        if (!(select instanceof J.MethodInvocation)) {
+            return false;
+        }
+
+        J.MethodInvocation receiverMethod = (J.MethodInvocation) select;
+        return "response".equals(receiverMethod.getSimpleName());
+    }
+
     /** Field set during POJO instantiation, e.g.,
      * PutObjectRequest request = new PutObjectRequest("bucket" "key", "redirectLocation").withFile(file);
      */
@@ -236,7 +250,7 @@ public static boolean isSetterForClassType(J.MethodInvocation method, String fqc
     }
 
     public static boolean hasArguments(J.MethodInvocation method) {
-        return !method.getArguments().isEmpty();
+        return method.getArguments().stream().anyMatch(arg -> !(arg instanceof J.Empty));
     }
 
     public static boolean isPayloadSetter(J.MethodInvocation method) {