From 1ee7b1d5fce7dea7fa78cd1c68220eb40b75d2e1 Mon Sep 17 00:00:00 2001 From: Marcel Lengl <52546181+LenglBoy@users.noreply.github.com> Date: Mon, 19 Feb 2018 16:30:37 +0100 Subject: [PATCH] TSK-318: Add Security-switch to EngineConfiguration-Constructor. --- .../pro/taskana/configuration/DbSchemaCreator.java | 2 +- .../configuration/TaskanaEngineConfiguration.java | 3 ++- .../SpringTaskanaEngineConfiguration.java | 13 +++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/configuration/DbSchemaCreator.java b/lib/taskana-core/src/main/java/pro/taskana/configuration/DbSchemaCreator.java index 611991e00..6dd7814c9 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/configuration/DbSchemaCreator.java +++ b/lib/taskana-core/src/main/java/pro/taskana/configuration/DbSchemaCreator.java @@ -36,7 +36,7 @@ public class DbSchemaCreator { * Run all db scripts. * * @throws SQLException - * TODO + * will be thrown if there will be some incorrect SQL statements invoked. */ public void run() throws SQLException { Connection connection = dataSource.getConnection(); 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 5c61bbc28..c6e2f0aaf 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 @@ -30,7 +30,8 @@ public class TaskanaEngineConfiguration { protected boolean securityEnabled; protected boolean useManagedTransactions; - public TaskanaEngineConfiguration() { + public TaskanaEngineConfiguration(boolean enableSecurity) { + this.securityEnabled = enableSecurity; } public TaskanaEngineConfiguration(DataSource dataSource, boolean useManagedTransactions) diff --git a/lib/taskana-spring/src/main/java/pro/taskana/configuration/SpringTaskanaEngineConfiguration.java b/lib/taskana-spring/src/main/java/pro/taskana/configuration/SpringTaskanaEngineConfiguration.java index de025dcc4..4b3ccb673 100644 --- a/lib/taskana-spring/src/main/java/pro/taskana/configuration/SpringTaskanaEngineConfiguration.java +++ b/lib/taskana-spring/src/main/java/pro/taskana/configuration/SpringTaskanaEngineConfiguration.java @@ -17,6 +17,19 @@ public class SpringTaskanaEngineConfiguration extends TaskanaEngineConfiguration private static final Logger logger = LoggerFactory.getLogger(SpringTaskanaEngineConfiguration.class); + public SpringTaskanaEngineConfiguration() { + super(false); + } + + public SpringTaskanaEngineConfiguration(boolean enableSecurity) { + super(enableSecurity); + } + + public SpringTaskanaEngineConfiguration(DataSource dataSource, boolean useManagedTransactions, + boolean securityEnabled) throws SQLException { + super(dataSource, useManagedTransactions, securityEnabled); + } + /** * This method creates the Spring-based TaskanaEngine without an sqlSessionFactory *