1 files changed, 12 insertions, 9 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java
index 4fe22feb..e1646fb8 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java
@@ -23,6 +23,7 @@ import java.io.Serializable;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
@@ -57,7 +58,7 @@ public class AuthenticationData implements IAuthData, Serializable {
   private final Map<String, Object> genericDataStorate = new HashedMap<>();
 
   private String issuer;
-  private Date issueInstant;
+  private Instant issueInstant;
 
   @Deprecated
   private String identificationValue;
@@ -82,14 +83,14 @@ public class AuthenticationData implements IAuthData, Serializable {
   private String eidasLoa = null;
 
   private boolean ssoSession = false;
-  private Date ssoSessionValidTo = null;
+  private Instant ssoSessionValidTo = null;
 
   private String sessionIndex = null;
   private String nameID = null;
   private String nameIdFormat = null;
 
   public AuthenticationData() {
-    this.issueInstant = new Date();
+    this.issueInstant = Instant.now();
 
   }
 
@@ -109,7 +110,7 @@ public class AuthenticationData implements IAuthData, Serializable {
   }
 
   @Override
-  public Date getAuthenticationIssueInstant() {
+  public Instant getAuthenticationIssueInstant() {
     return getDateCopyOrNull(this.issueInstant);
 
   }
@@ -127,7 +128,7 @@ public class AuthenticationData implements IAuthData, Serializable {
    *
    * @param date Authentication data
    */
-  public void setAuthenticationIssueInstant(final Date date) {
+  public void setAuthenticationIssueInstant(final Instant date) {
     this.issueInstant = getDateCopyOrNull(date);
   }
 
@@ -396,7 +397,7 @@ public class AuthenticationData implements IAuthData, Serializable {
    * @return the ssoSessionValidTo
    */
   @Override
-  public Date getSsoSessionValidTo() {
+  public Instant getSsoSessionValidTo() {
     return getDateCopyOrNull(ssoSessionValidTo);
   }
 
@@ -405,7 +406,7 @@ public class AuthenticationData implements IAuthData, Serializable {
    *
    * @param ssoSessionValidTo the ssoSessionValidTo to set
    */
-  public void setSsoSessionValidTo(final Date ssoSessionValidTo) {
+  public void setSsoSessionValidTo(final Instant ssoSessionValidTo) {
     this.ssoSessionValidTo = getDateCopyOrNull(ssoSessionValidTo);
   }
 
@@ -519,10 +520,12 @@ public class AuthenticationData implements IAuthData, Serializable {
     this.encSourceIdType = encSourceIdType;
   }
 
-  private Date getDateCopyOrNull(Date in) {
+  private Instant getDateCopyOrNull(Instant in) {
     if (in != null) {
-      return new Date(in.getTime());
+      return Instant.from(in);
+      
     } else {
+      
       return null;
     }
   }