refactor some code to Java Stream API

1 files changed, 10 insertions, 15 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);
 
+          }           
+        });   
   }
 
   /**