From ea7ab903d575414dc773f48175e311a272c1e15c Mon Sep 17 00:00:00 2001
From: Holger Hagen <19706592+holgerhagen@users.noreply.github.com>
Date: Tue, 20 Mar 2018 10:14:29 +0100
Subject: [PATCH] TSK-383: removed InvalidArgumentException from
 WorkbasketQuery.callerHasPermission()

---
 .../src/main/java/pro/taskana/WorkbasketQuery.java  | 13 +++++--------
 .../java/pro/taskana/impl/WorkbasketQueryImpl.java  |  2 +-
 .../QueryWorkbasketByPermissionAccTest.java         |  4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java
index aebba959b..4fc1911a5 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java
@@ -163,17 +163,14 @@ public interface WorkbasketQuery extends BaseQuery<WorkbasketSummary> {
         throws InvalidArgumentException, NotAuthorizedException;
 
     /**
-     * Setting up the permissions for the accessIds of the CurrentUserContext. READ permissions need to be granted,too
-     * by default.<br>
-     * The UserContext-AccessIds and the given permission will throw a Exception if they would be NULL.
+     * Add condition to query if the caller (one of the accessIds of the caller) has the given permission on the
+     * workbasket.
      *
-     * @return the current query object.
+     * @return the updated query.
      * @param permission
-     *            which should be used for results.
-     * @throws InvalidArgumentException
-     *             when permission OR accessIds of the userContext are NULL.
+     *            the permission for the query condition.
      */
-    WorkbasketQuery callerHasPermission(WorkbasketPermission permission) throws InvalidArgumentException;
+    WorkbasketQuery callerHasPermission(WorkbasketPermission permission);
 
     /**
      * Sort the query result by name.
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java
index 718623059..603a3b680 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java
@@ -361,7 +361,7 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
     }
 
     @Override
-    public WorkbasketQuery callerHasPermission(WorkbasketPermission permission) throws InvalidArgumentException {
+    public WorkbasketQuery callerHasPermission(WorkbasketPermission permission) {
         this.permission = permission;
         return this;
     }
diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java
index 2eb0eaec4..ec0621f79 100644
--- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java
@@ -127,7 +127,7 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest {
         groupNames = {"group_1"})
     @Test
     public void testQueryAllTransferTargetsForUserAndGroupFromSubject()
-        throws SQLException, NotAuthorizedException, InvalidArgumentException, SystemException {
+        throws SQLException, NotAuthorizedException, SystemException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
         List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
             .callerHasPermission(WorkbasketPermission.APPEND)
@@ -138,7 +138,7 @@ public class QueryWorkbasketByPermissionAccTest extends AbstractAccTest {
     @WithAccessId(userName = "user_1_1")
     @Test
     public void testQueryAllAvailableWorkbasketForOpeningForUserAndGroupFromSubject()
-        throws SQLException, NotAuthorizedException, InvalidArgumentException {
+        throws SQLException, NotAuthorizedException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
         List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
             .callerHasPermission(WorkbasketPermission.READ)