From 37bb8535a3a6b175129d2a8f2bccc04adaa7b581 Mon Sep 17 00:00:00 2001 From: BerndBreier <33351391+BerndBreier@users.noreply.github.com> Date: Wed, 3 Jan 2018 17:04:02 +0100 Subject: [PATCH] TSK-59 implement comments from holger - toLowerCase only for setters not for getters and change useContainerManagedTransactions to useManagedTransactions --- .../taskana/configuration/TaskanaEngineConfiguration.java | 8 ++++---- .../src/main/java/pro/taskana/impl/TaskanaEngineImpl.java | 6 +++--- .../main/java/pro/taskana/model/WorkbasketAccessItem.java | 6 +----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java index 324d405bb..b7e229b78 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java +++ b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java @@ -34,14 +34,14 @@ public class TaskanaEngineConfiguration { public TaskanaEngineConfiguration() { } - public TaskanaEngineConfiguration(DataSource dataSource, boolean useContainerManagedTransactions) + public TaskanaEngineConfiguration(DataSource dataSource, boolean useManagedTransactions) throws SQLException { - this(dataSource, useContainerManagedTransactions, true); + this(dataSource, useManagedTransactions, true); } - public TaskanaEngineConfiguration(DataSource dataSource, boolean useContainerManagedTransactions, + public TaskanaEngineConfiguration(DataSource dataSource, boolean useManagedTransactions, boolean securityEnabled) throws SQLException { - this.useManagedTransactions = useContainerManagedTransactions; + this.useManagedTransactions = useManagedTransactions; if (dataSource != null) { this.dataSource = dataSource; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java index ffa3c2ea9..237d58916 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java @@ -242,10 +242,10 @@ public class TaskanaEngineImpl implements TaskanaEngine { /** * creates the MyBatis transaction factory. * - * @param useContainerManagedTransactions + * @param useManagedTransactions */ - private void createTransactionFactory(boolean useContainerManagedTransactions) { - if (useContainerManagedTransactions) { + private void createTransactionFactory(boolean useManagedTransactions) { + if (useManagedTransactions) { this.transactionFactory = new ManagedTransactionFactory(); } else { this.transactionFactory = new JdbcTransactionFactory(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAccessItem.java b/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAccessItem.java index ec704f37b..1272f8448 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAccessItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAccessItem.java @@ -41,11 +41,7 @@ public class WorkbasketAccessItem { } public String getAccessId() { - if (TaskanaEngineConfiguration.shouldUseLowerCaseForAccessIds()) { - return accessId != null ? accessId.toLowerCase() : null; - } else { - return accessId; - } + return accessId; } public void setAccessId(String accessId) {