From 13f0e0d8c74a70cf78adfae75b042ad6de6e0139 Mon Sep 17 00:00:00 2001 From: "julian.schallenmueller" Date: Tue, 19 Jun 2018 10:16:53 +0200 Subject: [PATCH] TSK-559: Removed unused methods --- .../java/pro/taskana/WorkbasketService.java | 10 ----- .../taskana/impl/WorkbasketServiceImpl.java | 29 ------------- .../taskana/mappings/WorkbasketMapper.java | 41 ------------------- .../workbasket/GetWorkbasketAccTest.java | 30 -------------- 4 files changed, 110 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java index 3e815ed20..c92269bd4 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java @@ -188,16 +188,6 @@ public interface WorkbasketService { void setWorkbasketAccessItems(String workbasketId, List wbAccessItems) throws InvalidArgumentException, NotAuthorizedException; - /** - * This method returns the workbaskets for which the current user has all permissions specified in the permissions - * list. - * - * @param permission - * a List of WorkbasketAuthorization enums - * @return the summaries of all Workbaskets for which the current user has the specified authorizations - */ - List getWorkbaskets(List permission); - /** * This method provides a query builder for querying the database. * diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java index 81395dbfc..e00d1234d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java @@ -3,10 +3,7 @@ package pro.taskana.impl; import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; import java.util.List; -import java.util.Set; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,32 +99,6 @@ public class WorkbasketServiceImpl implements WorkbasketService { } } - @Override - public List getWorkbaskets(List permissions) { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("entry to getWorkbaskets(permissions = {})", LoggerUtils.listToString(permissions)); - } - List result = null; - try { - taskanaEngine.openConnection(); - // use a set to avoid duplicates - Set workbaskets = new HashSet<>(); - for (String accessId : CurrentUserContext.getAccessIds()) { - workbaskets.addAll(workbasketMapper.findByPermission(permissions, accessId)); - } - result = new ArrayList<>(); - result.addAll(workbaskets); - return result; - } finally { - taskanaEngine.returnConnection(); - if (LOGGER.isDebugEnabled()) { - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from getWorkbaskets(permissions). Returning {} resulting Objects: {} ", - numberOfResultObjects, LoggerUtils.listToString(result)); - } - } - } - @Override public Workbasket createWorkbasket(Workbasket newWorkbasket) throws InvalidWorkbasketException, NotAuthorizedException, WorkbasketAlreadyExistException, diff --git a/lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketMapper.java index a66fabf81..f92d166dc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketMapper.java @@ -11,7 +11,6 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import pro.taskana.WorkbasketPermission; import pro.taskana.impl.WorkbasketImpl; import pro.taskana.impl.WorkbasketSummaryImpl; @@ -133,46 +132,6 @@ public interface WorkbasketMapper { @Result(property = "orgLevel4", column = "ORG_LEVEL_4")}) List findAll(); - @Select("") - @Results(value = { - @Result(property = "id", column = "ID"), - @Result(property = "key", column = "KEY"), - @Result(property = "modified", column = "MODIFIED"), - @Result(property = "name", column = "NAME"), - @Result(property = "description", column = "DESCRIPTION"), - @Result(property = "owner", column = "OWNER"), - @Result(property = "domain", column = "DOMAIN"), - @Result(property = "type", column = "TYPE"), - @Result(property = "orgLevel1", column = "ORG_LEVEL_1"), - @Result(property = "orgLevel2", column = "ORG_LEVEL_2"), - @Result(property = "orgLevel3", column = "ORG_LEVEL_3"), - @Result(property = "orgLevel4", column = "ORG_LEVEL_4")}) - List findByPermission(@Param("permissions") List permissions, - @Param("accessId") String accessId); - @Insert("") @Options(keyProperty = "id", keyColumn = "ID") diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java index 9c4e61760..5292e5865 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java @@ -3,7 +3,6 @@ package acceptance.workbasket; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; -import java.util.ArrayList; import java.util.List; import org.junit.Test; @@ -119,35 +118,6 @@ public class GetWorkbasketAccTest extends AbstractAccTest { assertEquals("Team", workbasketSummary.getOrgLevel4()); } - @WithAccessId( - userName = "user_1_1", - groupNames = {"group_1"}) - @Test - public void testGetWorkbasketsByPermissions() - throws NotAuthorizedException, WorkbasketNotFoundException { - - WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - List permissions = new ArrayList(); - permissions.add(WorkbasketPermission.READ); - permissions.add(WorkbasketPermission.OPEN); - permissions.add(WorkbasketPermission.APPEND); - permissions.add(WorkbasketPermission.TRANSFER); - - List workbasketSummaries = workbasketService.getWorkbaskets(permissions); - - List expectedSummaries = new ArrayList(); - expectedSummaries.add(workbasketService.getWorkbasket("WBI:100000000000000000000000000000000002").asSummary()); - expectedSummaries.add(workbasketService.getWorkbasket("WBI:100000000000000000000000000000000004").asSummary()); - expectedSummaries.add(workbasketService.getWorkbasket("WBI:100000000000000000000000000000000006").asSummary()); - expectedSummaries.add(workbasketService.getWorkbasket("WBI:100000000000000000000000000000000007").asSummary()); - - assertEquals(4, workbasketSummaries.size()); - - for (WorkbasketSummary wbSummary : workbasketSummaries) { - assertTrue(expectedSummaries.contains(wbSummary)); - } - } - @Test(expected = WorkbasketNotFoundException.class) public void testThrowsExceptionIfIdIsInvalid() throws NotAuthorizedException, WorkbasketNotFoundException {