fix(jans-auth-server): use duration class instead of custom util to c…

…alculate seconds from date to now (#1249)
JanssenProject · Apr 25, 2022 · 5ae76ab · 5ae76ab
1 parent 369129d
commit 5ae76ab
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 44 deletions.
diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/uma/persistence/UmaPermission.java b/jans-auth-server/model/src/main/java/io/jans/as/model/uma/persistence/UmaPermission.java
@@ -17,6 +17,7 @@
 import io.jans.orm.annotation.ObjectClass;
 
 import java.io.Serializable;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -86,7 +87,8 @@ public void setTtl(Integer ttl) {
     }
 
     public void resetTtlFromExpirationDate() {
-        final Integer calculatedTtl = Util.getNumberOfSecondFromNow(getExpirationDate());
+        final Long duration = Duration.between(new Date().toInstant(), getExpirationDate().toInstant()).getSeconds();
+        final Integer calculatedTtl = duration.intValue();
         if (calculatedTtl != null) {
             setTtl(calculatedTtl);
         }

diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/uma/persistence/UmaResource.java b/jans-auth-server/model/src/main/java/io/jans/as/model/uma/persistence/UmaResource.java
@@ -17,6 +17,7 @@
 
 import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -91,7 +92,8 @@ public void setTtl(Integer ttl) {
     }
 
     public void resetTtlFromExpirationDate() {
-        final Integer calculatedTtl = Util.getNumberOfSecondFromNow(getExpirationDate());
+        final Long duration = Duration.between(new Date().toInstant(), getExpirationDate().toInstant()).getSeconds();
+        final Integer calculatedTtl = duration.intValue();
         if (calculatedTtl != null) {
             setTtl(calculatedTtl);
         }

diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/util/Util.java b/jans-auth-server/model/src/main/java/io/jans/as/model/util/Util.java
@@ -29,6 +29,7 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -330,20 +331,6 @@ public static String byteArrayToHexString(byte[] b) {
         return result.toString();
     }
 
-    public static Integer getNumberOfSecondFromNow(Date date) {
-        if (date == null) {
-            return 0;
-        }
-
-        long now = new Date().getTime();
-        final long time = date.getTime();
-        if (time > now) {
-            return (int) (time - now) / 1000;
-        }
-
-        return null;
-    }
-
     public static Date createExpirationDate(Integer lifetimeInSeconds) {
         if (lifetimeInSeconds == null || lifetimeInSeconds == 0)
             throw new IllegalArgumentException("lifetime can't be null or zero");

diff --git a/jans-auth-server/model/src/test/java/io/jans/as/model/util/UtilTest.java b/jans-auth-server/model/src/test/java/io/jans/as/model/util/UtilTest.java
@@ -416,33 +416,6 @@ public void byteArrayToHexString_byteArray_hexString() {
         assertEquals(result, "48656c6c6f20776f726c64");
     }
 
-    @Test
-    public void getNumberOfSecondFromNow_null_zero() {
-        showTitle("getNumberOfSecondFromNow_null_zero");
-        Integer seconds = Util.getNumberOfSecondFromNow(null);
-        assertNotNull(seconds);
-        assertEquals(seconds, Integer.valueOf(0));
-    }
-
-    @Test
-    public void getNumberOfSecondFromNow_dateInPast_null() {
-        showTitle("getNumberOfSecondFromNow_dateInPast_null");
-        Calendar cal = Calendar.getInstance();
-        cal.setTimeInMillis(cal.getTimeInMillis() - 10000L);
-        Integer seconds = Util.getNumberOfSecondFromNow(cal.getTime());
-        assertNull(seconds);
-    }
-
-    @Test
-    public void getNumberOfSecondFromNow_dateInFuture_intNumberOfSeconds() {
-        showTitle("getNumberOfSecondFromNow_dateInFuture_intNumberOfSeconds");
-        Calendar cal = Calendar.getInstance();
-        cal.setTimeInMillis(cal.getTimeInMillis() + 10999L);
-        Integer seconds = Util.getNumberOfSecondFromNow(cal.getTime());
-        assertNotNull(seconds);
-        assertTrue(seconds >= 10);
-    }
-
     @Test
     public void createExpirationDate_nullLifeTime_IllegalArgumentException() {
         showTitle("createExpirationDate_nullLifeTime_IllegalArgumentException");

diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AbstractToken.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AbstractToken.java
@@ -16,6 +16,7 @@
 import io.jans.orm.model.base.Deletable;
 
 import java.io.Serializable;
+import java.time.Duration;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
@@ -105,7 +106,8 @@ private void initTtl() {
     }
 
     public void resetTtlFromExpirationDate() {
-        final Integer seconds = Util.getNumberOfSecondFromNow(getExpirationDate());
+        final Long duration = Duration.between(new Date().toInstant(), getExpirationDate().toInstant()).getSeconds();
+        final Integer seconds = duration.intValue();
         if (seconds != null) {
             this.ttl = seconds;
         }