refactor some code to Java Stream API

2 files changed, 27 insertions, 26 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
index 1378d49b..f1811022 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Map.Entry;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -205,22 +204,18 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
     setCitizenCountryCode(internalAuthData, authProcessData);
 
     // set generic authProcessData to authdata
-    for (final Entry<String, Object> el : authProcessData.getGenericSessionDataStorage()
-        .entrySet()) {
-      if (el.getKey().startsWith(GENERIC_AUTHDATA_IDENTIFIER)) {
-        log.trace("Find generic authProcessData {}. Map it directly to authData", el.getKey());
-        try {
-          internalAuthData.setGenericData(el.getKey(), el.getValue());
-
-        } catch (final EaafStorageException e) {
-          log.warn("Can NOT set authData with key: {}", el.getKey(), null, e);
-
-        }
-
-      }
+    authProcessData.getGenericSessionDataStream()
+        .filter(el -> el.getKey().startsWith(GENERIC_AUTHDATA_IDENTIFIER))
+        .forEach(el -> {
+          log.trace("Find generic authProcessData {}. Map it directly to authData", el.getKey());
+          try {
+            internalAuthData.setGenericData(el.getKey(), el.getValue());
 
-    }
+          } catch (final EaafStorageException e) {
+            log.warn("Can NOT set authData with key: {}", el.getKey(), null, e);
 
+          }           
+        });   
   }
 
   /**
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();
+    
   }
 
   /*