3 files changed, 78 insertions, 13 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/AuthProcessDataWrapper.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/AuthProcessDataWrapper.java
index 8eef4a8e..368652be 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/AuthProcessDataWrapper.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/AuthProcessDataWrapper.java
@@ -22,9 +22,11 @@ package at.gv.egiz.eaaf.core.impl.idp.auth.data;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.TimeZone;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
@@ -264,16 +266,20 @@ public class AuthProcessDataWrapper
    * getGenericSessionDataStorage()
    */
   @Override
-  public Map<String, Object> getGenericSessionDataStorage() {
-    final Map<String, Object> result = new HashMap<>();
-    for (final Map.Entry<String, Object> el : authProcessData.entrySet()) {
-      if (el.getKey().startsWith(GENERIC_PREFIX)) {
-        result.put(el.getKey().substring(GENERIC_PREFIX.length()), el.getValue());
-      }
-
-    }
-
-    return result;
+  public Map<String, Object> getGenericSessionDataStorage() {    
+    return authProcessData.entrySet().stream()
+        .filter(el -> el.getKey().startsWith(GENERIC_PREFIX))
+        .collect(
+            Collectors.toMap(
+                el -> el.getKey().substring(GENERIC_PREFIX.length()), 
+                value -> value.getValue()));
+    
+  }
+  
+  @Override
+  public Stream<Entry<String, Object>> getGenericSessionDataStream() {
+    return getGenericSessionDataStorage().entrySet().stream();
+    
   }
 
   /*
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/EidAuthProcessDataWrapper.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/EidAuthProcessDataWrapper.java
new file mode 100644
index 00000000..48a2206b
--- /dev/null
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/EidAuthProcessDataWrapper.java
@@ -0,0 +1,34 @@
+package at.gv.egiz.eaaf.core.impl.idp.auth.data;
+
+import java.util.Map;
+
+import at.gv.egiz.eaaf.core.api.idp.auth.data.IEidAuthProcessData;
+
+/**
+ * Authentication session-data that adds ID Austria specific information.  
+ * 
+ * @author tlenz
+ *
+ */
+public class EidAuthProcessDataWrapper extends AuthProcessDataWrapper implements IEidAuthProcessData {
+
+  private static final String VALUE_INTERNAL_TEST_IDENTITY_PROCESS = "direct_is_testidentity";
+  
+  public EidAuthProcessDataWrapper(Map<String, Object> authProcessData) {
+    super(authProcessData);
+    
+  }
+  
+  @Override
+  public boolean isTestIdentity() {
+    return wrapStoredObject(VALUE_INTERNAL_TEST_IDENTITY_PROCESS, false, Boolean.class);
+
+  }
+
+  @Override
+  public void setTestIdentity(boolean flag) {
+    authProcessData.put(VALUE_INTERNAL_TEST_IDENTITY_PROCESS, flag);
+
+  }
+  
+}
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
index ee1037a1..8327b544 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
@@ -23,15 +23,20 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.Serializable;
 import java.security.PublicKey;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import javax.xml.transform.TransformerException;
 
-import org.w3c.dom.Element;
-
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
 import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
 
+import org.w3c.dom.Element;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * Data contained in an identity link issued by BMI, relevant to the MOA ID
  * component. <br>
@@ -41,10 +46,13 @@ import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
  * @author Paul Ivancsics
  * @version $Id$
  */
+@Slf4j
 public class IdentityLink implements Serializable, IIdentityLink {
 
   private static final long serialVersionUID = 1L;
 
+  public static final String PATTERN_ISSUE_INSTANT = "yyyy-MM-dd'T'HH:mm:ssXXX";
+
   /**
    * <code>"identificationValue"</code> is the translation of
    * <code>"Stammzahl"</code>.
@@ -372,6 +380,23 @@ public class IdentityLink implements Serializable, IIdentityLink {
     return issueInstant;
   }
 
+  @Override
+  public Date getIssueInstantDate() {
+    final SimpleDateFormat f = new SimpleDateFormat(PATTERN_ISSUE_INSTANT);
+    try {
+      if (issueInstant != null) {
+        return f.parse(issueInstant);
+
+      }
+
+    } catch (final ParseException e) {
+      log.error("Can NOT parse Date from String: {}", issueInstant, null, e);
+
+    }
+
+    return null;
+  }
+
   /*
    * (non-Javadoc)
    *