From 2fbb88d25f9a523a6826aca97899ff5afe3201b8 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Wed, 8 Jan 2020 13:41:51 +0100 Subject: [PATCH] moved double setter from accessItem to WorkbasketService --- .../java/pro/taskana/impl/WorkbasketAccessItemImpl.java | 8 -------- .../main/java/pro/taskana/impl/WorkbasketServiceImpl.java | 7 ++++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java index a8457cf69..90542fcb2 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java @@ -407,14 +407,6 @@ public class WorkbasketAccessItemImpl implements WorkbasketAccessItem { this.permCustom12 = permCustom12; } - public void setAccessIdWithSanitizing(String accessId) { - if (TaskanaEngineConfiguration.shouldUseLowerCaseForAccessIds()) { - setAccessId(accessId != null ? accessId.toLowerCase() : null); - } else { - setAccessId(accessId); - } - } - @Override public int hashCode() { return Objects.hash( 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 780b57aab..73c64cb2e 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 @@ -18,6 +18,7 @@ import pro.taskana.WorkbasketPermission; import pro.taskana.WorkbasketQuery; import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketSummary; +import pro.taskana.configuration.TaskanaEngineConfiguration; import pro.taskana.exceptions.DomainNotFoundException; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.InvalidWorkbasketException; @@ -160,7 +161,11 @@ public class WorkbasketServiceImpl implements WorkbasketService { public WorkbasketAccessItem newWorkbasketAccessItem(String workbasketId, String accessId) { WorkbasketAccessItemImpl accessItem = new WorkbasketAccessItemImpl(); accessItem.setWorkbasketId(workbasketId); - accessItem.setAccessIdWithSanitizing(accessId); + if (TaskanaEngineConfiguration.shouldUseLowerCaseForAccessIds()) { + accessItem.setAccessId(accessId != null ? accessId.toLowerCase() : null); + } else { + accessItem.setAccessId(accessId); + } return accessItem; }