Add transform for httpExpiresDate

Author: davidh44

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

@@ -56,16 +56,15 @@ void objectmetadata_unsupportedSetters(Date dateVal) {
         HeadObjectResponse metadata = HeadObjectResponse.builder()
                 .build();
 
-        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - expirationTimeRuleId - is not supported, please manually migrate the code by setting it on the v2 PutObjectRequest.*/metadata.expirationTimeRuleId("expirationTimeRuleId");
-        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - ongoingRestore - is not supported, please manually migrate the code by setting it on the v2 PutObjectRequest.*/metadata.ongoingRestore(false);
-        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - requesterCharged - is not supported, please manually migrate the code by setting it on the v2 PutObjectRequest.*/metadata.requesterCharged(false);
+        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - expirationTimeRuleId - is not supported, please manually migrate the code by setting it on the v2 request/response object.*/metadata.expirationTimeRuleId("expirationTimeRuleId");
+        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - ongoingRestore - is not supported, please manually migrate the code by setting it on the v2 request/response object.*/metadata.ongoingRestore(false);
+        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - requesterCharged - is not supported, please manually migrate the code by setting it on the v2 request/response object.*/metadata.requesterCharged(false);
 
-        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - lastModified - is not supported, please manually migrate the code by setting it on the v2 PutObjectRequest.*/metadata.lastModified(dateVal);
-        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - httpExpiresDate - is not supported, please manually migrate the code by setting it on the v2 PutObjectRequest.*/metadata.httpExpiresDate(dateVal);
-        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - expirationTime - is not supported, please manually migrate the code by setting it on the v2 PutObjectRequest.*/metadata.expirationTime(dateVal);
-        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - restoreExpirationTime - is not supported, please manually migrate the code by setting it on the v2 PutObjectRequest.*/metadata.restoreExpirationTime(dateVal);
+        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - lastModified - is not supported, please manually migrate the code by setting it on the v2 request/response object.*/metadata.lastModified(dateVal);
+        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - expirationTime - is not supported, please manually migrate the code by setting it on the v2 request/response object.*/metadata.expirationTime(dateVal);
+        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - restoreExpirationTime - is not supported, please manually migrate the code by setting it on the v2 request/response object.*/metadata.restoreExpirationTime(dateVal);
 
-        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - header - is not supported, please manually migrate the code by setting it on the v2 PutObjectRequest.*/metadata.header("key", "val");
-        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - addUserMetadata - is not supported, please manually migrate the code by setting it on the v2 PutObjectRequest.*/metadata.addUserMetadata("a", "b");
+        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - header - is not supported, please manually migrate the code by setting it on the v2 request/response object.*/metadata.header("key", "val");
+        /*AWS SDK for Java v2 migration: Transform for ObjectMetadata setter - addUserMetadata - is not supported, please manually migrate the code by setting it on the v2 request/response object.*/metadata.addUserMetadata("a", "b");
     }
 }

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

@@ -58,7 +58,6 @@ void objectmetadata_unsupportedSetters(Date dateVal) {
         metadata.setRequesterCharged(false);
 
         metadata.setLastModified(dateVal);
-        metadata.setHttpExpiresDate(dateVal);
         metadata.setExpirationTime(dateVal);
         metadata.setRestoreExpirationTime(dateVal);
 

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

@@ -18,6 +18,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import software.amazon.awssdk.core.ResponseInputStream;
@@ -133,6 +134,7 @@ void putObjectRequest_withMetadata() {
         HeadObjectResponse metadata = HeadObjectResponse.builder()
             .build();
         long contentLen = 66;
+        Date expiry = new Date();
 
         Map<String, String> userMetadata = new HashMap<>();
         userMetadata.put("key", "value");
@@ -149,6 +151,7 @@ void putObjectRequest_withMetadata() {
             .sseCustomerKeyMD5("sseCustomerKeyMd5Val")
             .bucketKeyEnabled(true)
             .metadata(userMetadata)
+            .expires(expiry.toInstant())
             .build();
     }
 }

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

@@ -24,6 +24,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -126,6 +127,8 @@ void putObjectRequest_withMetadata() {
         metadata.setServerSideEncryption("sseEncryptionVal");
         metadata.setSSECustomerKeyMd5("sseCustomerKeyMd5Val");
         metadata.setBucketKeyEnabled(true);
+        Date expiry = new Date();
+        metadata.setHttpExpiresDate(expiry);
 
         Map<String, String> userMetadata = new HashMap<>();
         userMetadata.put("key", "value");

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

@@ -421,7 +421,7 @@ private J.MethodInvocation saveMetadataValueAndRemoveStatement(J.MethodInvocatio
 
             if (!SUPPORTED_METADATA_TRANSFORMS.contains(methodName)) {
                 String comment = String.format("Transform for ObjectMetadata setter - %s - is not supported, please manually "
-                                               + "migrate the code by setting it on the v2 PutObjectRequest.", methodName);
+                                               + "migrate the code by setting it on the v2 request/response object.", methodName);
                 return method.withComments(createComments(comment));
             }
 

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

@@ -53,7 +53,8 @@ public final class S3TransformUtils {
         "serverSideEncryption",
         "sseCustomerKeyMd5",
         "bucketKeyEnabled",
-        "userMetadata"
+        "userMetadata",
+        "httpExpiresDate"
     )));
 
 
@@ -129,6 +130,10 @@ public static void addMetadataFields(StringBuilder sb, String metadataName,
         if (userMetadata != null) {
             sb.append(".metadata(").append(userMetadata).append(")\n");
         }
+        Expression expiresDate = map.get("httpExpiresDate");
+        if (expiresDate != null) {
+            sb.append(".expires(").append(expiresDate).append(".toInstant())\n");
+        }
     }
 
     public static String getArgumentName(J.MethodInvocation method) {