Use Instant instead of Date in Presigner params

Author: varunnvs92

auth/src/main/java/software/amazon/awssdk/auth/AwsExecutionAttributes.java

@@ -15,7 +15,7 @@
 
 package software.amazon.awssdk.auth;
 
-import java.util.Date;
+import java.time.Instant;
 import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
@@ -59,10 +59,9 @@ public final class AwsExecutionAttributes extends SdkExecutionAttributes {
     public static final ExecutionAttribute<Boolean> SIGNER_DOUBLE_URL_ENCODE = new ExecutionAttribute<>("DoubleUrlEncode");
 
     /**
-     * The key to specify the expiration date when pre-signing aws requests.
+     * The key to specify the expiration time when pre-signing aws requests.
      */
-    public static final ExecutionAttribute<Date> AWS_PRESIGNER_EXPIRATION_DATE =
-        new ExecutionAttribute<>("PresignerExpirationDate");
+    public static final ExecutionAttribute<Instant> PRESIGNER_EXPIRATION = new ExecutionAttribute<>("PresignerExpiration");
 
     private AwsExecutionAttributes() {
     }

auth/src/main/java/software/amazon/awssdk/auth/signer/AbstractAws4Signer.java

@@ -21,9 +21,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -105,7 +105,7 @@ protected SdkHttpFullRequest.Builder doPresign(SdkHttpFullRequest request,
 
         SdkHttpFullRequest.Builder mutableRequest = request.toBuilder();
 
-        long expirationInSeconds = generateExpirationDate(signingParams.expirationDate());
+        long expirationInSeconds = generateExpirationTime(signingParams.expirationTime());
         addHostHeader(mutableRequest);
 
         AwsCredentials sanitizedCredentials = sanitizeCredentials(signingParams.awsCredentials());
@@ -375,21 +375,20 @@ private void addDateHeader(SdkHttpFullRequest.Builder mutableRequest, String dat
     }
 
     /**
-     * Generates an expiration date for the presigned url. If user has specified
-     * an expiration date, check if it is in the given limit.
+     * Generates an expiration time for the presigned url. If user has specified
+     * an expiration time, check if it is in the given limit.
      */
-    private long generateExpirationDate(Date expirationDate) {
+    private long generateExpirationTime(Instant expirationTime) {
 
-        long expirationInSeconds = expirationDate != null
-                                   ? (expirationDate.getTime() / 1000L)
+        long expirationInSeconds = expirationTime != null
+                                   ? expirationTime.getEpochSecond()
                                    : SignerConstants.PRESIGN_URL_MAX_EXPIRATION_SECONDS;
 
         if (expirationInSeconds > SignerConstants.PRESIGN_URL_MAX_EXPIRATION_SECONDS) {
             throw new SdkClientException(
                 "Requests that are pre-signed by SigV4 algorithm are valid for at most 7 days. "
                 + "The expiration date set on the current request ["
-                + Aws4SignerUtils.formatTimestamp(expirationDate
-                                                      .getTime()) + "] has exceeded this limit.");
+                + Aws4SignerUtils.formatTimestamp(expirationInSeconds * 1000L) + "] has exceeded this limit.");
         }
         return expirationInSeconds;
     }
@@ -411,7 +410,7 @@ private byte[] newSigningKey(AwsCredentials credentials,
     protected <B extends Aws4PresignerParams.Builder> B extractPresignerParams(B builder,
                                                                                ExecutionAttributes executionAttributes) {
         builder = extractSignerParams(builder, executionAttributes);
-        builder.expirationDate(executionAttributes.getAttribute(AwsExecutionAttributes.AWS_PRESIGNER_EXPIRATION_DATE));
+        builder.expirationTime(executionAttributes.getAttribute(AwsExecutionAttributes.PRESIGNER_EXPIRATION));
 
         return builder;
     }

auth/src/main/java/software/amazon/awssdk/auth/signer/params/Aws4PresignerParams.java

@@ -15,37 +15,37 @@
 
 package software.amazon.awssdk.auth.signer.params;
 
-import java.util.Date;
+import java.time.Instant;
 import software.amazon.awssdk.auth.signer.SignerConstants;
 
 public final class Aws4PresignerParams extends Aws4SignerParams {
 
-    private final Date expirationDate;
+    private final Instant expirationTime;
 
     private Aws4PresignerParams(Builder builder) {
         super(builder);
-        this.expirationDate = builder.expirationDate;
+        this.expirationTime = builder.expirationTime;
     }
 
-    public Date expirationDate() {
-        return expirationDate;
+    public Instant expirationTime() {
+        return expirationTime;
     }
 
     public static Builder builder() {
         return new Builder();
     }
 
     public static final class Builder extends Aws4SignerParams.Builder<Builder> {
-        private Date expirationDate;
+        private Instant expirationTime;
 
         /**
-         * Sets an expiration date for the presigned url. If this value is not specified,
+         * Sets an expiration time for the presigned url. If this value is not specified,
          * {@link SignerConstants#PRESIGN_URL_MAX_EXPIRATION_SECONDS} is used.
          *
-         * @param expirationDate Expiration date for the presigned url.
+         * @param expirationTime Expiration time for the presigned url expressed in {@link Instant}.
          */
-        public Builder expirationDate(Date expirationDate) {
-            this.expirationDate = expirationDate;
+        public Builder expirationTime(Instant expirationTime) {
+            this.expirationTime = expirationTime;
             return this;
         }
 

auth/src/test/java/software/amazon/awssdk/auth/signer/SignerTestUtils.java

@@ -16,7 +16,7 @@
 package software.amazon.awssdk.auth.signer;
 
 import java.time.Clock;
-import java.util.Date;
+import java.time.Instant;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.signer.params.Aws4PresignerParams;
 import software.amazon.awssdk.auth.signer.params.Aws4SignerParams;
@@ -44,13 +44,13 @@ public static SdkHttpFullRequest signRequest(Aws4Signer signer,
     public static SdkHttpFullRequest presignRequest(Aws4Signer presigner,
                                                     SdkHttpFullRequest request,
                                                     AwsCredentials credentials,
-                                                    Date expiration,
+                                                    Instant expiration,
                                                     String signingName,
                                                     Clock signingDateOverride,
                                                     String region) {
         Aws4PresignerParams signerParams = Aws4PresignerParams.builder()
                                                               .awsCredentials(credentials)
-                                                              .expirationDate(expiration)
+                                                              .expirationTime(expiration)
                                                               .signingName(signingName)
                                                               .signingClockOverride(signingDateOverride)
                                                               .signingRegion(Region.of(region))