nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-2003: minor refactoring

This commit is contained in:
Mustapha Zorgati 2023-02-16 14:58:29 +01:00
parent 3af17ece6a
commit e40417f1fd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java
View File

@ -422,8 +422,9 @@ public class WorkbasketServiceImpl implements WorkbasketService {
taskanaEngine.getEngine().getCurrentUserContext().getAccessIds())) taskanaEngine.getEngine().getCurrentUserContext().getAccessIds()))
.map(this::getPermissionsFromWorkbasketAccessItem); .map(this::getPermissionsFromWorkbasketAccessItem);
if (!grantedPermissions.isPresent() if (grantedPermissions.isEmpty()
|| !grantedPermissions.get().containsAll(Arrays.asList(requestedPermissions))) { || !new HashSet<>(grantedPermissions.get())
.containsAll(Arrays.asList(requestedPermissions))) {
throw new MismatchedWorkbasketPermissionException( throw new MismatchedWorkbasketPermissionException(
taskanaEngine.getEngine().getCurrentUserContext().getUserid(), taskanaEngine.getEngine().getCurrentUserContext().getUserid(),
workbasketId, workbasketId,
@ -456,8 +457,9 @@ public class WorkbasketServiceImpl implements WorkbasketService {
taskanaEngine.getEngine().getCurrentUserContext().getAccessIds())) taskanaEngine.getEngine().getCurrentUserContext().getAccessIds()))
.map(this::getPermissionsFromWorkbasketAccessItem); .map(this::getPermissionsFromWorkbasketAccessItem);
if (!grantedPermissions.isPresent() if (grantedPermissions.isEmpty()
|| !grantedPermissions.get().containsAll(Arrays.asList(requestedPermissions))) { || !new HashSet<>(grantedPermissions.get())
.containsAll(Arrays.asList(requestedPermissions))) {
throw new MismatchedWorkbasketPermissionException( throw new MismatchedWorkbasketPermissionException(
taskanaEngine.getEngine().getCurrentUserContext().getUserid(), taskanaEngine.getEngine().getCurrentUserContext().getUserid(),
workbasketKey, workbasketKey,