switch to use of long for expire and issue dates

Author: atakavci

core/src/main/java/redis/clients/authentication/core/SimpleToken.java

@@ -1,16 +1,15 @@
 package redis.clients.authentication.core;
 
-import java.util.Date;
 import java.util.Map;
 
 public class SimpleToken implements Token {
 
     private String value;
-    private Date expiresAt;
-    private Date receivedAt;
+    private long expiresAt;
+    private long receivedAt;
     private Map<String, String> claims;
 
-    public SimpleToken(String value, Date expiresAt, Date receivedAt, Map<String, String> claims) {
+    public SimpleToken(String value, long expiresAt, long receivedAt, Map<String, String> claims) {
         this.value = value;
         this.expiresAt = expiresAt;
         this.receivedAt = receivedAt;
@@ -19,12 +18,12 @@ public SimpleToken(String value, Date expiresAt, Date receivedAt, Map<String, St
 
     @Override
     public boolean isExpired() {
-        return new Date().after(expiresAt);
+        return System.currentTimeMillis() > expiresAt;
     }
 
     @Override
     public long ttl() {
-        return expiresAt.getTime() - System.currentTimeMillis();
+        return expiresAt - System.currentTimeMillis();
     }
 
     @Override
@@ -33,12 +32,12 @@ public String getValue() {
     }
 
     @Override
-    public Date getExpiresAt() {
+    public long getExpiresAt() {
         return expiresAt;
     }
 
     @Override
-    public Date getReceivedAt() {
+    public long getReceivedAt() {
         return receivedAt;
     }
 

core/src/main/java/redis/clients/authentication/core/Token.java

@@ -1,7 +1,5 @@
 package redis.clients.authentication.core;
 
-import java.util.Date;
-
 public interface Token {
 
     public boolean isExpired();
@@ -10,9 +8,9 @@ public interface Token {
 
     public String getValue();
 
-    public Date getExpiresAt();
+    public long getExpiresAt();
 
-    public Date getReceivedAt();
+    public long getReceivedAt();
 
     public String tryGet(String key);
 }

core/src/main/java/redis/clients/authentication/core/TokenManager.java

@@ -1,6 +1,5 @@
 package redis.clients.authentication.core;
 
-import java.util.Date;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -78,23 +77,23 @@ protected Token renewToken() {
         return null;
     }
 
-    public long calculateRenewalDelay(Date expireDate, Date issueDate) {
+    public long calculateRenewalDelay(long expireDate, long issueDate) {
         long ttlLowerRefresh = ttlForLowerRefresh(expireDate);
         long ttlRatioRefresh = ttlForRatioRefresh(expireDate, issueDate);
         long delay = Math.min(ttlLowerRefresh, ttlRatioRefresh);
 
         return delay < 0 ? 0 : delay;
     }
 
-    public long ttlForLowerRefresh(Date expireDate) {
-        return expireDate.getTime() - tokenManagerConfig.getLowerRefreshBoundMillis()
+    public long ttlForLowerRefresh(long expireDate) {
+        return expireDate - tokenManagerConfig.getLowerRefreshBoundMillis()
                 - System.currentTimeMillis();
     }
 
-    protected long ttlForRatioRefresh(Date expireDate, Date issueDate) {
-        long validDuration = expireDate.getTime() - issueDate.getTime();
+    protected long ttlForRatioRefresh(long expireDate, long issueDate) {
+        long validDuration = expireDate - issueDate;
         long refreshBefore = validDuration
                 - (long) (validDuration * tokenManagerConfig.getExpirationRefreshRatio());
-        return expireDate.getTime() - refreshBefore - System.currentTimeMillis();
+        return expireDate - refreshBefore - System.currentTimeMillis();
     }
 }

core/src/test/java/redis/clients/authentication/CoreAuthenticationUnitTests.java

@@ -16,7 +16,6 @@
 import static org.mockito.Mockito.verify;
 
 import java.util.Collections;
-import java.util.Date;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -60,10 +59,9 @@ public void testAuthXManagerFactory() {
         assertEquals(identityProvider, context.arguments().get(0));
         assertEquals(tokenManagerConfig, context.arguments().get(1));
       })) {
-      AuthXManager manager = AuthXManagerFactory
-          .create(new TokenAuthConfig(tokenManagerConfig, identityProviderConfig));
+      AuthXManagerFactory.create(new TokenAuthConfig(tokenManagerConfig, identityProviderConfig));
 
-      CustomAuthXManager customManager = AuthXManagerFactory.create(CustomAuthXManager.class,
+      AuthXManagerFactory.create(CustomAuthXManager.class,
         new TokenAuthConfig(tokenManagerConfig, identityProviderConfig));
     }
   }
@@ -91,17 +89,17 @@ public float getExpirationRefreshRatio() {
   public void testCalculateRenewalDelay() {
     long delay = 0;
     long duration = 0;
-    Date issueDate;
-    Date expireDate;
+    long issueDate;
+    long expireDate;
 
     TokenManagerConfigWrapper config = new TokenManagerConfigWrapper();
     TokenManager manager = new TokenManager(() -> null, config);
 
     duration = 5000;
     config.lower = 2000;
     config.ratio = 0.5F;
-    issueDate = new Date();
-    expireDate = new Date(issueDate.getTime() + duration);
+    issueDate = System.currentTimeMillis();
+    expireDate = issueDate + duration;
 
     delay = manager.calculateRenewalDelay(expireDate, issueDate);
 
@@ -111,8 +109,8 @@ public void testCalculateRenewalDelay() {
     duration = 10000;
     config.lower = 8000;
     config.ratio = 0.2F;
-    issueDate = new Date();
-    expireDate = new Date(issueDate.getTime() + duration);
+    issueDate = System.currentTimeMillis();
+    expireDate = issueDate + duration;
 
     delay = manager.calculateRenewalDelay(expireDate, issueDate);
 
@@ -122,8 +120,8 @@ public void testCalculateRenewalDelay() {
     duration = 10000;
     config.lower = 10000;
     config.ratio = 0.2F;
-    issueDate = new Date();
-    expireDate = new Date(issueDate.getTime() + duration);
+    issueDate = System.currentTimeMillis();
+    expireDate = issueDate + duration;
 
     delay = manager.calculateRenewalDelay(expireDate, issueDate);
 
@@ -132,8 +130,8 @@ public void testCalculateRenewalDelay() {
     duration = 0;
     config.lower = 5000;
     config.ratio = 0.2F;
-    issueDate = new Date();
-    expireDate = new Date(issueDate.getTime() + duration);
+    issueDate = System.currentTimeMillis();
+    expireDate = issueDate + duration;
 
     delay = manager.calculateRenewalDelay(expireDate, issueDate);
 
@@ -142,8 +140,8 @@ public void testCalculateRenewalDelay() {
     duration = 10000;
     config.lower = 1000;
     config.ratio = 0.00001F;
-    issueDate = new Date();
-    expireDate = new Date(issueDate.getTime() + duration);
+    issueDate = System.currentTimeMillis();
+    expireDate = issueDate + duration;
 
     delay = manager.calculateRenewalDelay(expireDate, issueDate);
 
@@ -152,8 +150,8 @@ public void testCalculateRenewalDelay() {
     duration = 10000;
     config.lower = 1000;
     config.ratio = 0.0001F;
-    issueDate = new Date();
-    expireDate = new Date(issueDate.getTime() + duration);
+    issueDate = System.currentTimeMillis();
+    expireDate = issueDate + duration;
 
     delay = manager.calculateRenewalDelay(expireDate, issueDate);
 
@@ -164,7 +162,7 @@ public void testCalculateRenewalDelay() {
   public void testAuthXManager() throws InterruptedException, ExecutionException, TimeoutException {
 
     IdentityProvider identityProvider = () -> new SimpleToken("tokenVal",
-        new Date(System.currentTimeMillis() + 5 * 1000), new Date(),
+        System.currentTimeMillis() + 5 * 1000, System.currentTimeMillis(),
         Collections.singletonMap("oid", "user1"));
 
     TokenManager tokenManager = new TokenManager(identityProvider,
@@ -232,8 +230,8 @@ public void testTokenManagerWithFailingTokenRequest()
       if (requesLatch.getCount() > 0) {
         throw new RuntimeException("Test exception from identity provider!");
       }
-      return new SimpleToken("tokenValX", new Date(System.currentTimeMillis() + 50 * 1000),
-          new Date(), Collections.singletonMap("oid", "user1"));
+      return new SimpleToken("tokenValX", System.currentTimeMillis() + 50 * 1000,
+          System.currentTimeMillis(), Collections.singletonMap("oid", "user1"));
     });
 
     ArgumentCaptor<Token> argument = ArgumentCaptor.forClass(Token.class);
@@ -268,8 +266,8 @@ public void testTokenManagerWithHangingTokenRequest()
         }
         return null;
       }
-      return new SimpleToken("tokenValX", new Date(System.currentTimeMillis() + tokenLifetime),
-          new Date(), Collections.singletonMap("oid", "user1"));
+      return new SimpleToken("tokenValX", System.currentTimeMillis() + tokenLifetime,
+          System.currentTimeMillis(), Collections.singletonMap("oid", "user1"));
     };
 
     TokenManager tokenManager = new TokenManager(identityProvider, new TokenManagerConfig(0.7F, 200,

entraid/src/main/java/redis/clients/authentication/entraid/JWToken.java

@@ -1,6 +1,5 @@
 package redis.clients.authentication.entraid;
 
-import java.util.Date;
 import java.util.function.Function;
 
 import com.auth0.jwt.interfaces.DecodedJWT;
@@ -10,26 +9,26 @@
 
 public class JWToken implements Token {
     private final String token;
-    private final Date expiresAt;
-    private final Date receivedAt;
-    private final Function<String, String> claimQuery; 
-    
+    private final long expiresAt;
+    private final long receivedAt;
+    private final Function<String, String> claimQuery;
+
     public JWToken(String token) {
         this.token = token;
         DecodedJWT jwt = JWT.decode(token);
-        this.expiresAt = jwt.getExpiresAt();
-        this.receivedAt = new Date();
+        this.expiresAt = jwt.getExpiresAt().getTime();
+        this.receivedAt = System.currentTimeMillis();
         this.claimQuery = key -> jwt.getClaim(key).asString();
     }
 
     @Override
     public boolean isExpired() {
-        return new Date().after(expiresAt);
+        return System.currentTimeMillis() > expiresAt;
     }
 
     @Override
     public long ttl() {
-        return expiresAt.getTime() - System.currentTimeMillis();
+        return expiresAt - System.currentTimeMillis();
     }
 
     @Override
@@ -38,12 +37,12 @@ public String getValue() {
     }
 
     @Override
-    public Date getExpiresAt() {
+    public long getExpiresAt() {
         return expiresAt;
     }
 
     @Override
-    public Date getReceivedAt() {
+    public long getReceivedAt() {
         return receivedAt;
     }