From e40417f1fd57596c3bbc1d2ead57e9f88ad2cc8e Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Thu, 16 Feb 2023 14:58:29 +0100
Subject: [PATCH] TSK-2003: minor refactoring

---
 .../workbasket/internal/WorkbasketServiceImpl.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java
index c6985b142..44f339617 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java
@@ -422,8 +422,9 @@ public class WorkbasketServiceImpl implements WorkbasketService {
                       taskanaEngine.getEngine().getCurrentUserContext().getAccessIds()))
               .map(this::getPermissionsFromWorkbasketAccessItem);
 
-      if (!grantedPermissions.isPresent()
-          || !grantedPermissions.get().containsAll(Arrays.asList(requestedPermissions))) {
+      if (grantedPermissions.isEmpty()
+          || !new HashSet<>(grantedPermissions.get())
+              .containsAll(Arrays.asList(requestedPermissions))) {
         throw new MismatchedWorkbasketPermissionException(
             taskanaEngine.getEngine().getCurrentUserContext().getUserid(),
             workbasketId,
@@ -456,8 +457,9 @@ public class WorkbasketServiceImpl implements WorkbasketService {
                       taskanaEngine.getEngine().getCurrentUserContext().getAccessIds()))
               .map(this::getPermissionsFromWorkbasketAccessItem);
 
-      if (!grantedPermissions.isPresent()
-          || !grantedPermissions.get().containsAll(Arrays.asList(requestedPermissions))) {
+      if (grantedPermissions.isEmpty()
+          || !new HashSet<>(grantedPermissions.get())
+              .containsAll(Arrays.asList(requestedPermissions))) {
         throw new MismatchedWorkbasketPermissionException(
             taskanaEngine.getEngine().getCurrentUserContext().getUserid(),
             workbasketKey,