Refactor role creation in FENCEAuthenticationService

hms-dbmi · May 27, 2024 · dd7ff13 · dd7ff13
1 parent cdb7a5b
commit dd7ff13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...ices/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/RoleRepository.java b/...ices/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/RoleRepository.java
@@ -5,7 +5,7 @@
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.transaction.Transactional;
-import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -20,7 +20,7 @@ protected RoleRepository() {
         super(Role.class);
     }
 
-    public void persistAll(ArrayList<Role> newRoles) {
+    public void persistAll(List<Role> newRoles) {
         newRoles.forEach(this::persist);
     }
 }
diff --git a/...main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/FENCEAuthenticationService.java b/...main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/FENCEAuthenticationService.java
@@ -217,10 +217,11 @@ public Response getFENCEProfile(String callback_url, Map<String, String> authReq
         Set<String> roleNames = new HashSet<>();
         project_access_names.forEachRemaining(roleNames::add);
 
-        ArrayList<Role> newRoles = new ArrayList<>();
-        roleNames.parallelStream().forEach(roleName -> {
-            newRoles.add(createRole(roleName, "FENCE role "+roleName));
-        });
+        List<Role> newRoles = roleNames.parallelStream()
+                .map(roleName -> createRole(roleName, "FENCE role " + roleName))
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+
         roleRepo.persistAll(newRoles);
 
         if (current_user.getRoles() == null) {