CLASS_TO_LOGGER = new ConcurrentHashMap<>();
@Pointcut(
- "!@annotation(pro.taskana.common.internal.logging.NoLogging)"
- + " && !within(@pro.taskana.common.internal.logging.NoLogging *)"
- + " && execution(* pro.taskana..*(..))"
+ "!@annotation(io.kadai.common.internal.logging.NoLogging)"
+ + " && !within(@io.kadai.common.internal.logging.NoLogging *)"
+ + " && execution(* io.kadai..*(..))"
+ " && !execution(* lambda*(..))"
+ " && !execution(* access*(..))"
+ " && !execution(String *.toString())"
diff --git a/common/taskana-common-logging/src/main/java/pro/taskana/common/internal/logging/NoLogging.java b/common/kadai-common-logging/src/main/java/io/kadai/common/internal/logging/NoLogging.java
similarity index 86%
rename from common/taskana-common-logging/src/main/java/pro/taskana/common/internal/logging/NoLogging.java
rename to common/kadai-common-logging/src/main/java/io/kadai/common/internal/logging/NoLogging.java
index 2e96250aa..1ac26538e 100644
--- a/common/taskana-common-logging/src/main/java/pro/taskana/common/internal/logging/NoLogging.java
+++ b/common/kadai-common-logging/src/main/java/io/kadai/common/internal/logging/NoLogging.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.logging;
+package io.kadai.common.internal.logging;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/common/kadai-common-logging/src/test/java/io/kadai/AtProKadaiRootPackageLoggingTestClass.java b/common/kadai-common-logging/src/test/java/io/kadai/AtProKadaiRootPackageLoggingTestClass.java
new file mode 100644
index 000000000..bf5a71422
--- /dev/null
+++ b/common/kadai-common-logging/src/test/java/io/kadai/AtProKadaiRootPackageLoggingTestClass.java
@@ -0,0 +1,7 @@
+package io.kadai;
+
+public class AtProKadaiRootPackageLoggingTestClass {
+
+ @SuppressWarnings("unused")
+ public void doStuff() {}
+}
diff --git a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/LoggingAspectTest.java b/common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/LoggingAspectTest.java
similarity index 89%
rename from common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/LoggingAspectTest.java
rename to common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/LoggingAspectTest.java
index 1bb017686..9fa199658 100644
--- a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/LoggingAspectTest.java
+++ b/common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/LoggingAspectTest.java
@@ -1,10 +1,11 @@
-package pro.taskana.common.internal.logging;
+package io.kadai.common.internal.logging;
import static org.assertj.core.api.Assertions.assertThat;
import com.github.valfirst.slf4jtest.LoggingEvent;
import com.github.valfirst.slf4jtest.TestLogger;
import com.github.valfirst.slf4jtest.TestLoggerFactory;
+import io.kadai.AtProKadaiRootPackageLoggingTestClass;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -13,8 +14,7 @@ import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.mockito.internal.stubbing.answers.CallsRealMethods;
import org.slf4j.event.Level;
-import outside.of.pro.taskana.OutsideOfProTaskanaPackageLoggingTestClass;
-import pro.taskana.AtProTaskanaRootPackageLoggingTestClass;
+import outside.of.io.kadai.OutsideOfProKadaiPackageLoggingTestClass;
@NoLogging
class LoggingAspectTest {
@@ -30,9 +30,9 @@ class LoggingAspectTest {
}
@Test
- void should_NotLogMethodCalls_When_ClassDoesNotResideWithinTaskanaPackage() {
- OutsideOfProTaskanaPackageLoggingTestClass loggingTestClass =
- new OutsideOfProTaskanaPackageLoggingTestClass();
+ void should_NotLogMethodCalls_When_ClassDoesNotResideWithinKadaiPackage() {
+ OutsideOfProKadaiPackageLoggingTestClass loggingTestClass =
+ new OutsideOfProKadaiPackageLoggingTestClass();
TestLogger logger = TestLoggerFactory.getTestLogger(loggingTestClass.getClass());
loggingTestClass.doStuff();
@@ -41,9 +41,9 @@ class LoggingAspectTest {
}
@Test
- void should_LogMethod_When_ClassResidesAtTaskanaRootPackage() {
- AtProTaskanaRootPackageLoggingTestClass loggingTestClass =
- new AtProTaskanaRootPackageLoggingTestClass();
+ void should_LogMethod_When_ClassResidesAtKadaiRootPackage() {
+ AtProKadaiRootPackageLoggingTestClass loggingTestClass =
+ new AtProKadaiRootPackageLoggingTestClass();
TestLogger logger = TestLoggerFactory.getTestLogger(loggingTestClass.getClass());
loggingTestClass.doStuff();
@@ -52,7 +52,7 @@ class LoggingAspectTest {
}
@Test
- void should_LogInternalMethod_When_ClassResidesAtTaskanaSubPackage() {
+ void should_LogInternalMethod_When_ClassResidesAtKadaiSubPackage() {
LoggingTestClass loggingTestClass = new LoggingTestClass();
TestLogger logger = TestLoggerFactory.getTestLogger(loggingTestClass.getClass());
@@ -76,7 +76,7 @@ class LoggingAspectTest {
}
@Test
- void should_LogInternalMethodWithReturnValue_When_ClassResidesAtTaskanaSubPackage() {
+ void should_LogInternalMethodWithReturnValue_When_ClassResidesAtKadaiSubPackage() {
LoggingTestClass loggingTestClass = new LoggingTestClass();
TestLogger logger = TestLoggerFactory.getTestLogger(loggingTestClass.getClass());
@@ -86,7 +86,7 @@ class LoggingAspectTest {
}
@Test
- void should_LogInternalMethodWithReturnValueNull_When_ClassResidesAtTaskanaSubPackage() {
+ void should_LogInternalMethodWithReturnValueNull_When_ClassResidesAtKadaiSubPackage() {
LoggingTestClass loggingTestClass = new LoggingTestClass();
TestLogger logger = TestLoggerFactory.getTestLogger(loggingTestClass.getClass());
@@ -96,7 +96,7 @@ class LoggingAspectTest {
}
@Test
- void should_LogInternalMethodWithArguments_When_ClassResidesAtTaskanaSubPackage() {
+ void should_LogInternalMethodWithArguments_When_ClassResidesAtKadaiSubPackage() {
LoggingTestClass loggingTestClass = new LoggingTestClass();
TestLogger logger = TestLoggerFactory.getTestLogger(loggingTestClass.getClass());
@@ -106,7 +106,7 @@ class LoggingAspectTest {
}
@Test
- void should_LogInternalMethodWithReturnValueAndArguments_When_ClassResidesAtTaskanaSubPackage() {
+ void should_LogInternalMethodWithReturnValueAndArguments_When_ClassResidesAtKadaiSubPackage() {
LoggingTestClass loggingTestClass = new LoggingTestClass();
TestLogger logger = TestLoggerFactory.getTestLogger(loggingTestClass.getClass());
@@ -117,7 +117,7 @@ class LoggingAspectTest {
}
@Test
- void should_NotLogExternalMethod_When_AMethodCallsAMethodOutsideOfTaskanaPackage() {
+ void should_NotLogExternalMethod_When_AMethodCallsAMethodOutsideOfKadaiPackage() {
LoggingTestClass loggingTestClass = new LoggingTestClass();
TestLogger logger = TestLoggerFactory.getTestLogger(loggingTestClass.getClass());
diff --git a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/LoggingTestClass.java b/common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/LoggingTestClass.java
similarity index 95%
rename from common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/LoggingTestClass.java
rename to common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/LoggingTestClass.java
index 0673fd1b4..ae833f977 100644
--- a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/LoggingTestClass.java
+++ b/common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/LoggingTestClass.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.logging;
+package io.kadai.common.internal.logging;
class LoggingTestClass {
diff --git a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestClass.java b/common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/NoLoggingTestClass.java
similarity index 65%
rename from common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestClass.java
rename to common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/NoLoggingTestClass.java
index 92a8bf7f2..a57fe663e 100644
--- a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestClass.java
+++ b/common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/NoLoggingTestClass.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.logging;
+package io.kadai.common.internal.logging;
@NoLogging
class NoLoggingTestClass {
diff --git a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestSubClass.java b/common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/NoLoggingTestSubClass.java
similarity index 56%
rename from common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestSubClass.java
rename to common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/NoLoggingTestSubClass.java
index 793892ecc..cdbc8b17e 100644
--- a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestSubClass.java
+++ b/common/kadai-common-logging/src/test/java/io/kadai/common/internal/logging/NoLoggingTestSubClass.java
@@ -1,3 +1,3 @@
-package pro.taskana.common.internal.logging;
+package io.kadai.common.internal.logging;
class NoLoggingTestSubClass extends NoLoggingTestClass {}
diff --git a/common/kadai-common-logging/src/test/java/outside/of/io/kadai/OutsideOfProKadaiPackageLoggingTestClass.java b/common/kadai-common-logging/src/test/java/outside/of/io/kadai/OutsideOfProKadaiPackageLoggingTestClass.java
new file mode 100644
index 000000000..32b307053
--- /dev/null
+++ b/common/kadai-common-logging/src/test/java/outside/of/io/kadai/OutsideOfProKadaiPackageLoggingTestClass.java
@@ -0,0 +1,7 @@
+package outside.of.io.kadai;
+
+public class OutsideOfProKadaiPackageLoggingTestClass {
+
+ @SuppressWarnings("unused")
+ public void doStuff() {}
+}
diff --git a/common/kadai-common-logging/src/test/resources/log4j2-test.xml b/common/kadai-common-logging/src/test/resources/log4j2-test.xml
new file mode 100644
index 000000000..f22b3ace0
--- /dev/null
+++ b/common/kadai-common-logging/src/test/resources/log4j2-test.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/common/kadai-common-security/pom.xml b/common/kadai-common-security/pom.xml
new file mode 100644
index 000000000..8c8e52fa1
--- /dev/null
+++ b/common/kadai-common-security/pom.xml
@@ -0,0 +1,32 @@
+
+
+ 4.0.0
+ kadai-common-security
+
+ ${project.groupId}:${project.artifactId}
+ The global security principals needed for user and group authentication
+
+
+ io.kadai
+ kadai-common-parent
+ 8.2.1-SNAPSHOT
+
+
+
+
+
+
+
+
+ io.kadai
+ kadai-common-logging
+ ${project.version}
+
+
+ org.slf4j
+ slf4j-api
+
+
+
diff --git a/common/taskana-common-security/src/main/java/pro/taskana/common/api/security/CurrentUserContext.java b/common/kadai-common-security/src/main/java/io/kadai/common/api/security/CurrentUserContext.java
similarity index 95%
rename from common/taskana-common-security/src/main/java/pro/taskana/common/api/security/CurrentUserContext.java
rename to common/kadai-common-security/src/main/java/io/kadai/common/api/security/CurrentUserContext.java
index 580561214..090edc8db 100644
--- a/common/taskana-common-security/src/main/java/pro/taskana/common/api/security/CurrentUserContext.java
+++ b/common/kadai-common-security/src/main/java/io/kadai/common/api/security/CurrentUserContext.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api.security;
+package io.kadai.common.api.security;
import java.util.List;
diff --git a/common/taskana-common-security/src/main/java/pro/taskana/common/api/security/GroupPrincipal.java b/common/kadai-common-security/src/main/java/io/kadai/common/api/security/GroupPrincipal.java
similarity index 94%
rename from common/taskana-common-security/src/main/java/pro/taskana/common/api/security/GroupPrincipal.java
rename to common/kadai-common-security/src/main/java/io/kadai/common/api/security/GroupPrincipal.java
index 6c1749b7e..ab1d4c432 100644
--- a/common/taskana-common-security/src/main/java/pro/taskana/common/api/security/GroupPrincipal.java
+++ b/common/kadai-common-security/src/main/java/io/kadai/common/api/security/GroupPrincipal.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api.security;
+package io.kadai.common.api.security;
import java.security.Principal;
import java.util.Objects;
diff --git a/common/taskana-common-security/src/main/java/pro/taskana/common/api/security/UserPrincipal.java b/common/kadai-common-security/src/main/java/io/kadai/common/api/security/UserPrincipal.java
similarity index 94%
rename from common/taskana-common-security/src/main/java/pro/taskana/common/api/security/UserPrincipal.java
rename to common/kadai-common-security/src/main/java/io/kadai/common/api/security/UserPrincipal.java
index 273c57011..b476bb893 100644
--- a/common/taskana-common-security/src/main/java/pro/taskana/common/api/security/UserPrincipal.java
+++ b/common/kadai-common-security/src/main/java/io/kadai/common/api/security/UserPrincipal.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api.security;
+package io.kadai.common.api.security;
import java.security.Principal;
import java.util.Objects;
diff --git a/common/taskana-common-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java b/common/kadai-common-security/src/main/java/io/kadai/common/internal/security/CurrentUserContextImpl.java
similarity index 94%
rename from common/taskana-common-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java
rename to common/kadai-common-security/src/main/java/io/kadai/common/internal/security/CurrentUserContextImpl.java
index 154e0249b..34b966f23 100644
--- a/common/taskana-common-security/src/main/java/pro/taskana/common/internal/security/CurrentUserContextImpl.java
+++ b/common/kadai-common-security/src/main/java/io/kadai/common/internal/security/CurrentUserContextImpl.java
@@ -1,7 +1,9 @@
-package pro.taskana.common.internal.security;
+package io.kadai.common.internal.security;
import static java.util.function.Predicate.not;
+import io.kadai.common.api.security.CurrentUserContext;
+import io.kadai.common.api.security.GroupPrincipal;
import java.lang.reflect.Method;
import java.security.AccessController;
import java.security.Principal;
@@ -13,8 +15,6 @@ import java.util.Set;
import javax.security.auth.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.common.api.security.CurrentUserContext;
-import pro.taskana.common.api.security.GroupPrincipal;
public class CurrentUserContextImpl implements CurrentUserContext {
@@ -31,7 +31,7 @@ public class CurrentUserContextImpl implements CurrentUserContext {
try {
Class.forName(WSSUBJECT_CLASSNAME);
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("WSSubject detected. Assuming that Taskana runs on IBM WebSphere.");
+ LOGGER.debug("WSSubject detected. Assuming that Kadai runs on IBM WebSphere.");
}
runningOnWebSphere = true;
} catch (ClassNotFoundException e) {
@@ -96,7 +96,7 @@ public class CurrentUserContextImpl implements CurrentUserContext {
return publicCredentials.stream()
.map(
// we could use CheckedFunction#wrap here, but this either requires a dependency
- // to taskana-common or an inclusion of the class CheckedFunction in this module.
+ // to kadai-common or an inclusion of the class CheckedFunction in this module.
// The first is not possible due to a cyclic dependency.
// The second is not desired, since this module is a very slim security module and
// the inclusion of CheckedFunction and its transitive dependencies would increase
diff --git a/common/kadai-common-test/pom.xml b/common/kadai-common-test/pom.xml
new file mode 100644
index 000000000..0d1141949
--- /dev/null
+++ b/common/kadai-common-test/pom.xml
@@ -0,0 +1,145 @@
+
+
+ 4.0.0
+ kadai-common-test
+
+ ${project.groupId}:${project.artifactId}
+ The helper module for test utils
+
+
+ io.kadai
+ kadai-common-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
+
+
+
+ io.kadai
+ kadai-common-logging
+ ${project.version}
+
+
+ io.kadai
+ kadai-common
+ ${project.version}
+
+
+ io.kadai
+ kadai-common-data
+ ${project.version}
+
+
+ org.junit.jupiter
+ junit-jupiter
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ com.fasterxml.jackson.module
+ jackson-module-parameter-names
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jdk8
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+
+
+ jakarta.servlet
+ jakarta.servlet-api
+ ${version.jakarta.servlet}
+
+
+ org.springframework
+ spring-web
+
+
+ org.springframework.hateoas
+ spring-hateoas
+
+
+ org.springframework.boot
+ spring-boot-autoconfigure
+
+
+ org.springframework
+ spring-jdbc
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+
+
+ org.springframework.boot
+ spring-boot-starter-logging
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.security
+ spring-security-test
+
+
+ org.springframework.security
+ spring-security-ldap
+
+
+ org.springframework
+ spring-webmvc
+
+
+ org.testcontainers
+ db2
+ ${version.testcontainers}
+
+
+ junit
+ junit
+
+
+
+
+ org.testcontainers
+ oracle-xe
+ ${version.testcontainers}
+
+
+ junit
+ junit
+
+
+
+
+
+ org.testcontainers
+ postgresql
+ ${version.testcontainers}
+
+
+ junit
+ junit
+
+
+
+
+
+
+ org.assertj
+ assertj-core
+ ${version.assertj}
+ test
+
+
+
+
diff --git a/lib/taskana-test-api/src/main/java/pro/taskana/testapi/DockerContainerCreator.java b/common/kadai-common-test/src/main/java/io/kadai/common/test/DockerContainerCreator.java
similarity index 95%
rename from lib/taskana-test-api/src/main/java/pro/taskana/testapi/DockerContainerCreator.java
rename to common/kadai-common-test/src/main/java/io/kadai/common/test/DockerContainerCreator.java
index 7e11fe532..0f0ff62c6 100644
--- a/lib/taskana-test-api/src/main/java/pro/taskana/testapi/DockerContainerCreator.java
+++ b/common/kadai-common-test/src/main/java/io/kadai/common/test/DockerContainerCreator.java
@@ -1,7 +1,8 @@
-package pro.taskana.testapi;
+package io.kadai.common.test;
import static java.time.temporal.ChronoUnit.SECONDS;
+import io.kadai.common.internal.configuration.DB;
import java.time.Duration;
import java.util.Optional;
import javax.sql.DataSource;
@@ -12,7 +13,6 @@ import org.testcontainers.containers.OracleContainer;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.utility.DockerImageName;
-import pro.taskana.common.internal.configuration.DB;
public class DockerContainerCreator {
@@ -25,7 +25,7 @@ public class DockerContainerCreator {
case ORACLE:
return Optional.of(
new OracleContainer("gvenzl/oracle-xe:18-slim-faststart")
- .withDatabaseName("taskana")
+ .withDatabaseName("kadai")
.withUsername("TEST_USER")
.withPassword("testPassword")
.withEnv("TZ", "Europe/Berlin"));
diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/OracleSchemaHelper.java b/common/kadai-common-test/src/main/java/io/kadai/common/test/OracleSchemaHelper.java
similarity index 96%
rename from common/taskana-common-test/src/main/java/pro/taskana/common/test/OracleSchemaHelper.java
rename to common/kadai-common-test/src/main/java/io/kadai/common/test/OracleSchemaHelper.java
index 1c72cbb36..9788cd7b5 100644
--- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/OracleSchemaHelper.java
+++ b/common/kadai-common-test/src/main/java/io/kadai/common/test/OracleSchemaHelper.java
@@ -1,10 +1,10 @@
-package pro.taskana.common.test;
+package io.kadai.common.test;
+import io.kadai.common.api.exceptions.SystemException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.Statement;
import javax.sql.DataSource;
-import pro.taskana.common.api.exceptions.SystemException;
public final class OracleSchemaHelper {
diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/config/DataSourceGenerator.java b/common/kadai-common-test/src/main/java/io/kadai/common/test/config/DataSourceGenerator.java
similarity index 82%
rename from common/taskana-common-test/src/main/java/pro/taskana/common/test/config/DataSourceGenerator.java
rename to common/kadai-common-test/src/main/java/io/kadai/common/test/config/DataSourceGenerator.java
index 7d8fd1651..15bc3f1e0 100644
--- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/config/DataSourceGenerator.java
+++ b/common/kadai-common-test/src/main/java/io/kadai/common/test/config/DataSourceGenerator.java
@@ -1,19 +1,19 @@
-package pro.taskana.common.test.config;
+package io.kadai.common.test.config;
-import static pro.taskana.common.test.OracleSchemaHelper.initOracleSchema;
+import static io.kadai.common.test.OracleSchemaHelper.initOracleSchema;
+import io.kadai.common.internal.configuration.DB;
+import io.kadai.common.test.DockerContainerCreator;
import java.util.Optional;
import javax.sql.DataSource;
import org.apache.ibatis.datasource.pooled.PooledDataSource;
import org.testcontainers.containers.JdbcDatabaseContainer;
-import pro.taskana.common.internal.configuration.DB;
-import pro.taskana.common.test.DockerContainerCreator;
/**
* The DataSourceGenerator provides the proper {@linkplain DataSource} for all Integration tests.
*
* Additionally the property schemaName can be defined. If that property is missing, or
- * the file doesn't exist the schemaName TASKANA will be used.
+ * the file doesn't exist the schemaName KADAI will be used.
*/
public final class DataSourceGenerator {
@@ -52,8 +52,8 @@ public final class DataSourceGenerator {
public static DataSource createDataSourceForH2() {
String jdbcDriver = "org.h2.Driver";
String jdbcUrl =
- "jdbc:h2:mem:taskana;NON_KEYWORDS=KEY,VALUE;LOCK_MODE=0;"
- + "INIT=CREATE SCHEMA IF NOT EXISTS TASKANA\\;"
+ "jdbc:h2:mem:kadai;NON_KEYWORDS=KEY,VALUE;LOCK_MODE=0;"
+ + "INIT=CREATE SCHEMA IF NOT EXISTS KADAI\\;"
+ "SET COLLATION DEFAULT_de_DE ";
String dbUserName = "sa";
String dbPassword = "sa";
@@ -71,7 +71,7 @@ public final class DataSourceGenerator {
}
private static String determineSchemaName(DB db) {
- return db == DB.POSTGRES ? "taskana" : "TASKANA";
+ return db == DB.POSTGRES ? "kadai" : "KADAI";
}
private static DB retrieveDatabaseFromEnv() {
diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java b/common/kadai-common-test/src/main/java/io/kadai/common/test/security/JaasExtension.java
similarity index 97%
rename from common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java
rename to common/kadai-common-test/src/main/java/io/kadai/common/test/security/JaasExtension.java
index 09655fefa..5e55f17e7 100644
--- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java
+++ b/common/kadai-common-test/src/main/java/io/kadai/common/test/security/JaasExtension.java
@@ -1,8 +1,12 @@
-package pro.taskana.common.test.security;
+package io.kadai.common.test.security;
+import static io.kadai.common.internal.util.CheckedFunction.wrapExceptFor;
import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated;
-import static pro.taskana.common.internal.util.CheckedFunction.wrapExceptFor;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.api.security.GroupPrincipal;
+import io.kadai.common.api.security.UserPrincipal;
+import io.kadai.common.test.security.WithAccessId.WithAccessIds;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -36,10 +40,6 @@ import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
import org.junit.platform.commons.JUnitException;
import org.junit.platform.commons.support.AnnotationSupport;
import org.opentest4j.TestAbortedException;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.api.security.GroupPrincipal;
-import pro.taskana.common.api.security.UserPrincipal;
-import pro.taskana.common.test.security.WithAccessId.WithAccessIds;
/** Runner for integration tests that enables JAAS subject. */
public class JaasExtension implements InvocationInterceptor, TestTemplateInvocationContextProvider {
diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessId.java b/common/kadai-common-test/src/main/java/io/kadai/common/test/security/WithAccessId.java
similarity index 84%
rename from common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessId.java
rename to common/kadai-common-test/src/main/java/io/kadai/common/test/security/WithAccessId.java
index f49636087..e20d6ded3 100644
--- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessId.java
+++ b/common/kadai-common-test/src/main/java/io/kadai/common/test/security/WithAccessId.java
@@ -1,11 +1,11 @@
-package pro.taskana.common.test.security;
+package io.kadai.common.test.security;
+import io.kadai.common.test.security.WithAccessId.WithAccessIds;
import java.lang.annotation.ElementType;
import java.lang.annotation.Repeatable;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import pro.taskana.common.test.security.WithAccessId.WithAccessIds;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/util/ParallelThreadHelper.java b/common/kadai-common-test/src/main/java/io/kadai/common/test/util/ParallelThreadHelper.java
similarity index 90%
rename from common/taskana-common-test/src/main/java/pro/taskana/common/test/util/ParallelThreadHelper.java
rename to common/kadai-common-test/src/main/java/io/kadai/common/test/util/ParallelThreadHelper.java
index 09cbab760..7cb705feb 100644
--- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/util/ParallelThreadHelper.java
+++ b/common/kadai-common-test/src/main/java/io/kadai/common/test/util/ParallelThreadHelper.java
@@ -1,9 +1,9 @@
-package pro.taskana.common.test.util;
+package io.kadai.common.test.util;
+import io.kadai.common.api.exceptions.SystemException;
import java.lang.Thread.UncaughtExceptionHandler;
import java.util.Collection;
import java.util.concurrent.ConcurrentLinkedQueue;
-import pro.taskana.common.api.exceptions.SystemException;
public class ParallelThreadHelper {
diff --git a/common/taskana-common-test/src/main/java/org/junit/rules/TestRule.java b/common/kadai-common-test/src/main/java/org/junit/rules/TestRule.java
similarity index 100%
rename from common/taskana-common-test/src/main/java/org/junit/rules/TestRule.java
rename to common/kadai-common-test/src/main/java/org/junit/rules/TestRule.java
diff --git a/common/taskana-common-test/src/main/java/org/junit/runners/model/Statement.java b/common/kadai-common-test/src/main/java/org/junit/runners/model/Statement.java
similarity index 100%
rename from common/taskana-common-test/src/main/java/org/junit/runners/model/Statement.java
rename to common/kadai-common-test/src/main/java/org/junit/runners/model/Statement.java
diff --git a/common/taskana-common-test/src/main/resources/container-license-acceptance.txt b/common/kadai-common-test/src/main/resources/container-license-acceptance.txt
similarity index 100%
rename from common/taskana-common-test/src/main/resources/container-license-acceptance.txt
rename to common/kadai-common-test/src/main/resources/container-license-acceptance.txt
diff --git a/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java b/common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTest.java
similarity index 98%
rename from common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java
rename to common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTest.java
index 011bdc534..53e01ca7e 100644
--- a/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java
+++ b/common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTest.java
@@ -1,9 +1,13 @@
-package pro.taskana.common.test.security;
+package io.kadai.common.test.security;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.DynamicContainer.dynamicContainer;
import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import io.kadai.common.api.security.CurrentUserContext;
+import io.kadai.common.internal.security.CurrentUserContextImpl;
+import io.kadai.common.test.security.JaasExtensionTestExtensions.ShouldThrowJunitException;
+import io.kadai.common.test.security.JaasExtensionTestExtensions.ShouldThrowParameterResolutionException;
import java.util.Iterator;
import java.util.List;
import java.util.function.Supplier;
@@ -21,10 +25,6 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.api.security.CurrentUserContext;
-import pro.taskana.common.internal.security.CurrentUserContextImpl;
-import pro.taskana.common.test.security.JaasExtensionTestExtensions.ShouldThrowJunitException;
-import pro.taskana.common.test.security.JaasExtensionTestExtensions.ShouldThrowParameterResolutionException;
@ExtendWith(JaasExtension.class)
class JaasExtensionTest {
diff --git a/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTestExtensions.java b/common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTestExtensions.java
similarity index 96%
rename from common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTestExtensions.java
rename to common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTestExtensions.java
index c64ad0abc..d7d1d375e 100644
--- a/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTestExtensions.java
+++ b/common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTestExtensions.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.test.security;
+package io.kadai.common.test.security;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/common/kadai-common/pom.xml b/common/kadai-common/pom.xml
new file mode 100644
index 000000000..5cf2f2b30
--- /dev/null
+++ b/common/kadai-common/pom.xml
@@ -0,0 +1,62 @@
+
+
+ 4.0.0
+ kadai-common
+
+ ${project.groupId}:${project.artifactId}
+ The global helper module
+
+
+ io.kadai
+ kadai-common-parent
+ 8.2.1-SNAPSHOT
+
+
+
+
+ io.kadai
+ kadai-common-logging
+ ${project.version}
+
+
+ io.kadai
+ kadai-common-security
+ ${project.version}
+
+
+ org.json
+ json
+ ${version.json}
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.mybatis
+ mybatis
+ ${version.mybatis}
+
+
+
+
+ org.slf4j
+ slf4j-simple
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+ org.assertj
+ assertj-core
+ ${version.assertj}
+ test
+
+
+
+
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/BaseQuery.java b/common/kadai-common/src/main/java/io/kadai/common/api/BaseQuery.java
similarity index 99%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/BaseQuery.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/BaseQuery.java
index d5d90b5ed..1bb4a86c5 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/BaseQuery.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/BaseQuery.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
import java.util.Arrays;
import java.util.List;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/BulkOperationResults.java b/common/kadai-common/src/main/java/io/kadai/common/api/BulkOperationResults.java
similarity index 98%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/BulkOperationResults.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/BulkOperationResults.java
index 67c0603e1..a5b50f859 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/BulkOperationResults.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/BulkOperationResults.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/CustomHoliday.java b/common/kadai-common/src/main/java/io/kadai/common/api/CustomHoliday.java
similarity index 96%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/CustomHoliday.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/CustomHoliday.java
index 0a7b93e15..c0509f3ab 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/CustomHoliday.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/CustomHoliday.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
import java.util.Objects;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/IntInterval.java b/common/kadai-common/src/main/java/io/kadai/common/api/IntInterval.java
similarity index 79%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/IntInterval.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/IntInterval.java
index adabce095..7403a224f 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/IntInterval.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/IntInterval.java
@@ -1,6 +1,6 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
-import pro.taskana.common.internal.Interval;
+import io.kadai.common.internal.Interval;
/**
* IntInterval captures an Integer interval. A fixed interval has defined begin and end. An open
diff --git a/common/kadai-common/src/main/java/io/kadai/common/api/KadaiRole.java b/common/kadai-common/src/main/java/io/kadai/common/api/KadaiRole.java
new file mode 100644
index 000000000..266f6497e
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/KadaiRole.java
@@ -0,0 +1,11 @@
+package io.kadai.common.api;
+
+/** The KadaiRole enum contains all roles that are known to KADAI. */
+public enum KadaiRole {
+ USER,
+ BUSINESS_ADMIN,
+ ADMIN,
+ MONITOR,
+ TASK_ADMIN,
+ TASK_ROUTER
+}
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/KeyDomain.java b/common/kadai-common/src/main/java/io/kadai/common/api/KeyDomain.java
similarity index 96%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/KeyDomain.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/KeyDomain.java
index cb224e137..1e86f0445 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/KeyDomain.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/KeyDomain.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
import java.util.Objects;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/LocalTimeInterval.java b/common/kadai-common/src/main/java/io/kadai/common/api/LocalTimeInterval.java
similarity index 92%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/LocalTimeInterval.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/LocalTimeInterval.java
index 8ead56835..2e0332a7b 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/LocalTimeInterval.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/LocalTimeInterval.java
@@ -1,8 +1,8 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
+import io.kadai.common.internal.Interval;
import java.time.LocalTime;
import java.util.Objects;
-import pro.taskana.common.internal.Interval;
/**
* LocalTimeInterval provides a closed interval using {@link LocalTime}.
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/QueryColumnName.java b/common/kadai-common/src/main/java/io/kadai/common/api/QueryColumnName.java
similarity index 80%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/QueryColumnName.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/QueryColumnName.java
index 69813087a..173518366 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/QueryColumnName.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/QueryColumnName.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
/** This interface is used to emulate an extensible enum for use in the Basequery interface. */
public interface QueryColumnName {}
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/TimeInterval.java b/common/kadai-common/src/main/java/io/kadai/common/api/TimeInterval.java
similarity index 80%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/TimeInterval.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/TimeInterval.java
index 155cc19eb..87d91c969 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/TimeInterval.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/TimeInterval.java
@@ -1,7 +1,7 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
+import io.kadai.common.internal.Interval;
import java.time.Instant;
-import pro.taskana.common.internal.Interval;
/**
* Capture a time interval. A fixed interval has defined begin and end Instant. An open ended
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/WorkingTimeCalculator.java b/common/kadai-common/src/main/java/io/kadai/common/api/WorkingTimeCalculator.java
similarity index 97%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/WorkingTimeCalculator.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/WorkingTimeCalculator.java
index 853fda904..e423f27a8 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/WorkingTimeCalculator.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/WorkingTimeCalculator.java
@@ -1,8 +1,8 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
import java.time.Duration;
import java.time.Instant;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
@SuppressWarnings("unused")
public interface WorkingTimeCalculator {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/AutocommitFailedException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/AutocommitFailedException.java
similarity index 52%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/AutocommitFailedException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/AutocommitFailedException.java
index d22d98c6e..7aa8ed8a6 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/AutocommitFailedException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/AutocommitFailedException.java
@@ -1,10 +1,10 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
/**
- * This exception is thrown when using TASKANA with the AUTOCOMMIT ConnectionManagementMode and an
+ * This exception is thrown when using KADAI with the AUTOCOMMIT ConnectionManagementMode and an
* attempt to commit fails.
*/
-public class AutocommitFailedException extends TaskanaRuntimeException {
+public class AutocommitFailedException extends KadaiRuntimeException {
public static final String ERROR_KEY = "CONNECTION_AUTOCOMMIT_FAILED";
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConcurrencyException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/ConcurrencyException.java
similarity index 86%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConcurrencyException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/ConcurrencyException.java
index a7c59f2c7..f9dcebedf 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConcurrencyException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/ConcurrencyException.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
import java.util.Map;
@@ -6,7 +6,7 @@ import java.util.Map;
* This exception is thrown when an attempt is made to update an object that has already been
* updated by another user.
*/
-public class ConcurrencyException extends TaskanaException {
+public class ConcurrencyException extends KadaiException {
public static final String ERROR_KEY = "ENTITY_NOT_UP_TO_DATE";
private final String entityId;
diff --git a/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/ConnectionNotSetException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/ConnectionNotSetException.java
new file mode 100644
index 000000000..0d5435322
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/ConnectionNotSetException.java
@@ -0,0 +1,15 @@
+package io.kadai.common.api.exceptions;
+
+/**
+ * This exception is thrown when using KADAI with the EXPLICIT ConnectionManagementMode and an
+ * attempt is made to call an API method before the KadainEngine#setConnection() method has been
+ * called.
+ */
+public class ConnectionNotSetException extends KadaiRuntimeException {
+
+ public static final String ERROR_KEY = "CONNECTION_NOT_SET";
+
+ public ConnectionNotSetException() {
+ super("Connection not set", ErrorCode.of(ERROR_KEY));
+ }
+}
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/DomainNotFoundException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/DomainNotFoundException.java
similarity index 82%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/DomainNotFoundException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/DomainNotFoundException.java
index 717e2d5b8..1560e3a2c 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/DomainNotFoundException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/DomainNotFoundException.java
@@ -1,9 +1,9 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
import java.util.Map;
/** This exception is thrown when the specified domain is not found in the configuration. */
-public class DomainNotFoundException extends TaskanaException {
+public class DomainNotFoundException extends KadaiException {
public static final String ERROR_KEY = "DOMAIN_NOT_FOUND";
private final String domain;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ErrorCode.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/ErrorCode.java
similarity index 97%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ErrorCode.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/ErrorCode.java
index 6a0a76110..06dd0480f 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ErrorCode.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/ErrorCode.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
import java.io.Serializable;
import java.util.Collections;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/InvalidArgumentException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/InvalidArgumentException.java
similarity index 74%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/InvalidArgumentException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/InvalidArgumentException.java
index fa9270897..ae402b5eb 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/InvalidArgumentException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/InvalidArgumentException.java
@@ -1,7 +1,7 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
/** This exception is thrown when a method is called with an invalid argument. */
-public class InvalidArgumentException extends TaskanaRuntimeException {
+public class InvalidArgumentException extends KadaiRuntimeException {
public static final String ERROR_KEY = "INVALID_ARGUMENT";
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiException.java
similarity index 63%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiException.java
index 7a6368efc..d1050613a 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiException.java
@@ -1,17 +1,17 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
import java.io.Serializable;
-/** common base class for TASKANA's checked exceptions. */
-public class TaskanaException extends Exception {
+/** common base class for KADAI's checked exceptions. */
+public class KadaiException extends Exception {
private final ErrorCode errorCode;
- protected TaskanaException(String message, ErrorCode errorCode) {
+ protected KadaiException(String message, ErrorCode errorCode) {
this(message, errorCode, null);
}
- protected TaskanaException(String message, ErrorCode errorCode, Throwable cause) {
+ protected KadaiException(String message, ErrorCode errorCode, Throwable cause) {
super(message, cause);
this.errorCode = errorCode;
}
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaRuntimeException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiRuntimeException.java
similarity index 61%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaRuntimeException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiRuntimeException.java
index cc831ac9d..c3ad948ce 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaRuntimeException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiRuntimeException.java
@@ -1,17 +1,17 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
import java.io.Serializable;
-/** The common base class for TASKANA's runtime exceptions. */
-public class TaskanaRuntimeException extends RuntimeException {
+/** The common base class for KADAI's runtime exceptions. */
+public class KadaiRuntimeException extends RuntimeException {
private final ErrorCode errorCode;
- protected TaskanaRuntimeException(String message, ErrorCode errorCode) {
+ protected KadaiRuntimeException(String message, ErrorCode errorCode) {
this(message, errorCode, null);
}
- protected TaskanaRuntimeException(String message, ErrorCode errorCode, Throwable cause) {
+ protected KadaiRuntimeException(String message, ErrorCode errorCode, Throwable cause) {
super(message, cause);
this.errorCode = errorCode;
}
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/NotAuthorizedException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/NotAuthorizedException.java
similarity index 70%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/NotAuthorizedException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/NotAuthorizedException.java
index 337d076a8..2f954ec72 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/NotAuthorizedException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/NotAuthorizedException.java
@@ -1,20 +1,20 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
+import io.kadai.common.api.KadaiRole;
import java.util.Arrays;
import java.util.Map;
-import pro.taskana.common.api.TaskanaRole;
/**
- * This exception is thrown when the current user is not in a certain {@linkplain TaskanaRole role}
+ * This exception is thrown when the current user is not in a certain {@linkplain KadaiRole role}
* it is supposed to be.
*/
-public class NotAuthorizedException extends TaskanaException {
+public class NotAuthorizedException extends KadaiException {
public static final String ERROR_KEY = "NOT_AUTHORIZED";
private final String currentUserId;
- private final TaskanaRole[] roles;
+ private final KadaiRole[] roles;
- public NotAuthorizedException(String currentUserId, TaskanaRole... roles) {
+ public NotAuthorizedException(String currentUserId, KadaiRole... roles) {
super(
String.format(
"Not authorized. The current user '%s' is not member of role(s) '%s'.",
@@ -29,7 +29,7 @@ public class NotAuthorizedException extends TaskanaException {
this.roles = roles;
}
- public TaskanaRole[] getRoles() {
+ public KadaiRole[] getRoles() {
return roles;
}
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/SystemException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/SystemException.java
similarity index 56%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/SystemException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/SystemException.java
index 924be18f4..d7e39c646 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/SystemException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/SystemException.java
@@ -1,7 +1,7 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
-/** This exception is thrown when a generic TASKANA problem is encountered. */
-public class SystemException extends TaskanaRuntimeException {
+/** This exception is thrown when a generic KADAI problem is encountered. */
+public class SystemException extends KadaiRuntimeException {
public static final String ERROR_KEY = "CRITICAL_SYSTEM_ERROR";
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/UnsupportedDatabaseException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/UnsupportedDatabaseException.java
similarity index 84%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/UnsupportedDatabaseException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/UnsupportedDatabaseException.java
index 12d470493..87a67f5bb 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/UnsupportedDatabaseException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/UnsupportedDatabaseException.java
@@ -1,11 +1,11 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
import java.util.Map;
/**
* This exception is thrown when the database name doesn't match to one of the desired databases.
*/
-public class UnsupportedDatabaseException extends TaskanaRuntimeException {
+public class UnsupportedDatabaseException extends KadaiRuntimeException {
public static final String ERROR_KEY = "DATABASE_UNSUPPORTED";
private final String databaseProductName;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/WrongCustomHolidayFormatException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/WrongCustomHolidayFormatException.java
similarity index 80%
rename from common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/WrongCustomHolidayFormatException.java
rename to common/kadai-common/src/main/java/io/kadai/common/api/exceptions/WrongCustomHolidayFormatException.java
index 0f8b1bfd1..51d892183 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/WrongCustomHolidayFormatException.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/WrongCustomHolidayFormatException.java
@@ -1,10 +1,10 @@
-package pro.taskana.common.api.exceptions;
+package io.kadai.common.api.exceptions;
+import io.kadai.common.api.CustomHoliday;
import java.util.Map;
-import pro.taskana.common.api.CustomHoliday;
/** This exception is thrown when an entry for the {@linkplain CustomHoliday} has a wrong format. */
-public class WrongCustomHolidayFormatException extends TaskanaRuntimeException {
+public class WrongCustomHolidayFormatException extends KadaiRuntimeException {
public static final String ERROR_KEY = "CUSTOM_HOLIDAY_WRONG_FORMAT";
private final String customHoliday;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/Interval.java b/common/kadai-common/src/main/java/io/kadai/common/internal/Interval.java
similarity index 97%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/Interval.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/Interval.java
index bdbf4d2a3..3eb6a3ac6 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/Interval.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/Interval.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal;
+package io.kadai.common.internal;
import java.util.Objects;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DB.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/DB.java
similarity index 80%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DB.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/DB.java
index 0bacfa9cf..ee53fe878 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DB.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/DB.java
@@ -1,25 +1,25 @@
-package pro.taskana.common.internal.configuration;
+package io.kadai.common.internal.configuration;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.api.exceptions.UnsupportedDatabaseException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Arrays;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.api.exceptions.UnsupportedDatabaseException;
/** Supported versions of databases. */
public enum DB {
- H2("H2", "h2", "/sql/h2/schema-detection-h2.sql", "/sql/h2/taskana-schema-h2.sql"),
- DB2("DB2", "db2", "/sql/db2/schema-detection-db2.sql", "/sql/db2/taskana-schema-db2.sql"),
+ H2("H2", "h2", "/sql/h2/schema-detection-h2.sql", "/sql/h2/kadai-schema-h2.sql"),
+ DB2("DB2", "db2", "/sql/db2/schema-detection-db2.sql", "/sql/db2/kadai-schema-db2.sql"),
ORACLE(
"Oracle",
"oracle",
"/sql/oracle/schema-detection-oracle.sql",
- "/sql/oracle/taskana-schema-oracle.sql"),
+ "/sql/oracle/kadai-schema-oracle.sql"),
POSTGRES(
"PostgreSQL",
"postgres",
"/sql/postgres/schema-detection-postgres.sql",
- "/sql/postgres/taskana-schema-postgres.sql");
+ "/sql/postgres/kadai-schema-postgres.sql");
public final String dbProductName;
public final String dbProductId;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/DbSchemaCreator.java
similarity index 93%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/DbSchemaCreator.java
index e79c23169..4b8ac9424 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/DbSchemaCreator.java
@@ -1,5 +1,6 @@
-package pro.taskana.common.internal.configuration;
+package io.kadai.common.internal.configuration;
+import io.kadai.common.internal.util.ComparableVersion;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -17,9 +18,8 @@ import org.apache.ibatis.jdbc.ScriptRunner;
import org.apache.ibatis.jdbc.SqlRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.common.internal.util.ComparableVersion;
-/** This class create the schema for taskana. */
+/** This class create the schema for kadai. */
public class DbSchemaCreator {
private static final Logger LOGGER = LoggerFactory.getLogger(DbSchemaCreator.class);
@@ -80,8 +80,8 @@ public class DbSchemaCreator {
}
String query =
- "select VERSION from TASKANA_SCHEMA_VERSION where "
- + "VERSION = (select max(VERSION) from TASKANA_SCHEMA_VERSION) ";
+ "select VERSION from KADAI_SCHEMA_VERSION where "
+ + "VERSION = (select max(VERSION) from KADAI_SCHEMA_VERSION) ";
Map queryResult = runner.selectOne(query);
@@ -90,7 +90,7 @@ public class DbSchemaCreator {
if (actualVersion.compareTo(minVersion) < 0) {
LOGGER.error(
- "Schema version not valid. The VERSION property in table TASKANA_SCHEMA_VERSION "
+ "Schema version not valid. The VERSION property in table KADAI_SCHEMA_VERSION "
+ "has not the expected min value {}",
expectedMinVersion);
return false;
@@ -103,7 +103,7 @@ public class DbSchemaCreator {
} catch (RuntimeSqlException | SQLException e) {
LOGGER.error(
- "Schema version not valid. The VERSION property in table TASKANA_SCHEMA_VERSION "
+ "Schema version not valid. The VERSION property in table KADAI_SCHEMA_VERSION "
+ "has not the expected min value {}",
expectedMinVersion);
return false;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/TaskanaProperty.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/KadaiProperty.java
similarity index 73%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/TaskanaProperty.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/KadaiProperty.java
index f664ec075..40dca7589 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/TaskanaProperty.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/KadaiProperty.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.configuration;
+package io.kadai.common.internal.configuration;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -7,7 +7,7 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
-public @interface TaskanaProperty {
+public @interface KadaiProperty {
String value();
}
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/CollectionPropertyParser.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/CollectionPropertyParser.java
similarity index 91%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/CollectionPropertyParser.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/CollectionPropertyParser.java
index 52c59e916..fc50b1c8a 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/CollectionPropertyParser.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/CollectionPropertyParser.java
@@ -1,13 +1,13 @@
-package pro.taskana.common.internal.configuration.parser;
+package io.kadai.common.internal.configuration.parser;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.util.ReflectionUtil;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.regex.Pattern;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.util.ReflectionUtil;
public class CollectionPropertyParser> implements PropertyParser {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/CustomHolidayParser.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/CustomHolidayParser.java
similarity index 73%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/CustomHolidayParser.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/CustomHolidayParser.java
index 829b071dc..34f4432f2 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/CustomHolidayParser.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/CustomHolidayParser.java
@@ -1,8 +1,8 @@
-package pro.taskana.common.internal.configuration.parser;
+package io.kadai.common.internal.configuration.parser;
+import io.kadai.common.api.CustomHoliday;
+import io.kadai.common.api.exceptions.WrongCustomHolidayFormatException;
import java.util.List;
-import pro.taskana.common.api.CustomHoliday;
-import pro.taskana.common.api.exceptions.WrongCustomHolidayFormatException;
public class CustomHolidayParser extends SimpleParser {
public CustomHolidayParser() {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/EnumPropertyParser.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/EnumPropertyParser.java
similarity index 93%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/EnumPropertyParser.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/EnumPropertyParser.java
index 042552df7..0d5085226 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/EnumPropertyParser.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/EnumPropertyParser.java
@@ -1,5 +1,6 @@
-package pro.taskana.common.internal.configuration.parser;
+package io.kadai.common.internal.configuration.parser;
+import io.kadai.common.api.exceptions.SystemException;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.Arrays;
@@ -7,7 +8,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
-import pro.taskana.common.api.exceptions.SystemException;
public class EnumPropertyParser implements PropertyParser> {
@Override
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/LocalTimeIntervalParser.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/LocalTimeIntervalParser.java
similarity index 82%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/LocalTimeIntervalParser.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/LocalTimeIntervalParser.java
index b7f8c3e6f..e572a90f5 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/LocalTimeIntervalParser.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/LocalTimeIntervalParser.java
@@ -1,9 +1,9 @@
-package pro.taskana.common.internal.configuration.parser;
+package io.kadai.common.internal.configuration.parser;
+import io.kadai.common.api.LocalTimeInterval;
+import io.kadai.common.api.exceptions.SystemException;
import java.time.LocalTime;
import java.util.List;
-import pro.taskana.common.api.LocalTimeInterval;
-import pro.taskana.common.api.exceptions.SystemException;
public class LocalTimeIntervalParser extends SimpleParser {
public LocalTimeIntervalParser() {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/MapPropertyParser.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/MapPropertyParser.java
similarity index 88%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/MapPropertyParser.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/MapPropertyParser.java
index e0ac0c139..5e8ed68ae 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/MapPropertyParser.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/MapPropertyParser.java
@@ -1,5 +1,9 @@
-package pro.taskana.common.internal.configuration.parser;
+package io.kadai.common.internal.configuration.parser;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.configuration.KadaiProperty;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.common.internal.util.ReflectionUtil;
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
@@ -7,10 +11,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.configuration.TaskanaProperty;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.common.internal.util.ReflectionUtil;
public class MapPropertyParser implements PropertyParser> {
@@ -24,7 +24,7 @@ public class MapPropertyParser implements PropertyParser> {
Map properties,
String separator,
Field field,
- TaskanaProperty taskanaProperty) {
+ KadaiProperty kadaiProperty) {
if (!Map.class.isAssignableFrom(field.getType())) {
throw new SystemException(
String.format(
@@ -38,7 +38,7 @@ public class MapPropertyParser implements PropertyParser> {
Class valueClass = ReflectionUtil.getRawClass(actualTypeArguments[1]);
// Parses property files into a Map using the following layout: . =
- String propertyKey = taskanaProperty.value();
+ String propertyKey = kadaiProperty.value();
Map mapFromProperties =
properties.keySet().stream()
.filter(it -> it.startsWith(propertyKey))
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/PropertyParser.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/PropertyParser.java
similarity index 82%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/PropertyParser.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/PropertyParser.java
index ee7cdb8fc..e26b68aa6 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/PropertyParser.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/PropertyParser.java
@@ -1,5 +1,8 @@
-package pro.taskana.common.internal.configuration.parser;
+package io.kadai.common.internal.configuration.parser;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.configuration.KadaiProperty;
+import io.kadai.common.internal.util.ReflectionUtil;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.time.Duration;
@@ -14,9 +17,6 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.configuration.TaskanaProperty;
-import pro.taskana.common.internal.util.ReflectionUtil;
public interface PropertyParser {
@@ -35,8 +35,7 @@ public interface PropertyParser {
new SimpleParser<>(Long.class, Long::parseLong),
new SimpleParser<>(String.class, Function.identity()),
new SimpleParser<>(ZoneId.class, ZoneId::of))
- .collect(
- Collectors.toUnmodifiableMap(PropertyParser::getTargetClass, t -> t));
+ .collect(Collectors.toUnmodifiableMap(PropertyParser::getTargetClass, t -> t));
static PropertyParser getPropertyParser(Class forClass) {
forClass = ReflectionUtil.wrap(forClass);
@@ -68,11 +67,8 @@ public interface PropertyParser {
}
default Optional parse(
- Map properties,
- String separator,
- Field field,
- TaskanaProperty taskanaProperty) {
- return parse(properties.get(taskanaProperty.value()), separator, field);
+ Map properties, String separator, Field field, KadaiProperty kadaiProperty) {
+ return parse(properties.get(kadaiProperty.value()), separator, field);
}
default boolean validateTargetField(Field field) {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/SimpleParser.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/SimpleParser.java
similarity index 88%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/SimpleParser.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/SimpleParser.java
index dcdef8bc0..b889a6964 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/parser/SimpleParser.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/SimpleParser.java
@@ -1,15 +1,15 @@
-package pro.taskana.common.internal.configuration.parser;
+package io.kadai.common.internal.configuration.parser;
import static java.util.function.Predicate.not;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.util.ReflectionUtil;
import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;
import java.util.regex.Pattern;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.util.ReflectionUtil;
public class SimpleParser implements PropertyParser {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/persistence/InstantTypeHandler.java b/common/kadai-common/src/main/java/io/kadai/common/internal/persistence/InstantTypeHandler.java
similarity index 97%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/persistence/InstantTypeHandler.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/persistence/InstantTypeHandler.java
index e78cb5a3d..3ec1d561d 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/persistence/InstantTypeHandler.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/persistence/InstantTypeHandler.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.persistence;
+package io.kadai.common.internal.persistence;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/persistence/MapTypeHandler.java b/common/kadai-common/src/main/java/io/kadai/common/internal/persistence/MapTypeHandler.java
similarity index 97%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/persistence/MapTypeHandler.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/persistence/MapTypeHandler.java
index 7f22d7f46..e37fe063a 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/persistence/MapTypeHandler.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/persistence/MapTypeHandler.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.persistence;
+package io.kadai.common.internal.persistence;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/persistence/StringTypeHandler.java b/common/kadai-common/src/main/java/io/kadai/common/internal/persistence/StringTypeHandler.java
similarity index 96%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/persistence/StringTypeHandler.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/persistence/StringTypeHandler.java
index 3dc52b12a..9aa8111ad 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/persistence/StringTypeHandler.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/persistence/StringTypeHandler.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.persistence;
+package io.kadai.common.internal.persistence;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/transaction/TaskanaTransactionProvider.java b/common/kadai-common/src/main/java/io/kadai/common/internal/transaction/KadaiTransactionProvider.java
similarity index 69%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/transaction/TaskanaTransactionProvider.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/transaction/KadaiTransactionProvider.java
index 5d89761b2..2d51f2a7d 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/transaction/TaskanaTransactionProvider.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/transaction/KadaiTransactionProvider.java
@@ -1,22 +1,22 @@
-package pro.taskana.common.internal.transaction;
+package io.kadai.common.internal.transaction;
import java.util.function.Supplier;
/** This functional interface provides support for transactions. */
@FunctionalInterface
-public interface TaskanaTransactionProvider {
+public interface KadaiTransactionProvider {
T executeInTransaction(Supplier supplier);
static T executeInTransactionIfPossible(
- TaskanaTransactionProvider transactionProvider, Supplier supplier) {
+ KadaiTransactionProvider transactionProvider, Supplier supplier) {
return transactionProvider != null
? transactionProvider.executeInTransaction(supplier)
: supplier.get();
}
static void executeInTransactionIfPossible(
- TaskanaTransactionProvider transactionProvider, Runnable runnable) {
+ KadaiTransactionProvider transactionProvider, Runnable runnable) {
executeInTransactionIfPossible(
transactionProvider,
() -> {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedConsumer.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedConsumer.java
similarity index 80%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedConsumer.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedConsumer.java
index 49704ffce..e084d4d26 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedConsumer.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedConsumer.java
@@ -1,7 +1,7 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
+import io.kadai.common.api.exceptions.SystemException;
import java.util.function.Consumer;
-import pro.taskana.common.api.exceptions.SystemException;
@FunctionalInterface
public interface CheckedConsumer {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedFunction.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedFunction.java
similarity index 89%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedFunction.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedFunction.java
index f886fec6b..40b83df2f 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedFunction.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedFunction.java
@@ -1,7 +1,7 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
+import io.kadai.common.api.exceptions.SystemException;
import java.util.function.Function;
-import pro.taskana.common.api.exceptions.SystemException;
@FunctionalInterface
public interface CheckedFunction {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedRunnable.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedRunnable.java
similarity index 76%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedRunnable.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedRunnable.java
index 49b6ccc11..4690e7231 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedRunnable.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedRunnable.java
@@ -1,6 +1,6 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
-import pro.taskana.common.api.exceptions.SystemException;
+import io.kadai.common.api.exceptions.SystemException;
@FunctionalInterface
public interface CheckedRunnable {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedSupplier.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedSupplier.java
similarity index 79%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedSupplier.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedSupplier.java
index 817db7309..2a8d893a1 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedSupplier.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CheckedSupplier.java
@@ -1,7 +1,7 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
+import io.kadai.common.api.exceptions.SystemException;
import java.util.function.Supplier;
-import pro.taskana.common.api.exceptions.SystemException;
@FunctionalInterface
public interface CheckedSupplier {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CollectionUtil.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CollectionUtil.java
similarity index 95%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/CollectionUtil.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/CollectionUtil.java
index b33c7b3de..56204573a 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CollectionUtil.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/CollectionUtil.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import java.util.Collection;
import java.util.List;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ComparableVersion.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/ComparableVersion.java
similarity index 99%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/ComparableVersion.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/ComparableVersion.java
index 1fadbbed6..8a95aace1 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ComparableVersion.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/ComparableVersion.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -437,6 +437,7 @@ public class ComparableVersion implements Comparable {
Arrays.asList("alpha", "beta", "milestone", "rc", "snapshot", "", "sp");
private static final Properties ALIASES = new Properties();
+
/**
* A comparable value for the empty-string qualifier. This one is used to determine if a given
* qualifier makes the version older than one without a qualifier, or more recent.
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/EnumUtil.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/EnumUtil.java
similarity index 93%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/EnumUtil.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/EnumUtil.java
index 37578081b..e702b56da 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/EnumUtil.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/EnumUtil.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import java.lang.reflect.Array;
import java.util.Arrays;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/FileLoaderUtil.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/FileLoaderUtil.java
similarity index 93%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/FileLoaderUtil.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/FileLoaderUtil.java
index f4eee956e..f45753d2e 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/FileLoaderUtil.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/FileLoaderUtil.java
@@ -1,12 +1,12 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
+import io.kadai.common.api.exceptions.SystemException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.common.api.exceptions.SystemException;
public class FileLoaderUtil {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/IdGenerator.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/IdGenerator.java
similarity index 96%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/IdGenerator.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/IdGenerator.java
index 02bdf73cd..510d22afe 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/IdGenerator.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/IdGenerator.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import java.util.UUID;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/LogSanitizer.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/LogSanitizer.java
similarity index 91%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/LogSanitizer.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/LogSanitizer.java
index 5d74acb1f..e38e4b5f0 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/LogSanitizer.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/LogSanitizer.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
public class LogSanitizer {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/ObjectAttributeChangeDetector.java
similarity index 95%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/ObjectAttributeChangeDetector.java
index 9ecc53842..b6492b0fd 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/ObjectAttributeChangeDetector.java
@@ -1,14 +1,14 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
+import static io.kadai.common.internal.util.CheckedFunction.wrap;
import static java.util.function.Predicate.not;
-import static pro.taskana.common.internal.util.CheckedFunction.wrap;
+import io.kadai.common.api.exceptions.SystemException;
import java.lang.reflect.Field;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import org.json.JSONObject;
-import pro.taskana.common.api.exceptions.SystemException;
public class ObjectAttributeChangeDetector {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/Pair.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/Pair.java
similarity index 95%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/Pair.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/Pair.java
index 453edf248..be6532b8d 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/Pair.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/Pair.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import java.util.Objects;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/Quadruple.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/Quadruple.java
similarity index 93%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/Quadruple.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/Quadruple.java
index c8b57d389..e5b4572a8 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/Quadruple.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/Quadruple.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
public class Quadruple {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/ReflectionUtil.java
similarity index 98%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/ReflectionUtil.java
index e94476bb0..fae6f2c23 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ReflectionUtil.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/ReflectionUtil.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import static java.util.function.Predicate.not;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ResourceUtil.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/ResourceUtil.java
similarity index 95%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/ResourceUtil.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/ResourceUtil.java
index bf51c7b76..b74d040fb 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ResourceUtil.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/ResourceUtil.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/SpiLoader.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/SpiLoader.java
similarity index 90%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/SpiLoader.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/SpiLoader.java
index f02fb133a..4d6d6fa9b 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/SpiLoader.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/SpiLoader.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import java.util.List;
import java.util.ServiceLoader;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/SqlProviderUtil.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/SqlProviderUtil.java
similarity index 99%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/SqlProviderUtil.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/SqlProviderUtil.java
index 0e933fbeb..2056e47a7 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/SqlProviderUtil.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/SqlProviderUtil.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import java.util.stream.IntStream;
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/Triplet.java b/common/kadai-common/src/main/java/io/kadai/common/internal/util/Triplet.java
similarity index 92%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/util/Triplet.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/util/Triplet.java
index c6736b339..12d166dce 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/util/Triplet.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/util/Triplet.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
public class Triplet {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/HolidaySchedule.java b/common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/HolidaySchedule.java
similarity index 96%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/HolidaySchedule.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/HolidaySchedule.java
index 1a10ebf84..89a17f274 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/HolidaySchedule.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/HolidaySchedule.java
@@ -1,7 +1,8 @@
-package pro.taskana.common.internal.workingtime;
+package io.kadai.common.internal.workingtime;
import static java.time.temporal.ChronoUnit.DAYS;
+import io.kadai.common.api.CustomHoliday;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Collection;
@@ -10,7 +11,6 @@ import java.util.HashSet;
import java.util.Set;
import java.util.stream.LongStream;
import java.util.stream.LongStream.Builder;
-import pro.taskana.common.api.CustomHoliday;
/**
* The WorkingDaysToDaysConverter provides a method to convert an age in working days into an age in
@@ -66,7 +66,7 @@ public class HolidaySchedule {
if (germanHolidaysEnabled && isGermanHoliday(date)) {
return true;
}
- // Custom holidays that can be configured in the TaskanaConfiguration
+ // Custom holidays that can be configured in the KadaiConfiguration
return customHolidays.contains(CustomHoliday.of(date.getDayOfMonth(), date.getMonthValue()));
}
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/WorkingDayCalculatorImpl.java b/common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/WorkingDayCalculatorImpl.java
similarity index 93%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/WorkingDayCalculatorImpl.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/WorkingDayCalculatorImpl.java
index ddaf46d8b..3daec7857 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/WorkingDayCalculatorImpl.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/WorkingDayCalculatorImpl.java
@@ -1,5 +1,8 @@
-package pro.taskana.common.internal.workingtime;
+package io.kadai.common.internal.workingtime;
+import io.kadai.common.api.WorkingTimeCalculator;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.SystemException;
import java.time.DayOfWeek;
import java.time.Duration;
import java.time.Instant;
@@ -7,9 +10,6 @@ import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.stream.LongStream;
-import pro.taskana.common.api.WorkingTimeCalculator;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.SystemException;
public class WorkingDayCalculatorImpl implements WorkingTimeCalculator {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/WorkingTimeCalculatorImpl.java b/common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/WorkingTimeCalculatorImpl.java
similarity index 98%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/WorkingTimeCalculatorImpl.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/WorkingTimeCalculatorImpl.java
index b4ccd4aad..7e454ce4b 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/WorkingTimeCalculatorImpl.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/WorkingTimeCalculatorImpl.java
@@ -1,5 +1,8 @@
-package pro.taskana.common.internal.workingtime;
+package io.kadai.common.internal.workingtime;
+import io.kadai.common.api.LocalTimeInterval;
+import io.kadai.common.api.WorkingTimeCalculator;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
import java.time.DayOfWeek;
import java.time.Duration;
import java.time.Instant;
@@ -13,9 +16,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.SortedSet;
-import pro.taskana.common.api.LocalTimeInterval;
-import pro.taskana.common.api.WorkingTimeCalculator;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
public class WorkingTimeCalculatorImpl implements WorkingTimeCalculator {
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/WorkingTimeSchedule.java b/common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/WorkingTimeSchedule.java
similarity index 94%
rename from common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/WorkingTimeSchedule.java
rename to common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/WorkingTimeSchedule.java
index 33d2666d2..1b00b6d81 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/workingtime/WorkingTimeSchedule.java
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/workingtime/WorkingTimeSchedule.java
@@ -1,5 +1,8 @@
-package pro.taskana.common.internal.workingtime;
+package io.kadai.common.internal.workingtime;
+import io.kadai.common.api.LocalTimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.internal.util.Pair;
import java.time.DayOfWeek;
import java.time.LocalTime;
import java.util.Collections;
@@ -11,9 +14,6 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.function.Function;
-import pro.taskana.common.api.LocalTimeInterval;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.internal.util.Pair;
class WorkingTimeSchedule {
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai-schema-db2.sql
similarity index 98%
rename from common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai-schema-db2.sql
index fa97f8ff4..5880e0239 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai-schema-db2.sql
@@ -1,6 +1,6 @@
SET SCHEMA %schemaName%;
-CREATE TABLE TASKANA_SCHEMA_VERSION
+CREATE TABLE KADAI_SCHEMA_VERSION
(
ID INT NOT NULL,
VERSION VARCHAR(255) NOT NULL,
@@ -8,14 +8,14 @@ CREATE TABLE TASKANA_SCHEMA_VERSION
PRIMARY KEY (ID)
);
-CREATE SEQUENCE TASKANA_SCHEMA_VERSION_ID_SEQ
+CREATE SEQUENCE KADAI_SCHEMA_VERSION_ID_SEQ
MINVALUE 1
START WITH 100
INCREMENT BY 1 CACHE 10;
--- The VERSION value must be equal or higher then the value of TaskanaEngineImpl.MINIMAL_TASKANA_SCHEMA_VERSION
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.1.0', CURRENT_TIMESTAMP);
+-- The VERSION value must be equal or higher then the value of KadaiEngineImpl.MINIMAL_KADAI_SCHEMA_VERSION
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.1.0', CURRENT_TIMESTAMP);
CREATE TABLE CLASSIFICATION
(
@@ -377,7 +377,7 @@ CREATE SEQUENCE SCHEDULED_JOB_SEQ
-- LIST OF RECOMMENDED INDEXES
-- This list is provided on a as-is basis. It is used for tuning of the internal performance tests.
--- The script needs to be reviewed and adapted for each indiviual TASKANA setup.
+-- The script needs to be reviewed and adapted for each indiviual KADAI setup.
-- ===========================
CREATE UNIQUE INDEX IDX_CLASSIFICATION_ID ON CLASSIFICATION
("ID" ASC) INCLUDE ("CUSTOM_8", "CUSTOM_7", "CUSTOM_6", "CUSTOM_5", "CUSTOM_4", "CUSTOM_3", "CUSTOM_2",
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_0.9.2_to_1.0.2_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_0.9.2_to_1.0.2_db2.sql
similarity index 83%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_0.9.2_to_1.0.2_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_0.9.2_to_1.0.2_db2.sql
index 8effecb08..b305da4b5 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_0.9.2_to_1.0.2_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_0.9.2_to_1.0.2_db2.sql
@@ -3,16 +3,16 @@
SET SCHEMA %schemaName%;
-DROP TABLE TASKANA_SCHEMA_VERSION;
+DROP TABLE KADAI_SCHEMA_VERSION;
-CREATE TABLE TASKANA_SCHEMA_VERSION(
+CREATE TABLE KADAI_SCHEMA_VERSION(
ID INT NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
VERSION VARCHAR(255) NOT NULL,
CREATED TIMESTAMP NOT NULL,
PRIMARY KEY (ID)
);
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('0.9.2', CURRENT_TIMESTAMP);
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.2', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('0.9.2', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.2', CURRENT_TIMESTAMP);
DROP TABLE JOB;
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_1.0.4_to_1.0.6_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_1.0.4_to_1.0.6_db2.sql
similarity index 65%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_1.0.4_to_1.0.6_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_1.0.4_to_1.0.6_db2.sql
index a35c0e5fc..ef3d41502 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_1.0.4_to_1.0.6_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_1.0.4_to_1.0.6_db2.sql
@@ -1,8 +1,8 @@
--- this script update the tables TASKANA_SCHEMA_VERSION and TASK.
+-- this script update the tables KADAI_SCHEMA_VERSION and TASK.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.6', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.6', CURRENT_TIMESTAMP);
ALTER TABLE TASK ADD COLUMN EXTERNAL_ID VARCHAR(64) NOT NULL DEFAULT '';
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_2.0.2_to_3.0.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_2.0.2_to_3.0.0_db2.sql
similarity index 94%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_2.0.2_to_3.0.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_2.0.2_to_3.0.0_db2.sql
index 857e63b30..2a434784c 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_2.0.2_to_3.0.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_2.0.2_to_3.0.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and HISTORY_EVENTS.
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('3.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('3.0.0', CURRENT_TIMESTAMP);
ALTER TABLE HISTORY_EVENTS DROP COLUMN COMMENT, DROP COLUMN OLD_DATA, DROP COLUMN NEW_DATA, ADD COLUMN DETAILS CLOB;
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_3.0.0_to_4.0.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_3.0.0_to_4.0.0_db2.sql
similarity index 94%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_3.0.0_to_4.0.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_3.0.0_to_4.0.0_db2.sql
index 2b15da5aa..f09e2a137 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_3.0.0_to_4.0.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_3.0.0_to_4.0.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and HISTORY_EVENTS.
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.0.0', CURRENT_TIMESTAMP);
ALTER TABLE HISTORY_EVENTS ALTER COLUMN ID DROP IDENTITY;
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.0.0_to_4.3.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.0.0_to_4.3.0_db2.sql
similarity index 52%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.0.0_to_4.3.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.0.0_to_4.3.0_db2.sql
index b4da19acb..b8ec679af 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.0.0_to_4.3.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.0.0_to_4.3.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and ATTACHMENT.
+-- this script updates the tables KADAI_SCHEMA_VERSION and ATTACHMENT.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.3.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.3.0', CURRENT_TIMESTAMP);
ALTER TABLE ATTACHMENT ALTER COLUMN REF_SYSTEM DROP NOT NULL ALTER COLUMN REF_INSTANCE DROP NOT NULL;
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.11.0_to_5.0.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.11.0_to_5.0.0_db2.sql
similarity index 96%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.11.0_to_5.0.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.11.0_to_5.0.0_db2.sql
index 7279a67fb..5d871edb7 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.11.0_to_5.0.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.11.0_to_5.0.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 4.11.0 to version 5.0.0.
+-- this script updates the KADAI database schema from version 4.11.0 to version 5.0.0.
-- REORGS are only necessary for _some_ altering operations. See https://www.ibm.com/docs/en/db2/11.1?topic=statements-alter-table
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.0.0', CURRENT_TIMESTAMP);
ALTER TABLE OBJECT_REFERENCE ADD COLUMN TASK_ID VARCHAR(40) NOT NULL DEFAULT 'EMPTY';
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.3.0_to_4.8.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.3.0_to_4.8.0_db2.sql
similarity index 92%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.3.0_to_4.8.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.3.0_to_4.8.0_db2.sql
index 90b383ae4..68b6a5275 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.3.0_to_4.8.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.3.0_to_4.8.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 4.3.0 to version 4.8.0.
+-- this script updates the KADAI database schema from version 4.3.0 to version 4.8.0.
-- REORGS are only necessary for _some_ altering operations. See https://www.ibm.com/docs/en/db2/11.1?topic=statements-alter-table
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.8.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.8.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK ADD COLUMN RECEIVED TIMESTAMP NULL;
ALTER TABLE TASK ADD COLUMN MANUAL_PRIORITY INT NULL;
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.8.0_to_4.11.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.8.0_to_4.11.0_db2.sql
similarity index 92%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.8.0_to_4.11.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.8.0_to_4.11.0_db2.sql
index cdb60ef4c..811b55ca5 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.8.0_to_4.11.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.8.0_to_4.11.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 4.8.0 to version 4.11.0.
+-- this script updates the KADAI database schema from version 4.8.0 to version 4.11.0.
-- REORGS are only necessary for _some_ altering operations. See https://www.ibm.com/docs/en/db2/11.1?topic=statements-alter-table
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.11.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.11.0', CURRENT_TIMESTAMP);
ALTER TABLE CONFIGURATION ADD COLUMN NAME VARCHAR(8) NOT NULL DEFAULT 'MASTER';
ALTER TABLE CONFIGURATION ALTER COLUMN ENFORCE_SECURITY DROP NOT NULL;
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.0.0_to_5.1.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.0.0_to_5.1.0_db2.sql
similarity index 74%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.0.0_to_5.1.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.0.0_to_5.1.0_db2.sql
index c33fb1bb7..d7fdb43f1 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.0.0_to_5.1.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.0.0_to_5.1.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 5.0.0 to version 5.1.0.
+-- this script updates the KADAI database schema from version 5.0.0 to version 5.1.0.
-- REORGS are only necessary for _some_ altering operations. See https://www.ibm.com/docs/en/db2/11.1?topic=statements-alter-table
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.1.0', CURRENT_TIMESTAMP);
DROP INDEX IDX_TASK_POR_VALUE;
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.1.0_to_5.2.0_h2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.1.0_to_5.2.0_db2.sql
similarity index 55%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.1.0_to_5.2.0_h2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.1.0_to_5.2.0_db2.sql
index 7636c27a1..faa42fdb4 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.1.0_to_5.2.0_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.1.0_to_5.2.0_db2.sql
@@ -1,6 +1,6 @@
--- this script updates the TASKANA database schema from version 5.1.0 to version 5.2.0.
+-- this script updates the KADAI database schema from version 5.1.0 to version 5.2.0.
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.2.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.2.0', CURRENT_TIMESTAMP);
CREATE TABLE GROUP_INFO
(
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.10.0_to_6.2.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.10.0_to_6.2.0_db2.sql
similarity index 69%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.10.0_to_6.2.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.10.0_to_6.2.0_db2.sql
index e767fab81..05d9385b1 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.10.0_to_6.2.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.10.0_to_6.2.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 5.10.0 to version 6.2.0.
+-- this script updates the KADAI database schema from version 5.10.0 to version 6.2.0.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '6.2.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '6.2.0', CURRENT_TIMESTAMP);
ALTER TABLE WORKBASKET_ACCESS_LIST
ADD COLUMN PERM_READTASKS SMALLINT NOT NULL DEFAULT 0;
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.2.0_to_5.10.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.2.0_to_5.10.0_db2.sql
similarity index 57%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.2.0_to_5.10.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.2.0_to_5.10.0_db2.sql
index f17581d92..a70e5cc2e 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.2.0_to_5.10.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.2.0_to_5.10.0_db2.sql
@@ -1,16 +1,16 @@
--- this script updates the TASKANA database schema from version 5.2.0 to version 5.10.0.
+-- this script updates the KADAI database schema from version 5.2.0 to version 5.10.0.
SET SCHEMA %schemaName%;
-ALTER TABLE TASKANA_SCHEMA_VERSION ALTER COLUMN ID DROP IDENTITY;
+ALTER TABLE KADAI_SCHEMA_VERSION ALTER COLUMN ID DROP IDENTITY;
-CREATE SEQUENCE TASKANA_SCHEMA_VERSION_ID_SEQ
+CREATE SEQUENCE KADAI_SCHEMA_VERSION_ID_SEQ
MINVALUE 1
START WITH 100
INCREMENT BY 1 CACHE 10;
--- The VERSION value must be equal or higher then the value of TaskanaEngineImpl.MINIMAL_TASKANA_SCHEMA_VERSION
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '5.10.0', CURRENT_TIMESTAMP);
+-- The VERSION value must be equal or higher then the value of KadaiEngineImpl.MINIMAL_KADAI_SCHEMA_VERSION
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '5.10.0', CURRENT_TIMESTAMP);
CREATE INDEX IDX_OBJECT_REFERE_PK_ID ON OBJECT_REFERENCE
(ID ASC) ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_6.2.0_to_7.0.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_6.2.0_to_7.0.0_db2.sql
similarity index 68%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_6.2.0_to_7.0.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_6.2.0_to_7.0.0_db2.sql
index 84c9b70db..18d47357a 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_6.2.0_to_7.0.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_6.2.0_to_7.0.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 6.2.0 to version 7.0.0.
+-- this script updates the KADAI database schema from version 6.2.0 to version 7.0.0.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.0.0', CURRENT_TIMESTAMP);
CREATE TABLE PERMISSION_INFO
(
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_7.0.0_to_7.1.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_7.0.0_to_7.1.0_db2.sql
similarity index 60%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_7.0.0_to_7.1.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_7.0.0_to_7.1.0_db2.sql
index 44e78bafd..b3e54dbcc 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_7.0.0_to_7.1.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_7.0.0_to_7.1.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 7.0.0. to version 7.1.0.
+-- this script updates the KADAI database schema from version 7.0.0. to version 7.1.0.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.1.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK
ADD COLUMN NUMBER_OF_COMMENTS INT DEFAULT 0;
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_8.1.0_to_8.2.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_8.1.0_to_8.2.0_db2.sql
similarity index 55%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_8.1.0_to_8.2.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_8.1.0_to_8.2.0_db2.sql
index 5ea520cbc..5234bc402 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_8.1.0_to_8.2.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_8.1.0_to_8.2.0_db2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 8.1.0. to version 8.2.0.
+-- this script updates the KADAI database schema from version 8.1.0. to version 8.2.0.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.1.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK
ADD COLUMN NUMBER_OF_COMMENTS INT DEFAULT 0;
diff --git a/common/kadai-common/src/main/resources/sql/db2/schema-detection-db2.sql b/common/kadai-common/src/main/resources/sql/db2/schema-detection-db2.sql
new file mode 100644
index 000000000..dd128e107
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/schema-detection-db2.sql
@@ -0,0 +1,3 @@
+SET SCHEMA %schemaName%;
+
+SELECT MAX(VERSION) FROM KADAI_SCHEMA_VERSION;
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai-schema-h2.sql
similarity index 96%
rename from common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai-schema-h2.sql
index 14bdf59d8..7c2d3c608 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai-schema-h2.sql
@@ -2,12 +2,12 @@ CREATE SCHEMA IF NOT EXISTS %schemaName%;
SET SCHEMA %schemaName%;
--- Moved to h2 jdbc connect string, because of taskana-spring-example project is using two schemas.
--- There the order of the schema setup's (dbcustom, taskana) should be switched then we can set collation
+-- Moved to h2 jdbc connect string, because of kadai-spring-example project is using two schemas.
+-- There the order of the schema setup's (dbcustom, kadai) should be switched then we can set collation
-- here in this file!
-- SET COLLATION DEFAULT_de_DE;
-CREATE TABLE TASKANA_SCHEMA_VERSION
+CREATE TABLE KADAI_SCHEMA_VERSION
(
ID INT NOT NULL,
VERSION VARCHAR(255) NOT NULL,
@@ -15,14 +15,14 @@ CREATE TABLE TASKANA_SCHEMA_VERSION
PRIMARY KEY (ID)
);
-CREATE SEQUENCE TASKANA_SCHEMA_VERSION_ID_SEQ
+CREATE SEQUENCE KADAI_SCHEMA_VERSION_ID_SEQ
MINVALUE 1
START WITH 100
INCREMENT BY 1 CACHE 10;
--- The VERSION value must be equal or higher then the value of TaskanaEngineImpl.MINIMAL_TASKANA_SCHEMA_VERSION
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
+-- The VERSION value must be equal or higher then the value of KadaiEngineImpl.MINIMAL_KADAI_SCHEMA_VERSION
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
CREATE TABLE CLASSIFICATION
(
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_0.9.2_to_1.0.2_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_0.9.2_to_1.0.2_h2.sql
similarity index 83%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_0.9.2_to_1.0.2_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_0.9.2_to_1.0.2_h2.sql
index 8effecb08..b305da4b5 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_0.9.2_to_1.0.2_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_0.9.2_to_1.0.2_h2.sql
@@ -3,16 +3,16 @@
SET SCHEMA %schemaName%;
-DROP TABLE TASKANA_SCHEMA_VERSION;
+DROP TABLE KADAI_SCHEMA_VERSION;
-CREATE TABLE TASKANA_SCHEMA_VERSION(
+CREATE TABLE KADAI_SCHEMA_VERSION(
ID INT NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
VERSION VARCHAR(255) NOT NULL,
CREATED TIMESTAMP NOT NULL,
PRIMARY KEY (ID)
);
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('0.9.2', CURRENT_TIMESTAMP);
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.2', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('0.9.2', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.2', CURRENT_TIMESTAMP);
DROP TABLE JOB;
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.2_to_1.0.4_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.2_to_1.0.4_h2.sql
new file mode 100644
index 000000000..e78eb622f
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.2_to_1.0.4_h2.sql
@@ -0,0 +1,7 @@
+-- this script update the tables KADAI_SCHEMA_VERSION and WORKBASKET.
+
+SET SCHEMA %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.4', CURRENT_TIMESTAMP);
+
+ALTER TABLE WORKBASKET ADD COLUMN MARKED_FOR_DELETION SMALLINT NOT NULL DEFAULT false;
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.0.4_to_1.0.6_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.4_to_1.0.6_h2.sql
similarity index 65%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.0.4_to_1.0.6_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.4_to_1.0.6_h2.sql
index 298646267..ac16333d9 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.0.4_to_1.0.6_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.4_to_1.0.6_h2.sql
@@ -1,8 +1,8 @@
--- this script update the tables TASKANA_SCHEMA_VERSION and TASK.
+-- this script update the tables KADAI_SCHEMA_VERSION and TASK.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.6', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.6', CURRENT_TIMESTAMP);
ALTER TABLE TASK ADD COLUMN EXTERNAL_ID VARCHAR(64) NOT NULL DEFAULT '';
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.6_to_1.1.5_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.6_to_1.1.5_h2.sql
new file mode 100644
index 000000000..444862cbb
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.6_to_1.1.5_h2.sql
@@ -0,0 +1,9 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and TASK.
+
+SET SCHEMA %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.1.5', CURRENT_TIMESTAMP);
+
+ALTER TABLE TASK ADD COLUMN CALLBACK_STATE VARCHAR(30) NULL DEFAULT 'NONE';
+UPDATE TASK T SET CALLBACK_STATE = 'NONE';
+
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.1.5_to_1.2.1_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.1.5_to_1.2.1_h2.sql
similarity index 85%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.1.5_to_1.2.1_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.1.5_to_1.2.1_h2.sql
index 825aa6787..61d4364b8 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.1.5_to_1.2.1_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.1.5_to_1.2.1_h2.sql
@@ -4,7 +4,7 @@
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.2.1', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.2.1', CURRENT_TIMESTAMP);
-- If the database contains records that violate this constraint, the following statement will fail.
-- In this case it is required to remove the conflicting records before the constraint can be added
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.2.1_to_2.0.2_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.2.1_to_2.0.2_h2.sql
similarity index 65%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.2.1_to_2.0.2_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.2.1_to_2.0.2_h2.sql
index 9a350a428..3f8906230 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.2.1_to_2.0.2_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.2.1_to_2.0.2_h2.sql
@@ -1,8 +1,8 @@
--- this script adds a TASK_COMMENT table and updates the table TASKANA_SCHEMA_VERSION.
+-- this script adds a TASK_COMMENT table and updates the table KADAI_SCHEMA_VERSION.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('2.0.2', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('2.0.2', CURRENT_TIMESTAMP);
CREATE TABLE TASK_COMMENT(
ID CHAR(40) NOT NULL,
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_2.0.2_to_3.0.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_2.0.2_to_3.0.0_h2.sql
similarity index 89%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_2.0.2_to_3.0.0_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_2.0.2_to_3.0.0_h2.sql
index fb2c94866..c492083df 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_2.0.2_to_3.0.0_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_2.0.2_to_3.0.0_h2.sql
@@ -1,8 +1,8 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and HISTORY_EVENTS.
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('3.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('3.0.0', CURRENT_TIMESTAMP);
ALTER TABLE HISTORY_EVENTS DROP COLUMN COMMENT, DROP COLUMN OLD_DATA, DROP COLUMN NEW_DATA, ADD COLUMN DETAILS CLOB;
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_3.0.0_to_4.0.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_3.0.0_to_4.0.0_h2.sql
similarity index 93%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_3.0.0_to_4.0.0_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_3.0.0_to_4.0.0_h2.sql
index 61551c0df..1cf9da182 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_3.0.0_to_4.0.0_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_3.0.0_to_4.0.0_h2.sql
@@ -1,8 +1,8 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and HISTORY_EVENTS.
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.0.0', CURRENT_TIMESTAMP);
ALTER TABLE HISTORY_EVENTS ALTER COLUMN ID VARCHAR(40);
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.0.0_to_4.3.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.0.0_to_4.3.0_h2.sql
new file mode 100644
index 000000000..f331327cb
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.0.0_to_4.3.0_h2.sql
@@ -0,0 +1,6 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and ATTACHMENT.
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.3.0', CURRENT_TIMESTAMP);
+
+ALTER TABLE ATTACHMENT ALTER COLUMN REF_SYSTEM DROP NOT NULL;
+
+ALTER TABLE ATTACHMENT ALTER COLUMN REF_INSTANCE DROP NOT NULL;
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.11.0_to_5.0.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.11.0_to_5.0.0_h2.sql
new file mode 100644
index 000000000..d17468107
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.11.0_to_5.0.0_h2.sql
@@ -0,0 +1,5 @@
+-- this script updates the KADAI database schema from version 4.11.0 to version 5.0.0.
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.0.0', CURRENT_TIMESTAMP);
+
+ALTER TABLE OBJECT_REFERENCE ADD COLUMN TASK_ID VARCHAR(40) NOT NULL DEFAULT 'EMPTY';
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.3.0_to_4.8.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.3.0_to_4.8.0_h2.sql
similarity index 91%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.3.0_to_4.8.0_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.3.0_to_4.8.0_h2.sql
index 4d15bad01..6fe063e7b 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.3.0_to_4.8.0_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.3.0_to_4.8.0_h2.sql
@@ -1,6 +1,6 @@
--- this script updates the TASKANA database schema from version 4.3.0 to version 4.8.0.
+-- this script updates the KADAI database schema from version 4.3.0 to version 4.8.0.
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.8.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.8.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK ADD COLUMN RECEIVED TIMESTAMP NULL;
ALTER TABLE TASK ADD COLUMN MANUAL_PRIORITY INT NULL;
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.8.0_to_4.11.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.8.0_to_4.11.0_h2.sql
similarity index 91%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.8.0_to_4.11.0_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.8.0_to_4.11.0_h2.sql
index 5092d65d5..a18d4d9bb 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.8.0_to_4.11.0_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.8.0_to_4.11.0_h2.sql
@@ -1,6 +1,6 @@
--- this script updates the TASKANA database schema from version 4.8.0 to version 4.11.0.
+-- this script updates the KADAI database schema from version 4.8.0 to version 4.11.0.
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.11.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.11.0', CURRENT_TIMESTAMP);
ALTER TABLE CONFIGURATION ADD COLUMN NAME VARCHAR(8) NOT NULL DEFAULT 'MASTER';
ALTER TABLE CONFIGURATION ALTER COLUMN ENFORCE_SECURITY DROP NOT NULL;
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.0.0_to_5.1.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.0.0_to_5.1.0_h2.sql
new file mode 100644
index 000000000..16a4b4853
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.0.0_to_5.1.0_h2.sql
@@ -0,0 +1,3 @@
+-- this script updates the KADAI database schema from version 5.0.0 to version 5.1.0.
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.1.0', CURRENT_TIMESTAMP);
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.1.0_to_5.2.0_db2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.1.0_to_5.2.0_h2.sql
similarity index 55%
rename from common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.1.0_to_5.2.0_db2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.1.0_to_5.2.0_h2.sql
index 7636c27a1..faa42fdb4 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_5.1.0_to_5.2.0_db2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.1.0_to_5.2.0_h2.sql
@@ -1,6 +1,6 @@
--- this script updates the TASKANA database schema from version 5.1.0 to version 5.2.0.
+-- this script updates the KADAI database schema from version 5.1.0 to version 5.2.0.
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.2.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.2.0', CURRENT_TIMESTAMP);
CREATE TABLE GROUP_INFO
(
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.10.0_to_6.2.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.10.0_to_6.2.0_h2.sql
similarity index 68%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.10.0_to_6.2.0_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.10.0_to_6.2.0_h2.sql
index eeb153e0b..be7fca524 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.10.0_to_6.2.0_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.10.0_to_6.2.0_h2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 5.10.0 to version 6.2.0.
+-- this script updates the KADAI database schema from version 5.10.0 to version 6.2.0.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '6.2.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '6.2.0', CURRENT_TIMESTAMP);
ALTER TABLE WORKBASKET_ACCESS_LIST
ADD COLUMN PERM_READTASKS SMALLINT NOT NULL DEFAULT 0;
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.2.0_to_5.10.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.2.0_to_5.10.0_h2.sql
new file mode 100644
index 000000000..43a7b64ba
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.2.0_to_5.10.0_h2.sql
@@ -0,0 +1,24 @@
+-- this script updates the KADAI database schema from version 5.2.0 to version 5.10.0.
+
+SET SCHEMA %schemaName%;
+
+ALTER TABLE KADAI_SCHEMA_VERSION ALTER COLUMN ID DROP IDENTITY;
+
+CREATE SEQUENCE KADAI_SCHEMA_VERSION_ID_SEQ
+ MINVALUE 1
+ START WITH 100
+ INCREMENT BY 1 CACHE 10;
+
+-- The VERSION value must be equal or higher then the value of KadaiEngineImpl.MINIMAL_KADAI_SCHEMA_VERSION
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '5.10.0', CURRENT_TIMESTAMP);
+
+CREATE INDEX IDX_OBJECT_REFERE_PK_ID ON OBJECT_REFERENCE
+ (ID ASC);
+COMMIT WORK ;
+CREATE INDEX IDX_OBJECT_REFERE_FK_TASK_ID ON OBJECT_REFERENCE
+ (TASK_ID ASC);
+COMMIT WORK ;
+CREATE INDEX IDX_OBJECT_REFERE_ACCESS_LIST ON OBJECT_REFERENCE
+ (VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC, ID ASC);
+COMMIT WORK ;
\ No newline at end of file
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_6.2.0_to_7.0.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_6.2.0_to_7.0.0_h2.sql
similarity index 60%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_6.2.0_to_7.0.0_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_6.2.0_to_7.0.0_h2.sql
index 271e7ebcc..7032b965d 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_6.2.0_to_7.0.0_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_6.2.0_to_7.0.0_h2.sql
@@ -1,7 +1,7 @@
--- this script updates the TASKANA database schema from version 6.2.0 to version 7.0.0.
+-- this script updates the KADAI database schema from version 6.2.0 to version 7.0.0.
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.0.0', CURRENT_TIMESTAMP);
CREATE TABLE PERMISSION_INFO
(
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_7.0.0_to_7.1.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_7.0.0_to_7.1.0_h2.sql
similarity index 55%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_7.0.0_to_7.1.0_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_7.0.0_to_7.1.0_h2.sql
index 027b4275b..e0068dd91 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_7.0.0_to_7.1.0_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_7.0.0_to_7.1.0_h2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 7.0.0 to version 7.1.0.
+-- this script updates the KADAI database schema from version 7.0.0 to version 7.1.0.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK
ADD COLUMN NUMBER_OF_COMMENTS INT DEFAULT 0;
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_8.1.0_to_8.2.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_8.1.0_to_8.2.0_h2.sql
similarity index 54%
rename from common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_8.1.0_to_8.2.0_h2.sql
rename to common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_8.1.0_to_8.2.0_h2.sql
index e7ccef118..c72edb38f 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_8.1.0_to_8.2.0_h2.sql
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_8.1.0_to_8.2.0_h2.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 8.1.0 to version 8.2.0.
+-- this script updates the KADAI database schema from version 8.1.0 to version 8.2.0.
SET SCHEMA %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK
ADD COLUMN NUMBER_OF_COMMENTS INT DEFAULT 0;
diff --git a/common/kadai-common/src/main/resources/sql/h2/schema-detection-h2.sql b/common/kadai-common/src/main/resources/sql/h2/schema-detection-h2.sql
new file mode 100644
index 000000000..dd128e107
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/schema-detection-h2.sql
@@ -0,0 +1,3 @@
+SET SCHEMA %schemaName%;
+
+SELECT MAX(VERSION) FROM KADAI_SCHEMA_VERSION;
diff --git a/common/taskana-common/src/main/resources/sql/oracle/taskana-schema-oracle.sql b/common/kadai-common/src/main/resources/sql/oracle/kadai-schema-oracle.sql
similarity index 97%
rename from common/taskana-common/src/main/resources/sql/oracle/taskana-schema-oracle.sql
rename to common/kadai-common/src/main/resources/sql/oracle/kadai-schema-oracle.sql
index e09b5cfec..ccf663b22 100644
--- a/common/taskana-common/src/main/resources/sql/oracle/taskana-schema-oracle.sql
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai-schema-oracle.sql
@@ -1,20 +1,20 @@
ALTER SESSION SET CURRENT_SCHEMA = %schemaName%;
-CREATE TABLE TASKANA_SCHEMA_VERSION (
+CREATE TABLE KADAI_SCHEMA_VERSION (
ID NUMBER(10) NOT NULL,
VERSION VARCHAR2(255) NOT NULL,
CREATED TIMESTAMP NOT NULL,
- CONSTRAINT TASKANA_SCHEMA_VERSION_PKEY PRIMARY KEY (ID)
+ CONSTRAINT KADAI_SCHEMA_VERSION_PKEY PRIMARY KEY (ID)
);
-CREATE SEQUENCE TASKANA_SCHEMA_VERSION_ID_SEQ
+CREATE SEQUENCE KADAI_SCHEMA_VERSION_ID_SEQ
START WITH 100
INCREMENT BY 1
CACHE 10;
--- The VERSION value must be equal or higher then the value of TaskanaEngineImpl.MINIMAL_TASKANA_SCHEMA_VERSION
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.1.0', CURRENT_TIMESTAMP);
+-- The VERSION value must be equal or higher then the value of KadaiEngineImpl.MINIMAL_KADAI_SCHEMA_VERSION
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.1.0', CURRENT_TIMESTAMP);
CREATE TABLE CLASSIFICATION
(
@@ -375,7 +375,7 @@ CREATE SEQUENCE SCHEDULED_JOB_SEQ
-- LIST OF RECOMMENDED INDEXES
-- This list is provided on a as-is basis. It is used for tuning of the internal performance tests.
--- The script needs to be reviewed and adapted for each indiviual TASKANA setup.
+-- The script needs to be reviewed and adapted for each indiviual KADAI setup.
-- ===========================
CREATE UNIQUE INDEX IDX_CLASSIFICATION_ID ON CLASSIFICATION
(ID ASC, CUSTOM_8, CUSTOM_7, CUSTOM_6, CUSTOM_5, CUSTOM_4,
diff --git a/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_5.10.0_to_6.2.0_oracle.sql b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_5.10.0_to_6.2.0_oracle.sql
similarity index 71%
rename from common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_5.10.0_to_6.2.0_oracle.sql
rename to common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_5.10.0_to_6.2.0_oracle.sql
index 55aedcd99..4b9777150 100644
--- a/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_5.10.0_to_6.2.0_oracle.sql
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_5.10.0_to_6.2.0_oracle.sql
@@ -1,9 +1,9 @@
--- this script updates the TASKANA database schema from version 5.10.0 to version 6.2.0.
+-- this script updates the KADAI database schema from version 5.10.0 to version 6.2.0.
ALTER
SESSION SET CURRENT_SCHEMA = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '6.2.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '6.2.0', CURRENT_TIMESTAMP);
ALTER TABLE WORKBASKET_ACCESS_LIST
ADD PERM_READTASKS NUMBER(1) DEFAULT 0 NOT NULL CHECK (PERM_READTASKS IN (0,1));
diff --git a/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_6.2.0_to_7.0.0_oracle.sql b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_6.2.0_to_7.0.0_oracle.sql
similarity index 66%
rename from common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_6.2.0_to_7.0.0_oracle.sql
rename to common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_6.2.0_to_7.0.0_oracle.sql
index 1d21a5b3a..bbda31e5f 100644
--- a/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_6.2.0_to_7.0.0_oracle.sql
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_6.2.0_to_7.0.0_oracle.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 6.2.0 to version 7.0.0.
+-- this script updates the KADAI database schema from version 6.2.0 to version 7.0.0.
ALTER SESSION SET CURRENT_SCHEMA = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.0.0', CURRENT_TIMESTAMP);
CREATE TABLE PERMISSION_INFO
(
diff --git a/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_7.0.0_to_7.1.0_oracle.sql b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_7.0.0_to_7.1.0_oracle.sql
similarity index 61%
rename from common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_7.0.0_to_7.1.0_oracle.sql
rename to common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_7.0.0_to_7.1.0_oracle.sql
index f715cf4da..4db7ecaf6 100644
--- a/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_7.0.0_to_7.1.0_oracle.sql
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_7.0.0_to_7.1.0_oracle.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 7.0.0 to version 7.1.0.
+-- this script updates the KADAI database schema from version 7.0.0 to version 7.1.0.
ALTER SESSION SET CURRENT_SCHEMA = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK
ADD COLUMN NUMBER_OF_COMMENTS INT DEFAULT 0;
diff --git a/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_8.1.0_to_8.2.0_oracle.sql b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_8.1.0_to_8.2.0_oracle.sql
similarity index 57%
rename from common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_8.1.0_to_8.2.0_oracle.sql
rename to common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_8.1.0_to_8.2.0_oracle.sql
index 0f80e67ed..25075f10d 100644
--- a/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_8.1.0_to_8.2.0_oracle.sql
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_8.1.0_to_8.2.0_oracle.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 8.1.0 to version 8.2.0.
+-- this script updates the KADAI database schema from version 8.1.0 to version 8.2.0.
ALTER SESSION SET CURRENT_SCHEMA = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK
ADD COLUMN NUMBER_OF_COMMENTS INT DEFAULT 0;
diff --git a/common/taskana-common/src/main/resources/sql/oracle/schema-detection-oracle.sql b/common/kadai-common/src/main/resources/sql/oracle/schema-detection-oracle.sql
similarity index 51%
rename from common/taskana-common/src/main/resources/sql/oracle/schema-detection-oracle.sql
rename to common/kadai-common/src/main/resources/sql/oracle/schema-detection-oracle.sql
index 925b02b39..91753c0de 100644
--- a/common/taskana-common/src/main/resources/sql/oracle/schema-detection-oracle.sql
+++ b/common/kadai-common/src/main/resources/sql/oracle/schema-detection-oracle.sql
@@ -1,3 +1,3 @@
ALTER SESSION SET CURRENT_SCHEMA = %schemaName%;
-SELECT MAX(VERSION) FROM TASKANA_SCHEMA_VERSION;
\ No newline at end of file
+SELECT MAX(VERSION) FROM KADAI_SCHEMA_VERSION;
\ No newline at end of file
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai-schema-postgres.sql
similarity index 98%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai-schema-postgres.sql
index 76151f0e4..fc97c88b1 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai-schema-postgres.sql
@@ -3,7 +3,7 @@ CREATE SCHEMA IF NOT EXISTS %schemaName%;
SET
search_path TO %schemaName%;
-CREATE TABLE TASKANA_SCHEMA_VERSION
+CREATE TABLE KADAI_SCHEMA_VERSION
(
ID INT NOT NULL,
VERSION VARCHAR(255) NOT NULL,
@@ -11,14 +11,14 @@ CREATE TABLE TASKANA_SCHEMA_VERSION
PRIMARY KEY (ID)
);
-CREATE SEQUENCE TASKANA_SCHEMA_VERSION_ID_SEQ
+CREATE SEQUENCE KADAI_SCHEMA_VERSION_ID_SEQ
MINVALUE 1
START WITH 100
INCREMENT BY 1 CACHE 10;
--- The VERSION value must be equal or higher then the value of TaskanaEngineImpl.MINIMAL_TASKANA_SCHEMA_VERSION
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
+-- The VERSION value must be equal or higher then the value of KadaiEngineImpl.MINIMAL_KADAI_SCHEMA_VERSION
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
CREATE TABLE CLASSIFICATION
(
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_0.9.2_to_1.0.2_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_0.9.2_to_1.0.2_postgres.sql
similarity index 83%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_0.9.2_to_1.0.2_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_0.9.2_to_1.0.2_postgres.sql
index 96800ee66..5b136b05e 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_0.9.2_to_1.0.2_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_0.9.2_to_1.0.2_postgres.sql
@@ -3,16 +3,16 @@
SET SCHEMA %schemaName%;
-DROP TABLE TASKANA_SCHEMA_VERSION;
+DROP TABLE KADAI_SCHEMA_VERSION;
-CREATE TABLE TASKANA_SCHEMA_VERSION(
+CREATE TABLE KADAI_SCHEMA_VERSION(
ID INT NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
VERSION VARCHAR(255) NOT NULL,
CREATED TIMESTAMP NOT NULL,
PRIMARY KEY (ID)
);
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('0.9.2', CURRENT_TIMESTAMP);
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.2', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('0.9.2', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.2', CURRENT_TIMESTAMP);
DROP TABLE JOB;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.0.2_to_1.0.4_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.0.2_to_1.0.4_postgres.sql
new file mode 100644
index 000000000..9a951e106
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.0.2_to_1.0.4_postgres.sql
@@ -0,0 +1,7 @@
+-- this script update the tables KADAI_SCHEMA_VERSION and WORKBASKET in postgre database.
+
+SET SCHEMA %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.4', CURRENT_TIMESTAMP);
+
+ALTER TABLE WORKBASKET ADD COLUMN MARKED_FOR_DELETION BOOLEAN NOT NULL DEFAULT false;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.0.6_to_1.1.5._postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.0.6_to_1.1.5._postgres.sql
new file mode 100644
index 000000000..9d694a250
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.0.6_to_1.1.5._postgres.sql
@@ -0,0 +1,9 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and TASK.
+
+SET search_path = %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.1.5', CURRENT_TIMESTAMP);
+
+ALTER TABLE TASK ADD COLUMN CALLBACK_STATE VARCHAR(30) NULL DEFAULT 'NONE';
+UPDATE TASK T SET CALLBACK_STATE = 'NONE';
+
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.1.5_to_1.2.1_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.1.5_to_1.2.1_postgres.sql
similarity index 85%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.1.5_to_1.2.1_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.1.5_to_1.2.1_postgres.sql
index b453453a3..8969a50bc 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.1.5_to_1.2.1_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.1.5_to_1.2.1_postgres.sql
@@ -4,7 +4,7 @@
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.2.1', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.2.1', CURRENT_TIMESTAMP);
-- If the database contains records that violate this constraint, the following statement will fail.
-- In this case it is required to remove the conflicting records before the constraint can be added
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.2.1_to_2.0.2_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.2.1_to_2.0.2_postgres.sql
similarity index 65%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.2.1_to_2.0.2_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.2.1_to_2.0.2_postgres.sql
index 6bedda5fe..342acc56b 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.2.1_to_2.0.2_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.2.1_to_2.0.2_postgres.sql
@@ -1,8 +1,8 @@
--- this script adds a TASK_COMMENT table and updates the table TASKANA_SCHEMA_VERSION.
+-- this script adds a TASK_COMMENT table and updates the table KADAI_SCHEMA_VERSION.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('2.0.2', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('2.0.2', CURRENT_TIMESTAMP);
CREATE TABLE TASK_COMMENT(
ID CHAR(40) NOT NULL,
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_2.0.2_to_3.0.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_2.0.2_to_3.0.0_postgres.sql
similarity index 90%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_2.0.2_to_3.0.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_2.0.2_to_3.0.0_postgres.sql
index f90118a2c..8d8c74472 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_2.0.2_to_3.0.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_2.0.2_to_3.0.0_postgres.sql
@@ -1,8 +1,8 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and HISTORY_EVENTS.
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('3.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('3.0.0', CURRENT_TIMESTAMP);
ALTER TABLE HISTORY_EVENTS DROP COLUMN COMMENT, DROP COLUMN OLD_DATA, DROP COLUMN NEW_DATA, ADD COLUMN DETAILS TEXT;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_3.0.0_to_4.0.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_3.0.0_to_4.0.0_postgres.sql
similarity index 94%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_3.0.0_to_4.0.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_3.0.0_to_4.0.0_postgres.sql
index e7de33379..043afa95b 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_3.0.0_to_4.0.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_3.0.0_to_4.0.0_postgres.sql
@@ -1,8 +1,8 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and HISTORY_EVENTS.
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.0.0', CURRENT_TIMESTAMP);
ALTER TABLE HISTORY_EVENTS ALTER COLUMN ID DROP IDENTITY;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.0.0_to_4.3.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.0.0_to_4.3.0_postgres.sql
new file mode 100644
index 000000000..642168a93
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.0.0_to_4.3.0_postgres.sql
@@ -0,0 +1,7 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and ATTACHMENT.
+
+SET search_path = %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.3.0', CURRENT_TIMESTAMP);
+
+ALTER TABLE ATTACHMENT ALTER COLUMN REF_SYSTEM DROP NOT NULL, ALTER COLUMN REF_INSTANCE DROP NOT NULL;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.11.0_to_5.0.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.11.0_to_5.0.0_postgres.sql
similarity index 94%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.11.0_to_5.0.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.11.0_to_5.0.0_postgres.sql
index 5a0a7d842..d488cd2f6 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.11.0_to_5.0.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.11.0_to_5.0.0_postgres.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 4.11.0 to version 5.0.0.
+-- this script updates the KADAI database schema from version 4.11.0 to version 5.0.0.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.0.0', CURRENT_TIMESTAMP);
ALTER TABLE OBJECT_REFERENCE ADD COLUMN TASK_ID VARCHAR(40) NOT NULL DEFAULT 'EMPTY';
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.3.0_to_4.8.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.3.0_to_4.8.0_postgres.sql
similarity index 91%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.3.0_to_4.8.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.3.0_to_4.8.0_postgres.sql
index eb4c9130a..29c2d7ea8 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.3.0_to_4.8.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.3.0_to_4.8.0_postgres.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 4.3.0 to version 4.8.0.
+-- this script updates the KADAI database schema from version 4.3.0 to version 4.8.0.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.8.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.8.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK ADD COLUMN RECEIVED TIMESTAMP NULL;
ALTER TABLE TASK ADD COLUMN MANUAL_PRIORITY INT NULL;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.8.0_to_4.11.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.8.0_to_4.11.0_postgres.sql
similarity index 91%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.8.0_to_4.11.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.8.0_to_4.11.0_postgres.sql
index ddd3353f3..dfcc6931a 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.8.0_to_4.11.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.8.0_to_4.11.0_postgres.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 4.8.0 to version 4.11.0.
+-- this script updates the KADAI database schema from version 4.8.0 to version 4.11.0.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.11.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.11.0', CURRENT_TIMESTAMP);
ALTER TABLE CONFIGURATION ADD COLUMN NAME VARCHAR(8) NOT NULL DEFAULT 'MASTER';
ALTER TABLE CONFIGURATION ALTER COLUMN ENFORCE_SECURITY DROP NOT NULL;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.0.0_to_5.1.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.0.0_to_5.1.0_postgres.sql
similarity index 57%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.0.0_to_5.1.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.0.0_to_5.1.0_postgres.sql
index 98291a2ed..dc50f4379 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.0.0_to_5.1.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.0.0_to_5.1.0_postgres.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 5.0.0 to version 5.1.0.
+-- this script updates the KADAI database schema from version 5.0.0 to version 5.1.0.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.1.0', CURRENT_TIMESTAMP);
DROP INDEX IF EXISTS IDX_TASK_POR_VALUE;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.1.0_to_5.2.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.1.0_to_5.2.0_postgres.sql
similarity index 58%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.1.0_to_5.2.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.1.0_to_5.2.0_postgres.sql
index e5b241573..63c9805ad 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.1.0_to_5.2.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.1.0_to_5.2.0_postgres.sql
@@ -1,8 +1,8 @@
--- this script updates the TASKANA database schema from version 5.1.0 to version 5.2.0.
+-- this script updates the KADAI database schema from version 5.1.0 to version 5.2.0.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.2.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.2.0', CURRENT_TIMESTAMP);
CREATE TABLE GROUP_INFO
(
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.10.0_to_6.2.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.10.0_to_6.2.0_postgres.sql
similarity index 69%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.10.0_to_6.2.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.10.0_to_6.2.0_postgres.sql
index 9f15fd9d4..ea3718236 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.10.0_to_6.2.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.10.0_to_6.2.0_postgres.sql
@@ -1,9 +1,9 @@
--- this script updates the TASKANA database schema from version 5.10.0 to version 6.2.0.
+-- this script updates the KADAI database schema from version 5.10.0 to version 6.2.0.
SET
search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '6.2.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '6.2.0', CURRENT_TIMESTAMP);
ALTER TABLE WORKBASKET_ACCESS_LIST
ADD COLUMN PERM_READTASKS BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.2.0_to_5.10.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.2.0_to_5.10.0_postgres.sql
new file mode 100644
index 000000000..230ab1aa1
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.2.0_to_5.10.0_postgres.sql
@@ -0,0 +1,25 @@
+-- this script updates the KADAI database schema from version 5.2.0 to version 5.10.0.
+SET SCHEMA %schemaName%;
+
+SET search_path = %schemaName%;
+
+ALTER TABLE KADAI_SCHEMA_VERSION ALTER COLUMN ID DROP IDENTITY;
+
+CREATE SEQUENCE KADAI_SCHEMA_VERSION_ID_SEQ
+ MINVALUE 1
+ START WITH 100
+ INCREMENT BY 1 CACHE 10;
+
+-- The VERSION value must be equal or higher then the value of KadaiEngineImpl.MINIMAL_KADAI_SCHEMA_VERSION
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '5.10.0', CURRENT_TIMESTAMP);
+
+CREATE INDEX IDX_OBJECT_REFERE_PK_ID ON OBJECT_REFERENCE
+ (ID ASC);
+COMMIT WORK ;
+CREATE INDEX IDX_OBJECT_REFERE_FK_TASK_ID ON OBJECT_REFERENCE
+ (TASK_ID ASC);
+COMMIT WORK ;
+CREATE INDEX IDX_OBJECT_REFERE_ACCESS_LIST ON OBJECT_REFERENCE
+ (VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC, ID ASC);
+COMMIT WORK ;
\ No newline at end of file
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_6.2.0_to_7.0.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_6.2.0_to_7.0.0_postgres.sql
similarity index 68%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_6.2.0_to_7.0.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_6.2.0_to_7.0.0_postgres.sql
index e499e4a39..7195f2845 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_6.2.0_to_7.0.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_6.2.0_to_7.0.0_postgres.sql
@@ -1,9 +1,9 @@
--- this script updates the TASKANA database schema from version 6.2.0 to version 7.0.0.
+-- this script updates the KADAI database schema from version 6.2.0 to version 7.0.0.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.0.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.0.0', CURRENT_TIMESTAMP);
CREATE TABLE PERMISSION_INFO
(
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_7.0.0_to_7.1.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_7.0.0_to_7.1.0_postgres.sql
similarity index 60%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_7.0.0_to_7.1.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_7.0.0_to_7.1.0_postgres.sql
index 78b0e5dfd..96016b68e 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_7.0.0_to_7.1.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_7.0.0_to_7.1.0_postgres.sql
@@ -1,9 +1,9 @@
--- this script updates the TASKANA database schema from version 7.0.0 to version 7.1.0.
+-- this script updates the KADAI database schema from version 7.0.0 to version 7.1.0.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK
ADD COLUMN NUMBER_OF_COMMENTS INT DEFAULT 0;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_8.1.0_to_8.2.0_postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_8.1.0_to_8.2.0_postgres.sql
similarity index 55%
rename from common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_8.1.0_to_8.2.0_postgres.sql
rename to common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_8.1.0_to_8.2.0_postgres.sql
index bfdb6eb9b..e6ca95cfc 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_8.1.0_to_8.2.0_postgres.sql
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_8.1.0_to_8.2.0_postgres.sql
@@ -1,9 +1,9 @@
--- this script updates the TASKANA database schema from version 8.1.0 to version 8.2.0.
+-- this script updates the KADAI database schema from version 8.1.0 to version 8.2.0.
SET search_path = %schemaName%;
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.1.0', CURRENT_TIMESTAMP);
ALTER TABLE TASK
ADD COLUMN NUMBER_OF_COMMENTS INT DEFAULT 0;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/schema-detection-postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/schema-detection-postgres.sql
new file mode 100644
index 000000000..6ebccb252
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/schema-detection-postgres.sql
@@ -0,0 +1,3 @@
+SET search_path TO %schemaName%;
+
+SELECT MAX(VERSION) FROM KADAI_SCHEMA_VERSION;
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/api/IntIntervalTest.java b/common/kadai-common/src/test/java/io/kadai/common/api/IntIntervalTest.java
similarity index 98%
rename from common/taskana-common/src/test/java/pro/taskana/common/api/IntIntervalTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/api/IntIntervalTest.java
index ea86390f6..b7194c14c 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/api/IntIntervalTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/api/IntIntervalTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/api/LocalTimeIntervalTest.java b/common/kadai-common/src/test/java/io/kadai/common/api/LocalTimeIntervalTest.java
similarity index 93%
rename from common/taskana-common/src/test/java/pro/taskana/common/api/LocalTimeIntervalTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/api/LocalTimeIntervalTest.java
index 8d503985d..ab90d5b45 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/api/LocalTimeIntervalTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/api/LocalTimeIntervalTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/api/TimeIntervalTest.java b/common/kadai-common/src/test/java/io/kadai/common/api/TimeIntervalTest.java
similarity index 98%
rename from common/taskana-common/src/test/java/pro/taskana/common/api/TimeIntervalTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/api/TimeIntervalTest.java
index 715884f50..f736cb8c8 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/api/TimeIntervalTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/api/TimeIntervalTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.api;
+package io.kadai.common.api;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/CollectionUtilTest.java b/common/kadai-common/src/test/java/io/kadai/common/internal/util/CollectionUtilTest.java
similarity index 93%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/util/CollectionUtilTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/util/CollectionUtilTest.java
index 585230a4e..2e3326e99 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/CollectionUtilTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/util/CollectionUtilTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/FileLoaderUtilTest.java b/common/kadai-common/src/test/java/io/kadai/common/internal/util/FileLoaderUtilTest.java
similarity index 96%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/util/FileLoaderUtilTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/util/FileLoaderUtilTest.java
index e56d6ded7..09f8c36ac 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/FileLoaderUtilTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/util/FileLoaderUtilTest.java
@@ -1,8 +1,9 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import io.kadai.common.api.exceptions.SystemException;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -15,7 +16,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import org.junit.jupiter.api.io.TempDir;
-import pro.taskana.common.api.exceptions.SystemException;
@DisabledOnOs(
value = OS.WINDOWS,
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/LogSanitizerTest.java b/common/kadai-common/src/test/java/io/kadai/common/internal/util/LogSanitizerTest.java
similarity index 98%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/util/LogSanitizerTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/util/LogSanitizerTest.java
index cace7ddec..fa2e0e252 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/LogSanitizerTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/util/LogSanitizerTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/ReflectionUtilTest.java b/common/kadai-common/src/test/java/io/kadai/common/internal/util/ReflectionUtilTest.java
similarity index 92%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/util/ReflectionUtilTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/util/ReflectionUtilTest.java
index 9c13c8abf..4076d4825 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/ReflectionUtilTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/util/ReflectionUtilTest.java
@@ -1,12 +1,12 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.common.internal.util.TopLevelTestClass.FirstNestedClass;
+import io.kadai.common.internal.util.TopLevelTestClass.FirstNestedClass.SecondNestedClass;
import java.lang.reflect.Field;
import java.util.List;
import org.junit.jupiter.api.Test;
-import pro.taskana.common.internal.util.TopLevelTestClass.FirstNestedClass;
-import pro.taskana.common.internal.util.TopLevelTestClass.FirstNestedClass.SecondNestedClass;
class ReflectionUtilTest {
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/ResourceUtilTest.java b/common/kadai-common/src/test/java/io/kadai/common/internal/util/ResourceUtilTest.java
similarity index 93%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/util/ResourceUtilTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/util/ResourceUtilTest.java
index 9f0599ebb..e775a5ce3 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/ResourceUtilTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/util/ResourceUtilTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/SpiLoaderTest.java b/common/kadai-common/src/test/java/io/kadai/common/internal/util/SpiLoaderTest.java
similarity index 80%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/util/SpiLoaderTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/util/SpiLoaderTest.java
index 8b081b105..4706fd160 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/SpiLoaderTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/util/SpiLoaderTest.java
@@ -1,10 +1,10 @@
-package pro.taskana.common.internal.util;
+package io.kadai.common.internal.util;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.common.internal.util.spi.ServiceProviderInterface;
import java.util.List;
import org.junit.jupiter.api.Test;
-import pro.taskana.common.internal.util.spi.ServiceProviderInterface;
class SpiLoaderTest {
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/spi/ServiceProviderInterface.java b/common/kadai-common/src/test/java/io/kadai/common/internal/util/spi/ServiceProviderInterface.java
similarity index 59%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/util/spi/ServiceProviderInterface.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/util/spi/ServiceProviderInterface.java
index 5c850b53b..ecd6855d6 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/spi/ServiceProviderInterface.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/util/spi/ServiceProviderInterface.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util.spi;
+package io.kadai.common.internal.util.spi;
public interface ServiceProviderInterface {
String doStuff();
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/spi/ServiceProviderInterfaceImpl.java b/common/kadai-common/src/test/java/io/kadai/common/internal/util/spi/ServiceProviderInterfaceImpl.java
similarity index 77%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/util/spi/ServiceProviderInterfaceImpl.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/util/spi/ServiceProviderInterfaceImpl.java
index 9e076e3f0..b9595b575 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/util/spi/ServiceProviderInterfaceImpl.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/util/spi/ServiceProviderInterfaceImpl.java
@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.util.spi;
+package io.kadai.common.internal.util.spi;
public class ServiceProviderInterfaceImpl implements ServiceProviderInterface {
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/workingtime/HolidayScheduleTest.java b/common/kadai-common/src/test/java/io/kadai/common/internal/workingtime/HolidayScheduleTest.java
similarity index 95%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/workingtime/HolidayScheduleTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/workingtime/HolidayScheduleTest.java
index 0b7f7fce8..034eb7271 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/workingtime/HolidayScheduleTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/workingtime/HolidayScheduleTest.java
@@ -1,7 +1,9 @@
-package pro.taskana.common.internal.workingtime;
+package io.kadai.common.internal.workingtime;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.common.api.CustomHoliday;
+import io.kadai.common.internal.workingtime.HolidaySchedule.EasterCalculator;
import java.time.LocalDate;
import java.util.List;
import java.util.stream.Stream;
@@ -9,8 +11,6 @@ import org.junit.jupiter.api.DynamicNode;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
-import pro.taskana.common.api.CustomHoliday;
-import pro.taskana.common.internal.workingtime.HolidaySchedule.EasterCalculator;
/** Test for the HolidaySchedule. */
class HolidayScheduleTest {
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/workingtime/WorkingTimeCalculatorImplTest.java b/common/kadai-common/src/test/java/io/kadai/common/internal/workingtime/WorkingTimeCalculatorImplTest.java
similarity index 98%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/workingtime/WorkingTimeCalculatorImplTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/workingtime/WorkingTimeCalculatorImplTest.java
index fee3f2639..2b5f22cea 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/workingtime/WorkingTimeCalculatorImplTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/workingtime/WorkingTimeCalculatorImplTest.java
@@ -1,8 +1,11 @@
-package pro.taskana.common.internal.workingtime;
+package io.kadai.common.internal.workingtime;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import io.kadai.common.api.LocalTimeInterval;
+import io.kadai.common.api.WorkingTimeCalculator;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
import java.time.DayOfWeek;
import java.time.Duration;
import java.time.Instant;
@@ -15,9 +18,6 @@ import java.util.Map;
import java.util.Set;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import pro.taskana.common.api.LocalTimeInterval;
-import pro.taskana.common.api.WorkingTimeCalculator;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
class WorkingTimeCalculatorImplTest {
diff --git a/common/taskana-common/src/test/java/pro/taskana/common/internal/workingtime/WorkingTimeScheduleTest.java b/common/kadai-common/src/test/java/io/kadai/common/internal/workingtime/WorkingTimeScheduleTest.java
similarity index 94%
rename from common/taskana-common/src/test/java/pro/taskana/common/internal/workingtime/WorkingTimeScheduleTest.java
rename to common/kadai-common/src/test/java/io/kadai/common/internal/workingtime/WorkingTimeScheduleTest.java
index 133e8c37f..ec1baf309 100644
--- a/common/taskana-common/src/test/java/pro/taskana/common/internal/workingtime/WorkingTimeScheduleTest.java
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/workingtime/WorkingTimeScheduleTest.java
@@ -1,13 +1,13 @@
-package pro.taskana.common.internal.workingtime;
+package io.kadai.common.internal.workingtime;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import io.kadai.common.api.LocalTimeInterval;
import java.time.DayOfWeek;
import java.time.LocalTime;
import java.util.Map;
import java.util.Set;
import org.junit.jupiter.api.Test;
-import pro.taskana.common.api.LocalTimeInterval;
class WorkingTimeScheduleTest {
diff --git a/common/kadai-common/src/test/resources/META-INF/services/io.kadai.common.internal.util.spi.ServiceProviderInterface b/common/kadai-common/src/test/resources/META-INF/services/io.kadai.common.internal.util.spi.ServiceProviderInterface
new file mode 100644
index 000000000..e8bb2472a
--- /dev/null
+++ b/common/kadai-common/src/test/resources/META-INF/services/io.kadai.common.internal.util.spi.ServiceProviderInterface
@@ -0,0 +1 @@
+io.kadai.common.internal.util.spi.ServiceProviderInterfaceImpl
diff --git a/common/taskana-common/src/test/resources/pro/taskana/common/internal/util/fileInClasspath.txt b/common/kadai-common/src/test/resources/io/kadai/common/internal/util/fileInClasspath.txt
similarity index 100%
rename from common/taskana-common/src/test/resources/pro/taskana/common/internal/util/fileInClasspath.txt
rename to common/kadai-common/src/test/resources/io/kadai/common/internal/util/fileInClasspath.txt
diff --git a/common/pom.xml b/common/pom.xml
index aa4320b97..78736027a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,26 +1,26 @@
- 4.0.0
- taskana-common-parent
- pom
+ 4.0.0
+ kadai-common-parent
+ pom
- ${project.groupId}:${project.artifactId}
- This pom is parent to all taskana common modules and serves the common build.
-
+ ${project.groupId}:${project.artifactId}
+ This pom is parent to all kadai common modules and serves the common build.
+
-
- pro.taskana
- taskana-parent
- 8.2.1-SNAPSHOT
- ../pom.xml
-
+
+ io.kadai
+ kadai-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
-
- taskana-common
- taskana-common-security
- taskana-common-data
- taskana-common-test
- taskana-common-logging
-
+
+ kadai-common
+ kadai-common-security
+ kadai-common-data
+ kadai-common-test
+ kadai-common-logging
+
diff --git a/common/taskana-common-data/pom.xml b/common/taskana-common-data/pom.xml
deleted file mode 100644
index f6f064df2..000000000
--- a/common/taskana-common-data/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
- 4.0.0
- taskana-common-data
-
- ${project.groupId}:${project.artifactId}
- The helper module to import data for testing.
-
-
- pro.taskana
- taskana-common-parent
- 8.2.1-SNAPSHOT
- ../pom.xml
-
-
-
-
- pro.taskana
- taskana-common-logging
- ${project.version}
-
-
- org.mybatis
- mybatis
- ${version.mybatis}
-
-
- org.slf4j
- slf4j-api
-
-
- pro.taskana
- taskana-common
- ${project.version}
-
-
-
-
- org.slf4j
- slf4j-simple
- test
-
-
- org.assertj
- assertj-core
- ${version.assertj}
- test
-
-
- org.junit.jupiter
- junit-jupiter
- test
-
-
- com.h2database
- h2
- test
-
-
-
diff --git a/common/taskana-common-logging/pom.xml b/common/taskana-common-logging/pom.xml
deleted file mode 100644
index 715a4c9fe..000000000
--- a/common/taskana-common-logging/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
- 4.0.0
- taskana-common-logging
-
- ${project.groupId}:${project.artifactId}
- The global trace logging implementation
-
-
- pro.taskana
- taskana-common-parent
- 8.2.1-SNAPSHOT
-
-
-
-
- org.aspectj
- aspectjrt
- ${version.aspectj}
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- org.junit.jupiter
- junit-jupiter
- test
-
-
- com.github.valfirst
- slf4j-test
- ${version.slf4j-test}
- test
-
-
- org.assertj
- assertj-core
- ${version.assertj}
- test
-
-
- org.mockito
- mockito-core
- test
-
-
-
-
-
-
- org.codehaus.mojo
- aspectj-maven-plugin
- ${version.aspectj-maven-plugin}
-
-
-
-
-
-
-
-
diff --git a/common/taskana-common-logging/src/test/java/outside/of/pro/taskana/OutsideOfProTaskanaPackageLoggingTestClass.java b/common/taskana-common-logging/src/test/java/outside/of/pro/taskana/OutsideOfProTaskanaPackageLoggingTestClass.java
deleted file mode 100644
index 458e9bf30..000000000
--- a/common/taskana-common-logging/src/test/java/outside/of/pro/taskana/OutsideOfProTaskanaPackageLoggingTestClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package outside.of.pro.taskana;
-
-public class OutsideOfProTaskanaPackageLoggingTestClass {
-
- @SuppressWarnings("unused")
- public void doStuff() {}
-}
diff --git a/common/taskana-common-logging/src/test/java/pro/taskana/AtProTaskanaRootPackageLoggingTestClass.java b/common/taskana-common-logging/src/test/java/pro/taskana/AtProTaskanaRootPackageLoggingTestClass.java
deleted file mode 100644
index a555849af..000000000
--- a/common/taskana-common-logging/src/test/java/pro/taskana/AtProTaskanaRootPackageLoggingTestClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pro.taskana;
-
-public class AtProTaskanaRootPackageLoggingTestClass {
-
- @SuppressWarnings("unused")
- public void doStuff() {}
-}
diff --git a/common/taskana-common-logging/src/test/resources/log4j2-test.xml b/common/taskana-common-logging/src/test/resources/log4j2-test.xml
deleted file mode 100644
index f63741e5f..000000000
--- a/common/taskana-common-logging/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/common/taskana-common-security/pom.xml b/common/taskana-common-security/pom.xml
deleted file mode 100644
index 0c21167d2..000000000
--- a/common/taskana-common-security/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
- 4.0.0
- taskana-common-security
-
- ${project.groupId}:${project.artifactId}
- The global security principals needed for user and group authentication
-
-
- pro.taskana
- taskana-common-parent
- 8.2.1-SNAPSHOT
-
-
-
-
-
-
-
-
- pro.taskana
- taskana-common-logging
- ${project.version}
-
-
- org.slf4j
- slf4j-api
-
-
-
diff --git a/common/taskana-common-test/pom.xml b/common/taskana-common-test/pom.xml
deleted file mode 100644
index 4e1a4b34c..000000000
--- a/common/taskana-common-test/pom.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
- 4.0.0
- taskana-common-test
-
- ${project.groupId}:${project.artifactId}
- The helper module for test utils
-
-
- pro.taskana
- taskana-common-parent
- 8.2.1-SNAPSHOT
- ../pom.xml
-
-
-
-
- pro.taskana
- taskana-common-logging
- ${project.version}
-
-
- pro.taskana
- taskana-common
- ${project.version}
-
-
- pro.taskana
- taskana-common-data
- ${project.version}
-
-
- org.junit.jupiter
- junit-jupiter
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
- com.fasterxml.jackson.module
- jackson-module-parameter-names
-
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jdk8
-
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jsr310
-
-
- jakarta.servlet
- jakarta.servlet-api
- ${version.jakarta.servlet}
-
-
- org.springframework
- spring-web
-
-
- org.springframework.hateoas
- spring-hateoas
-
-
- org.springframework.boot
- spring-boot-autoconfigure
-
-
- org.springframework
- spring-jdbc
-
-
- org.springframework.boot
- spring-boot-starter-test
-
-
- org.springframework.boot
- spring-boot-starter-logging
-
-
-
-
- org.springframework.boot
- spring-boot-starter-validation
-
-
- org.springframework.security
- spring-security-test
-
-
- org.springframework.security
- spring-security-ldap
-
-
- org.springframework
- spring-webmvc
-
-
- org.testcontainers
- db2
- ${version.testcontainers}
-
-
- junit
- junit
-
-
-
-
- org.testcontainers
- oracle-xe
- ${version.testcontainers}
-
-
- junit
- junit
-
-
-
-
-
- org.testcontainers
- postgresql
- ${version.testcontainers}
-
-
- junit
- junit
-
-
-
-
-
-
- org.assertj
- assertj-core
- ${version.assertj}
- test
-
-
-
-
diff --git a/common/taskana-common/pom.xml b/common/taskana-common/pom.xml
deleted file mode 100644
index 3b661d413..000000000
--- a/common/taskana-common/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
- 4.0.0
- taskana-common
-
- ${project.groupId}:${project.artifactId}
- The global helper module
-
-
- pro.taskana
- taskana-common-parent
- 8.2.1-SNAPSHOT
-
-
-
-
- pro.taskana
- taskana-common-logging
- ${project.version}
-
-
- pro.taskana
- taskana-common-security
- ${project.version}
-
-
- org.json
- json
- ${version.json}
-
-
- org.slf4j
- slf4j-api
-
-
- org.mybatis
- mybatis
- ${version.mybatis}
-
-
-
-
- org.slf4j
- slf4j-simple
- test
-
-
- org.junit.jupiter
- junit-jupiter
- test
-
-
- org.assertj
- assertj-core
- ${version.assertj}
- test
-
-
-
-
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/TaskanaRole.java b/common/taskana-common/src/main/java/pro/taskana/common/api/TaskanaRole.java
deleted file mode 100644
index 2936ed925..000000000
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/TaskanaRole.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package pro.taskana.common.api;
-
-/** The TaskanaRole enum contains all roles that are known to TASKANA. */
-public enum TaskanaRole {
- USER,
- BUSINESS_ADMIN,
- ADMIN,
- MONITOR,
- TASK_ADMIN,
- TASK_ROUTER
-}
diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConnectionNotSetException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConnectionNotSetException.java
deleted file mode 100644
index 1370e029a..000000000
--- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConnectionNotSetException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package pro.taskana.common.api.exceptions;
-
-/**
- * This exception is thrown when using TASKANA with the EXPLICIT ConnectionManagementMode and an
- * attempt is made to call an API method before the TaskananEngine#setConnection() method has been
- * called.
- */
-public class ConnectionNotSetException extends TaskanaRuntimeException {
-
- public static final String ERROR_KEY = "CONNECTION_NOT_SET";
-
- public ConnectionNotSetException() {
- super("Connection not set", ErrorCode.of(ERROR_KEY));
- }
-}
diff --git a/common/taskana-common/src/main/resources/sql/db2/schema-detection-db2.sql b/common/taskana-common/src/main/resources/sql/db2/schema-detection-db2.sql
deleted file mode 100644
index 08b0c6c0c..000000000
--- a/common/taskana-common/src/main/resources/sql/db2/schema-detection-db2.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SET SCHEMA %schemaName%;
-
-SELECT MAX(VERSION) FROM TASKANA_SCHEMA_VERSION;
diff --git a/common/taskana-common/src/main/resources/sql/h2/schema-detection-h2.sql b/common/taskana-common/src/main/resources/sql/h2/schema-detection-h2.sql
deleted file mode 100644
index 08b0c6c0c..000000000
--- a/common/taskana-common/src/main/resources/sql/h2/schema-detection-h2.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SET SCHEMA %schemaName%;
-
-SELECT MAX(VERSION) FROM TASKANA_SCHEMA_VERSION;
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.0.2_to_1.0.4_h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.0.2_to_1.0.4_h2.sql
deleted file mode 100644
index 00550e849..000000000
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.0.2_to_1.0.4_h2.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- this script update the tables TASKANA_SCHEMA_VERSION and WORKBASKET.
-
-SET SCHEMA %schemaName%;
-
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.4', CURRENT_TIMESTAMP);
-
-ALTER TABLE WORKBASKET ADD COLUMN MARKED_FOR_DELETION SMALLINT NOT NULL DEFAULT false;
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.0.6_to_1.1.5_h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.0.6_to_1.1.5_h2.sql
deleted file mode 100644
index 11786a323..000000000
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_1.0.6_to_1.1.5_h2.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and TASK.
-
-SET SCHEMA %schemaName%;
-
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.1.5', CURRENT_TIMESTAMP);
-
-ALTER TABLE TASK ADD COLUMN CALLBACK_STATE VARCHAR(30) NULL DEFAULT 'NONE';
-UPDATE TASK T SET CALLBACK_STATE = 'NONE';
-
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.0.0_to_4.3.0_h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.0.0_to_4.3.0_h2.sql
deleted file mode 100644
index 57a703953..000000000
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.0.0_to_4.3.0_h2.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and ATTACHMENT.
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.3.0', CURRENT_TIMESTAMP);
-
-ALTER TABLE ATTACHMENT ALTER COLUMN REF_SYSTEM DROP NOT NULL;
-
-ALTER TABLE ATTACHMENT ALTER COLUMN REF_INSTANCE DROP NOT NULL;
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.11.0_to_5.0.0_h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.11.0_to_5.0.0_h2.sql
deleted file mode 100644
index 9489e98de..000000000
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.11.0_to_5.0.0_h2.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- this script updates the TASKANA database schema from version 4.11.0 to version 5.0.0.
-
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.0.0', CURRENT_TIMESTAMP);
-
-ALTER TABLE OBJECT_REFERENCE ADD COLUMN TASK_ID VARCHAR(40) NOT NULL DEFAULT 'EMPTY';
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.0.0_to_5.1.0_h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.0.0_to_5.1.0_h2.sql
deleted file mode 100644
index dc4e4d39b..000000000
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.0.0_to_5.1.0_h2.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- this script updates the TASKANA database schema from version 5.0.0 to version 5.1.0.
-
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.1.0', CURRENT_TIMESTAMP);
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.2.0_to_5.10.0_h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.2.0_to_5.10.0_h2.sql
deleted file mode 100644
index 9224d9813..000000000
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_5.2.0_to_5.10.0_h2.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- this script updates the TASKANA database schema from version 5.2.0 to version 5.10.0.
-
-SET SCHEMA %schemaName%;
-
-ALTER TABLE TASKANA_SCHEMA_VERSION ALTER COLUMN ID DROP IDENTITY;
-
-CREATE SEQUENCE TASKANA_SCHEMA_VERSION_ID_SEQ
- MINVALUE 1
- START WITH 100
- INCREMENT BY 1 CACHE 10;
-
--- The VERSION value must be equal or higher then the value of TaskanaEngineImpl.MINIMAL_TASKANA_SCHEMA_VERSION
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '5.10.0', CURRENT_TIMESTAMP);
-
-CREATE INDEX IDX_OBJECT_REFERE_PK_ID ON OBJECT_REFERENCE
- (ID ASC);
-COMMIT WORK ;
-CREATE INDEX IDX_OBJECT_REFERE_FK_TASK_ID ON OBJECT_REFERENCE
- (TASK_ID ASC);
-COMMIT WORK ;
-CREATE INDEX IDX_OBJECT_REFERE_ACCESS_LIST ON OBJECT_REFERENCE
- (VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC, ID ASC);
-COMMIT WORK ;
\ No newline at end of file
diff --git a/common/taskana-common/src/main/resources/sql/postgres/schema-detection-postgres.sql b/common/taskana-common/src/main/resources/sql/postgres/schema-detection-postgres.sql
deleted file mode 100644
index 1c2df9af5..000000000
--- a/common/taskana-common/src/main/resources/sql/postgres/schema-detection-postgres.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SET search_path TO %schemaName%;
-
-SELECT MAX(VERSION) FROM TASKANA_SCHEMA_VERSION;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.0.2_to_1.0.4_postgres.sql b/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.0.2_to_1.0.4_postgres.sql
deleted file mode 100644
index fc12b6789..000000000
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.0.2_to_1.0.4_postgres.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- this script update the tables TASKANA_SCHEMA_VERSION and WORKBASKET in postgre database.
-
-SET SCHEMA %schemaName%;
-
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.0.4', CURRENT_TIMESTAMP);
-
-ALTER TABLE WORKBASKET ADD COLUMN MARKED_FOR_DELETION BOOLEAN NOT NULL DEFAULT false;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.0.6_to_1.1.5._postgres.sql b/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.0.6_to_1.1.5._postgres.sql
deleted file mode 100644
index ff976cf66..000000000
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_1.0.6_to_1.1.5._postgres.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and TASK.
-
-SET search_path = %schemaName%;
-
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('1.1.5', CURRENT_TIMESTAMP);
-
-ALTER TABLE TASK ADD COLUMN CALLBACK_STATE VARCHAR(30) NULL DEFAULT 'NONE';
-UPDATE TASK T SET CALLBACK_STATE = 'NONE';
-
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.0.0_to_4.3.0_postgres.sql b/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.0.0_to_4.3.0_postgres.sql
deleted file mode 100644
index 16a4438aa..000000000
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.0.0_to_4.3.0_postgres.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- this script updates the tables TASKANA_SCHEMA_VERSION and ATTACHMENT.
-
-SET search_path = %schemaName%;
-
-INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.3.0', CURRENT_TIMESTAMP);
-
-ALTER TABLE ATTACHMENT ALTER COLUMN REF_SYSTEM DROP NOT NULL, ALTER COLUMN REF_INSTANCE DROP NOT NULL;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.2.0_to_5.10.0_postgres.sql b/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.2.0_to_5.10.0_postgres.sql
deleted file mode 100644
index dc8741709..000000000
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_5.2.0_to_5.10.0_postgres.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- this script updates the TASKANA database schema from version 5.2.0 to version 5.10.0.
-SET SCHEMA %schemaName%;
-
-SET search_path = %schemaName%;
-
-ALTER TABLE TASKANA_SCHEMA_VERSION ALTER COLUMN ID DROP IDENTITY;
-
-CREATE SEQUENCE TASKANA_SCHEMA_VERSION_ID_SEQ
- MINVALUE 1
- START WITH 100
- INCREMENT BY 1 CACHE 10;
-
--- The VERSION value must be equal or higher then the value of TaskanaEngineImpl.MINIMAL_TASKANA_SCHEMA_VERSION
-INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED)
-VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '5.10.0', CURRENT_TIMESTAMP);
-
-CREATE INDEX IDX_OBJECT_REFERE_PK_ID ON OBJECT_REFERENCE
- (ID ASC);
-COMMIT WORK ;
-CREATE INDEX IDX_OBJECT_REFERE_FK_TASK_ID ON OBJECT_REFERENCE
- (TASK_ID ASC);
-COMMIT WORK ;
-CREATE INDEX IDX_OBJECT_REFERE_ACCESS_LIST ON OBJECT_REFERENCE
- (VALUE ASC, TYPE ASC, SYSTEM_INSTANCE ASC, SYSTEM ASC, COMPANY ASC, ID ASC);
-COMMIT WORK ;
\ No newline at end of file
diff --git a/common/taskana-common/src/test/resources/META-INF/services/pro.taskana.common.internal.util.spi.ServiceProviderInterface b/common/taskana-common/src/test/resources/META-INF/services/pro.taskana.common.internal.util.spi.ServiceProviderInterface
deleted file mode 100644
index 13a125410..000000000
--- a/common/taskana-common/src/test/resources/META-INF/services/pro.taskana.common.internal.util.spi.ServiceProviderInterface
+++ /dev/null
@@ -1 +0,0 @@
-pro.taskana.common.internal.util.spi.ServiceProviderInterfaceImpl
diff --git a/docker-databases/docker-compose.yml b/docker-databases/docker-compose.yml
index ed6ac0adb..7f9a21ec1 100644
--- a/docker-databases/docker-compose.yml
+++ b/docker-databases/docker-compose.yml
@@ -1,22 +1,22 @@
version: '3'
services:
- taskana-postgres_14:
+ kadai-postgres_14:
build: postgres_14
ports:
- "5102:5432"
environment:
- POSTGRES_PASSWORD=postgres
- taskana-db2_11-5:
+ kadai-db2_11-5:
image: taskana/db2:11.5
environment:
- LICENSE=accept
ports:
- "5101:50000"
- taskana-oracle-18:
+ kadai-oracle-18:
image: gvenzl/oracle-xe:18-slim-faststart
environment:
- ORACLE_PASSWORD=testPassword
- - ORACLE_DATABASE=taskana
+ - ORACLE_DATABASE=kadai
- APP_USER=TEST_USER
- APP_USER_PASSWORD=testPassword
- TZ=Europe/Berlin
diff --git a/docker-databases/prepare_db.bat b/docker-databases/prepare_db.bat
index 0457dc99c..68cfeb07d 100644
--- a/docker-databases/prepare_db.bat
+++ b/docker-databases/prepare_db.bat
@@ -31,48 +31,48 @@ SETLOCAL
:START_DB2_11_5
ECHO ---
- ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
- docker compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
+ ECHO docker compose -f %~dp0/docker-compose.yml up -d kadai-db2_11-5
+ docker compose -f %~dp0/docker-compose.yml up -d kadai-db2_11-5
ECHO ---
GOTO MENU
:STOP_DB2_11_5
ECHO ---
- ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
- docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
+ ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v kadai-db2_11-5
+ docker compose -f %~dp0/docker-compose.yml rm -f -s -v kadai-db2_11-5
ECHO ---
GOTO MENU
:START_POSTGRES_14
ECHO ---
- ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
- docker compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
+ ECHO docker compose -f %~dp0/docker-compose.yml up -d kadai-postgres_14
+ docker compose -f %~dp0/docker-compose.yml up -d kadai-postgres_14
ECHO ---
GOTO MENU
:STOP_POSTGRES_14
ECHO ---
- ECHO docker stop taskana-postgres_14
- ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
- docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
+ ECHO docker stop kadai-postgres_14
+ ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v kadai-postgres_14
+ docker compose -f %~dp0/docker-compose.yml rm -f -s -v kadai-postgres_14
ECHO ---
GOTO MENU
:START_ORACLE_18
ECHO ---
- ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
- docker compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
+ ECHO docker compose -f %~dp0/docker-compose.yml up -d kadai-oracle-18
+ docker compose -f %~dp0/docker-compose.yml up -d kadai-oracle-18
ECHO ---
GOTO MENU
:STOP_ORACLE_18
ECHO ---
- ECHO docker stop taskana-oracle-18
- ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
- docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
+ ECHO docker stop kadai-oracle-18
+ ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v kadai-oracle-18
+ docker compose -f %~dp0/docker-compose.yml rm -f -s -v kadai-oracle-18
ECHO ---
GOTO MENU
diff --git a/docker-databases/prepare_db.sh b/docker-databases/prepare_db.sh
index e6789df85..128bb851a 100755
--- a/docker-databases/prepare_db.sh
+++ b/docker-databases/prepare_db.sh
@@ -10,7 +10,7 @@ export TOP_PID=$$
#H
#H %FILE%
#H
-#H downloads and starts docker image for TASKANA unit tests.
+#H downloads and starts docker image for KADAI unit tests.
#H
#H %FILE% stop [database]
#H
@@ -35,13 +35,13 @@ function mapDBToDockerComposeServiceName() {
[[ -z "$1" || "$1" == "H2" ]] && return
case "$1" in
DB2|DB2_11_5)
- echo "taskana-db2_11-5"
+ echo "kadai-db2_11-5"
;;
POSTGRES|POSTGRES_14)
- echo "taskana-postgres_14"
+ echo "kadai-postgres_14"
;;
ORACLE|ORACLE_18)
- echo "taskana-oracle-18"
+ echo "kadai-oracle-18"
;;
*)
echo "unknown database '$1'" >&2 && kill -s TERM $TOP_PID
diff --git a/history/kadai-loghistory-provider/pom.xml b/history/kadai-loghistory-provider/pom.xml
new file mode 100644
index 000000000..778e23f05
--- /dev/null
+++ b/history/kadai-loghistory-provider/pom.xml
@@ -0,0 +1,67 @@
+
+
+ 4.0.0
+ kadai-loghistory-provider
+
+ ${project.groupId}:${project.artifactId}
+ The kadai history events logging plugin to include in your project.
+
+
+ io.kadai.history
+ kadai-history-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
+
+
+
+ io.kadai
+ kadai-common-logging
+ ${project.version}
+
+
+ io.kadai
+ kadai-core
+ ${project.version}
+
+
+ org.slf4j
+ slf4j-api
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+
+
+
+
+ com.github.valfirst
+ slf4j-test
+ ${version.slf4j-test}
+ test
+
+
+ org.assertj
+ assertj-core
+ ${version.assertj}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+
+
diff --git a/history/taskana-loghistory-provider/src/main/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImpl.java b/history/kadai-loghistory-provider/src/main/java/io/kadai/loghistory/impl/LogfileHistoryServiceImpl.java
similarity index 76%
rename from history/taskana-loghistory-provider/src/main/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImpl.java
rename to history/kadai-loghistory-provider/src/main/java/io/kadai/loghistory/impl/LogfileHistoryServiceImpl.java
index 9cf31d447..713b221f4 100644
--- a/history/taskana-loghistory-provider/src/main/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImpl.java
+++ b/history/kadai-loghistory-provider/src/main/java/io/kadai/loghistory/impl/LogfileHistoryServiceImpl.java
@@ -1,30 +1,30 @@
-package pro.taskana.loghistory.impl;
+package io.kadai.loghistory.impl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.spi.history.api.KadaiHistory;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.spi.history.api.TaskanaHistory;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-public class LogfileHistoryServiceImpl implements TaskanaHistory {
+public class LogfileHistoryServiceImpl implements KadaiHistory {
private static final Logger LOGGER = LoggerFactory.getLogger(LogfileHistoryServiceImpl.class);
private ObjectMapper objectMapper;
private Logger historyLogger;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
+ public void initialize(KadaiEngine kadaiEngine) {
objectMapper = new ObjectMapper().registerModule(new JavaTimeModule());
- String historyLoggerName = taskanaEngine.getConfiguration().getLogHistoryLoggerName();
+ String historyLoggerName = kadaiEngine.getConfiguration().getLogHistoryLoggerName();
if (historyLoggerName != null) {
historyLogger = LoggerFactory.getLogger(historyLoggerName);
diff --git a/history/kadai-loghistory-provider/src/main/resources/META-INF/services/io.kadai.spi.history.api.KadaiHistory b/history/kadai-loghistory-provider/src/main/resources/META-INF/services/io.kadai.spi.history.api.KadaiHistory
new file mode 100644
index 000000000..8c5e19a3c
--- /dev/null
+++ b/history/kadai-loghistory-provider/src/main/resources/META-INF/services/io.kadai.spi.history.api.KadaiHistory
@@ -0,0 +1 @@
+io.kadai.loghistory.impl.LogfileHistoryServiceImpl
diff --git a/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java b/history/kadai-loghistory-provider/src/test/java/io/kadai/loghistory/impl/LogfileHistoryServiceImplTest.java
similarity index 77%
rename from history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java
rename to history/kadai-loghistory-provider/src/test/java/io/kadai/loghistory/impl/LogfileHistoryServiceImplTest.java
index 9292fbdb7..1285e9c7b 100644
--- a/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java
+++ b/history/kadai-loghistory-provider/src/test/java/io/kadai/loghistory/impl/LogfileHistoryServiceImplTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.loghistory.impl;
+package io.kadai.loghistory.impl;
import static org.assertj.core.api.Assertions.assertThat;
@@ -6,23 +6,23 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.github.valfirst.slf4jtest.TestLogger;
import com.github.valfirst.slf4jtest.TestLoggerFactory;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEventType;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
import java.time.Instant;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEventType;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
class LogfileHistoryServiceImplTest {
- static TaskanaEngine taskanaEngineMock;
+ static KadaiEngine kadaiEngineMock;
private final ObjectMapper objectMapper = new ObjectMapper().registerModule(new JavaTimeModule());
private final LogfileHistoryServiceImpl logfileHistoryServiceImpl =
new LogfileHistoryServiceImpl();
@@ -35,16 +35,16 @@ class LogfileHistoryServiceImplTest {
@BeforeAll
public static void setupObjectMapper() {
- TaskanaConfiguration taskanaConfiguration = Mockito.mock(TaskanaConfiguration.class);
- taskanaEngineMock = Mockito.mock(TaskanaEngine.class);
- Mockito.when(taskanaEngineMock.getConfiguration()).thenReturn(taskanaConfiguration);
- Mockito.when(taskanaConfiguration.getLogHistoryLoggerName()).thenReturn("AUDIT");
+ KadaiConfiguration kadaiConfiguration = Mockito.mock(KadaiConfiguration.class);
+ kadaiEngineMock = Mockito.mock(KadaiEngine.class);
+ Mockito.when(kadaiEngineMock.getConfiguration()).thenReturn(kadaiConfiguration);
+ Mockito.when(kadaiConfiguration.getLogHistoryLoggerName()).thenReturn("AUDIT");
}
@Test
void should_LogTaskEventAsJson_When_CreateIsCalled() throws Exception {
- logfileHistoryServiceImpl.initialize(taskanaEngineMock);
+ logfileHistoryServiceImpl.initialize(kadaiEngineMock);
TaskHistoryEvent eventToBeLogged = new TaskHistoryEvent();
eventToBeLogged.setId("someId");
eventToBeLogged.setUserId("someUser");
@@ -71,7 +71,7 @@ class LogfileHistoryServiceImplTest {
@Test
void should_LogWorkbasketEventAsJson_When_CreateIsCalled() throws Exception {
- logfileHistoryServiceImpl.initialize(taskanaEngineMock);
+ logfileHistoryServiceImpl.initialize(kadaiEngineMock);
WorkbasketHistoryEvent eventToBeLogged = new WorkbasketHistoryEvent();
eventToBeLogged.setId("someId");
eventToBeLogged.setUserId("someUser");
@@ -94,7 +94,7 @@ class LogfileHistoryServiceImplTest {
@Test
void should_LogClassificationEventAsJson_When_CreateIsCalled() throws Exception {
- logfileHistoryServiceImpl.initialize(taskanaEngineMock);
+ logfileHistoryServiceImpl.initialize(kadaiEngineMock);
ClassificationHistoryEvent eventToBeLogged = new ClassificationHistoryEvent();
eventToBeLogged.setId("someId");
eventToBeLogged.setUserId("someUser");
diff --git a/history/kadai-loghistory-provider/src/test/resources/log4j2-test.xml b/history/kadai-loghistory-provider/src/test/resources/log4j2-test.xml
new file mode 100644
index 000000000..d4430d5c1
--- /dev/null
+++ b/history/kadai-loghistory-provider/src/test/resources/log4j2-test.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/history/kadai-simplehistory-provider/pom.xml b/history/kadai-simplehistory-provider/pom.xml
new file mode 100644
index 000000000..8f2f5d1ab
--- /dev/null
+++ b/history/kadai-simplehistory-provider/pom.xml
@@ -0,0 +1,102 @@
+
+
+ 4.0.0
+ kadai-simplehistory-provider
+
+ ${project.groupId}:${project.artifactId}
+ The kadai history events plugin to include in your project.
+
+
+ io.kadai.history
+ kadai-history-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
+
+
+
+ io.kadai
+ kadai-common-logging
+ ${project.version}
+
+
+ io.kadai
+ kadai-core
+ ${project.version}
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.mybatis
+ mybatis
+ ${version.mybatis}
+
+
+
+
+ io.kadai
+ kadai-common-data
+ ${project.version}
+ test
+
+
+ io.kadai
+ kadai-common-test
+ ${project.version}
+ test
+
+
+ org.assertj
+ assertj-core
+ test
+
+
+ org.slf4j
+ slf4j-simple
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ com.h2database
+ h2
+ test
+
+
+ org.postgresql
+ postgresql
+ test
+
+
+ com.ibm.db2
+ jcc
+ ${version.db2}
+ test
+
+
+ com.oracle.database.jdbc
+ ojdbc8
+ ${version.oracle}
+ test
+
+
+ io.kadai
+ kadai-test-api
+ ${project.version}
+ test
+
+
+
+
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImpl.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/ClassificationHistoryQueryImpl.java
similarity index 89%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImpl.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/ClassificationHistoryQueryImpl.java
index d57ee191f..00bc8eae3 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImpl.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/ClassificationHistoryQueryImpl.java
@@ -1,25 +1,25 @@
-package pro.taskana.simplehistory.impl;
+package io.kadai.simplehistory.impl;
-import static pro.taskana.common.api.BaseQuery.toLowerCopy;
+import static io.kadai.common.api.BaseQuery.toLowerCopy;
+import io.kadai.classification.api.ClassificationCustomField;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryQuery;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryQueryColumnName;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
import java.util.ArrayList;
import java.util.List;
import org.apache.ibatis.session.RowBounds;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.classification.api.ClassificationCustomField;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryQuery;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryQueryColumnName;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
public class ClassificationHistoryQueryImpl implements ClassificationHistoryQuery {
private static final String CLASSIFICATION_PACKAGE_PATH =
- "pro.taskana.simplehistory.impl.classification.";
+ "io.kadai.simplehistory.impl.classification.";
private static final String LINK_TO_MAPPER =
CLASSIFICATION_PACKAGE_PATH + "ClassificationHistoryQueryMapper.queryHistoryEvents";
private static final String LINK_TO_VALUE_MAPPER =
@@ -33,7 +33,7 @@ public class ClassificationHistoryQueryImpl implements ClassificationHistoryQuer
private static final String SQL_EXCEPTION_MESSAGE =
"Method openConnection() could not open a connection to the database.";
- private final InternalTaskanaEngine internalTaskanaEngine;
+ private final InternalKadaiEngine internalKadaiEngine;
private final List orderBy = new ArrayList<>();
private final List orderColumns = new ArrayList<>();
@@ -82,8 +82,8 @@ public class ClassificationHistoryQueryImpl implements ClassificationHistoryQuer
private String[] custom7Like;
private String[] custom8Like;
- public ClassificationHistoryQueryImpl(InternalTaskanaEngine internalTaskanaEngine) {
- this.internalTaskanaEngine = internalTaskanaEngine;
+ public ClassificationHistoryQueryImpl(InternalKadaiEngine internalKadaiEngine) {
+ this.internalKadaiEngine = internalKadaiEngine;
}
@Override
@@ -417,11 +417,11 @@ public class ClassificationHistoryQueryImpl implements ClassificationHistoryQuer
public List list() {
List result;
try {
- internalTaskanaEngine.openConnection();
- result = internalTaskanaEngine.getSqlSession().selectList(LINK_TO_MAPPER, this);
+ internalKadaiEngine.openConnection();
+ result = internalKadaiEngine.getSqlSession().selectList(LINK_TO_MAPPER, this);
return result;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -429,12 +429,12 @@ public class ClassificationHistoryQueryImpl implements ClassificationHistoryQuer
public List list(int offset, int limit) {
List result = new ArrayList<>();
try {
- internalTaskanaEngine.openConnection();
+ internalKadaiEngine.openConnection();
RowBounds rowBounds = new RowBounds(offset, limit);
- result = internalTaskanaEngine.getSqlSession().selectList(LINK_TO_MAPPER, this, rowBounds);
+ result = internalKadaiEngine.getSqlSession().selectList(LINK_TO_MAPPER, this, rowBounds);
return result;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -448,14 +448,14 @@ public class ClassificationHistoryQueryImpl implements ClassificationHistoryQuer
this.addOrderCriteria(columnName.toString(), sortDirection);
try {
- internalTaskanaEngine.openConnection();
- result = internalTaskanaEngine.getSqlSession().selectList(LINK_TO_VALUE_MAPPER, this);
+ internalKadaiEngine.openConnection();
+ result = internalKadaiEngine.getSqlSession().selectList(LINK_TO_VALUE_MAPPER, this);
return result;
} finally {
this.orderBy.addAll(cacheOrderBy);
this.columnName = null;
this.orderColumns.remove(orderColumns.size() - 1);
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -464,12 +464,12 @@ public class ClassificationHistoryQueryImpl implements ClassificationHistoryQuer
ClassificationHistoryEvent result = null;
try {
- internalTaskanaEngine.openConnection();
- result = internalTaskanaEngine.getSqlSession().selectOne(LINK_TO_MAPPER, this);
+ internalKadaiEngine.openConnection();
+ result = internalKadaiEngine.getSqlSession().selectOne(LINK_TO_MAPPER, this);
return result;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -477,11 +477,11 @@ public class ClassificationHistoryQueryImpl implements ClassificationHistoryQuer
public long count() {
Long rowCount = null;
try {
- internalTaskanaEngine.openConnection();
- rowCount = internalTaskanaEngine.getSqlSession().selectOne(LINK_TO_COUNTER, this);
+ internalKadaiEngine.openConnection();
+ rowCount = internalKadaiEngine.getSqlSession().selectOne(LINK_TO_COUNTER, this);
return (rowCount == null) ? 0L : rowCount;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImpl.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/SimpleHistoryServiceImpl.java
similarity index 59%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImpl.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/SimpleHistoryServiceImpl.java
index e8dadddcd..2ad7c91ee 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImpl.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/SimpleHistoryServiceImpl.java
@@ -1,37 +1,37 @@
-package pro.taskana.simplehistory.impl;
+package io.kadai.simplehistory.impl;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.common.internal.KadaiEngineImpl;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryEventMapper;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryQuery;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryQueryMapper;
+import io.kadai.simplehistory.impl.task.TaskHistoryEventMapper;
+import io.kadai.simplehistory.impl.task.TaskHistoryQuery;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryQuery;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryQueryMapper;
+import io.kadai.spi.history.api.KadaiHistory;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.exceptions.KadaiHistoryEventNotFoundException;
+import io.kadai.user.api.models.User;
+import io.kadai.user.internal.UserMapper;
import java.lang.reflect.Field;
import java.time.Instant;
import java.util.List;
import org.apache.ibatis.session.SqlSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.common.internal.TaskanaEngineImpl;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryQuery;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryQueryMapper;
-import pro.taskana.simplehistory.impl.task.TaskHistoryEventMapper;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQuery;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryQuery;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryQueryMapper;
-import pro.taskana.spi.history.api.TaskanaHistory;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.exceptions.TaskanaHistoryEventNotFoundException;
-import pro.taskana.user.api.models.User;
-import pro.taskana.user.internal.UserMapper;
-/** This is the implementation of TaskanaHistory. */
-public class SimpleHistoryServiceImpl implements TaskanaHistory {
+/** This is the implementation of KadaiHistory. */
+public class SimpleHistoryServiceImpl implements KadaiHistory {
private static final Logger LOGGER = LoggerFactory.getLogger(SimpleHistoryServiceImpl.class);
private TaskHistoryEventMapper taskHistoryEventMapper;
@@ -39,21 +39,21 @@ public class SimpleHistoryServiceImpl implements TaskanaHistory {
private ClassificationHistoryEventMapper classificationHistoryEventMapper;
private UserMapper userMapper;
- private InternalTaskanaEngine internalTaskanaEngine;
+ private InternalKadaiEngine internalKadaiEngine;
- public void initialize(TaskanaEngine taskanaEngine) {
+ public void initialize(KadaiEngine kadaiEngine) {
LOGGER.info(
"Simple history service implementation initialized with schemaName: {} ",
- taskanaEngine.getConfiguration().getSchemaName());
+ kadaiEngine.getConfiguration().getSchemaName());
Field sessionManager = null;
try {
- Field internalTaskanaEngineImpl =
- TaskanaEngineImpl.class.getDeclaredField("internalTaskanaEngineImpl");
- internalTaskanaEngineImpl.setAccessible(true);
- this.internalTaskanaEngine =
- (InternalTaskanaEngine) internalTaskanaEngineImpl.get(taskanaEngine);
- sessionManager = TaskanaEngineImpl.class.getDeclaredField("sessionManager");
+ Field internalKadaiEngineImpl =
+ KadaiEngineImpl.class.getDeclaredField("internalKadaiEngineImpl");
+ internalKadaiEngineImpl.setAccessible(true);
+ this.internalKadaiEngine =
+ (InternalKadaiEngine) internalKadaiEngineImpl.get(kadaiEngine);
+ sessionManager = KadaiEngineImpl.class.getDeclaredField("sessionManager");
sessionManager.setAccessible(true);
} catch (NoSuchFieldException e) {
throw new SystemException("SQL Session could not be retrieved. Aborting Startup");
@@ -61,7 +61,7 @@ public class SimpleHistoryServiceImpl implements TaskanaHistory {
throw new SystemException(e.getMessage());
}
try {
- SqlSession sqlSession = (SqlSession) sessionManager.get(taskanaEngine);
+ SqlSession sqlSession = (SqlSession) sessionManager.get(kadaiEngine);
if (!sqlSession
.getConfiguration()
.getMapperRegistry()
@@ -114,7 +114,7 @@ public class SimpleHistoryServiceImpl implements TaskanaHistory {
this.userMapper = sqlSession.getMapper(UserMapper.class);
} catch (IllegalAccessException e) {
throw new SystemException(
- "TASKANA engine of Session Manager could not be retrieved. Aborting Startup");
+ "KADAI engine of Session Manager could not be retrieved. Aborting Startup");
}
}
@@ -152,33 +152,33 @@ public class SimpleHistoryServiceImpl implements TaskanaHistory {
public void deleteHistoryEventsByTaskIds(List taskIds)
throws InvalidArgumentException, NotAuthorizedException {
- internalTaskanaEngine.getEngine().checkRoleMembership(TaskanaRole.ADMIN);
+ internalKadaiEngine.getEngine().checkRoleMembership(KadaiRole.ADMIN);
if (taskIds == null) {
throw new InvalidArgumentException("List of taskIds must not be null.");
}
try {
- internalTaskanaEngine.openConnection();
+ internalKadaiEngine.openConnection();
taskHistoryEventMapper.deleteMultipleByTaskIds(taskIds);
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
public TaskHistoryEvent getTaskHistoryEvent(String historyEventId)
- throws TaskanaHistoryEventNotFoundException {
+ throws KadaiHistoryEventNotFoundException {
TaskHistoryEvent resultEvent = null;
try {
- internalTaskanaEngine.openConnection();
+ internalKadaiEngine.openConnection();
resultEvent = taskHistoryEventMapper.findById(historyEventId);
if (resultEvent == null) {
- throw new TaskanaHistoryEventNotFoundException(historyEventId);
+ throw new KadaiHistoryEventNotFoundException(historyEventId);
}
- if (internalTaskanaEngine.getEngine().getConfiguration().isAddAdditionalUserInfo()) {
+ if (internalKadaiEngine.getEngine().getConfiguration().isAddAdditionalUserInfo()) {
User user = userMapper.findById(resultEvent.getUserId());
if (user != null) {
resultEvent.setUserLongName(user.getLongName());
@@ -187,19 +187,19 @@ public class SimpleHistoryServiceImpl implements TaskanaHistory {
return resultEvent;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
public TaskHistoryQuery createTaskHistoryQuery() {
- return new TaskHistoryQueryImpl(internalTaskanaEngine);
+ return new TaskHistoryQueryImpl(internalKadaiEngine);
}
public WorkbasketHistoryQuery createWorkbasketHistoryQuery() {
- return new WorkbasketHistoryQueryImpl(internalTaskanaEngine);
+ return new WorkbasketHistoryQueryImpl(internalKadaiEngine);
}
public ClassificationHistoryQuery createClassificationHistoryQuery() {
- return new ClassificationHistoryQueryImpl(internalTaskanaEngine);
+ return new ClassificationHistoryQueryImpl(internalKadaiEngine);
}
}
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/TaskHistoryQueryImpl.java
similarity index 89%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/TaskHistoryQueryImpl.java
index 92a85357f..a840b8f52 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/TaskHistoryQueryImpl.java
@@ -1,36 +1,36 @@
-package pro.taskana.simplehistory.impl;
+package io.kadai.simplehistory.impl;
-import static pro.taskana.common.api.BaseQuery.toLowerCopy;
+import static io.kadai.common.api.BaseQuery.toLowerCopy;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.simplehistory.impl.task.TaskHistoryQuery;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryColumnName;
+import io.kadai.spi.history.api.events.task.TaskHistoryCustomField;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
import java.util.ArrayList;
import java.util.List;
import org.apache.ibatis.session.RowBounds;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQuery;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryColumnName;
-import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
/** Implementation for generating dynamic sql. */
public class TaskHistoryQueryImpl implements TaskHistoryQuery {
private static final String LINK_TO_MAPPER =
- "pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper.queryHistoryEvents";
+ "io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper.queryHistoryEvents";
private static final String LINK_TO_VALUE_MAPPER =
- "pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper.queryHistoryColumnValues";
+ "io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper.queryHistoryColumnValues";
private static final String LINK_TO_COUNTER =
- "pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper.countHistoryEvents";
+ "io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper.countHistoryEvents";
private static final Logger LOGGER = LoggerFactory.getLogger(TaskHistoryQueryImpl.class);
private static final String SQL_EXCEPTION_MESSAGE =
"Method openConnection() could not open a connection to the database.";
- private final InternalTaskanaEngine internalTaskanaEngine;
+ private final InternalKadaiEngine internalKadaiEngine;
private final List orderBy;
private final List orderColumns;
private boolean joinWithUserInfo;
@@ -83,12 +83,12 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery {
private String[] custom3Like;
private String[] custom4Like;
- public TaskHistoryQueryImpl(InternalTaskanaEngine internalTaskanaEngine) {
- this.internalTaskanaEngine = internalTaskanaEngine;
+ public TaskHistoryQueryImpl(InternalKadaiEngine internalKadaiEngine) {
+ this.internalKadaiEngine = internalKadaiEngine;
this.orderBy = new ArrayList<>();
this.orderColumns = new ArrayList<>();
this.joinWithUserInfo =
- internalTaskanaEngine.getEngine().getConfiguration().isAddAdditionalUserInfo();
+ internalKadaiEngine.getEngine().getConfiguration().isAddAdditionalUserInfo();
}
public String[] getIdIn() {
@@ -632,11 +632,11 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery {
public List list() {
List result = new ArrayList<>();
try {
- internalTaskanaEngine.openConnection();
- result = internalTaskanaEngine.getSqlSession().selectList(LINK_TO_MAPPER, this);
+ internalKadaiEngine.openConnection();
+ result = internalKadaiEngine.getSqlSession().selectList(LINK_TO_MAPPER, this);
return result;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -644,12 +644,12 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery {
public List list(int offset, int limit) {
List result = new ArrayList<>();
try {
- internalTaskanaEngine.openConnection();
+ internalKadaiEngine.openConnection();
RowBounds rowBounds = new RowBounds(offset, limit);
- result = internalTaskanaEngine.getSqlSession().selectList(LINK_TO_MAPPER, this, rowBounds);
+ result = internalKadaiEngine.getSqlSession().selectList(LINK_TO_MAPPER, this, rowBounds);
return result;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -667,12 +667,12 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery {
}
try {
- internalTaskanaEngine.openConnection();
- result = internalTaskanaEngine.getSqlSession().selectList(LINK_TO_VALUE_MAPPER, this);
+ internalKadaiEngine.openConnection();
+ result = internalKadaiEngine.getSqlSession().selectList(LINK_TO_VALUE_MAPPER, this);
return result;
} finally {
this.orderColumns.remove(orderColumns.size() - 1);
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -680,13 +680,13 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery {
public TaskHistoryEvent single() {
TaskHistoryEvent result = null;
try {
- internalTaskanaEngine.openConnection();
- result = internalTaskanaEngine.getSqlSession().selectOne(LINK_TO_MAPPER, this);
+ internalKadaiEngine.openConnection();
+ result = internalKadaiEngine.getSqlSession().selectOne(LINK_TO_MAPPER, this);
return result;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -694,11 +694,11 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery {
public long count() {
Long rowCount;
try {
- internalTaskanaEngine.openConnection();
- rowCount = internalTaskanaEngine.getSqlSession().selectOne(LINK_TO_COUNTER, this);
+ internalKadaiEngine.openConnection();
+ rowCount = internalKadaiEngine.getSqlSession().selectOne(LINK_TO_COUNTER, this);
return (rowCount == null) ? 0L : rowCount;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/WorkbasketHistoryQueryImpl.java
similarity index 86%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/WorkbasketHistoryQueryImpl.java
index 6b3fbc78d..0a0560052 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/WorkbasketHistoryQueryImpl.java
@@ -1,36 +1,36 @@
-package pro.taskana.simplehistory.impl;
+package io.kadai.simplehistory.impl;
-import static pro.taskana.common.api.BaseQuery.toLowerCopy;
+import static io.kadai.common.api.BaseQuery.toLowerCopy;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryQuery;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryQueryColumnName;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.workbasket.api.WorkbasketCustomField;
import java.util.ArrayList;
import java.util.List;
import org.apache.ibatis.session.RowBounds;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryQuery;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryQueryColumnName;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.workbasket.api.WorkbasketCustomField;
public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
private static final String LINK_TO_MAPPER =
- "pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryQueryMapper.queryHistoryEvents";
+ "io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryQueryMapper.queryHistoryEvents";
private static final String LINK_TO_VALUE_MAPPER =
- "pro.taskana.simplehistory.impl.workbasket."
+ "io.kadai.simplehistory.impl.workbasket."
+ "WorkbasketHistoryQueryMapper.queryHistoryColumnValues";
private static final String LINK_TO_COUNTER =
- "pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryQueryMapper.countHistoryEvents";
+ "io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryQueryMapper.countHistoryEvents";
private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketHistoryQueryImpl.class);
private static final String SQL_EXCEPTION_MESSAGE =
"Method openConnection() could not open a connection to the database.";
- private final InternalTaskanaEngine internalTaskanaEngine;
+ private final InternalKadaiEngine internalKadaiEngine;
private final List orderColumns;
@SuppressWarnings("unused")
@@ -71,8 +71,8 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
private String[] orgLevel3Like;
private String[] orgLevel4Like;
- public WorkbasketHistoryQueryImpl(InternalTaskanaEngine internalTaskanaEngine) {
- this.internalTaskanaEngine = internalTaskanaEngine;
+ public WorkbasketHistoryQueryImpl(InternalKadaiEngine internalKadaiEngine) {
+ this.internalKadaiEngine = internalKadaiEngine;
this.orderBy = new ArrayList<>();
this.orderColumns = new ArrayList<>();
}
@@ -475,11 +475,11 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
public List list() {
List result = new ArrayList<>();
try {
- internalTaskanaEngine.openConnection();
- result = internalTaskanaEngine.getSqlSession().selectList(LINK_TO_MAPPER, this);
+ internalKadaiEngine.openConnection();
+ result = internalKadaiEngine.getSqlSession().selectList(LINK_TO_MAPPER, this);
return result;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -487,12 +487,12 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
public List list(int offset, int limit) {
List result = new ArrayList<>();
try {
- internalTaskanaEngine.openConnection();
+ internalKadaiEngine.openConnection();
RowBounds rowBounds = new RowBounds(offset, limit);
- result = internalTaskanaEngine.getSqlSession().selectList(LINK_TO_MAPPER, this, rowBounds);
+ result = internalKadaiEngine.getSqlSession().selectList(LINK_TO_MAPPER, this, rowBounds);
return result;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -506,14 +506,14 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
this.addOrderCriteria(columnName.toString(), sortDirection);
try {
- internalTaskanaEngine.openConnection();
- result = internalTaskanaEngine.getSqlSession().selectList(LINK_TO_VALUE_MAPPER, this);
+ internalKadaiEngine.openConnection();
+ result = internalKadaiEngine.getSqlSession().selectList(LINK_TO_VALUE_MAPPER, this);
return result;
} finally {
this.orderBy = cacheOrderBy;
this.columnName = null;
this.orderColumns.remove(orderColumns.size() - 1);
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -521,12 +521,12 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
public WorkbasketHistoryEvent single() {
WorkbasketHistoryEvent result = null;
try {
- internalTaskanaEngine.openConnection();
- result = internalTaskanaEngine.getSqlSession().selectOne(LINK_TO_MAPPER, this);
+ internalKadaiEngine.openConnection();
+ result = internalKadaiEngine.getSqlSession().selectOne(LINK_TO_MAPPER, this);
return result;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
@@ -534,11 +534,11 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
public long count() {
Long rowCount;
try {
- internalTaskanaEngine.openConnection();
- rowCount = internalTaskanaEngine.getSqlSession().selectOne(LINK_TO_COUNTER, this);
+ internalKadaiEngine.openConnection();
+ rowCount = internalKadaiEngine.getSqlSession().selectOne(LINK_TO_COUNTER, this);
return (rowCount == null) ? 0L : rowCount;
} finally {
- internalTaskanaEngine.returnConnection();
+ internalKadaiEngine.returnConnection();
}
}
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryEventMapper.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryEventMapper.java
similarity index 96%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryEventMapper.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryEventMapper.java
index 3ecdca164..a2784b52a 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryEventMapper.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryEventMapper.java
@@ -1,10 +1,10 @@
-package pro.taskana.simplehistory.impl.classification;
+package io.kadai.simplehistory.impl.classification;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Select;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
/** This class is the mybatis mapping of classification history events. */
@SuppressWarnings("checkstyle:LineLength")
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQuery.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryQuery.java
similarity index 97%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQuery.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryQuery.java
index 41b6bbd47..727b0cfb7 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQuery.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryQuery.java
@@ -1,10 +1,10 @@
-package pro.taskana.simplehistory.impl.classification;
+package io.kadai.simplehistory.impl.classification;
-import pro.taskana.classification.api.ClassificationCustomField;
-import pro.taskana.common.api.BaseQuery;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
+import io.kadai.classification.api.ClassificationCustomField;
+import io.kadai.common.api.BaseQuery;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
/** HistoryQuery for generating dynamic sql. */
public interface ClassificationHistoryQuery
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQueryColumnName.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryQueryColumnName.java
similarity index 89%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQueryColumnName.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryQueryColumnName.java
index e649dfddf..d4067c988 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQueryColumnName.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryQueryColumnName.java
@@ -1,6 +1,6 @@
-package pro.taskana.simplehistory.impl.classification;
+package io.kadai.simplehistory.impl.classification;
-import pro.taskana.common.api.QueryColumnName;
+import io.kadai.common.api.QueryColumnName;
/** Enum containing the column names for {@link ClassificationHistoryQueryMapper}. */
public enum ClassificationHistoryQueryColumnName implements QueryColumnName {
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQueryMapper.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryQueryMapper.java
similarity index 99%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQueryMapper.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryQueryMapper.java
index 0b1fe6a9f..0b828412a 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/classification/ClassificationHistoryQueryMapper.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/classification/ClassificationHistoryQueryMapper.java
@@ -1,10 +1,10 @@
-package pro.taskana.simplehistory.impl.classification;
+package io.kadai.simplehistory.impl.classification;
+import io.kadai.simplehistory.impl.ClassificationHistoryQueryImpl;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
import java.util.List;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Select;
-import pro.taskana.simplehistory.impl.ClassificationHistoryQueryImpl;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
/** This class is the mybatis mapping of ClassificationHistoryQueries. */
@SuppressWarnings("checkstyle:LineLength")
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/jobs/HistoryCleanupJob.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/jobs/HistoryCleanupJob.java
similarity index 79%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/jobs/HistoryCleanupJob.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/jobs/HistoryCleanupJob.java
index 2f7a5f0ad..debf67c50 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/jobs/HistoryCleanupJob.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/jobs/HistoryCleanupJob.java
@@ -1,10 +1,23 @@
-package pro.taskana.simplehistory.impl.jobs;
+package io.kadai.simplehistory.impl.jobs;
import static java.util.function.Predicate.not;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.mapping;
import static java.util.stream.Collectors.toList;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.ScheduledJob;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.jobs.AbstractKadaiJob;
+import io.kadai.common.internal.transaction.KadaiTransactionProvider;
+import io.kadai.common.internal.util.CollectionUtil;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
@@ -14,44 +27,27 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.api.ScheduledJob;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.jobs.AbstractTaskanaJob;
-import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
-import pro.taskana.common.internal.util.CollectionUtil;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-public class HistoryCleanupJob extends AbstractTaskanaJob {
+public class HistoryCleanupJob extends AbstractKadaiJob {
private static final Logger LOGGER = LoggerFactory.getLogger(HistoryCleanupJob.class);
private final boolean allCompletedSameParentBusiness =
- taskanaEngineImpl
- .getConfiguration()
- .isSimpleHistoryCleanupJobAllCompletedSameParentBusiness();
+ kadaiEngineImpl.getConfiguration().isSimpleHistoryCleanupJobAllCompletedSameParentBusiness();
private final Duration minimumAge =
- taskanaEngineImpl.getConfiguration().getSimpleHistoryCleanupJobMinimumAge();
+ kadaiEngineImpl.getConfiguration().getSimpleHistoryCleanupJobMinimumAge();
private final int batchSize =
- taskanaEngineImpl.getConfiguration().getSimpleHistoryCleanupJobBatchSize();
+ kadaiEngineImpl.getConfiguration().getSimpleHistoryCleanupJobBatchSize();
private SimpleHistoryServiceImpl simpleHistoryService = null;
public HistoryCleanupJob(
- TaskanaEngine taskanaEngine,
- TaskanaTransactionProvider txProvider,
- ScheduledJob scheduledJob) {
- super(taskanaEngine, txProvider, scheduledJob, true);
+ KadaiEngine kadaiEngine, KadaiTransactionProvider txProvider, ScheduledJob scheduledJob) {
+ super(kadaiEngine, txProvider, scheduledJob, true);
simpleHistoryService = new SimpleHistoryServiceImpl();
- simpleHistoryService.initialize(taskanaEngine);
+ simpleHistoryService.initialize(kadaiEngine);
}
- public static Duration getLockExpirationPeriod(TaskanaConfiguration taskanaConfiguration) {
- return taskanaConfiguration.getSimpleHistoryCleanupJobLockExpirationPeriod();
+ public static Duration getLockExpirationPeriod(KadaiConfiguration kadaiConfiguration) {
+ return kadaiConfiguration.getSimpleHistoryCleanupJobLockExpirationPeriod();
}
@Override
@@ -161,7 +157,7 @@ public class HistoryCleanupJob extends AbstractTaskanaJob {
}
private int deleteHistoryEventsTransactionally(List taskIdsToDeleteHistoryEventsFor) {
- return TaskanaTransactionProvider.executeInTransactionIfPossible(
+ return KadaiTransactionProvider.executeInTransactionIfPossible(
txProvider,
() -> {
try {
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryEventMapper.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryEventMapper.java
similarity index 97%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryEventMapper.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryEventMapper.java
index d7715f183..9927f24e9 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryEventMapper.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryEventMapper.java
@@ -1,12 +1,12 @@
-package pro.taskana.simplehistory.impl.task;
+package io.kadai.simplehistory.impl.task;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
import java.util.List;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Select;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
/** This class is the mybatis mapping of task history events. */
@SuppressWarnings("checkstyle:LineLength")
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryQuery.java
similarity index 98%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryQuery.java
index 4e722e270..37033bf5d 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryQuery.java
@@ -1,9 +1,9 @@
-package pro.taskana.simplehistory.impl.task;
+package io.kadai.simplehistory.impl.task;
-import pro.taskana.common.api.BaseQuery;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.common.api.BaseQuery;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.spi.history.api.events.task.TaskHistoryCustomField;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
/** HistoryQuery for generating dynamic sql. */
public interface TaskHistoryQuery extends BaseQuery {
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQueryColumnName.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryQueryColumnName.java
similarity index 92%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQueryColumnName.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryQueryColumnName.java
index 73074df27..53f7e6799 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQueryColumnName.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryQueryColumnName.java
@@ -1,6 +1,6 @@
-package pro.taskana.simplehistory.impl.task;
+package io.kadai.simplehistory.impl.task;
-import pro.taskana.common.api.QueryColumnName;
+import io.kadai.common.api.QueryColumnName;
/** Enum containing the column names for {@link TaskHistoryQueryMapper#queryHistoryColumnValues}. */
public enum TaskHistoryQueryColumnName implements QueryColumnName {
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQueryMapper.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryQueryMapper.java
similarity index 99%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQueryMapper.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryQueryMapper.java
index 9a6139461..199316a77 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQueryMapper.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/task/TaskHistoryQueryMapper.java
@@ -1,10 +1,10 @@
-package pro.taskana.simplehistory.impl.task;
+package io.kadai.simplehistory.impl.task;
+import io.kadai.simplehistory.impl.TaskHistoryQueryImpl;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
import java.util.List;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Select;
-import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
/** This class is the mybatis mapping of TaskHistoryQueries. */
@SuppressWarnings("checkstyle:LineLength")
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java
similarity index 95%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java
index d83ff13ae..4af36c599 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryEventMapper.java
@@ -1,10 +1,10 @@
-package pro.taskana.simplehistory.impl.workbasket;
+package io.kadai.simplehistory.impl.workbasket;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Select;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
/** This class is the mybatis mapping of workbasket history events. */
@SuppressWarnings("checkstyle:LineLength")
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java
similarity index 96%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java
index e10bd3e5d..6940fefd4 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryQuery.java
@@ -1,10 +1,10 @@
-package pro.taskana.simplehistory.impl.workbasket;
+package io.kadai.simplehistory.impl.workbasket;
-import pro.taskana.common.api.BaseQuery;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.workbasket.api.WorkbasketCustomField;
+import io.kadai.common.api.BaseQuery;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.workbasket.api.WorkbasketCustomField;
/** HistoryQuery for generating dynamic sql. */
public interface WorkbasketHistoryQuery
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java
similarity index 87%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java
index cf27dacd7..ff82eaf1a 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryQueryColumnName.java
@@ -1,6 +1,6 @@
-package pro.taskana.simplehistory.impl.workbasket;
+package io.kadai.simplehistory.impl.workbasket;
-import pro.taskana.common.api.QueryColumnName;
+import io.kadai.common.api.QueryColumnName;
/** Enum containing the column names for {@link WorkbasketHistoryQueryMapper}. */
public enum WorkbasketHistoryQueryColumnName implements QueryColumnName {
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java
similarity index 98%
rename from history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java
rename to history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java
index 94a6d6855..d0f237fdd 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java
+++ b/history/kadai-simplehistory-provider/src/main/java/io/kadai/simplehistory/impl/workbasket/WorkbasketHistoryQueryMapper.java
@@ -1,10 +1,10 @@
-package pro.taskana.simplehistory.impl.workbasket;
+package io.kadai.simplehistory.impl.workbasket;
+import io.kadai.simplehistory.impl.WorkbasketHistoryQueryImpl;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
import java.util.List;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Select;
-import pro.taskana.simplehistory.impl.WorkbasketHistoryQueryImpl;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
/** This class is the mybatis mapping of WorkbasketHistoryQueries. */
@SuppressWarnings("checkstyle:LineLength")
diff --git a/history/kadai-simplehistory-provider/src/main/resources/META-INF/services/io.kadai.spi.history.api.KadaiHistory b/history/kadai-simplehistory-provider/src/main/resources/META-INF/services/io.kadai.spi.history.api.KadaiHistory
new file mode 100644
index 000000000..e759c6205
--- /dev/null
+++ b/history/kadai-simplehistory-provider/src/main/resources/META-INF/services/io.kadai.spi.history.api.KadaiHistory
@@ -0,0 +1 @@
+io.kadai.simplehistory.impl.SimpleHistoryServiceImpl
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java
similarity index 67%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java
index 2c776c215..a1faf962b 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java
@@ -1,7 +1,25 @@
package acceptance;
-import static pro.taskana.common.test.OracleSchemaHelper.initOracleSchema;
+import static io.kadai.common.test.OracleSchemaHelper.initOracleSchema;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.KadaiEngine.ConnectionManagementMode;
+import io.kadai.common.internal.JobMapper;
+import io.kadai.common.internal.KadaiEngineImpl;
+import io.kadai.common.internal.configuration.DB;
+import io.kadai.common.internal.util.IdGenerator;
+import io.kadai.common.test.config.DataSourceGenerator;
+import io.kadai.sampledata.SampleDataGenerator;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryEventMapper;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.internal.models.ObjectReferenceImpl;
import java.lang.reflect.Field;
import java.sql.Connection;
import java.sql.SQLException;
@@ -9,30 +27,12 @@ import javax.sql.DataSource;
import org.apache.ibatis.session.SqlSessionManager;
import org.junit.jupiter.api.BeforeAll;
import org.junit.platform.commons.JUnitException;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode;
-import pro.taskana.common.internal.JobMapper;
-import pro.taskana.common.internal.TaskanaEngineImpl;
-import pro.taskana.common.internal.configuration.DB;
-import pro.taskana.common.internal.util.IdGenerator;
-import pro.taskana.common.test.config.DataSourceGenerator;
-import pro.taskana.sampledata.SampleDataGenerator;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.internal.models.ObjectReferenceImpl;
/** Set up database for tests. */
public abstract class AbstractAccTest {
- protected static TaskanaConfiguration taskanaConfiguration;
- protected static TaskanaEngine taskanaEngine;
+ protected static KadaiConfiguration kadaiConfiguration;
+ protected static KadaiEngine kadaiEngine;
protected static SimpleHistoryServiceImpl historyService;
protected static TaskService taskService;
@@ -98,11 +98,11 @@ public abstract class AbstractAccTest {
initOracleSchema(dataSource, schemaNameTmp);
}
}
- TaskanaConfiguration configuration =
- new TaskanaConfiguration.Builder(dataSource, false, schemaNameTmp)
- .initTaskanaProperties()
+ KadaiConfiguration configuration =
+ new KadaiConfiguration.Builder(dataSource, false, schemaNameTmp)
+ .initKadaiProperties()
.build();
- initTaskanaEngine(configuration);
+ initKadaiEngine(configuration);
SampleDataGenerator sampleDataGenerator =
new SampleDataGenerator(dataSource, configuration.getSchemaName());
@@ -110,13 +110,13 @@ public abstract class AbstractAccTest {
sampleDataGenerator.generateTestData();
}
- protected static void initTaskanaEngine(TaskanaConfiguration configuration) throws SQLException {
- taskanaConfiguration = configuration;
- taskanaEngine =
- TaskanaEngine.buildTaskanaEngine(taskanaConfiguration, ConnectionManagementMode.AUTOCOMMIT);
- taskService = taskanaEngine.getTaskService();
+ protected static void initKadaiEngine(KadaiConfiguration configuration) throws SQLException {
+ kadaiConfiguration = configuration;
+ kadaiEngine =
+ KadaiEngine.buildKadaiEngine(kadaiConfiguration, ConnectionManagementMode.AUTOCOMMIT);
+ taskService = kadaiEngine.getTaskService();
historyService = new SimpleHistoryServiceImpl();
- historyService.initialize(taskanaEngine);
+ historyService.initialize(kadaiEngine);
}
protected static SimpleHistoryServiceImpl getHistoryService() {
@@ -126,20 +126,20 @@ public abstract class AbstractAccTest {
protected TaskHistoryQueryMapper getHistoryQueryMapper()
throws NoSuchFieldException, IllegalAccessException {
- Field sessionManagerField = TaskanaEngineImpl.class.getDeclaredField("sessionManager");
+ Field sessionManagerField = KadaiEngineImpl.class.getDeclaredField("sessionManager");
sessionManagerField.setAccessible(true);
SqlSessionManager sqlSessionManager =
- (SqlSessionManager) sessionManagerField.get(taskanaEngine);
+ (SqlSessionManager) sessionManagerField.get(kadaiEngine);
return sqlSessionManager.getMapper(TaskHistoryQueryMapper.class);
}
protected JobMapper getJobMapper() throws NoSuchFieldException, IllegalAccessException {
- Field sessionManagerField = TaskanaEngineImpl.class.getDeclaredField("sessionManager");
+ Field sessionManagerField = KadaiEngineImpl.class.getDeclaredField("sessionManager");
sessionManagerField.setAccessible(true);
SqlSessionManager sqlSessionManager =
- (SqlSessionManager) sessionManagerField.get(taskanaEngine);
+ (SqlSessionManager) sessionManagerField.get(kadaiEngine);
return sqlSessionManager.getMapper(JobMapper.class);
}
@@ -157,32 +157,32 @@ public abstract class AbstractAccTest {
protected static WorkbasketHistoryEventMapper getWorkbasketHistoryEventMapper() {
try {
- Field sessionManager = TaskanaEngineImpl.class.getDeclaredField("sessionManager");
+ Field sessionManager = KadaiEngineImpl.class.getDeclaredField("sessionManager");
sessionManager.setAccessible(true);
- SqlSessionManager manager = (SqlSessionManager) sessionManager.get(taskanaEngine);
+ SqlSessionManager manager = (SqlSessionManager) sessionManager.get(kadaiEngine);
return manager.getMapper(WorkbasketHistoryEventMapper.class);
} catch (Exception e) {
throw new JUnitException(
String.format(
"Could not extract %s from %s",
- WorkbasketHistoryEventMapper.class, TaskanaEngineImpl.class));
+ WorkbasketHistoryEventMapper.class, KadaiEngineImpl.class));
}
}
protected static ClassificationHistoryEventMapper getClassificationHistoryEventMapper() {
try {
- Field sessionManager = TaskanaEngineImpl.class.getDeclaredField("sessionManager");
+ Field sessionManager = KadaiEngineImpl.class.getDeclaredField("sessionManager");
sessionManager.setAccessible(true);
- SqlSessionManager manager = (SqlSessionManager) sessionManager.get(taskanaEngine);
+ SqlSessionManager manager = (SqlSessionManager) sessionManager.get(kadaiEngine);
return manager.getMapper(ClassificationHistoryEventMapper.class);
} catch (Exception e) {
throw new JUnitException(
String.format(
"Could not extract %s from %s",
- ClassificationHistoryEventMapper.class, TaskanaEngineImpl.class));
+ ClassificationHistoryEventMapper.class, KadaiEngineImpl.class));
}
}
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java
similarity index 75%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java
index 1bc95daf1..f558d9278 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java
@@ -3,23 +3,23 @@ package acceptance.events.classification;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryEventMapper;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEventType;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEventType;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnClassificationDeletionAccTest extends AbstractAccTest {
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final ClassificationService classificationService =
- taskanaEngine.getClassificationService();
+ kadaiEngine.getClassificationService();
private final ClassificationHistoryEventMapper classificationHistoryEventMapper =
getClassificationHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java
similarity index 73%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java
index fe750f23e..e6bc247a7 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java
@@ -3,24 +3,24 @@ package acceptance.events.classification;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryEventMapper;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEventType;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEventType;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnClassificationsCreationAccTest extends AbstractAccTest {
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final ClassificationService classificationService =
- taskanaEngine.getClassificationService();
+ kadaiEngine.getClassificationService();
private final ClassificationHistoryEventMapper classificationHistoryEventMapper =
getClassificationHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java
similarity index 77%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java
index db76a2a9b..6cdcbfe14 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java
@@ -3,25 +3,25 @@ package acceptance.events.classification;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.classification.api.ClassificationCustomField;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryEventMapper;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.classification.api.ClassificationCustomField;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnClassificationsUpdateAccTest extends AbstractAccTest {
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final ClassificationService classificationService =
- taskanaEngine.getClassificationService();
+ kadaiEngine.getClassificationService();
private final ClassificationHistoryEventMapper classificationHistoryEventMapper =
getClassificationHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
similarity index 85%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
index 88993d37f..8491881c2 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
@@ -3,6 +3,17 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.internal.util.Triplet;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.TaskHistoryQueryImpl;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.Task;
import java.time.Instant;
import java.util.List;
import java.util.stream.Stream;
@@ -12,22 +23,11 @@ import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.Task;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskCancelClaimAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@WithAccessId(user = "admin")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java
similarity index 80%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java
index b6fa32265..b58a0b57f 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java
@@ -3,20 +3,20 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskCancellationAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@Test
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
similarity index 85%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
index 92910e189..83333e4cd 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
@@ -3,6 +3,17 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.TaskHistoryQueryImpl;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.Task;
import java.time.Instant;
import java.util.List;
import java.util.stream.Stream;
@@ -12,22 +23,11 @@ import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.Task;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskClaimAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@WithAccessId(user = "admin")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java
similarity index 69%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java
index 6cbd6e8dc..63babd725 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java
@@ -3,24 +3,24 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.TaskHistoryQueryImpl;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.Task;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.Task;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskCompletionAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@WithAccessId(user = "admin")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java
similarity index 66%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java
index a99f665ca..a7baa6c15 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java
@@ -3,24 +3,24 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.TaskHistoryQueryImpl;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.internal.models.TaskImpl;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.internal.models.TaskImpl;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskCreationAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@Test
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskDeletionAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskDeletionAccTest.java
similarity index 73%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskDeletionAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskDeletionAccTest.java
index 47f00fcee..9cd9f5a0b 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskDeletionAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskDeletionAccTest.java
@@ -2,40 +2,40 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.spi.history.api.KadaiHistory;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.List;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.spi.history.api.TaskanaHistory;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
@WithServiceProvider(
- serviceProviderInterface = TaskanaHistory.class,
+ serviceProviderInterface = KadaiHistory.class,
serviceProviders = SimpleHistoryServiceImpl.class)
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskDeletionAccTest {
- @TaskanaInject TaskanaEngine taskanaEngine;
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject KadaiEngine kadaiEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
Task task1;
@@ -60,7 +60,7 @@ class CreateHistoryEventOnTaskDeletionAccTest {
task4 = createTask().state(TaskState.COMPLETED).buildAndStore(taskService);
historyService = new SimpleHistoryServiceImpl();
- historyService.initialize(taskanaEngine);
+ historyService.initialize(kadaiEngine);
}
@WithAccessId(user = "admin")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java
similarity index 80%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java
index a0a947b16..1a71de1a3 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java
@@ -3,27 +3,27 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.TaskHistoryQueryImpl;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.Task;
import java.time.Instant;
import java.util.List;
import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.Task;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskRequestChangesAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@WithAccessId(user = "user-1-1")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java
similarity index 80%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java
index e55ba25fb..c8784708c 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java
@@ -3,27 +3,27 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.TaskHistoryQueryImpl;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.Task;
import java.time.Instant;
import java.util.List;
import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.Task;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskRequestReviewAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@WithAccessId(user = "user-1-1")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java
similarity index 80%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java
index dfae8a8f5..022d928b9 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java
@@ -3,20 +3,20 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskTerminationAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@Test
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java
similarity index 94%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java
index 5af79669f..d2503469a 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java
@@ -1,9 +1,21 @@
package acceptance.events.task;
+import static io.kadai.common.internal.util.CheckedConsumer.wrap;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.common.internal.util.CheckedConsumer.wrap;
import acceptance.AbstractAccTest;
+import io.kadai.common.internal.util.Quadruple;
+import io.kadai.common.internal.util.Triplet;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.TaskHistoryQueryImpl;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.Workbasket;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -15,23 +27,11 @@ import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.common.internal.util.Quadruple;
-import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.Workbasket;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskTransferAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@WithAccessId(user = "admin")
@@ -345,7 +345,7 @@ class CreateHistoryEventOnTaskTransferAccTest extends AbstractAccTest {
foundField = true;
String oldWorkbasketStr = change.get("oldValue").toString();
String newWorkbasketStr = change.get("newValue").toString();
- WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
Workbasket oldWorkbasket = workbasketService.getWorkbasket(expectedOldValue);
assertThat(oldWorkbasketStr)
.isEqualTo(JSONObject.wrap(oldWorkbasket.asSummary()).toString());
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java
similarity index 69%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java
index 04cb5521a..8aa7b75d8 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java
@@ -3,23 +3,23 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.Task;
import java.time.Instant;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.Task;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnTaskUpdateAccTest extends AbstractAccTest {
- private final TaskService taskService = taskanaEngine.getTaskService();
+ private final TaskService taskService = kadaiEngine.getTaskService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
@Test
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java
similarity index 86%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java
index 364752173..13b1fb1d3 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java
@@ -4,19 +4,19 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import acceptance.AbstractAccTest;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.TaskHistoryQueryImpl;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.exceptions.TaskNotFoundException;
import java.sql.SQLException;
import java.util.List;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.exceptions.TaskNotFoundException;
@ExtendWith(JaasExtension.class)
class DeleteHistoryEventsOnTaskDeletionAccTest extends AbstractAccTest {
@@ -26,7 +26,7 @@ class DeleteHistoryEventsOnTaskDeletionAccTest extends AbstractAccTest {
void should_DeleteHistoryEvents_When_TaskIsDeletedWithHistoryDeletionEnabled() throws Exception {
final String taskid = "TKI:000000000000000000000000000000000036";
- createTaskanaEngineWithNewConfig(true);
+ createKadaiEngineWithNewConfig(true);
TaskHistoryQueryMapper taskHistoryQueryMapper = getHistoryQueryMapper();
@@ -60,7 +60,7 @@ class DeleteHistoryEventsOnTaskDeletionAccTest extends AbstractAccTest {
final String taskId_1 = "TKI:000000000000000000000000000000000037";
final String taskId_2 = "TKI:000000000000000000000000000000000038";
- createTaskanaEngineWithNewConfig(true);
+ createKadaiEngineWithNewConfig(true);
TaskHistoryQueryMapper taskHistoryQueryMapper = getHistoryQueryMapper();
@@ -101,7 +101,7 @@ class DeleteHistoryEventsOnTaskDeletionAccTest extends AbstractAccTest {
final String taskId = "TKI:000000000000000000000000000000000039";
- createTaskanaEngineWithNewConfig(false);
+ createKadaiEngineWithNewConfig(false);
TaskHistoryQueryMapper taskHistoryQueryMapper = getHistoryQueryMapper();
@@ -133,7 +133,7 @@ class DeleteHistoryEventsOnTaskDeletionAccTest extends AbstractAccTest {
final String taskId_1 = "TKI:000000000000000000000000000000000040";
final String taskId_2 = "TKI:000000000000000000000000000000000068";
- createTaskanaEngineWithNewConfig(false);
+ createKadaiEngineWithNewConfig(false);
TaskHistoryQueryMapper taskHistoryQueryMapper = getHistoryQueryMapper();
@@ -159,12 +159,12 @@ class DeleteHistoryEventsOnTaskDeletionAccTest extends AbstractAccTest {
assertThat(listEvents).hasSize(4);
}
- private void createTaskanaEngineWithNewConfig(boolean deleteHistoryOnTaskDeletionEnabled)
+ private void createKadaiEngineWithNewConfig(boolean deleteHistoryOnTaskDeletionEnabled)
throws SQLException {
- TaskanaConfiguration configuration =
- new TaskanaConfiguration.Builder(AbstractAccTest.taskanaConfiguration)
+ KadaiConfiguration configuration =
+ new KadaiConfiguration.Builder(AbstractAccTest.kadaiConfiguration)
.deleteHistoryEventsOnTaskDeletionEnabled(deleteHistoryOnTaskDeletionEnabled)
.build();
- initTaskanaEngine(configuration);
+ initKadaiEngine(configuration);
}
}
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java
similarity index 76%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java
index eabf3f541..c10c4e97f 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/task/GetTaskHistoryEventAccTest.java
@@ -3,11 +3,11 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.KadaiConfiguration;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
import java.sql.SQLException;
import org.junit.jupiter.api.Test;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
class GetTaskHistoryEventAccTest extends AbstractAccTest {
@@ -34,14 +34,14 @@ class GetTaskHistoryEventAccTest extends AbstractAccTest {
@Test
void should_SetTaskOwnerLongNameOfTask_When_PropertyEnabled() throws Exception {
- createTaskanaEngineWithNewConfig(true);
+ createKadaiEngineWithNewConfig(true);
TaskHistoryEvent taskHistoryEvent =
getHistoryService().getTaskHistoryEvent("THI:000000000000000000000000000000000000");
assertThat(taskHistoryEvent.getUserId()).isEqualTo("user-1-1");
String userLongName =
- taskanaEngine.getUserService().getUser(taskHistoryEvent.getUserId()).getLongName();
+ kadaiEngine.getUserService().getUser(taskHistoryEvent.getUserId()).getLongName();
assertThat(taskHistoryEvent)
.extracting(TaskHistoryEvent::getUserLongName)
.isEqualTo(userLongName);
@@ -50,7 +50,7 @@ class GetTaskHistoryEventAccTest extends AbstractAccTest {
@Test
void should_NotSetTaskOwnerLongNameOfTask_When_PropertyDisabled() throws Exception {
- createTaskanaEngineWithNewConfig(false);
+ createKadaiEngineWithNewConfig(false);
TaskHistoryEvent taskHistoryEvent =
getHistoryService().getTaskHistoryEvent("THI:000000000000000000000000000000000000");
@@ -60,11 +60,11 @@ class GetTaskHistoryEventAccTest extends AbstractAccTest {
assertThat(taskHistoryEvent).extracting(TaskHistoryEvent::getUserLongName).isNull();
}
- private void createTaskanaEngineWithNewConfig(boolean addAdditionalUserInfo) throws SQLException {
- TaskanaConfiguration configuration =
- new TaskanaConfiguration.Builder(AbstractAccTest.taskanaConfiguration)
+ private void createKadaiEngineWithNewConfig(boolean addAdditionalUserInfo) throws SQLException {
+ KadaiConfiguration configuration =
+ new KadaiConfiguration.Builder(AbstractAccTest.kadaiConfiguration)
.addAdditionalUserInfo(addAdditionalUserInfo)
.build();
- initTaskanaEngine(configuration);
+ initKadaiEngine(configuration);
}
}
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java
similarity index 72%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java
index 366d26727..7e4227c38 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java
@@ -3,22 +3,22 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketAccessItem;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketAccessItemCreationAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java
similarity index 80%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java
index d6ff081ef..919a5d800 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java
@@ -3,21 +3,21 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java
similarity index 80%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java
index d1f8ed37a..72a87d7a9 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java
@@ -1,24 +1,24 @@
package acceptance.events.workbasket;
+import static io.kadai.common.api.BaseQuery.SortDirection.ASCENDING;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.common.api.BaseQuery.SortDirection.ASCENDING;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java
similarity index 77%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java
index 6e8ca84c9..aa5db7417 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java
@@ -3,23 +3,23 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketAccessItem;
import java.util.ArrayList;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketAccessItemsSetAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java
similarity index 69%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java
index c9ef932c3..036ba9e96 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java
@@ -3,23 +3,23 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.WorkbasketType;
+import io.kadai.workbasket.api.models.Workbasket;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.WorkbasketType;
-import pro.taskana.workbasket.api.models.Workbasket;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketCreationAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java
similarity index 72%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java
index 3ddff8a27..aff0f201f 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java
@@ -3,21 +3,21 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketDeletionAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java
similarity index 74%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java
index 08db70c90..95133b6f8 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java
@@ -3,21 +3,21 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java
similarity index 75%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java
index c865ead7e..6c8fac45b 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java
@@ -3,21 +3,21 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java
similarity index 77%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java
index d3982a2a7..b2c289eda 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java
@@ -3,21 +3,21 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java
similarity index 73%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java
index d0545e3cb..35f21f9cb 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java
@@ -3,21 +3,21 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketService;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketService;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java
similarity index 74%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java
index 79add9cdf..d6de747fb 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java
@@ -3,24 +3,24 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketCustomField;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.WorkbasketType;
+import io.kadai.workbasket.api.models.Workbasket;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketCustomField;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.WorkbasketType;
-import pro.taskana.workbasket.api.models.Workbasket;
@ExtendWith(JaasExtension.class)
class CreateHistoryEventOnWorkbasketUpdateAccTest extends AbstractAccTest {
- private final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+ private final WorkbasketService workbasketService = kadaiEngine.getWorkbasketService();
private final SimpleHistoryServiceImpl historyService = getHistoryService();
private final WorkbasketHistoryEventMapper workbasketHistoryEventMapper =
getWorkbasketHistoryEventMapper();
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryClassificationHistoryAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/query/QueryClassificationHistoryAccTest.java
similarity index 96%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryClassificationHistoryAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/query/QueryClassificationHistoryAccTest.java
index e64560cd3..7c588d563 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryClassificationHistoryAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/query/QueryClassificationHistoryAccTest.java
@@ -4,19 +4,19 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import acceptance.AbstractAccTest;
+import io.kadai.classification.api.ClassificationCustomField;
+import io.kadai.common.api.BaseQuery.SortDirection;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryQuery;
+import io.kadai.simplehistory.impl.classification.ClassificationHistoryQueryColumnName;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEventType;
import java.time.Instant;
import java.util.Collections;
import java.util.List;
import org.apache.ibatis.exceptions.TooManyResultsException;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationCustomField;
-import pro.taskana.common.api.BaseQuery.SortDirection;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryQuery;
-import pro.taskana.simplehistory.impl.classification.ClassificationHistoryQueryColumnName;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEventType;
/** Test for Classification History queries. */
class QueryClassificationHistoryAccTest extends AbstractAccTest {
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java
similarity index 93%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java
index 026dd41ba..6c8638650 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java
@@ -5,6 +5,17 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import acceptance.AbstractAccTest;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.BaseQuery.SortDirection;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.test.security.JaasExtension;
+import io.kadai.common.test.security.WithAccessId;
+import io.kadai.simplehistory.impl.task.TaskHistoryQuery;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryColumnName;
+import io.kadai.spi.history.api.events.task.TaskHistoryCustomField;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.task.api.models.TaskSummary;
import java.sql.SQLException;
import java.time.Instant;
import java.util.Collections;
@@ -12,17 +23,6 @@ import java.util.List;
import org.apache.ibatis.exceptions.TooManyResultsException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.api.BaseQuery.SortDirection;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.test.security.JaasExtension;
-import pro.taskana.common.test.security.WithAccessId;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQuery;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryColumnName;
-import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.task.api.models.TaskSummary;
/** Test for Task History queries. */
@ExtendWith(JaasExtension.class)
@@ -447,7 +447,7 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
@WithAccessId(user = "user-1-1")
@Test
void should_SetUserLongNameOfTask_When_PropertyEnabled() throws Exception {
- createTaskanaEngineWithNewConfig(true);
+ createKadaiEngineWithNewConfig(true);
List taskHistoryEvents =
getHistoryService()
.createTaskHistoryQuery()
@@ -456,7 +456,7 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
assertThat(taskHistoryEvents).hasSize(1);
String userLongName =
- taskanaEngine.getUserService().getUser(taskHistoryEvents.get(0).getUserId()).getLongName();
+ kadaiEngine.getUserService().getUser(taskHistoryEvents.get(0).getUserId()).getLongName();
assertThat(taskHistoryEvents.get(0))
.extracting(TaskHistoryEvent::getUserLongName)
.isEqualTo(userLongName);
@@ -465,7 +465,7 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
@WithAccessId(user = "user-1-1")
@Test
void should_SetTaskOwnerLongNameOfTaskHistoryEvent_When_PropertyEnabled() throws Exception {
- createTaskanaEngineWithNewConfig(true);
+ createKadaiEngineWithNewConfig(true);
List taskHistoryEvents =
getHistoryService()
.createTaskHistoryQuery()
@@ -474,14 +474,14 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
assertThat(taskHistoryEvents).hasSize(1);
TaskSummary task =
- taskanaEngine
+ kadaiEngine
.getTaskService()
.createTaskQuery()
.idIn(taskHistoryEvents.get(0).getTaskId())
.single();
assertThat(task).isNotNull();
String taskOwnerLongName =
- taskanaEngine.getUserService().getUser(task.getOwner()).getLongName();
+ kadaiEngine.getUserService().getUser(task.getOwner()).getLongName();
assertThat(taskHistoryEvents.get(0))
.extracting(TaskHistoryEvent::getTaskOwnerLongName)
@@ -491,7 +491,7 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
@WithAccessId(user = "user-1-1")
@Test
void should_NotSetUserLongNameOfTaskHistoryEvent_When_PropertyDisabled() throws Exception {
- createTaskanaEngineWithNewConfig(false);
+ createKadaiEngineWithNewConfig(false);
List taskHistoryEvents =
getHistoryService()
.createTaskHistoryQuery()
@@ -505,7 +505,7 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
@WithAccessId(user = "user-1-1")
@Test
void should_NotSetTaskOwnerLongNameOfTaskHistoryEvent_When_PropertyDisabled() throws Exception {
- createTaskanaEngineWithNewConfig(false);
+ createKadaiEngineWithNewConfig(false);
List taskHistoryEvents =
getHistoryService()
.createTaskHistoryQuery()
@@ -522,7 +522,7 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
@Test
void should_SetUserLongNameOfTaskHistoryEventToNull_When_NotExistingAsUserInDatabase()
throws Exception {
- createTaskanaEngineWithNewConfig(true);
+ createKadaiEngineWithNewConfig(true);
List taskHistoryEvents =
getHistoryService()
.createTaskHistoryQuery()
@@ -533,12 +533,12 @@ class QueryTaskHistoryAccTest extends AbstractAccTest {
assertThat(taskHistoryEvents.get(0)).extracting(TaskHistoryEvent::getUserLongName).isNull();
}
- private void createTaskanaEngineWithNewConfig(boolean addAdditionalUserInfo) throws SQLException {
+ private void createKadaiEngineWithNewConfig(boolean addAdditionalUserInfo) throws SQLException {
- TaskanaConfiguration configuration =
- new TaskanaConfiguration.Builder(AbstractAccTest.taskanaConfiguration)
+ KadaiConfiguration configuration =
+ new KadaiConfiguration.Builder(AbstractAccTest.kadaiConfiguration)
.addAdditionalUserInfo(addAdditionalUserInfo)
.build();
- initTaskanaEngine(configuration);
+ initKadaiEngine(configuration);
}
}
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java b/history/kadai-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java
similarity index 96%
rename from history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java
rename to history/kadai-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java
index d994116ba..66ab524e4 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/acceptance/query/QueryWorkbasketHistoryAccTest.java
@@ -4,20 +4,20 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import acceptance.AbstractAccTest;
+import io.kadai.common.api.BaseQuery.SortDirection;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryQuery;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryQueryColumnName;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
+import io.kadai.workbasket.api.WorkbasketCustomField;
import java.time.Instant;
import java.util.Collections;
import java.util.List;
import org.apache.ibatis.exceptions.TooManyResultsException;
import org.junit.jupiter.api.Test;
-import pro.taskana.common.api.BaseQuery.SortDirection;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryQuery;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryQueryColumnName;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
-import pro.taskana.workbasket.api.WorkbasketCustomField;
class QueryWorkbasketHistoryAccTest extends AbstractAccTest {
diff --git a/history/taskana-simplehistory-provider/src/test/java/configuration/TaskanaConfigurationTest.java b/history/kadai-simplehistory-provider/src/test/java/configuration/KadaiConfigurationTest.java
similarity index 57%
rename from history/taskana-simplehistory-provider/src/test/java/configuration/TaskanaConfigurationTest.java
rename to history/kadai-simplehistory-provider/src/test/java/configuration/KadaiConfigurationTest.java
index 59219ea16..edfaa3f03 100644
--- a/history/taskana-simplehistory-provider/src/test/java/configuration/TaskanaConfigurationTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/configuration/KadaiConfigurationTest.java
@@ -3,29 +3,29 @@ package configuration;
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.test.config.DataSourceGenerator;
import javax.sql.DataSource;
import org.junit.jupiter.api.Test;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.test.config.DataSourceGenerator;
-class TaskanaConfigurationTest extends AbstractAccTest {
+class KadaiConfigurationTest extends AbstractAccTest {
@Test
- void testCreateTaskanaEngine() throws Exception {
+ void testCreateKadaiEngine() throws Exception {
DataSource ds = DataSourceGenerator.getDataSource();
- TaskanaConfiguration configuration =
- new TaskanaConfiguration.Builder(ds, false, DataSourceGenerator.getSchemaName(), false)
- .initTaskanaProperties()
+ KadaiConfiguration configuration =
+ new KadaiConfiguration.Builder(ds, false, DataSourceGenerator.getSchemaName(), false)
+ .initKadaiProperties()
.build();
- TaskanaEngine te = TaskanaEngine.buildTaskanaEngine(configuration);
+ KadaiEngine te = KadaiEngine.buildKadaiEngine(configuration);
assertThat(te).isNotNull();
}
@Test
- void testCreateTaskanaHistoryEventWithNonDefaultSchemaName() throws Exception {
+ void testCreateKadaiHistoryEventWithNonDefaultSchemaName() throws Exception {
resetDb("SOMECUSTOMSCHEMANAME");
long count = getHistoryService().createTaskHistoryQuery().workbasketKeyIn("wbKey1").count();
assertThat(count).isZero();
diff --git a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImplTest.java b/history/kadai-simplehistory-provider/src/test/java/io/kadai/simplehistory/impl/ClassificationHistoryQueryImplTest.java
similarity index 75%
rename from history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImplTest.java
rename to history/kadai-simplehistory-provider/src/test/java/io/kadai/simplehistory/impl/ClassificationHistoryQueryImplTest.java
index b2e01f2c4..5c117bd88 100644
--- a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImplTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/io/kadai/simplehistory/impl/ClassificationHistoryQueryImplTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.simplehistory.impl;
+package io.kadai.simplehistory.impl;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -6,6 +6,10 @@ import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.validateMockitoUsage;
import static org.mockito.Mockito.when;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.common.internal.util.IdGenerator;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEvent;
+import io.kadai.spi.history.api.events.classification.ClassificationHistoryEventType;
import java.util.ArrayList;
import java.util.List;
import org.apache.ibatis.session.SqlSession;
@@ -14,10 +18,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.common.internal.util.IdGenerator;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;
-import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEventType;
/** Unit Test for ClassificationQueryImplTest. */
@ExtendWith(MockitoExtension.class)
@@ -25,13 +25,13 @@ class ClassificationHistoryQueryImplTest {
private ClassificationHistoryQueryImpl historyQueryImpl;
- @Mock private InternalTaskanaEngine internalTaskanaEngineMock;
+ @Mock private InternalKadaiEngine internalKadaiEngineMock;
@Mock private SqlSession sqlSessionMock;
@BeforeEach
void setup() {
- historyQueryImpl = new ClassificationHistoryQueryImpl(internalTaskanaEngineMock);
+ historyQueryImpl = new ClassificationHistoryQueryImpl(internalKadaiEngineMock);
}
@Test
@@ -41,9 +41,9 @@ class ClassificationHistoryQueryImplTest {
createHistoryEvent(
ClassificationHistoryEventType.CREATED.getName(), "admin", "someDetails"));
- doNothing().when(internalTaskanaEngineMock).openConnection();
- doNothing().when(internalTaskanaEngineMock).returnConnection();
- when(internalTaskanaEngineMock.getSqlSession()).thenReturn(sqlSessionMock);
+ doNothing().when(internalKadaiEngineMock).openConnection();
+ doNothing().when(internalKadaiEngineMock).returnConnection();
+ when(internalKadaiEngineMock.getSqlSession()).thenReturn(sqlSessionMock);
when(sqlSessionMock.selectList(any(), any())).thenReturn(new ArrayList<>(returnList));
List result =
diff --git a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImplTest.java b/history/kadai-simplehistory-provider/src/test/java/io/kadai/simplehistory/impl/SimpleHistoryServiceImplTest.java
similarity index 68%
rename from history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImplTest.java
rename to history/kadai-simplehistory-provider/src/test/java/io/kadai/simplehistory/impl/SimpleHistoryServiceImplTest.java
index 828946621..540b9e805 100644
--- a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImplTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/io/kadai/simplehistory/impl/SimpleHistoryServiceImplTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.simplehistory.impl;
+package io.kadai.simplehistory.impl;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -7,6 +7,16 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import acceptance.AbstractAccTest;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.simplehistory.impl.task.TaskHistoryEventMapper;
+import io.kadai.simplehistory.impl.task.TaskHistoryQueryMapper;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
+import io.kadai.simplehistory.impl.workbasket.WorkbasketHistoryQueryMapper;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
import java.util.ArrayList;
import java.util.List;
import org.apache.ibatis.session.SqlSession;
@@ -17,16 +27,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.simplehistory.impl.task.TaskHistoryEventMapper;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
-import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryQueryMapper;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
/** Unit Test for SimpleHistoryServiceImplTest. */
@ExtendWith(MockitoExtension.class)
@@ -41,11 +41,11 @@ class SimpleHistoryServiceImplTest {
@Mock private WorkbasketHistoryEventMapper workbasketHistoryEventMapperMock;
@Mock private WorkbasketHistoryQueryMapper workbasketHistoryQueryMapperMock;
- @Mock private TaskanaConfiguration taskanaConfiguration;
+ @Mock private KadaiConfiguration kadaiConfiguration;
- @Mock private TaskanaEngine taskanaEngine;
+ @Mock private KadaiEngine kadaiEngine;
- @Mock private InternalTaskanaEngine internalTaskanaEngine;
+ @Mock private InternalKadaiEngine internalKadaiEngine;
@Mock private SqlSessionManager sqlSessionManagerMock;
@@ -80,21 +80,21 @@ class SimpleHistoryServiceImplTest {
AbstractAccTest.createTaskHistoryEvent(
"wbKey1", "taskId1", "type1", "wbKey2", "someUserId", "someDetails"));
- when(taskanaConfiguration.isAddAdditionalUserInfo()).thenReturn(false);
+ when(kadaiConfiguration.isAddAdditionalUserInfo()).thenReturn(false);
- when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSessionMock);
+ when(internalKadaiEngine.getSqlSession()).thenReturn(sqlSessionMock);
when(sqlSessionMock.selectList(any(), any())).thenReturn(new ArrayList<>(returnList));
- when(internalTaskanaEngine.getEngine()).thenReturn(taskanaEngine);
- when(taskanaEngine.getConfiguration()).thenReturn(taskanaConfiguration);
+ when(internalKadaiEngine.getEngine()).thenReturn(kadaiEngine);
+ when(kadaiEngine.getConfiguration()).thenReturn(kadaiConfiguration);
final List result =
cutSpy.createTaskHistoryQuery().taskIdIn("taskId1").list();
- verify(internalTaskanaEngine, times(1)).openConnection();
- verify(internalTaskanaEngine, times(1)).getSqlSession();
+ verify(internalKadaiEngine, times(1)).openConnection();
+ verify(internalKadaiEngine, times(1)).getSqlSession();
verify(sqlSessionMock, times(1)).selectList(any(), any());
- verify(internalTaskanaEngine, times(1)).returnConnection();
+ verify(internalKadaiEngine, times(1)).returnConnection();
assertThat(result).hasSize(returnList.size());
assertThat(result.get(0).getWorkbasketKey()).isEqualTo(returnList.get(0).getWorkbasketKey());
}
@@ -106,14 +106,14 @@ class SimpleHistoryServiceImplTest {
AbstractAccTest.createWorkbasketHistoryEvent(
"wbKey1", WorkbasketHistoryEventType.CREATED.getName(), "someUserId", "someDetails"));
when(sqlSessionMock.selectList(any(), any())).thenReturn(new ArrayList<>(returnList));
- when(internalTaskanaEngine.getSqlSession()).thenReturn(sqlSessionMock);
+ when(internalKadaiEngine.getSqlSession()).thenReturn(sqlSessionMock);
final List result =
cutSpy.createWorkbasketHistoryQuery().keyIn("wbKey1").list();
- verify(internalTaskanaEngine, times(1)).openConnection();
- verify(internalTaskanaEngine, times(1)).getSqlSession();
+ verify(internalKadaiEngine, times(1)).openConnection();
+ verify(internalKadaiEngine, times(1)).getSqlSession();
verify(sqlSessionMock, times(1)).selectList(any(), any());
- verify(internalTaskanaEngine, times(1)).returnConnection();
+ verify(internalKadaiEngine, times(1)).returnConnection();
assertThat(result).hasSize(returnList.size());
assertThat(result.get(0).getKey()).isEqualTo(returnList.get(0).getKey());
}
diff --git a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImplTest.java b/history/kadai-simplehistory-provider/src/test/java/io/kadai/simplehistory/impl/WorkbasketHistoryQueryImplTest.java
similarity index 75%
rename from history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImplTest.java
rename to history/kadai-simplehistory-provider/src/test/java/io/kadai/simplehistory/impl/WorkbasketHistoryQueryImplTest.java
index 5c02b3c8b..06af36a55 100644
--- a/history/taskana-simplehistory-provider/src/test/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImplTest.java
+++ b/history/kadai-simplehistory-provider/src/test/java/io/kadai/simplehistory/impl/WorkbasketHistoryQueryImplTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.simplehistory.impl;
+package io.kadai.simplehistory.impl;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -6,6 +6,11 @@ import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.validateMockitoUsage;
import static org.mockito.Mockito.when;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.common.internal.util.IdGenerator;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
+import io.kadai.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
@@ -15,17 +20,12 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.common.internal.util.IdGenerator;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;
-import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType;
/** Unit Test for WorkbasketHistoryQueryImplTest. */
@ExtendWith(MockitoExtension.class)
class WorkbasketHistoryQueryImplTest {
- @Mock private InternalTaskanaEngine internalTaskanaEngineMock;
+ @Mock private InternalKadaiEngine internalKadaiEngineMock;
private WorkbasketHistoryQueryImpl historyQueryImpl;
@@ -33,7 +33,7 @@ class WorkbasketHistoryQueryImplTest {
@BeforeEach
void setup() {
- historyQueryImpl = new WorkbasketHistoryQueryImpl(internalTaskanaEngineMock);
+ historyQueryImpl = new WorkbasketHistoryQueryImpl(internalKadaiEngineMock);
}
@Test
@@ -48,9 +48,9 @@ class WorkbasketHistoryQueryImplTest {
null));
TimeInterval interval = new TimeInterval(Instant.now().minusNanos(1000), Instant.now());
- doNothing().when(internalTaskanaEngineMock).openConnection();
- doNothing().when(internalTaskanaEngineMock).returnConnection();
- when(internalTaskanaEngineMock.getSqlSession()).thenReturn(sqlSessionMock);
+ doNothing().when(internalKadaiEngineMock).openConnection();
+ doNothing().when(internalKadaiEngineMock).returnConnection();
+ when(internalKadaiEngineMock.getSqlSession()).thenReturn(sqlSessionMock);
when(sqlSessionMock.selectList(any(), any())).thenReturn(new ArrayList<>(returnList));
List result =
diff --git a/history/kadai-simplehistory-provider/src/test/resources/kadai.properties b/history/kadai-simplehistory-provider/src/test/resources/kadai.properties
new file mode 100644
index 000000000..ffd3cefd0
--- /dev/null
+++ b/history/kadai-simplehistory-provider/src/test/resources/kadai.properties
@@ -0,0 +1,43 @@
+kadai.roles.user=cn=ksc-users,cn=groups,OU=Test,O=KADAI | teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2
+kadai.roles.admin=name=konrad,Organisation=envite|admin
+kadai.roles.business_admin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=KADAI
+kadai.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=KADAI
+kadai.roles.task_admin=taskadmin
+kadai.domains=DOMAIN_A | DOMAIN_B
+kadai.user.minimalPermissionsToAssignDomains=READ | OPEN
+kadai.classification.types=TASK | document
+kadai.classification.categories.task=EXTERNAL| manual| autoMAtic| Process
+kadai.classification.categories.document=EXTERNAL
+kadai.jobs.maxRetries=3
+kadai.jobs.batchSize=50
+kadai.jobs.runEvery=P1D
+kadai.jobs.firstRunAt=2018-07-25T08:00:00Z
+kadai.jobs.cleanup.task.minimumAge=P14D
+kadai.jobs.cleanup.history.simple.batchSize=50
+kadai.jobs.history.cleanup.runEvery=P1D
+kadai.jobs.history.cleanup.firstRunAt=2018-07-25T08:00:00Z
+kadai.jobs.cleanup.history.simple.minimumAge=P15D
+kadai.workingTime.holidays.german.enabled=true
+kadai.workingTime.holidays.german.corpus-christi.enabled=false
+kadai.history.simple.deleteOnTaskDeletion.enabled=true
+kadai.workingTime.schedule.MONDAY=00:00-00:00
+kadai.workingTime.schedule.TUESDAY=00:00-00:00
+kadai.workingTime.schedule.WEDNESDAY=00:00-00:00
+kadai.workingTime.schedule.THURSDAY=00:00-00:00
+kadai.workingTime.schedule.FRIDAY=00:00-00:00
+kadai.workingTime.timezone=UTC
+# enable or disable the jobscheduler at all
+# set it to false and no jobs are running
+kadai.jobs.scheduler.enabled=false
+# wait time before the first job run
+kadai.jobs.scheduler.initialStartDelay=100
+# sleeping time befor the next job runs
+kadai.jobs.scheduler.period=12
+# timeunit for the initial start delay and the sleeping period
+# Possible values: MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
+kadai.jobs.scheduler.periodTimeUnit=HOURS
+kadai.jobs.cleanup.task.enable=true
+kadai.jobs.priority.task.enable=true
+kadai.jobs.cleanup.workbasket.enable=true
+kadai.jobs.refresh.user.enable=false
+kadai.jobs.cleanup.history.simple.enable=true
diff --git a/history/taskana-simplehistory-provider/src/test/resources/simplelogger.properties b/history/kadai-simplehistory-provider/src/test/resources/simplelogger.properties
similarity index 96%
rename from history/taskana-simplehistory-provider/src/test/resources/simplelogger.properties
rename to history/kadai-simplehistory-provider/src/test/resources/simplelogger.properties
index 70d8c16b3..7260b40cc 100644
--- a/history/taskana-simplehistory-provider/src/test/resources/simplelogger.properties
+++ b/history/kadai-simplehistory-provider/src/test/resources/simplelogger.properties
@@ -1,35 +1,28 @@
# SLF4J's SimpleLogger configuration file
# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
-
# Default logging detail level for all instances of SimpleLogger.
# Must be one of ("trace", "debug", "info", "warn", or "error").
# If not specified, defaults to "info".
org.slf4j.simpleLogger.defaultLogLevel=info
-
# Logging detail level for a SimpleLogger instance named "xxxxx".
# Must be one of ("trace", "debug", "info", "warn", or "error").
# If not specified, the default logging detail level is used.
-org.slf4j.simpleLogger.log.pro.taskana=info
+org.slf4j.simpleLogger.log.io.kadai=info
org.slf4j.simpleLogger.log.org.apache.ibatis=info
-
# Set to true if you want the current date and time to be included in output messages.
# Default is false, and will output the number of milliseconds elapsed since startup.
org.slf4j.simpleLogger.showDateTime=true
-
# The date and time format to be used in the output messages.
# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
# If the format is not specified or is invalid, the default format is used.
# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
-
# Set to true if you want to output the current thread name.
# Defaults to true.
org.slf4j.simpleLogger.showThreadName=true
-
# Set to true if you want the Logger instance name to be included in output messages.
# Defaults to true.
#org.slf4j.simpleLogger.showLogName=true
-
# Set to true if you want the last component of the name to be included in output messages.
# Defaults to false.
org.slf4j.simpleLogger.showShortLogName=false
diff --git a/history/kadai-simplehistory-rest-spring/pom.xml b/history/kadai-simplehistory-rest-spring/pom.xml
new file mode 100644
index 000000000..9f093d75b
--- /dev/null
+++ b/history/kadai-simplehistory-rest-spring/pom.xml
@@ -0,0 +1,156 @@
+
+
+ 4.0.0
+ kadai-simplehistory-rest-spring
+
+ ${project.groupId}:${project.artifactId}
+ The kadai history events plugin, spring based REST API.
+
+
+ io.kadai.history
+ kadai-history-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
+
+
+
+ io.kadai
+ kadai-common-logging
+ ${project.version}
+
+
+ io.kadai.history
+ kadai-simplehistory-provider
+ ${project.version}
+
+
+ io.kadai
+ kadai-rest-spring
+ ${project.version}
+
+
+ org.springframework
+ spring-beans
+
+
+ org.springframework
+ spring-jdbc
+
+
+ org.springframework.hateoas
+ spring-hateoas
+
+
+ jakarta.servlet
+ jakarta.servlet-api
+ provided
+
+
+ jakarta.validation
+ jakarta.validation-api
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
+
+ io.kadai
+ kadai-rest-spring-test-lib
+ ${project.version}
+ test
+
+
+ io.kadai
+ kadai-common-data
+ ${project.version}
+ test
+
+
+ com.unboundid
+ unboundid-ldapsdk
+ test
+
+
+ org.assertj
+ assertj-core
+ ${version.assertj}
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-security
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+ test
+
+
+ org.springframework.plugin
+ spring-plugin-core
+ ${version.spring.plugin.core}
+ test
+
+
+ org.springframework.security
+ spring-security-test
+ test
+
+
+ net.bytebuddy
+ byte-buddy
+ test
+
+
+ net.bytebuddy
+ byte-buddy-agent
+ test
+
+
+ com.h2database
+ h2
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ ${version.maven.javadoc}
+ true
+
+
+
+ title
+ m
+
+
+
+
+
+
+
+
diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/HistoryRestEndpoints.java b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/HistoryRestEndpoints.java
similarity index 88%
rename from history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/HistoryRestEndpoints.java
rename to history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/HistoryRestEndpoints.java
index 0a31b4da5..cefae17b7 100644
--- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/HistoryRestEndpoints.java
+++ b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/HistoryRestEndpoints.java
@@ -1,4 +1,4 @@
-package pro.taskana.simplehistory.rest;
+package io.kadai.simplehistory.rest;
public class HistoryRestEndpoints {
diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryEventController.java b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/TaskHistoryEventController.java
similarity index 86%
rename from history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryEventController.java
rename to history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/TaskHistoryEventController.java
index b6f5f27fa..fa87098b1 100644
--- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryEventController.java
+++ b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/TaskHistoryEventController.java
@@ -1,5 +1,20 @@
-package pro.taskana.simplehistory.rest;
+package io.kadai.simplehistory.rest;
+import io.kadai.common.api.BaseQuery.SortDirection;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.rest.QueryPagingParameter;
+import io.kadai.common.rest.QuerySortBy;
+import io.kadai.common.rest.QuerySortParameter;
+import io.kadai.common.rest.util.QueryParamsValidator;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.task.TaskHistoryQuery;
+import io.kadai.simplehistory.rest.assembler.TaskHistoryEventRepresentationModelAssembler;
+import io.kadai.simplehistory.rest.models.TaskHistoryEventPagedRepresentationModel;
+import io.kadai.simplehistory.rest.models.TaskHistoryEventRepresentationModel;
+import io.kadai.spi.history.api.events.task.TaskHistoryCustomField;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.exceptions.KadaiHistoryEventNotFoundException;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
@@ -19,21 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController;
-import pro.taskana.common.api.BaseQuery.SortDirection;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.rest.QueryPagingParameter;
-import pro.taskana.common.rest.QuerySortBy;
-import pro.taskana.common.rest.QuerySortParameter;
-import pro.taskana.common.rest.util.QueryParamsValidator;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQuery;
-import pro.taskana.simplehistory.rest.assembler.TaskHistoryEventRepresentationModelAssembler;
-import pro.taskana.simplehistory.rest.models.TaskHistoryEventPagedRepresentationModel;
-import pro.taskana.simplehistory.rest.models.TaskHistoryEventRepresentationModel;
-import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.exceptions.TaskanaHistoryEventNotFoundException;
/** Controller for all TaskHistoryEvent related endpoints. */
@RestController
@@ -44,12 +44,12 @@ public class TaskHistoryEventController {
@Autowired
public TaskHistoryEventController(
- TaskanaEngine taskanaEngine,
+ KadaiEngine kadaiEngine,
SimpleHistoryServiceImpl simpleHistoryServiceImpl,
TaskHistoryEventRepresentationModelAssembler assembler) {
this.simpleHistoryService = simpleHistoryServiceImpl;
- this.simpleHistoryService.initialize(taskanaEngine);
+ this.simpleHistoryService.initialize(kadaiEngine);
this.assembler = assembler;
}
@@ -113,7 +113,7 @@ public class TaskHistoryEventController {
* @title Get a single Task History Event
* @param historyEventId the Id of the requested Task History Event.
* @return the requested Task History Event
- * @throws TaskanaHistoryEventNotFoundException If a Task History Event can't be found by the
+ * @throws KadaiHistoryEventNotFoundException If a Task History Event can't be found by the
* provided historyEventId
*/
@Operation(
@@ -140,7 +140,7 @@ public class TaskHistoryEventController {
@Transactional(readOnly = true, rollbackFor = Exception.class)
public ResponseEntity getTaskHistoryEvent(
@PathVariable("historyEventId") String historyEventId)
- throws TaskanaHistoryEventNotFoundException {
+ throws KadaiHistoryEventNotFoundException {
TaskHistoryEvent resultEvent = simpleHistoryService.getTaskHistoryEvent(historyEventId);
TaskHistoryEventRepresentationModel taskEventResource = assembler.toModel(resultEvent);
diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryQueryFilterParameter.java b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/TaskHistoryQueryFilterParameter.java
similarity index 98%
rename from history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryQueryFilterParameter.java
rename to history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/TaskHistoryQueryFilterParameter.java
index 28e917724..51237ab8e 100644
--- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryQueryFilterParameter.java
+++ b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/TaskHistoryQueryFilterParameter.java
@@ -1,15 +1,15 @@
-package pro.taskana.simplehistory.rest;
+package io.kadai.simplehistory.rest;
import static java.util.Optional.ofNullable;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.rest.QueryParameter;
+import io.kadai.simplehistory.impl.task.TaskHistoryQuery;
+import io.kadai.spi.history.api.events.task.TaskHistoryCustomField;
import io.swagger.v3.oas.annotations.media.Schema;
import java.beans.ConstructorProperties;
import java.time.Instant;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.rest.QueryParameter;
-import pro.taskana.simplehistory.impl.task.TaskHistoryQuery;
-import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField;
public class TaskHistoryQueryFilterParameter implements QueryParameter {
public String[] getEventType() {
diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryRestConfiguration.java b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/TaskHistoryRestConfiguration.java
similarity index 71%
rename from history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryRestConfiguration.java
rename to history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/TaskHistoryRestConfiguration.java
index fa6d6d4a1..f14afc58c 100644
--- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryRestConfiguration.java
+++ b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/TaskHistoryRestConfiguration.java
@@ -1,14 +1,14 @@
-package pro.taskana.simplehistory.rest;
+package io.kadai.simplehistory.rest;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-/** Configuration for Taskana history REST service. */
+/** Configuration for Kadai history REST service. */
@Configuration
-@ComponentScan("pro.taskana")
+@ComponentScan("io.kadai")
@EnableTransactionManagement
public class TaskHistoryRestConfiguration {
diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java
similarity index 83%
rename from history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java
rename to history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java
index 60dea2788..e1e7daa28 100644
--- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java
+++ b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java
@@ -1,19 +1,19 @@
-package pro.taskana.simplehistory.rest.assembler;
+package io.kadai.simplehistory.rest.assembler;
import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.rest.assembler.PagedRepresentationModelAssembler;
+import io.kadai.common.rest.models.PageMetadata;
+import io.kadai.simplehistory.rest.TaskHistoryEventController;
+import io.kadai.simplehistory.rest.models.TaskHistoryEventPagedRepresentationModel;
+import io.kadai.simplehistory.rest.models.TaskHistoryEventRepresentationModel;
+import io.kadai.spi.history.api.events.task.TaskHistoryCustomField;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
import java.util.Collection;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.rest.assembler.PagedRepresentationModelAssembler;
-import pro.taskana.common.rest.models.PageMetadata;
-import pro.taskana.simplehistory.rest.TaskHistoryEventController;
-import pro.taskana.simplehistory.rest.models.TaskHistoryEventPagedRepresentationModel;
-import pro.taskana.simplehistory.rest.models.TaskHistoryEventRepresentationModel;
-import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
@Component
public class TaskHistoryEventRepresentationModelAssembler
diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/models/TaskHistoryEventPagedRepresentationModel.java b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/models/TaskHistoryEventPagedRepresentationModel.java
similarity index 83%
rename from history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/models/TaskHistoryEventPagedRepresentationModel.java
rename to history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/models/TaskHistoryEventPagedRepresentationModel.java
index 178b26ea9..8d920aba3 100644
--- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/models/TaskHistoryEventPagedRepresentationModel.java
+++ b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/models/TaskHistoryEventPagedRepresentationModel.java
@@ -1,11 +1,11 @@
-package pro.taskana.simplehistory.rest.models;
+package io.kadai.simplehistory.rest.models;
import com.fasterxml.jackson.annotation.JsonProperty;
+import io.kadai.common.rest.models.PageMetadata;
+import io.kadai.common.rest.models.PagedRepresentationModel;
import io.swagger.v3.oas.annotations.media.Schema;
import java.beans.ConstructorProperties;
import java.util.Collection;
-import pro.taskana.common.rest.models.PageMetadata;
-import pro.taskana.common.rest.models.PagedRepresentationModel;
public class TaskHistoryEventPagedRepresentationModel
extends PagedRepresentationModel {
diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/models/TaskHistoryEventRepresentationModel.java b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/models/TaskHistoryEventRepresentationModel.java
similarity index 98%
rename from history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/models/TaskHistoryEventRepresentationModel.java
rename to history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/models/TaskHistoryEventRepresentationModel.java
index da7ea571b..e62ac2c34 100644
--- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/models/TaskHistoryEventRepresentationModel.java
+++ b/history/kadai-simplehistory-rest-spring/src/main/java/io/kadai/simplehistory/rest/models/TaskHistoryEventRepresentationModel.java
@@ -1,9 +1,9 @@
-package pro.taskana.simplehistory.rest.models;
+package io.kadai.simplehistory.rest.models;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
import io.swagger.v3.oas.annotations.media.Schema;
import java.time.Instant;
import org.springframework.hateoas.RepresentationModel;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
/** Resource class for {@link TaskHistoryEvent}. */
public class TaskHistoryEventRepresentationModel
diff --git a/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/TaskHistoryEventControllerIntTest.java b/history/kadai-simplehistory-rest-spring/src/test/java/io/kadai/simplehistory/rest/TaskHistoryEventControllerIntTest.java
similarity index 96%
rename from history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/TaskHistoryEventControllerIntTest.java
rename to history/kadai-simplehistory-rest-spring/src/test/java/io/kadai/simplehistory/rest/TaskHistoryEventControllerIntTest.java
index 7aa507a39..5f6b5f296 100644
--- a/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/TaskHistoryEventControllerIntTest.java
+++ b/history/kadai-simplehistory-rest-spring/src/test/java/io/kadai/simplehistory/rest/TaskHistoryEventControllerIntTest.java
@@ -1,10 +1,15 @@
-package pro.taskana.simplehistory.rest;
+package io.kadai.simplehistory.rest;
+import static io.kadai.rest.test.RestHelper.TEMPLATE;
import static java.lang.String.CASE_INSENSITIVE_ORDER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static pro.taskana.rest.test.RestHelper.TEMPLATE;
+import io.kadai.common.rest.models.PageMetadata;
+import io.kadai.rest.test.KadaiSpringBootTest;
+import io.kadai.rest.test.RestHelper;
+import io.kadai.simplehistory.rest.models.TaskHistoryEventPagedRepresentationModel;
+import io.kadai.simplehistory.rest.models.TaskHistoryEventRepresentationModel;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
@@ -24,14 +29,9 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.util.UriComponentsBuilder;
-import pro.taskana.common.rest.models.PageMetadata;
-import pro.taskana.rest.test.RestHelper;
-import pro.taskana.rest.test.TaskanaSpringBootTest;
-import pro.taskana.simplehistory.rest.models.TaskHistoryEventPagedRepresentationModel;
-import pro.taskana.simplehistory.rest.models.TaskHistoryEventRepresentationModel;
/** Controller for integration test. */
-@TaskanaSpringBootTest
+@KadaiSpringBootTest
class TaskHistoryEventControllerIntTest {
private static final ParameterizedTypeReference
diff --git a/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java b/history/kadai-simplehistory-rest-spring/src/test/java/io/kadai/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java
similarity index 93%
rename from history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java
rename to history/kadai-simplehistory-rest-spring/src/test/java/io/kadai/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java
index 2398f810b..e9313ce5c 100644
--- a/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java
+++ b/history/kadai-simplehistory-rest-spring/src/test/java/io/kadai/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java
@@ -1,17 +1,17 @@
-package pro.taskana.simplehistory.rest.assembler;
+package io.kadai.simplehistory.rest.assembler;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.rest.test.KadaiSpringBootTest;
+import io.kadai.simplehistory.rest.models.TaskHistoryEventRepresentationModel;
+import io.kadai.spi.history.api.events.task.TaskHistoryCustomField;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
import java.time.Instant;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import pro.taskana.rest.test.TaskanaSpringBootTest;
-import pro.taskana.simplehistory.rest.models.TaskHistoryEventRepresentationModel;
-import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
/** Test for {@link TaskHistoryEventRepresentationModelAssembler}. */
-@TaskanaSpringBootTest
+@KadaiSpringBootTest
class TaskHistoryEventRepresentationModelAssemblerTest {
private final TaskHistoryEventRepresentationModelAssembler assembler;
diff --git a/history/kadai-simplehistory-rest-spring/src/test/resources/application.properties b/history/kadai-simplehistory-rest-spring/src/test/resources/application.properties
new file mode 100644
index 000000000..3a389638d
--- /dev/null
+++ b/history/kadai-simplehistory-rest-spring/src/test/resources/application.properties
@@ -0,0 +1,49 @@
+logging.level.io.kadai=INFO
+spring.main.allow-bean-definition-overriding=true
+######## Kadai DB #######
+spring.datasource.url=jdbc:h2:mem:kadai;NON_KEYWORDS=KEY,VALUE;IGNORECASE=TRUE;LOCK_MODE=0
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=sa
+kadai.schemaName=KADAI
+####### Properties for AccessIdController to connect to LDAP
+kadai.ldap.serverUrl=ldap://localhost:10389
+kadai.ldap.bindDn=uid=admin
+kadai.ldap.bindPassword=secret
+kadai.ldap.baseDn=ou=Test,O=KADAI
+kadai.ldap.userSearchBase=cn=users
+kadai.ldap.userSearchFilterName=objectclass
+kadai.ldap.userSearchFilterValue=person
+kadai.ldap.userFirstnameAttribute=givenName
+kadai.ldap.userLastnameAttribute=sn
+kadai.ldap.userFullnameAttribute=cn
+kadai.ldap.userPhoneAttribute=phoneNumber
+kadai.ldap.userMobilePhoneAttribute=mobileNumber
+kadai.ldap.userEmailAttribute=email
+kadai.ldap.userOrglevel1Attribute=orgLevel1
+kadai.ldap.userOrglevel2Attribute=orgLevel2
+kadai.ldap.userOrglevel3Attribute=someDepartement
+kadai.ldap.userOrglevel4Attribute=orgLevel4
+kadai.ldap.userIdAttribute=uid
+kadai.ldap.userMemberOfGroupAttribute=memberOf
+kadai.ldap.userPermissionsAttribute=permission
+kadai.ldap.groupSearchBase=cn=groups
+kadai.ldap.groupSearchFilterName=objectclass
+kadai.ldap.groupSearchFilterValue=groupOfUniqueNames
+kadai.ldap.groupNameAttribute=cn
+kadai.ldap.minSearchForLength=3
+kadai.ldap.maxNumberOfReturnedAccessIds=50
+kadai.ldap.groupsOfUser=memberUid
+kadai.ldap.permissionSearchBase=cn=groups
+kadai.ldap.permissionSearchFilterName=objectclass
+kadai.ldap.permissionSearchFilterValue=groupofuniquenames
+kadai.ldap.permissionNameAttribute=permission
+kadai.ldap.permissionsOfUser=uniquemember
+kadai.ldap.useDnForGroups=true
+# Embedded Spring LDAP server
+spring.ldap.embedded.base-dn=OU=Test,O=KADAI
+spring.ldap.embedded.credential.username=uid=admin
+spring.ldap.embedded.credential.password=secret
+spring.ldap.embedded.ldif=classpath:kadai-test.ldif
+spring.ldap.embedded.port=10389
+spring.ldap.embedded.validation.enabled=false
diff --git a/history/kadai-simplehistory-rest-spring/src/test/resources/kadai.properties b/history/kadai-simplehistory-rest-spring/src/test/resources/kadai.properties
new file mode 100644
index 000000000..bca1af895
--- /dev/null
+++ b/history/kadai-simplehistory-rest-spring/src/test/resources/kadai.properties
@@ -0,0 +1,20 @@
+kadai.roles.user=cn=ksc-users,cn=groups,OU=Test,O=KADAI | teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2
+kadai.roles.admin=admin | uid=admin,cn=users,OU=Test,O=KADAI
+kadai.roles.business_admin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=KADAI
+kadai.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=KADAI
+kadai.roles.task_admin=taskadmin
+kadai.domains=DOMAIN_A | DOMAIN_B
+kadai.user.minimalPermissionsToAssignDomains=READ | OPEN
+kadai.classification.types=TASK | document
+kadai.classification.categories.task=EXTERNAL| manual| autoMAtic| Process
+kadai.classification.categories.document=EXTERNAL
+kadai.jobs.maxRetries=3
+kadai.jobs.batchSize=50
+kadai.jobs.runEvery=P1D
+kadai.jobs.firstRunAt=2018-07-25T08:00:00Z
+kadai.jobs.cleanup.task.minimumAge=P14D
+kadai.workingTime.holidays.german.enabled=true
+kadai.workingTime.holidays.german.corpus-christi.enabled=false
+kadai.history.simple.deleteOnTaskDeletion.enabled=true
+
+
diff --git a/history/pom.xml b/history/pom.xml
index 46deb1bb5..16c765bb7 100644
--- a/history/pom.xml
+++ b/history/pom.xml
@@ -1,25 +1,25 @@
- 4.0.0
- pro.taskana.history
- taskana-history-parent
- pom
+ 4.0.0
+ io.kadai.history
+ kadai-history-parent
+ pom
- ${project.groupId}:${project.artifactId}
- The taskana history events plugin parent and bom module.
+ ${project.groupId}:${project.artifactId}
+ The kadai history events plugin parent and bom module.
-
- pro.taskana
- taskana-parent
- 8.2.1-SNAPSHOT
- ../pom.xml
-
+
+ io.kadai
+ kadai-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
-
- taskana-simplehistory-provider
- taskana-simplehistory-rest-spring
- taskana-loghistory-provider
-
+
+ kadai-simplehistory-provider
+ kadai-simplehistory-rest-spring
+ kadai-loghistory-provider
+
diff --git a/history/taskana-loghistory-provider/pom.xml b/history/taskana-loghistory-provider/pom.xml
deleted file mode 100644
index 337618055..000000000
--- a/history/taskana-loghistory-provider/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
- 4.0.0
- taskana-loghistory-provider
-
- ${project.groupId}:${project.artifactId}
- The taskana history events logging plugin to include in your project.
-
-
- pro.taskana.history
- taskana-history-parent
- 8.2.1-SNAPSHOT
- ../pom.xml
-
-
-
-
- pro.taskana
- taskana-common-logging
- ${project.version}
-
-
- pro.taskana
- taskana-core
- ${project.version}
-
-
- org.slf4j
- slf4j-api
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jsr310
-
-
-
-
- com.github.valfirst
- slf4j-test
- ${version.slf4j-test}
- test
-
-
- org.assertj
- assertj-core
- ${version.assertj}
- test
-
-
- org.junit.jupiter
- junit-jupiter
- test
-
-
- org.mockito
- mockito-core
- test
-
-
-
-
diff --git a/history/taskana-loghistory-provider/src/main/resources/META-INF/services/pro.taskana.spi.history.api.TaskanaHistory b/history/taskana-loghistory-provider/src/main/resources/META-INF/services/pro.taskana.spi.history.api.TaskanaHistory
deleted file mode 100644
index 0d09d1cd6..000000000
--- a/history/taskana-loghistory-provider/src/main/resources/META-INF/services/pro.taskana.spi.history.api.TaskanaHistory
+++ /dev/null
@@ -1 +0,0 @@
-pro.taskana.loghistory.impl.LogfileHistoryServiceImpl
diff --git a/history/taskana-loghistory-provider/src/test/resources/log4j2-test.xml b/history/taskana-loghistory-provider/src/test/resources/log4j2-test.xml
deleted file mode 100644
index ff8db73e0..000000000
--- a/history/taskana-loghistory-provider/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml
deleted file mode 100644
index e645643ea..000000000
--- a/history/taskana-simplehistory-provider/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
- 4.0.0
- taskana-simplehistory-provider
-
- ${project.groupId}:${project.artifactId}
- The taskana history events plugin to include in your project.
-
-
- pro.taskana.history
- taskana-history-parent
- 8.2.1-SNAPSHOT
- ../pom.xml
-
-
-
-
- pro.taskana
- taskana-common-logging
- ${project.version}
-
-
- pro.taskana
- taskana-core
- ${project.version}
-
-
- org.slf4j
- slf4j-api
-
-
- org.mybatis
- mybatis
- ${version.mybatis}
-
-
-
-
- pro.taskana
- taskana-common-data
- ${project.version}
- test
-
-
- pro.taskana
- taskana-common-test
- ${project.version}
- test
-
-
- org.assertj
- assertj-core
- test
-
-
- org.slf4j
- slf4j-simple
- test
-
-
- org.junit.jupiter
- junit-jupiter
- test
-
-
- org.mockito
- mockito-core
- test
-
-
- com.h2database
- h2
- test
-
-
- org.postgresql
- postgresql
- test
-
-
- com.ibm.db2
- jcc
- ${version.db2}
- test
-
-
- com.oracle.database.jdbc
- ojdbc8
- ${version.oracle}
- test
-
-
- pro.taskana
- taskana-test-api
- ${project.version}
- test
-
-
-
-
diff --git a/history/taskana-simplehistory-provider/src/main/resources/META-INF/services/pro.taskana.spi.history.api.TaskanaHistory b/history/taskana-simplehistory-provider/src/main/resources/META-INF/services/pro.taskana.spi.history.api.TaskanaHistory
deleted file mode 100644
index 8dd76f1bc..000000000
--- a/history/taskana-simplehistory-provider/src/main/resources/META-INF/services/pro.taskana.spi.history.api.TaskanaHistory
+++ /dev/null
@@ -1 +0,0 @@
-pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl
diff --git a/history/taskana-simplehistory-provider/src/test/resources/taskana.properties b/history/taskana-simplehistory-provider/src/test/resources/taskana.properties
deleted file mode 100644
index c7ac38d55..000000000
--- a/history/taskana-simplehistory-provider/src/test/resources/taskana.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-taskana.roles.user=cn=ksc-users,cn=groups,OU=Test,O=TASKANA | teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2
-taskana.roles.admin=name=konrad,Organisation=novatec|admin
-taskana.roles.business_admin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=TASKANA
-taskana.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=TASKANA
-taskana.roles.task_admin=taskadmin
-taskana.domains=DOMAIN_A | DOMAIN_B
-taskana.user.minimalPermissionsToAssignDomains=READ | OPEN
-taskana.classification.types=TASK | document
-taskana.classification.categories.task=EXTERNAL| manual| autoMAtic| Process
-taskana.classification.categories.document=EXTERNAL
-taskana.jobs.maxRetries=3
-taskana.jobs.batchSize=50
-taskana.jobs.runEvery=P1D
-taskana.jobs.firstRunAt=2018-07-25T08:00:00Z
-taskana.jobs.cleanup.task.minimumAge=P14D
-taskana.jobs.cleanup.history.simple.batchSize=50
-taskana.jobs.history.cleanup.runEvery=P1D
-taskana.jobs.history.cleanup.firstRunAt=2018-07-25T08:00:00Z
-taskana.jobs.cleanup.history.simple.minimumAge=P15D
-taskana.workingTime.holidays.german.enabled=true
-taskana.workingTime.holidays.german.corpus-christi.enabled=false
-taskana.history.simple.deleteOnTaskDeletion.enabled=true
-taskana.workingTime.schedule.MONDAY=00:00-00:00
-taskana.workingTime.schedule.TUESDAY=00:00-00:00
-taskana.workingTime.schedule.WEDNESDAY=00:00-00:00
-taskana.workingTime.schedule.THURSDAY=00:00-00:00
-taskana.workingTime.schedule.FRIDAY=00:00-00:00
-taskana.workingTime.timezone=UTC
-# enable or disable the jobscheduler at all
-# set it to false and no jobs are running
-taskana.jobs.scheduler.enabled=false
-# wait time before the first job run
-taskana.jobs.scheduler.initialStartDelay=100
-# sleeping time befor the next job runs
-taskana.jobs.scheduler.period=12
-# timeunit for the initial start delay and the sleeping period
-# Possible values: MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
-taskana.jobs.scheduler.periodTimeUnit=HOURS
-taskana.jobs.cleanup.task.enable=true
-taskana.jobs.priority.task.enable=true
-taskana.jobs.cleanup.workbasket.enable=true
-taskana.jobs.refresh.user.enable=false
-taskana.jobs.cleanup.history.simple.enable=true
diff --git a/history/taskana-simplehistory-rest-spring/pom.xml b/history/taskana-simplehistory-rest-spring/pom.xml
deleted file mode 100644
index 38078bb4e..000000000
--- a/history/taskana-simplehistory-rest-spring/pom.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
- 4.0.0
- taskana-simplehistory-rest-spring
-
- ${project.groupId}:${project.artifactId}
- The taskana history events plugin, spring based REST API.
-
-
- pro.taskana.history
- taskana-history-parent
- 8.2.1-SNAPSHOT
- ../pom.xml
-
-
-
-
- pro.taskana
- taskana-common-logging
- ${project.version}
-
-
- pro.taskana.history
- taskana-simplehistory-provider
- ${project.version}
-
-
- pro.taskana
- taskana-rest-spring
- ${project.version}
-
-
- org.springframework
- spring-beans
-
-
- org.springframework
- spring-jdbc
-
-
- org.springframework.hateoas
- spring-hateoas
-
-
- jakarta.servlet
- jakarta.servlet-api
- provided
-
-
- jakarta.validation
- jakarta.validation-api
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
-
-
- pro.taskana
- taskana-rest-spring-test-lib
- ${project.version}
- test
-
-
- pro.taskana
- taskana-common-data
- ${project.version}
- test
-
-
- com.unboundid
- unboundid-ldapsdk
- test
-
-
- org.assertj
- assertj-core
- ${version.assertj}
- test
-
-
- org.springframework.boot
- spring-boot-starter-web
- test
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.springframework.boot
- spring-boot-starter-security
- test
-
-
- org.springframework.boot
- spring-boot-starter-jdbc
- test
-
-
- org.springframework.plugin
- spring-plugin-core
- ${version.spring.plugin.core}
- test
-
-
- org.springframework.security
- spring-security-test
- test
-
-
- net.bytebuddy
- byte-buddy
- test
-
-
- net.bytebuddy
- byte-buddy-agent
- test
-
-
- com.h2database
- h2
- test
-
-
- org.springframework.boot
- spring-boot-starter-validation
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- ${version.maven.javadoc}
- true
-
-
-
- title
- m
-
-
-
-
-
-
-
-
diff --git a/history/taskana-simplehistory-rest-spring/src/test/resources/application.properties b/history/taskana-simplehistory-rest-spring/src/test/resources/application.properties
deleted file mode 100644
index 4032c0e2e..000000000
--- a/history/taskana-simplehistory-rest-spring/src/test/resources/application.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-logging.level.pro.taskana=INFO
-spring.main.allow-bean-definition-overriding=true
-######## Taskana DB #######
-spring.datasource.url=jdbc:h2:mem:taskana;NON_KEYWORDS=KEY,VALUE;IGNORECASE=TRUE;LOCK_MODE=0
-spring.datasource.driverClassName=org.h2.Driver
-spring.datasource.username=sa
-spring.datasource.password=sa
-taskana.schemaName=TASKANA
-####### Properties for AccessIdController to connect to LDAP
-taskana.ldap.serverUrl=ldap://localhost:10389
-taskana.ldap.bindDn=uid=admin
-taskana.ldap.bindPassword=secret
-taskana.ldap.baseDn=ou=Test,O=TASKANA
-taskana.ldap.userSearchBase=cn=users
-taskana.ldap.userSearchFilterName=objectclass
-taskana.ldap.userSearchFilterValue=person
-taskana.ldap.userFirstnameAttribute=givenName
-taskana.ldap.userLastnameAttribute=sn
-taskana.ldap.userFullnameAttribute=cn
-taskana.ldap.userPhoneAttribute=phoneNumber
-taskana.ldap.userMobilePhoneAttribute=mobileNumber
-taskana.ldap.userEmailAttribute=email
-taskana.ldap.userOrglevel1Attribute=orgLevel1
-taskana.ldap.userOrglevel2Attribute=orgLevel2
-taskana.ldap.userOrglevel3Attribute=someDepartement
-taskana.ldap.userOrglevel4Attribute=orgLevel4
-taskana.ldap.userIdAttribute=uid
-taskana.ldap.userMemberOfGroupAttribute=memberOf
-taskana.ldap.userPermissionsAttribute=permission
-taskana.ldap.groupSearchBase=cn=groups
-taskana.ldap.groupSearchFilterName=objectclass
-taskana.ldap.groupSearchFilterValue=groupOfUniqueNames
-taskana.ldap.groupNameAttribute=cn
-taskana.ldap.minSearchForLength=3
-taskana.ldap.maxNumberOfReturnedAccessIds=50
-taskana.ldap.groupsOfUser=memberUid
-taskana.ldap.permissionSearchBase=cn=groups
-taskana.ldap.permissionSearchFilterName=objectclass
-taskana.ldap.permissionSearchFilterValue=groupofuniquenames
-taskana.ldap.permissionNameAttribute=permission
-taskana.ldap.permissionsOfUser=uniquemember
-taskana.ldap.useDnForGroups=true
-# Embedded Spring LDAP server
-spring.ldap.embedded.base-dn=OU=Test,O=TASKANA
-spring.ldap.embedded.credential.username=uid=admin
-spring.ldap.embedded.credential.password=secret
-spring.ldap.embedded.ldif=classpath:taskana-test.ldif
-spring.ldap.embedded.port=10389
-spring.ldap.embedded.validation.enabled=false
diff --git a/history/taskana-simplehistory-rest-spring/src/test/resources/taskana.properties b/history/taskana-simplehistory-rest-spring/src/test/resources/taskana.properties
deleted file mode 100644
index 685c6e6b8..000000000
--- a/history/taskana-simplehistory-rest-spring/src/test/resources/taskana.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-taskana.roles.user=cn=ksc-users,cn=groups,OU=Test,O=TASKANA | teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2
-taskana.roles.admin=admin | uid=admin,cn=users,OU=Test,O=TASKANA
-taskana.roles.business_admin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=TASKANA
-taskana.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=TASKANA
-taskana.roles.task_admin=taskadmin
-taskana.domains=DOMAIN_A | DOMAIN_B
-taskana.user.minimalPermissionsToAssignDomains=READ | OPEN
-taskana.classification.types=TASK | document
-taskana.classification.categories.task=EXTERNAL| manual| autoMAtic| Process
-taskana.classification.categories.document=EXTERNAL
-taskana.jobs.maxRetries=3
-taskana.jobs.batchSize=50
-taskana.jobs.runEvery=P1D
-taskana.jobs.firstRunAt=2018-07-25T08:00:00Z
-taskana.jobs.cleanup.task.minimumAge=P14D
-taskana.workingTime.holidays.german.enabled=true
-taskana.workingTime.holidays.german.corpus-christi.enabled=false
-taskana.history.simple.deleteOnTaskDeletion.enabled=true
-
-
diff --git a/lib/kadai-cdi-example/pom.xml b/lib/kadai-cdi-example/pom.xml
new file mode 100644
index 000000000..26928c002
--- /dev/null
+++ b/lib/kadai-cdi-example/pom.xml
@@ -0,0 +1,219 @@
+
+ 4.0.0
+ kadai-cdi-example
+ war
+
+ ${project.groupId}:${project.artifactId}
+ The Kadai Spring sample application.
+
+
+ io.kadai
+ kadai-lib-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
+
+
+
+
+
+
+
+
+ org.wildfly.bom
+ wildfly-ee
+ ${version.wildfly}
+ import
+ pom
+
+
+ org.jboss.arquillian
+ arquillian-bom
+ ${version.arquillian}
+ import
+ pom
+
+
+
+
+
+ jakarta.platform
+ jakarta.jakartaee-api
+ ${version.jakartaee-api}
+ provided
+
+
+ io.kadai
+ kadai-cdi
+ ${project.version}
+
+
+
+ org.slf4j
+ jcl-over-slf4j
+ test
+
+
+ org.slf4j
+ slf4j-simple
+ test
+
+
+ org.assertj
+ assertj-core
+ ${version.assertj}
+ test
+
+
+ org.awaitility
+ awaitility
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
+
+ jakarta.servlet
+ jakarta.servlet-api
+ test
+
+
+ com.h2database
+ h2
+ test
+
+
+ org.jboss.arquillian.junit
+ arquillian-junit-container
+ test
+
+
+ org.jboss.shrinkwrap.resolver
+ shrinkwrap-resolver-impl-maven
+ test
+
+
+ org.jboss.shrinkwrap.resolver
+ shrinkwrap-resolver-api-maven
+ test
+
+
+ org.wildfly.arquillian
+ wildfly-arquillian-container-managed
+ ${version.arquillian.managed.wildfly}
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ ${version.maven.dependency}
+
+
+ unpack-wildfly
+ process-test-classes
+
+ unpack
+
+
+
+
+ org.wildfly
+ wildfly-dist
+ ${version.wildfly}
+ zip
+ false
+ ${project.build.directory}
+
+
+
+
+
+ copy-latest-h2-db-driver
+ process-test-classes
+
+ copy
+
+
+
+
+ com.h2database
+ h2
+
+ ${project.build.directory}/wildfly-${version.wildfly}/modules/system/layers/base/com/h2database/h2/main
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ ${version.maven.resources}
+
+
+ copy-h2-module-xml
+ process-test-classes
+
+ copy-resources
+
+
+
+ ${project.build.directory}/wildfly-${version.wildfly}/modules/system/layers/base/com/h2database/h2/main
+
+
+
+ src/test/resources
+
+ module.xml
+
+
+
+
+
+
+ copy-wildfly-config-xml
+ process-test-classes
+
+ copy-resources
+
+
+
+ ${project.build.directory}/wildfly-${version.wildfly}/standalone/configuration
+
+
+
+ src/test/resources
+
+ int-test-standalone.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ jboss
+ https://repository.jboss.org/nexus/content/groups/public-jboss/
+
+
+
diff --git a/lib/taskana-cdi-example/src/main/java/pro/taskana/example/ExampleBootstrap.java b/lib/kadai-cdi-example/src/main/java/io/kadai/example/ExampleBootstrap.java
similarity index 62%
rename from lib/taskana-cdi-example/src/main/java/pro/taskana/example/ExampleBootstrap.java
rename to lib/kadai-cdi-example/src/main/java/io/kadai/example/ExampleBootstrap.java
index 2e8596855..3bd11d65f 100644
--- a/lib/taskana-cdi-example/src/main/java/pro/taskana/example/ExampleBootstrap.java
+++ b/lib/kadai-cdi-example/src/main/java/io/kadai/example/ExampleBootstrap.java
@@ -1,17 +1,17 @@
-package pro.taskana.example;
+package io.kadai.example;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.exceptions.KadaiException;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.internal.models.ObjectReferenceImpl;
+import io.kadai.workbasket.api.WorkbasketType;
+import io.kadai.workbasket.api.models.Workbasket;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.event.Startup;
import jakarta.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.internal.models.ObjectReferenceImpl;
-import pro.taskana.workbasket.api.WorkbasketType;
-import pro.taskana.workbasket.api.models.Workbasket;
/** Example Bootstrap Application. */
@ApplicationScoped
@@ -22,15 +22,15 @@ public class ExampleBootstrap {
private static final String CDIDOMAIN = "CDIDOMAIN";
private static final String CLASSIFICATION_TYPE = "T1";
- private final TaskanaEjb taskanaEjb;
+ private final KadaiEjb kadaiEjb;
public ExampleBootstrap() {
- this.taskanaEjb = null;
+ this.kadaiEjb = null;
}
@Inject
- public ExampleBootstrap(TaskanaEjb taskanaEjb) {
- this.taskanaEjb = taskanaEjb;
+ public ExampleBootstrap(KadaiEjb kadaiEjb) {
+ this.kadaiEjb = kadaiEjb;
}
/**
@@ -43,34 +43,34 @@ public class ExampleBootstrap {
public void init(@Observes Startup startup) throws ExampleStartupException {
try {
LOGGER.info("---------------------------> Start App -- {}", startup);
- Workbasket workbasket = taskanaEjb.getWorkbasketService().newWorkbasket("KEY", CDIDOMAIN);
+ Workbasket workbasket = kadaiEjb.getWorkbasketService().newWorkbasket("KEY", CDIDOMAIN);
workbasket.setName("wb");
workbasket.setType(WorkbasketType.PERSONAL);
- workbasket = taskanaEjb.getWorkbasketService().createWorkbasket(workbasket);
+ workbasket = kadaiEjb.getWorkbasketService().createWorkbasket(workbasket);
Classification classification =
- taskanaEjb
+ kadaiEjb
.getClassificationService()
.newClassification("TEST", CDIDOMAIN, CLASSIFICATION_TYPE);
- taskanaEjb.getClassificationService().createClassification(classification);
+ kadaiEjb.getClassificationService().createClassification(classification);
ObjectReferenceImpl objRef = new ObjectReferenceImpl();
objRef.setCompany("aCompany");
objRef.setSystem("aSystem");
objRef.setSystemInstance("anInstance");
objRef.setType("aType");
objRef.setValue("aValue");
- Task task = taskanaEjb.getTaskService().newTask(workbasket.getId());
+ Task task = kadaiEjb.getTaskService().newTask(workbasket.getId());
task.setClassificationKey(classification.getKey());
task.setName("BootstrapTask");
task.setPrimaryObjRef(objRef);
- task = taskanaEjb.getTaskService().createTask(task);
+ task = kadaiEjb.getTaskService().createTask(task);
LOGGER.info("---------------------------> Task started: {}", task.getId());
- taskanaEjb.getTaskService().claim(task.getId());
+ kadaiEjb.getTaskService().claim(task.getId());
LOGGER.info(
"---------------------------> Task claimed: {}",
- taskanaEjb.getTaskService().getTask(task.getId()).getOwner());
- taskanaEjb.getTaskService().completeTask(task.getId());
+ kadaiEjb.getTaskService().getTask(task.getId()).getOwner());
+ kadaiEjb.getTaskService().completeTask(task.getId());
LOGGER.info("---------------------------> Task completed");
- } catch (TaskanaException e) {
+ } catch (KadaiException e) {
throw new ExampleStartupException(e);
}
}
diff --git a/lib/taskana-cdi-example/src/main/java/pro/taskana/example/ExampleStartupException.java b/lib/kadai-cdi-example/src/main/java/io/kadai/example/ExampleStartupException.java
similarity index 86%
rename from lib/taskana-cdi-example/src/main/java/pro/taskana/example/ExampleStartupException.java
rename to lib/kadai-cdi-example/src/main/java/io/kadai/example/ExampleStartupException.java
index 80cc1ba1a..178023d87 100644
--- a/lib/taskana-cdi-example/src/main/java/pro/taskana/example/ExampleStartupException.java
+++ b/lib/kadai-cdi-example/src/main/java/io/kadai/example/ExampleStartupException.java
@@ -1,4 +1,4 @@
-package pro.taskana.example;
+package io.kadai.example;
public class ExampleStartupException extends RuntimeException {
diff --git a/lib/taskana-cdi-example/src/main/java/pro/taskana/example/TaskanaEjb.java b/lib/kadai-cdi-example/src/main/java/io/kadai/example/KadaiEjb.java
similarity index 75%
rename from lib/taskana-cdi-example/src/main/java/pro/taskana/example/TaskanaEjb.java
rename to lib/kadai-cdi-example/src/main/java/io/kadai/example/KadaiEjb.java
index 8c18e0b1e..d4150487e 100644
--- a/lib/taskana-cdi-example/src/main/java/pro/taskana/example/TaskanaEjb.java
+++ b/lib/kadai-cdi-example/src/main/java/io/kadai/example/KadaiEjb.java
@@ -1,14 +1,14 @@
-package pro.taskana.example;
+package io.kadai.example;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.task.api.TaskService;
+import io.kadai.workbasket.api.WorkbasketService;
import jakarta.ejb.Stateless;
import jakarta.inject.Inject;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.workbasket.api.WorkbasketService;
-/** example Taskana EJB. */
+/** example Kadai EJB. */
@Stateless
-public class TaskanaEjb {
+public class KadaiEjb {
private final TaskService taskService;
@@ -16,14 +16,14 @@ public class TaskanaEjb {
private final WorkbasketService workbasketService;
- public TaskanaEjb() {
+ public KadaiEjb() {
this.taskService = null;
this.classificationService = null;
this.workbasketService = null;
}
@Inject
- public TaskanaEjb(
+ public KadaiEjb(
TaskService taskService,
ClassificationService classificationService,
WorkbasketService workbasketService) {
diff --git a/lib/taskana-cdi-example/src/main/resources/META-INF/beans.xml b/lib/kadai-cdi-example/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from lib/taskana-cdi-example/src/main/resources/META-INF/beans.xml
rename to lib/kadai-cdi-example/src/main/resources/META-INF/beans.xml
diff --git a/lib/kadai-cdi-example/src/main/resources/kadai.properties b/lib/kadai-cdi-example/src/main/resources/kadai.properties
new file mode 100644
index 000000000..2f67bdc55
--- /dev/null
+++ b/lib/kadai-cdi-example/src/main/resources/kadai.properties
@@ -0,0 +1,19 @@
+datasource.jndi=java:jboss/datasources/Kadai
+kadai.domains=CDIDOMAIN
+kadai.classification.types=T1
+kadai.classification.categories.T1=DEFAULT
+# enable or disable the jobscheduler at all
+# set it to false and no jobs are running
+kadai.jobs.scheduler.enabled=true
+# wait time before the first job run
+kadai.jobs.scheduler.initialStartDelay=100
+# sleeping time befor the next job runs
+kadai.jobs.scheduler.period=1
+# timeunit for the initial start delay and the sleeping period
+# Possible values: MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
+kadai.jobs.scheduler.periodTimeUnit=HOURS
+kadai.jobs.cleanup.task.enable=true
+kadai.jobs.priority.task.enable=true
+kadai.jobs.cleanup.workbasket.enable=true
+kadai.jobs.refresh.user.enable=false
+kadai.jobs.cleanup.history.simple.enable=false
diff --git a/lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java b/lib/kadai-cdi-example/src/test/java/io/kadai/example/ExampleBootstrapTest.java
similarity index 80%
rename from lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java
rename to lib/kadai-cdi-example/src/test/java/io/kadai/example/ExampleBootstrapTest.java
index 02aff509c..795f2e914 100644
--- a/lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java
+++ b/lib/kadai-cdi-example/src/test/java/io/kadai/example/ExampleBootstrapTest.java
@@ -1,4 +1,4 @@
-package pro.taskana.example;
+package io.kadai.example;
import static org.awaitility.Awaitility.await;
import static org.awaitility.Durations.ONE_HUNDRED_MILLISECONDS;
@@ -32,7 +32,7 @@ public class ExampleBootstrapTest {
@Deployment(testable = false, order = 10)
public static Archive createDeployment() throws Exception {
- EnterpriseArchive deployment = ShrinkWrap.create(EnterpriseArchive.class, "taskana.ear");
+ EnterpriseArchive deployment = ShrinkWrap.create(EnterpriseArchive.class, "kadai.ear");
File[] libs =
Maven.resolver()
@@ -43,9 +43,9 @@ public class ExampleBootstrapTest {
.asFile();
deployment.addAsLibraries(libs);
- JavaArchive ejbModule = ShrinkWrap.create(JavaArchive.class, "taskana.jar");
- ejbModule.addClasses(TaskanaEjb.class, ExampleBootstrap.class, ExampleStartupException.class);
- ejbModule.addAsResource("taskana.properties");
+ JavaArchive ejbModule = ShrinkWrap.create(JavaArchive.class, "kadai.jar");
+ ejbModule.addClasses(KadaiEjb.class, ExampleBootstrap.class, ExampleStartupException.class);
+ ejbModule.addAsResource("kadai.properties");
deployment.addAsModule(ejbModule);
deployment.addAsManifestResource("META-INF/beans.xml", "beans.xml");
@@ -53,18 +53,18 @@ public class ExampleBootstrapTest {
}
@BeforeClass
- public static void cleanTaskanaH2DataFolder() throws IOException {
- // Delete Taskana folder if exists
- Path taskanaH2Data = Path.of(System.getProperty("user.home"), "taskana-h2-data");
- if (Files.exists(taskanaH2Data)) {
- FileUtils.forceDelete(taskanaH2Data.toFile());
+ public static void cleanKadaiH2DataFolder() throws IOException {
+ // Delete Kadai folder if exists
+ Path kadaiH2Data = Path.of(System.getProperty("user.home"), "kadai-h2-data");
+ if (Files.exists(kadaiH2Data)) {
+ FileUtils.forceDelete(kadaiH2Data.toFile());
}
}
@Test
public void should_count_tasks_after_example_cdi_application_was_deployed() throws Exception {
// this test method is started that fast that the commit
- // from pro.taskana.example.ExampleBootstrap.init is not completed
+ // from io.kadai.example.ExampleBootstrap.init is not completed
// so we need to wait here a bit
// https://www.baeldung.com/awaitility-testing
await()
@@ -86,7 +86,7 @@ public class ExampleBootstrapTest {
private Connection getConnection() throws Exception {
return DriverManager.getConnection(
- "jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
+ "jdbc:h2:~/kadai-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
+ "IGNORECASE=TRUE;LOCK_MODE=0",
"sa",
"sa");
@@ -98,7 +98,7 @@ public class ExampleBootstrapTest {
int resultCount = 0;
try (Connection conn = getConnection();
PreparedStatement statement =
- conn.prepareStatement("SELECT COUNT(ID) FROM TASKANA.TASK WHERE NAME = ?")) {
+ conn.prepareStatement("SELECT COUNT(ID) FROM KADAI.TASK WHERE NAME = ?")) {
statement.setString(1, taskName);
ResultSet rs = statement.executeQuery();
diff --git a/lib/kadai-cdi-example/src/test/resources/arquillian.xml b/lib/kadai-cdi-example/src/test/resources/arquillian.xml
new file mode 100644
index 000000000..a544a48ab
--- /dev/null
+++ b/lib/kadai-cdi-example/src/test/resources/arquillian.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ target/wildfly-31.0.1.Final
+ int-test-standalone.xml
+
+
+
+
+
+ -Djava.util.logging.manager=org.jboss.logmanager.LogManager
+
+
+
+
\ No newline at end of file
diff --git a/lib/kadai-cdi-example/src/test/resources/int-test-standalone.xml b/lib/kadai-cdi-example/src/test/resources/int-test-standalone.xml
new file mode 100644
index 000000000..d4c3dc33f
--- /dev/null
+++ b/lib/kadai-cdi-example/src/test/resources/int-test-standalone.xml
@@ -0,0 +1,703 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+ h2
+
+
+
+
+ jdbc:h2:~/kadai-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;IGNORECASE=TRUE;LOCK_MODE=0
+
+ h2
+
+
+
+
+ org.h2.jdbcx.JdbcDataSource
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${jboss.bind.address:127.0.0.1}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/kadai-cdi-example/src/test/resources/module.xml b/lib/kadai-cdi-example/src/test/resources/module.xml
new file mode 100644
index 000000000..2364f943a
--- /dev/null
+++ b/lib/kadai-cdi-example/src/test/resources/module.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/taskana-cdi/README.md b/lib/kadai-cdi/README.md
similarity index 90%
rename from lib/taskana-cdi/README.md
rename to lib/kadai-cdi/README.md
index d5a46aa4d..b6076ee7a 100644
--- a/lib/taskana-cdi/README.md
+++ b/lib/kadai-cdi/README.md
@@ -1,4 +1,4 @@
-# taskana-cdi
+# kadai-cdi
this module is for EJB deployments.
@@ -123,13 +123,15 @@ starting and stopping wildfly happens with [arquillian](https://arquillian.org/)
```java
@RunWith(Arquillian.class)
-public class TaskanaProducersTest {}
+public class KadaiProducersTest {}
```
-the file `src/test/resources/arquillian.xml` contains additional server start settings. change vm settings here for remote debugging.
+the file `src/test/resources/arquillian.xml` contains additional server start settings. change vm settings here for
+remote debugging.
-the file `src/test/resources/int-test-standalone.xml` conatins the wildfly server config. Here are the datasources configured, for example.
+the file `src/test/resources/int-test-standalone.xml` conatins the wildfly server config. Here are the datasources
+configured, for example.
### 4. deploy ear
@@ -138,7 +140,7 @@ create the ear deployment happens inside the testcase
```java
@Deployment(testable = false)
public static Archive createDeployment() throws Exception {
- EnterpriseArchive deployment = ShrinkWrap.create(EnterpriseArchive.class, "taskana.ear");
+ EnterpriseArchive deployment = ShrinkWrap.create(EnterpriseArchive.class, "kadai.ear");
File[] libs =
Maven.resolver()
@@ -149,14 +151,14 @@ create the ear deployment happens inside the testcase
.asFile();
deployment.addAsLibraries(libs);
- JavaArchive ejbModule = ShrinkWrap.create(JavaArchive.class, "taskana.jar");
- ejbModule.addClasses(TaskanaProducers.class, TaskanaEjb.class);
- ejbModule.addAsResource("taskana.properties");
+ JavaArchive ejbModule = ShrinkWrap.create(JavaArchive.class, "kadai.jar");
+ ejbModule.addClasses(KadaiProducers.class, KadaiEjb.class);
+ ejbModule.addAsResource("kadai.properties");
deployment.addAsModule(ejbModule);
WebArchive webArchive =
- ShrinkWrap.create(WebArchive.class, "taskana.war")
- .addClasses(TaskanaCdiTestRestController.class, RestApplication.class)
+ ShrinkWrap.create(WebArchive.class, "kadai.war")
+ .addClasses(KadaiCdiTestRestController.class, RestApplication.class)
.addAsWebInfResource("beans.xml")
.addAsWebInfResource("int-test-jboss-web.xml", "jboss-web.xml");
deployment.addAsModule(webArchive);
diff --git a/lib/kadai-cdi/pom.xml b/lib/kadai-cdi/pom.xml
new file mode 100644
index 000000000..d76ea0891
--- /dev/null
+++ b/lib/kadai-cdi/pom.xml
@@ -0,0 +1,210 @@
+
+ 4.0.0
+ kadai-cdi
+
+ ${project.groupId}:${project.artifactId}
+ The helper module to integrate kadai into CDI projects.
+
+
+ io.kadai
+ kadai-lib-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
+
+
+
+
+ org.wildfly.bom
+ wildfly-ee
+ ${version.wildfly}
+ import
+ pom
+
+
+ org.jboss.arquillian
+ arquillian-bom
+ ${version.arquillian}
+ import
+ pom
+
+
+
+
+
+ io.kadai
+ kadai-core
+ ${project.version}
+
+
+ jakarta.platform
+ jakarta.jakartaee-api
+ ${version.jakartaee-api}
+ provided
+
+
+
+
+ org.slf4j
+ jcl-over-slf4j
+ test
+
+
+ org.slf4j
+ slf4j-simple
+ test
+
+
+ org.assertj
+ assertj-core
+ ${version.assertj}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
+
+ jakarta.servlet
+ jakarta.servlet-api
+ test
+
+
+ com.h2database
+ h2
+ test
+
+
+ org.jboss.arquillian.junit
+ arquillian-junit-container
+ test
+
+
+ org.jboss.shrinkwrap.resolver
+ shrinkwrap-resolver-impl-maven
+ test
+
+
+ org.jboss.shrinkwrap.resolver
+ shrinkwrap-resolver-api-maven
+ test
+
+
+ org.wildfly.arquillian
+ wildfly-arquillian-container-managed
+ ${version.arquillian.managed.wildfly}
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ ${version.maven.dependency}
+
+
+ unpack-wildfly
+ process-test-classes
+
+ unpack
+
+
+
+
+ org.wildfly
+ wildfly-dist
+ ${version.wildfly}
+ zip
+ false
+ ${project.build.directory}
+
+
+
+
+
+ copy-latest-h2-db-driver
+ process-test-classes
+
+ copy
+
+
+
+
+ com.h2database
+ h2
+
+ ${project.build.directory}/wildfly-${version.wildfly}/modules/system/layers/base/com/h2database/h2/main
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ ${version.maven.resources}
+
+
+ copy-h2-module-xml
+ process-test-classes
+
+ copy-resources
+
+
+
+ ${project.build.directory}/wildfly-${version.wildfly}/modules/system/layers/base/com/h2database/h2/main
+
+
+
+ src/test/resources
+
+ module.xml
+
+
+
+
+
+
+ copy-wildfly-config-xml
+ process-test-classes
+
+ copy-resources
+
+
+
+ ${project.build.directory}/wildfly-${version.wildfly}/standalone/configuration
+
+
+
+ src/test/resources
+
+ int-test-standalone.xml
+
+
+
+
+
+
+
+
+
+
+
+
+ jboss
+ https://repository.jboss.org/nexus/content/groups/public-jboss/
+
+
+
diff --git a/lib/kadai-cdi/src/main/java/io/kadai/common/internal/KadaiCdiStartupException.java b/lib/kadai-cdi/src/main/java/io/kadai/common/internal/KadaiCdiStartupException.java
new file mode 100644
index 000000000..cdac2a93e
--- /dev/null
+++ b/lib/kadai-cdi/src/main/java/io/kadai/common/internal/KadaiCdiStartupException.java
@@ -0,0 +1,8 @@
+package io.kadai.common.internal;
+
+public class KadaiCdiStartupException extends RuntimeException {
+
+ public KadaiCdiStartupException(Throwable cause) {
+ super("Can't init KadaiProducers", cause);
+ }
+}
diff --git a/lib/taskana-cdi/src/main/java/pro/taskana/common/internal/TaskanaProducers.java b/lib/kadai-cdi/src/main/java/io/kadai/common/internal/KadaiProducers.java
similarity index 65%
rename from lib/taskana-cdi/src/main/java/pro/taskana/common/internal/TaskanaProducers.java
rename to lib/kadai-cdi/src/main/java/io/kadai/common/internal/KadaiProducers.java
index 5e475c1b6..a1ffb3f75 100644
--- a/lib/taskana-cdi/src/main/java/pro/taskana/common/internal/TaskanaProducers.java
+++ b/lib/kadai-cdi/src/main/java/io/kadai/common/internal/KadaiProducers.java
@@ -1,5 +1,10 @@
-package pro.taskana.common.internal;
+package io.kadai.common.internal;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.task.api.TaskService;
+import io.kadai.workbasket.api.WorkbasketService;
import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Observes;
@@ -18,32 +23,27 @@ import javax.naming.NamingException;
import javax.sql.DataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.workbasket.api.WorkbasketService;
/** TODO. */
@ApplicationScoped
-public class TaskanaProducers {
+public class KadaiProducers {
- private static final Logger LOGGER = LoggerFactory.getLogger(TaskanaProducers.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(KadaiProducers.class);
- private static final String TASKANA_PROPERTIES = "taskana.properties";
+ private static final String KADAI_PROPERTIES = "kadai.properties";
// initalized during post construct
- private TaskanaConfiguration taskanaConfiguration;
+ private KadaiConfiguration kadaiConfiguration;
- private final TaskanaEngine taskanaEngine;
+ private final KadaiEngine kadaiEngine;
- public TaskanaProducers() {
- this.taskanaEngine = null;
+ public KadaiProducers() {
+ this.kadaiEngine = null;
}
@Inject
- public TaskanaProducers(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public KadaiProducers(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
/**
@@ -64,7 +64,7 @@ public class TaskanaProducers {
Context ctx;
DataSource dataSource;
ClassLoader classloader = Thread.currentThread().getContextClassLoader();
- try (InputStream propertyStream = classloader.getResourceAsStream(TASKANA_PROPERTIES)) {
+ try (InputStream propertyStream = classloader.getResourceAsStream(KADAI_PROPERTIES)) {
Properties properties = new Properties();
ctx = new InitialContext();
properties.load(propertyStream);
@@ -75,36 +75,36 @@ public class TaskanaProducers {
LOGGER.debug("---------------> {}", metaData);
}
}
- this.taskanaConfiguration =
- new TaskanaConfiguration.Builder(dataSource, true, "TASKANA", false)
- .initTaskanaProperties()
+ this.kadaiConfiguration =
+ new KadaiConfiguration.Builder(dataSource, true, "KADAI", false)
+ .initKadaiProperties()
.build();
} catch (NamingException | SQLException | IOException e) {
- throw new TaskanaCdiStartupException(e);
+ throw new KadaiCdiStartupException(e);
}
}
@ApplicationScoped
@Produces
- public TaskanaEngine generateTaskEngine() throws SQLException {
- return TaskanaEngine.buildTaskanaEngine(taskanaConfiguration);
+ public KadaiEngine generateTaskEngine() throws SQLException {
+ return KadaiEngine.buildKadaiEngine(kadaiConfiguration);
}
@ApplicationScoped
@Produces
public TaskService generateTaskService() {
- return taskanaEngine.getTaskService();
+ return kadaiEngine.getTaskService();
}
@ApplicationScoped
@Produces
public ClassificationService generateClassificationService() {
- return taskanaEngine.getClassificationService();
+ return kadaiEngine.getClassificationService();
}
@ApplicationScoped
@Produces
public WorkbasketService generateWorkbasketService() {
- return taskanaEngine.getWorkbasketService();
+ return kadaiEngine.getWorkbasketService();
}
}
diff --git a/lib/taskana-cdi/src/main/resources/META-INF/beans.xml b/lib/kadai-cdi/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from lib/taskana-cdi/src/main/resources/META-INF/beans.xml
rename to lib/kadai-cdi/src/main/resources/META-INF/beans.xml
diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaCdiTestRestController.java b/lib/kadai-cdi/src/test/java/io/kadai/KadaiCdiTestRestController.java
similarity index 56%
rename from lib/taskana-cdi/src/test/java/pro/taskana/TaskanaCdiTestRestController.java
rename to lib/kadai-cdi/src/test/java/io/kadai/KadaiCdiTestRestController.java
index df06ea0be..c2d99fd88 100644
--- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaCdiTestRestController.java
+++ b/lib/kadai-cdi/src/test/java/io/kadai/KadaiCdiTestRestController.java
@@ -1,5 +1,11 @@
-package pro.taskana;
+package io.kadai;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.internal.models.ObjectReferenceImpl;
+import io.kadai.workbasket.api.WorkbasketType;
+import io.kadai.workbasket.api.models.Workbasket;
import jakarta.inject.Inject;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
@@ -9,47 +15,41 @@ import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.core.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.internal.models.ObjectReferenceImpl;
-import pro.taskana.workbasket.api.WorkbasketType;
-import pro.taskana.workbasket.api.models.Workbasket;
@Path("/test")
-public class TaskanaCdiTestRestController {
+public class KadaiCdiTestRestController {
- private static final Logger LOGGER = LoggerFactory.getLogger(TaskanaCdiTestRestController.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(KadaiCdiTestRestController.class);
private static final String CDIDOMAIN = "CDIDOMAIN";
private static final String CLASSIFICATION_TYPE = "T1";
- private final TaskanaEjb taskanaEjb;
+ private final KadaiEjb kadaiEjb;
private final ClassificationService classificationService;
- public TaskanaCdiTestRestController() {
- this.taskanaEjb = null;
+ public KadaiCdiTestRestController() {
+ this.kadaiEjb = null;
this.classificationService = null;
}
@Inject
- public TaskanaCdiTestRestController(
- TaskanaEjb taskanaEjb, ClassificationService classificationService) {
- this.taskanaEjb = taskanaEjb;
+ public KadaiCdiTestRestController(
+ KadaiEjb kadaiEjb, ClassificationService classificationService) {
+ this.kadaiEjb = kadaiEjb;
this.classificationService = classificationService;
}
@GET
public Response startTask() throws Exception {
- Workbasket workbasket = taskanaEjb.getWorkbasketService().newWorkbasket("KEY", CDIDOMAIN);
+ Workbasket workbasket = kadaiEjb.getWorkbasketService().newWorkbasket("KEY", CDIDOMAIN);
workbasket.setName("wb");
workbasket.setType(WorkbasketType.PERSONAL);
- workbasket = taskanaEjb.getWorkbasketService().createWorkbasket(workbasket);
+ workbasket = kadaiEjb.getWorkbasketService().createWorkbasket(workbasket);
Classification classification =
classificationService.newClassification("TEST", CDIDOMAIN, CLASSIFICATION_TYPE);
- taskanaEjb.getClassificationService().createClassification(classification);
+ kadaiEjb.getClassificationService().createClassification(classification);
- Task task = taskanaEjb.getTaskService().newTask(workbasket.getId());
+ Task task = kadaiEjb.getTaskService().newTask(workbasket.getId());
task.setClassificationKey(classification.getKey());
task.setName("startTask");
ObjectReferenceImpl objRef = new ObjectReferenceImpl();
@@ -60,7 +60,7 @@ public class TaskanaCdiTestRestController {
objRef.setValue("aValue");
task.setPrimaryObjRef(objRef);
- Task result = taskanaEjb.getTaskService().createTask(task);
+ Task result = kadaiEjb.getTaskService().createTask(task);
LOGGER.info(result.getId() + ":" + result.getOwner());
return Response.status(200).entity(result.getId()).build();
@@ -69,16 +69,16 @@ public class TaskanaCdiTestRestController {
@POST
public Response rollbackTask() throws Exception {
Workbasket workbasket =
- taskanaEjb.getWorkbasketService().newWorkbasket("KEY_ROLLBACK", CDIDOMAIN);
+ kadaiEjb.getWorkbasketService().newWorkbasket("KEY_ROLLBACK", CDIDOMAIN);
workbasket.setName("wb_rollback");
workbasket.setType(WorkbasketType.PERSONAL);
- workbasket = taskanaEjb.getWorkbasketService().createWorkbasket(workbasket);
+ workbasket = kadaiEjb.getWorkbasketService().createWorkbasket(workbasket);
Classification classification =
classificationService.newClassification("TEST_ROLLBACK", CDIDOMAIN, CLASSIFICATION_TYPE);
- taskanaEjb.getClassificationService().createClassification(classification);
+ kadaiEjb.getClassificationService().createClassification(classification);
try {
- taskanaEjb.triggerRollback(workbasket.getId(), classification.getKey());
+ kadaiEjb.triggerRollback(workbasket.getId(), classification.getKey());
} catch (Exception e) {
if (!"java.lang.RuntimeException: Expected Test Exception".equals(e.getMessage())) {
throw e;
@@ -91,6 +91,6 @@ public class TaskanaCdiTestRestController {
@Path("{id}")
public void completeTask(@PathParam("id") String id) throws Exception {
LOGGER.info(id);
- taskanaEjb.getTaskService().forceCompleteTask(id);
+ kadaiEjb.getTaskService().forceCompleteTask(id);
}
}
diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java b/lib/kadai-cdi/src/test/java/io/kadai/KadaiEjb.java
similarity index 81%
rename from lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java
rename to lib/kadai-cdi/src/test/java/io/kadai/KadaiEjb.java
index 8d74d2c3a..5ca5fbb5b 100644
--- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java
+++ b/lib/kadai-cdi/src/test/java/io/kadai/KadaiEjb.java
@@ -1,15 +1,15 @@
-package pro.taskana;
+package io.kadai;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.internal.models.ObjectReferenceImpl;
+import io.kadai.workbasket.api.WorkbasketService;
import jakarta.ejb.Stateless;
import jakarta.inject.Inject;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.internal.models.ObjectReferenceImpl;
-import pro.taskana.workbasket.api.WorkbasketService;
@Stateless
-public class TaskanaEjb {
+public class KadaiEjb {
private final TaskService taskService;
@@ -17,14 +17,14 @@ public class TaskanaEjb {
private final WorkbasketService workbasketService;
- public TaskanaEjb() {
+ public KadaiEjb() {
this.taskService = null;
this.classificationService = null;
this.workbasketService = null;
}
@Inject
- public TaskanaEjb(
+ public KadaiEjb(
TaskService taskService,
ClassificationService classificationService,
WorkbasketService workbasketService) {
diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java b/lib/kadai-cdi/src/test/java/io/kadai/RestApplication.java
similarity index 88%
rename from lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java
rename to lib/kadai-cdi/src/test/java/io/kadai/RestApplication.java
index cd7d8b3e7..4bb796d30 100644
--- a/lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java
+++ b/lib/kadai-cdi/src/test/java/io/kadai/RestApplication.java
@@ -1,4 +1,4 @@
-package pro.taskana;
+package io.kadai;
import jakarta.ws.rs.ApplicationPath;
import jakarta.ws.rs.core.Application;
diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java b/lib/kadai-cdi/src/test/java/io/kadai/common/internal/KadaiProducersTest.java
similarity index 79%
rename from lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java
rename to lib/kadai-cdi/src/test/java/io/kadai/common/internal/KadaiProducersTest.java
index fdc1b6b3c..d8f532844 100644
--- a/lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java
+++ b/lib/kadai-cdi/src/test/java/io/kadai/common/internal/KadaiProducersTest.java
@@ -1,7 +1,10 @@
-package pro.taskana.common.internal;
+package io.kadai.common.internal;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.KadaiCdiTestRestController;
+import io.kadai.KadaiEjb;
+import io.kadai.RestApplication;
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -27,14 +30,11 @@ import org.jboss.shrinkwrap.resolver.api.maven.Maven;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import pro.taskana.RestApplication;
-import pro.taskana.TaskanaCdiTestRestController;
-import pro.taskana.TaskanaEjb;
@RunWith(Arquillian.class)
-public class TaskanaProducersTest {
+public class KadaiProducersTest {
- private static final String REST_TEST_URL = "http://127.0.0.1:8080/taskana/rest/test";
+ private static final String REST_TEST_URL = "http://127.0.0.1:8080/kadai/rest/test";
private static final HttpClient HTTP_CLIENT =
HttpClient.newBuilder()
@@ -44,7 +44,7 @@ public class TaskanaProducersTest {
@Deployment(testable = false)
public static Archive createDeployment() throws Exception {
- EnterpriseArchive deployment = ShrinkWrap.create(EnterpriseArchive.class, "taskana.ear");
+ EnterpriseArchive deployment = ShrinkWrap.create(EnterpriseArchive.class, "kadai.ear");
File[] libs =
Maven.resolver()
@@ -55,15 +55,14 @@ public class TaskanaProducersTest {
.asFile();
deployment.addAsLibraries(libs);
- JavaArchive ejbModule = ShrinkWrap.create(JavaArchive.class, "taskana.jar");
- ejbModule.addClasses(
- TaskanaProducers.class, TaskanaEjb.class, TaskanaCdiStartupException.class);
- ejbModule.addAsResource("taskana.properties");
+ JavaArchive ejbModule = ShrinkWrap.create(JavaArchive.class, "kadai.jar");
+ ejbModule.addClasses(KadaiProducers.class, KadaiEjb.class, KadaiCdiStartupException.class);
+ ejbModule.addAsResource("kadai.properties");
deployment.addAsModule(ejbModule);
WebArchive webArchive =
- ShrinkWrap.create(WebArchive.class, "taskana.war")
- .addClasses(TaskanaCdiTestRestController.class, RestApplication.class)
+ ShrinkWrap.create(WebArchive.class, "kadai.war")
+ .addClasses(KadaiCdiTestRestController.class, RestApplication.class)
.addAsWebInfResource("META-INF/beans.xml", "beans.xml")
.addAsWebInfResource("int-test-jboss-web.xml", "jboss-web.xml");
deployment.addAsModule(webArchive);
@@ -74,10 +73,10 @@ public class TaskanaProducersTest {
@BeforeClass
public static void beforeClass() throws IOException {
- // Delete Taskana folder if exists
- Path taskanaH2Data = Path.of(System.getProperty("user.home"), "taskana-h2-data");
- if (Files.exists(taskanaH2Data)) {
- FileUtils.forceDelete(taskanaH2Data.toFile());
+ // Delete Kadai folder if exists
+ Path kadaiH2Data = Path.of(System.getProperty("user.home"), "kadai-h2-data");
+ if (Files.exists(kadaiH2Data)) {
+ FileUtils.forceDelete(kadaiH2Data.toFile());
}
}
@@ -108,7 +107,7 @@ public class TaskanaProducersTest {
private Connection getConnection() throws Exception {
return DriverManager.getConnection(
- "jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
+ "jdbc:h2:~/kadai-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
+ "IGNORECASE=TRUE;LOCK_MODE=0",
"sa",
"sa");
@@ -120,7 +119,7 @@ public class TaskanaProducersTest {
int resultCount = 0;
try (Connection conn = getConnection()) {
try (PreparedStatement statement =
- conn.prepareStatement("SELECT COUNT(ID) FROM TASKANA.TASK WHERE NAME = ?")) {
+ conn.prepareStatement("SELECT COUNT(ID) FROM KADAI.TASK WHERE NAME = ?")) {
statement.setString(1, taskName);
ResultSet rs = statement.executeQuery();
diff --git a/lib/kadai-cdi/src/test/resources/arquillian.xml b/lib/kadai-cdi/src/test/resources/arquillian.xml
new file mode 100644
index 000000000..a544a48ab
--- /dev/null
+++ b/lib/kadai-cdi/src/test/resources/arquillian.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ target/wildfly-31.0.1.Final
+ int-test-standalone.xml
+
+
+
+
+
+ -Djava.util.logging.manager=org.jboss.logmanager.LogManager
+
+
+
+
\ No newline at end of file
diff --git a/lib/taskana-cdi/src/test/resources/int-test-jboss-web.xml b/lib/kadai-cdi/src/test/resources/int-test-jboss-web.xml
similarity index 88%
rename from lib/taskana-cdi/src/test/resources/int-test-jboss-web.xml
rename to lib/kadai-cdi/src/test/resources/int-test-jboss-web.xml
index a4c595ccc..7f2e336c3 100644
--- a/lib/taskana-cdi/src/test/resources/int-test-jboss-web.xml
+++ b/lib/kadai-cdi/src/test/resources/int-test-jboss-web.xml
@@ -3,5 +3,5 @@
xmlns="http://www.jboss.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-web_7_2.xsd">
- /taskana
+ /kadai
diff --git a/lib/kadai-cdi/src/test/resources/int-test-standalone.xml b/lib/kadai-cdi/src/test/resources/int-test-standalone.xml
new file mode 100644
index 000000000..eff7ddcf5
--- /dev/null
+++ b/lib/kadai-cdi/src/test/resources/int-test-standalone.xml
@@ -0,0 +1,703 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+ h2
+
+
+
+
+ jdbc:h2:~/kadai-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;IGNORECASE=TRUE;LOCK_MODE=0
+
+ h2
+
+
+
+
+ org.h2.jdbcx.JdbcDataSource
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${jboss.bind.address:127.0.0.1}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/kadai-cdi/src/test/resources/kadai.properties b/lib/kadai-cdi/src/test/resources/kadai.properties
new file mode 100644
index 000000000..c62bb10ca
--- /dev/null
+++ b/lib/kadai-cdi/src/test/resources/kadai.properties
@@ -0,0 +1,19 @@
+datasource.jndi=java:jboss/datasources/TestDS
+kadai.domains=CDIDOMAIN
+kadai.classification.types=T1
+kadai.classification.categories.T1=DEFAULT
+# enable or disable the jobscheduler at all
+# set it to false and no jobs are running
+kadai.jobs.scheduler.enabled=true
+# wait time before the first job run
+kadai.jobs.scheduler.initialStartDelay=100
+# sleeping time befor the next job runs
+kadai.jobs.scheduler.period=1
+# timeunit for the initial start delay and the sleeping period
+# Possible values: MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
+kadai.jobs.scheduler.periodTimeUnit=HOURS
+kadai.jobs.cleanup.task.enable=true
+kadai.jobs.priority.task.enable=true
+kadai.jobs.cleanup.workbasket.enable=true
+kadai.jobs.refresh.user.enable=false
+kadai.jobs.cleanup.history.simple.enable=false
diff --git a/lib/kadai-cdi/src/test/resources/module.xml b/lib/kadai-cdi/src/test/resources/module.xml
new file mode 100644
index 000000000..2364f943a
--- /dev/null
+++ b/lib/kadai-cdi/src/test/resources/module.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/kadai-core-test/pom.xml b/lib/kadai-core-test/pom.xml
new file mode 100644
index 000000000..06510a695
--- /dev/null
+++ b/lib/kadai-core-test/pom.xml
@@ -0,0 +1,83 @@
+
+ 4.0.0
+ kadai-core-test
+
+ ${project.groupId}:${project.artifactId}
+ The tests for the kadai-core module
+
+
+ io.kadai
+ kadai-lib-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
+
+
+
+
+
+
+
+ io.kadai
+ kadai-common-logging
+ ${project.version}
+
+
+ io.kadai
+ kadai-core
+ ${project.version}
+
+
+
+
+ io.kadai
+ kadai-test-api
+ ${project.version}
+ test
+
+
+ io.kadai.history
+ kadai-simplehistory-provider
+ ${project.version}
+ test
+
+
+ org.slf4j
+ slf4j-simple
+ test
+
+
+ org.assertj
+ assertj-core
+ ${version.assertj}
+ test
+
+
+ com.tngtech.archunit
+ archunit
+ ${version.archunit}
+ test
+
+
+ com.openpojo
+ openpojo
+ ${version.openpojo}
+ test
+
+
+ nl.jqno.equalsverifier
+ equalsverifier
+ ${version.equalsverifier}
+ test
+
+
+ io.kadai
+ kadai-common-test
+ ${project.version}
+ test
+
+
+
+
diff --git a/lib/taskana-core-test/src/test/java/acceptance/ArchitectureTest.java b/lib/kadai-core-test/src/test/java/acceptance/ArchitectureTest.java
similarity index 86%
rename from lib/taskana-core-test/src/test/java/acceptance/ArchitectureTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/ArchitectureTest.java
index c3c357e22..a7d11d275 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/ArchitectureTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/ArchitectureTest.java
@@ -15,10 +15,10 @@ import static com.tngtech.archunit.library.GeneralCodingRules.USE_JAVA_UTIL_LOGG
import static com.tngtech.archunit.library.GeneralCodingRules.USE_JODATIME;
import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices;
import static com.tngtech.archunit.library.freeze.FreezingArchRule.freeze;
+import static io.kadai.common.internal.util.CheckedFunction.wrap;
import static java.util.function.Predicate.not;
import static java.util.stream.Collectors.toCollection;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.common.internal.util.CheckedFunction.wrap;
import com.tngtech.archunit.base.DescribedPredicate;
import com.tngtech.archunit.core.domain.JavaClass;
@@ -32,6 +32,19 @@ import com.tngtech.archunit.lang.ConditionEvents;
import com.tngtech.archunit.lang.SimpleConditionEvent;
import com.tngtech.archunit.library.dependencies.SliceAssignment;
import com.tngtech.archunit.library.dependencies.SliceIdentifier;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.WorkingTimeCalculator;
+import io.kadai.common.api.exceptions.ErrorCode;
+import io.kadai.common.api.exceptions.KadaiException;
+import io.kadai.common.api.exceptions.KadaiRuntimeException;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.common.internal.Interval;
+import io.kadai.common.internal.KadaiEngineImpl;
+import io.kadai.common.internal.jobs.JobScheduler;
+import io.kadai.common.internal.logging.LoggingAspect;
+import io.kadai.common.internal.workingtime.HolidaySchedule;
+import io.kadai.testapi.KadaiIntegrationTest;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
@@ -60,43 +73,30 @@ import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.platform.commons.support.AnnotationSupport;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.WorkingTimeCalculator;
-import pro.taskana.common.api.exceptions.ErrorCode;
-import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.common.api.exceptions.TaskanaRuntimeException;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.common.internal.Interval;
-import pro.taskana.common.internal.TaskanaEngineImpl;
-import pro.taskana.common.internal.jobs.JobScheduler;
-import pro.taskana.common.internal.logging.LoggingAspect;
-import pro.taskana.common.internal.workingtime.HolidaySchedule;
-import pro.taskana.testapi.TaskanaIntegrationTest;
/**
- * Test architecture of classes in TASKANA. For more info and examples see ArchUnit User Guide.
*/
class ArchitectureTest {
// region Test setup
- private static final List TASKANA_ROOT_PACKAGES =
+ private static final List KADAI_ROOT_PACKAGES =
List.of(
- "pro.taskana.classification",
- "pro.taskana.common",
- "pro.taskana.monitor",
- "pro.taskana.spi",
- "pro.taskana.task",
- "pro.taskana.user",
- "pro.taskana.workbasket");
+ "io.kadai.classification",
+ "io.kadai.common",
+ "io.kadai.monitor",
+ "io.kadai.spi",
+ "io.kadai.task",
+ "io.kadai.user",
+ "io.kadai.workbasket");
private static JavaClasses importedClasses;
@BeforeAll
static void init() {
// time intensive operation should only be done once
- importedClasses = new ClassFileImporter().importPackages("pro.taskana", "acceptance");
+ importedClasses = new ClassFileImporter().importPackages("io.kadai", "acceptance");
}
// endregion
@@ -145,19 +145,19 @@ class ArchitectureTest {
}
@Test
- void taskanaIntegrationTestsShouldOnlyHavePackagePrivateFields() {
+ void kadaiIntegrationTestsShouldOnlyHavePackagePrivateFields() {
classes()
.that()
- .areAnnotatedWith(TaskanaIntegrationTest.class)
- .or(areNestedTaskanaIntegrationTestClasses())
+ .areAnnotatedWith(KadaiIntegrationTest.class)
+ .or(areNestedKadaiIntegrationTestClasses())
.should(onlyHaveFieldsWithNoModifierAndPrivateConstants())
.check(importedClasses);
}
@Test
- void nestedTaskanaIntegrationTestsShouldBeAnnotatedWithTestInstance() {
+ void nestedKadaiIntegrationTestsShouldBeAnnotatedWithTestInstance() {
classes()
- .that(areNestedTaskanaIntegrationTestClasses())
+ .that(areNestedKadaiIntegrationTestClasses())
.should(beAnnotatedWithTestInstancePerClass())
.check(importedClasses);
}
@@ -218,13 +218,12 @@ class ArchitectureTest {
.that()
.resideInAPackage("..api..")
.and()
- .areNotAssignableFrom(TaskanaEngine.class)
+ .areNotAssignableFrom(KadaiEngine.class)
.and()
.areNotAssignableTo(Interval.class)
.should()
.onlyDependOnClassesThat(
- resideOutsideOfPackage("..pro.taskana..internal..")
- .or(assignableTo(LoggingAspect.class)))
+ resideOutsideOfPackage("..io.kadai..internal..").or(assignableTo(LoggingAspect.class)))
.check(importedClasses);
}
@@ -233,7 +232,7 @@ class ArchitectureTest {
void packagesShouldBeFreeOfCyclicDependencies() {
// Frozen, so it can be improved over time:
// https://www.archunit.org/userguide/html/000_Index.html#_freezing_arch_rules
- freeze(slices().matching("pro.taskana.(**)").should().beFreeOfCycles()).check(importedClasses);
+ freeze(slices().matching("io.kadai.(**)").should().beFreeOfCycles()).check(importedClasses);
}
@Test
@@ -299,7 +298,7 @@ class ArchitectureTest {
ThrowingConsumer testProvider =
p -> assertThat(importedClasses.containPackage(p)).isTrue();
- return DynamicTest.stream(TASKANA_ROOT_PACKAGES.stream(), descriptionProvider, testProvider);
+ return DynamicTest.stream(KADAI_ROOT_PACKAGES.stream(), descriptionProvider, testProvider);
}
@Test
@@ -316,7 +315,7 @@ class ArchitectureTest {
@TestFactory
Stream commonClassesShouldNotDependOnOtherPackages() {
- Stream input = TASKANA_ROOT_PACKAGES.stream().filter(not("pro.taskana.common"::equals));
+ Stream input = KADAI_ROOT_PACKAGES.stream().filter(not("io.kadai.common"::equals));
Function descriptionProvider =
p -> String.format("Common classes of %s should not depend on domain classes", p);
@@ -327,9 +326,9 @@ class ArchitectureTest {
.that()
.resideInAPackage("..common..")
.and()
- .areNotAssignableTo(TaskanaEngine.class)
+ .areNotAssignableTo(KadaiEngine.class)
.and()
- .areNotAssignableTo(InternalTaskanaEngine.class)
+ .areNotAssignableTo(InternalKadaiEngine.class)
.and()
.areNotAssignableTo(JobScheduler.class)
.should()
@@ -344,11 +343,11 @@ class ArchitectureTest {
void classesShouldNotDependOnMonitorDomainClasses() {
noClasses()
.that()
- .resideInAPackage("pro.taskana..")
+ .resideInAPackage("io.kadai..")
.and()
- .areNotAssignableTo(TaskanaEngine.class)
+ .areNotAssignableTo(KadaiEngine.class)
.and()
- .resideOutsideOfPackages("..monitor..", "pro.taskana.testapi..")
+ .resideOutsideOfPackages("..monitor..", "io.kadai.testapi..")
.should()
.dependOnClassesThat()
.resideInAPackage("..monitor..")
@@ -363,11 +362,11 @@ class ArchitectureTest {
void exceptionsShouldNotImplementToStringMethod() {
classes()
.that()
- .areAssignableTo(TaskanaException.class)
+ .areAssignableTo(KadaiException.class)
.or()
- .areAssignableTo(TaskanaRuntimeException.class)
+ .areAssignableTo(KadaiRuntimeException.class)
.and()
- .doNotBelongToAnyOf(TaskanaRuntimeException.class, TaskanaException.class)
+ .doNotBelongToAnyOf(KadaiRuntimeException.class, KadaiException.class)
.should(notImplementToString())
.check(importedClasses);
}
@@ -376,9 +375,9 @@ class ArchitectureTest {
void rootExceptionsShouldImplementToStringMethod() {
classes()
.that()
- .areAssignableFrom(TaskanaRuntimeException.class)
+ .areAssignableFrom(KadaiRuntimeException.class)
.or()
- .areAssignableFrom(TaskanaException.class)
+ .areAssignableFrom(KadaiException.class)
.should(implementToString())
.check(importedClasses);
}
@@ -416,13 +415,13 @@ class ArchitectureTest {
}
@Test
- void exceptionsShouldInheritFromTaskanaRootExceptions() {
+ void exceptionsShouldInheritFromKadaiRootExceptions() {
classes()
.that()
.areAssignableTo(Throwable.class)
.should()
.beAssignableTo(
- assignableTo(TaskanaException.class).or(assignableTo(TaskanaRuntimeException.class)))
+ assignableTo(KadaiException.class).or(assignableTo(KadaiRuntimeException.class)))
.check(importedClasses);
}
@@ -439,7 +438,7 @@ class ArchitectureTest {
.and()
.areNotAssignableTo(WorkingTimeCalculator.class)
.and()
- .areNotAssignableTo(TaskanaEngineImpl.class)
+ .areNotAssignableTo(KadaiEngineImpl.class)
.and()
.haveSimpleNameNotEndingWith("Test")
.should()
@@ -456,7 +455,7 @@ class ArchitectureTest {
// region Helper Methods
/**
- * Test the dependencies of the packages. Adds the prefix pro.taskana to every given
+ * Test the dependencies of the packages. Adds the prefix io.kadai to every given
* value.
*
* @param module the module which should be tested
@@ -464,7 +463,7 @@ class ArchitectureTest {
*/
private void moduleShouldOnlyDependOn(String module, List dependentModules) {
- String moduleTemplate = "pro.taskana.%s..";
+ String moduleTemplate = "io.kadai.%s..";
String moduleUndertest = String.format(moduleTemplate, module);
@@ -483,7 +482,7 @@ class ArchitectureTest {
.resideInAnyPackage(dependentModulesList.toArray(new String[0]))
.orShould()
.dependOnClassesThat()
- .areAssignableTo(TaskanaConfiguration.class)
+ .areAssignableTo(KadaiConfiguration.class)
.check(importedClasses);
}
@@ -543,24 +542,24 @@ class ArchitectureTest {
};
}
- private static DescribedPredicate areNestedTaskanaIntegrationTestClasses() {
- return new DescribedPredicate<>("are nested TaskanaIntegrationTest classes") {
+ private static DescribedPredicate areNestedKadaiIntegrationTestClasses() {
+ return new DescribedPredicate<>("are nested KadaiIntegrationTest classes") {
@Override
public boolean test(JavaClass input) {
Optional enclosingClass = input.getEnclosingClass();
return input.isAnnotatedWith(Nested.class)
&& enclosingClass.isPresent()
- && isTaskanaIntegrationTest(enclosingClass.get());
+ && isKadaiIntegrationTest(enclosingClass.get());
}
- private boolean isTaskanaIntegrationTest(JavaClass input) {
+ private boolean isKadaiIntegrationTest(JavaClass input) {
Optional enclosingClass = input.getEnclosingClass();
return enclosingClass
.map(
javaClass ->
- input.isAnnotatedWith(Nested.class) && isTaskanaIntegrationTest(javaClass))
- .orElseGet(() -> input.isAnnotatedWith(TaskanaIntegrationTest.class));
+ input.isAnnotatedWith(Nested.class) && isKadaiIntegrationTest(javaClass))
+ .orElseGet(() -> input.isAnnotatedWith(KadaiIntegrationTest.class));
}
};
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/TaskanaConfigurationTest.java b/lib/kadai-core-test/src/test/java/acceptance/KadaiConfigurationTest.java
similarity index 84%
rename from lib/taskana-core-test/src/test/java/acceptance/TaskanaConfigurationTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/KadaiConfigurationTest.java
index 6174e6946..1040b44f0 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/TaskanaConfigurationTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/KadaiConfigurationTest.java
@@ -1,11 +1,24 @@
package acceptance;
+import static io.kadai.common.api.SharedConstants.MASTER_DOMAIN;
import static java.util.function.Predicate.not;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static pro.taskana.common.api.SharedConstants.MASTER_DOMAIN;
+import io.kadai.KadaiConfiguration;
+import io.kadai.KadaiConfiguration.Builder;
+import io.kadai.common.api.CustomHoliday;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.LocalTimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.configuration.KadaiProperty;
+import io.kadai.common.internal.util.CheckedConsumer;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.common.internal.util.ReflectionUtil;
+import io.kadai.testapi.extensions.TestContainerExtension;
+import io.kadai.workbasket.api.WorkbasketPermission;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -44,33 +57,20 @@ import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.function.ThrowingConsumer;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.TaskanaConfiguration.Builder;
-import pro.taskana.common.api.CustomHoliday;
-import pro.taskana.common.api.LocalTimeInterval;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.configuration.TaskanaProperty;
-import pro.taskana.common.internal.util.CheckedConsumer;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.common.internal.util.ReflectionUtil;
-import pro.taskana.testapi.extensions.TestContainerExtension;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-class TaskanaConfigurationTest {
+class KadaiConfigurationTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
class Functionality {
- Map taskanaPropertyNameByFieldName =
+ Map kadaiPropertyNameByFieldName =
ReflectionUtil.retrieveAllFields(Builder.class).stream()
.collect(
Collectors.toMap(
Field::getName,
f -> {
- if (f.isAnnotationPresent(TaskanaProperty.class)) {
- return f.getAnnotation(TaskanaProperty.class).value();
+ if (f.isAnnotationPresent(KadaiProperty.class)) {
+ return f.getAnnotation(KadaiProperty.class).value();
}
return "";
}));
@@ -87,7 +87,7 @@ class TaskanaConfigurationTest {
Map.entry(DayOfWeek.THURSDAY, standardWorkingSlots),
Map.entry(DayOfWeek.FRIDAY, standardWorkingSlots));
- TaskanaConfiguration configuration =
+ KadaiConfiguration configuration =
new Builder(TestContainerExtension.createDataSourceForH2(), true, "schemaName").build();
// general configuration
@@ -97,7 +97,7 @@ class TaskanaConfigurationTest {
// authentication configuration
assertThat(configuration.getRoleMap())
.isEqualTo(
- Arrays.stream(TaskanaRole.values())
+ Arrays.stream(KadaiRole.values())
.collect(Collectors.toMap(Function.identity(), r -> Set.of())));
// classification configuration
assertThat(configuration.getClassificationTypes()).isEqualTo(Collections.emptyList());
@@ -148,10 +148,10 @@ class TaskanaConfigurationTest {
}
@Test
- void should_PopulateEveryTaskanaConfiguration_When_ImportingPropertiesFile() {
- TaskanaConfiguration configuration =
- new Builder(TestContainerExtension.createDataSourceForH2(), true, "TASKANA")
- .initTaskanaProperties("/fullTaskana.properties")
+ void should_PopulateEveryKadaiConfiguration_When_ImportingPropertiesFile() {
+ KadaiConfiguration configuration =
+ new Builder(TestContainerExtension.createDataSourceForH2(), true, "KADAI")
+ .initKadaiProperties("/fullKadai.properties")
.build();
verifyConfigurationValuesDifferFromDefaultConfiguration(configuration);
@@ -163,13 +163,13 @@ class TaskanaConfigurationTest {
assertThat(configuration.getRoleMap())
.isEqualTo(
Map.ofEntries(
- Map.entry(TaskanaRole.USER, Set.of("user-1", "user-2")),
- Map.entry(TaskanaRole.ADMIN, Set.of("admin-1", "admin-2")),
+ Map.entry(KadaiRole.USER, Set.of("user-1", "user-2")),
+ Map.entry(KadaiRole.ADMIN, Set.of("admin-1", "admin-2")),
Map.entry(
- TaskanaRole.BUSINESS_ADMIN, Set.of("business_admin-1", "business_admin-2")),
- Map.entry(TaskanaRole.MONITOR, Set.of("monitor-1", "monitor-2")),
- Map.entry(TaskanaRole.TASK_ADMIN, Set.of("taskadmin-1", "taskadmin-2")),
- Map.entry(TaskanaRole.TASK_ROUTER, Set.of("taskrouter-1", "taskrouter-2"))));
+ KadaiRole.BUSINESS_ADMIN, Set.of("business_admin-1", "business_admin-2")),
+ Map.entry(KadaiRole.MONITOR, Set.of("monitor-1", "monitor-2")),
+ Map.entry(KadaiRole.TASK_ADMIN, Set.of("taskadmin-1", "taskadmin-2")),
+ Map.entry(KadaiRole.TASK_ROUTER, Set.of("taskrouter-1", "taskrouter-2"))));
// classification configuration
assertThat(configuration.getClassificationTypes()).isEqualTo(List.of("TASK", "DOCUMENT"));
assertThat(configuration.getClassificationCategoriesByType())
@@ -227,25 +227,25 @@ class TaskanaConfigurationTest {
}
@Test
- void should_PopulateEveryTaskanaConfiguration_When_EveryBuilderFunctionIsCalled() {
+ void should_PopulateEveryKadaiConfiguration_When_EveryBuilderFunctionIsCalled() {
// given
// general configuration
DataSource expectedDataSource = TestContainerExtension.createDataSourceForH2();
boolean expectedUseManagedTransactions = false;
- String expectedSchemaName = "TASKANA";
+ String expectedSchemaName = "KADAI";
boolean expectedSecurityEnabled = false;
List expectedDomains = List.of("A", "B");
boolean expectedEnforceServiceLevel = false;
// authentication configuration
- Map> expectedRoleMap =
+ Map> expectedRoleMap =
Map.ofEntries(
- Map.entry(TaskanaRole.USER, Set.of("user")),
- Map.entry(TaskanaRole.BUSINESS_ADMIN, Set.of("business_admin")),
- Map.entry(TaskanaRole.ADMIN, Set.of("admin")),
- Map.entry(TaskanaRole.MONITOR, Set.of("monitor")),
- Map.entry(TaskanaRole.TASK_ADMIN, Set.of("task_admin")),
- Map.entry(TaskanaRole.TASK_ROUTER, Set.of("task_router")));
+ Map.entry(KadaiRole.USER, Set.of("user")),
+ Map.entry(KadaiRole.BUSINESS_ADMIN, Set.of("business_admin")),
+ Map.entry(KadaiRole.ADMIN, Set.of("admin")),
+ Map.entry(KadaiRole.MONITOR, Set.of("monitor")),
+ Map.entry(KadaiRole.TASK_ADMIN, Set.of("task_admin")),
+ Map.entry(KadaiRole.TASK_ROUTER, Set.of("task_router")));
// classification configuration
List expectedClassificationTypes = List.of("TYPE_A", "TYPE_B");
Map> expectedClassificationCategories =
@@ -300,7 +300,7 @@ class TaskanaConfigurationTest {
boolean expectedUseSpecificDb2Taskquery = false;
// when
- TaskanaConfiguration configuration =
+ KadaiConfiguration configuration =
new Builder(
expectedDataSource,
expectedUseManagedTransactions,
@@ -449,13 +449,13 @@ class TaskanaConfigurationTest {
@Test
void should_PopulateEveryConfigurationProperty_When_UsingCopyConstructor() {
// given
- TaskanaConfiguration configuration =
- new Builder(TestContainerExtension.createDataSourceForH2(), false, "TASKANA", false)
+ KadaiConfiguration configuration =
+ new Builder(TestContainerExtension.createDataSourceForH2(), false, "KADAI", false)
// general configuration
.domains(List.of("A", "B"))
.enforceServiceLevel(false)
// authentication configuration
- .roleMap(Map.of(TaskanaRole.ADMIN, Set.of("admin")))
+ .roleMap(Map.of(KadaiRole.ADMIN, Set.of("admin")))
// classification configuration
.classificationTypes(List.of("typeA", "typeB"))
.classificationCategoriesByType(
@@ -511,7 +511,7 @@ class TaskanaConfigurationTest {
.useSpecificDb2Taskquery(false)
.build();
- TaskanaConfiguration copyConfiguration = new Builder(configuration).build();
+ KadaiConfiguration copyConfiguration = new Builder(configuration).build();
verifyConfigurationValuesDifferFromDefaultConfiguration(configuration);
verifyConfigurationValuesDifferFromDefaultConfiguration(copyConfiguration);
@@ -522,9 +522,9 @@ class TaskanaConfigurationTest {
}
private void verifyConfigurationValuesDifferFromDefaultConfiguration(
- TaskanaConfiguration configuration) {
- TaskanaConfiguration defaultConfiguration =
- new Builder(TestContainerExtension.createDataSourceForH2(), true, "TASKANA").build();
+ KadaiConfiguration configuration) {
+ KadaiConfiguration defaultConfiguration =
+ new Builder(TestContainerExtension.createDataSourceForH2(), true, "KADAI").build();
Set ignoredFields =
Set.of(
"dataSource",
@@ -532,7 +532,7 @@ class TaskanaConfigurationTest {
"securityEnabled",
"schemaName",
"properties");
- ReflectionUtil.retrieveAllFields(TaskanaConfiguration.class).stream()
+ ReflectionUtil.retrieveAllFields(KadaiConfiguration.class).stream()
.filter(f -> !ignoredFields.contains(f.getName()))
.forEach(
CheckedConsumer.wrap(
@@ -543,7 +543,7 @@ class TaskanaConfigurationTest {
assertThat(value)
.as(
"Field '%s' (%s) should not be a default configuration value",
- field.getName(), taskanaPropertyNameByFieldName.get(field.getName()))
+ field.getName(), kadaiPropertyNameByFieldName.get(field.getName()))
.isNotEqualTo(defaultValue);
}));
}
@@ -573,7 +573,7 @@ class TaskanaConfigurationTest {
}
@TestFactory
- Stream should_HaveTaskanaPropertyAnnotation_For_EachOptionalConfiguration() {
+ Stream should_HaveKadaiPropertyAnnotation_For_EachOptionalConfiguration() {
Stream fields =
ReflectionUtil.retrieveAllFields(Builder.class).stream()
.filter(not(f -> Modifier.isStatic(f.getModifiers())))
@@ -581,7 +581,7 @@ class TaskanaConfigurationTest {
.filter(not(f -> "properties".equals(f.getName())));
ThrowingConsumer testCase =
- field -> assertThat(field.isAnnotationPresent(TaskanaProperty.class)).isTrue();
+ field -> assertThat(field.isAnnotationPresent(KadaiProperty.class)).isTrue();
return DynamicTest.stream(fields, Field::getName, testCase);
}
@@ -589,19 +589,19 @@ class TaskanaConfigurationTest {
@Test
void should_ShareConfigurationNamesWithBuilder() {
Set>> configurationFields =
- ReflectionUtil.retrieveAllFields(TaskanaConfiguration.class).stream()
+ ReflectionUtil.retrieveAllFields(KadaiConfiguration.class).stream()
.filter(not(f -> Modifier.isStatic(f.getModifiers())))
.map(field -> Pair.of(field.getName(), field.getType()))
.collect(Collectors.toSet());
Set>> builderFields =
- ReflectionUtil.retrieveAllFields(TaskanaConfiguration.Builder.class).stream()
+ ReflectionUtil.retrieveAllFields(KadaiConfiguration.Builder.class).stream()
.filter(not(f -> Modifier.isStatic(f.getModifiers())))
.map(field -> Pair.of(field.getName(), field.getType()))
.collect(Collectors.toSet());
assertThat(configurationFields)
- .as("TaskanaConfiguration and its builder should have the same configuration names")
+ .as("KadaiConfiguration and its builder should have the same configuration names")
.containsExactlyInAnyOrderElementsOf(builderFields);
}
}
@@ -618,18 +618,18 @@ class TaskanaConfigurationTest {
@TestFactory
Stream should_SaveUnmodifiableCollections() {
// given
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
// necessary to bypass validation since Classification Type will be an empty Set
.classificationCategoriesByType(Map.of());
initializeWithMutableCollections(builder);
Stream fields =
- ReflectionUtil.retrieveAllFields(TaskanaConfiguration.class).stream()
+ ReflectionUtil.retrieveAllFields(KadaiConfiguration.class).stream()
.filter(f -> Collection.class.isAssignableFrom(f.getType()));
// when
- TaskanaConfiguration configuration = builder.build();
+ KadaiConfiguration configuration = builder.build();
// then
ThrowingConsumer testCase =
@@ -651,14 +651,14 @@ class TaskanaConfigurationTest {
@TestFactory
Stream should_SaveUnmodifiableCollections_For_CollectionsAsMapValues() {
// given
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
// necessary to bypass validation since Classification Categories will be an empty Map
.classificationTypes(List.of(""));
initializeWithMutableCollectionsAsMapValues(builder);
Stream fields =
- ReflectionUtil.retrieveAllFields(TaskanaConfiguration.class).stream()
+ ReflectionUtil.retrieveAllFields(KadaiConfiguration.class).stream()
.filter(f -> Map.class.isAssignableFrom(f.getType()))
.filter(
f -> {
@@ -669,7 +669,7 @@ class TaskanaConfigurationTest {
});
// when
- TaskanaConfiguration configuration = builder.build();
+ KadaiConfiguration configuration = builder.build();
// then
ThrowingConsumer testCase =
@@ -699,18 +699,18 @@ class TaskanaConfigurationTest {
@TestFactory
Stream should_SaveUnmodifiableMaps() {
// given
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
// necessary to bypass validation since Classification Categories will be an empty Map
.classificationTypes(List.of());
initializeWithMutableMaps(builder);
Stream fields =
- ReflectionUtil.retrieveAllFields(TaskanaConfiguration.class).stream()
+ ReflectionUtil.retrieveAllFields(KadaiConfiguration.class).stream()
.filter(f -> Map.class.isAssignableFrom(f.getType()));
// when
- TaskanaConfiguration configuration = builder.build();
+ KadaiConfiguration configuration = builder.build();
// then
ThrowingConsumer testCase =
@@ -794,9 +794,9 @@ class TaskanaConfigurationTest {
@ParameterizedTest
@ValueSource(ints = {-1, 0})
void should_ThrowInvalidArgumentEx_When_JobBatchSizeIsNotPositive(int jobBatchSize) {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.jobBatchSize(jobBatchSize);
ThrowingCallable call = builder::build;
@@ -804,16 +804,16 @@ class TaskanaConfigurationTest {
assertThatThrownBy(call)
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
- "Parameter jobBatchSize (taskana.jobs.batchSize) must be a positive integer");
+ "Parameter jobBatchSize (kadai.jobs.batchSize) must be a positive integer");
}
@ParameterizedTest
@ValueSource(ints = {-1, 0})
void should_ThrowInvalidArgumentEx_When_MaxNumberOfJobRetriesIsNotPositive(
int maxNumberOfJobRetries) {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.jobBatchSize(1)
.maxNumberOfJobRetries(maxNumberOfJobRetries);
@@ -822,16 +822,16 @@ class TaskanaConfigurationTest {
assertThatThrownBy(call)
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
- "Parameter maxNumberOfJobRetries (taskana.jobs.maxRetries)"
+ "Parameter maxNumberOfJobRetries (kadai.jobs.maxRetries)"
+ " must be a positive integer");
}
@ParameterizedTest
@ValueSource(strings = {"P-1D", "P0D"})
void should_ThrowInvalidArgumentEx_When_JobRunEveryIsNotPositive(String cleanupJobRunEvery) {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.jobRunEvery(Duration.parse(cleanupJobRunEvery));
ThrowingCallable call = builder::build;
@@ -839,14 +839,14 @@ class TaskanaConfigurationTest {
assertThatThrownBy(call)
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
- "Parameter jobRunEvery (taskana.jobs.runEvery) must be a positive duration");
+ "Parameter jobRunEvery (kadai.jobs.runEvery) must be a positive duration");
}
@Test
void should_ThrowInvalidArgumentEx_When_SimpleHistoryCleanupJobMinimumAgeIsNegative() {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.simpleHistoryCleanupJobMinimumAge(Duration.ofDays(-1));
ThrowingCallable call = builder::build;
@@ -855,14 +855,14 @@ class TaskanaConfigurationTest {
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
"Parameter simpleHistoryCleanupJobMinimumAge "
- + "(taskana.jobs.cleanup.history.simple.minimumAge) must not be negative");
+ + "(kadai.jobs.cleanup.history.simple.minimumAge) must not be negative");
}
@Test
void should_ThrowInvalidArgumentEx_When_TaskCleanupJobMinimumAgeIsNegative() {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.taskCleanupJobMinimumAge(Duration.ofDays(-1));
ThrowingCallable call = builder::build;
@@ -870,7 +870,7 @@ class TaskanaConfigurationTest {
assertThatThrownBy(call)
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
- "Parameter taskCleanupJobMinimumAge (taskana.jobs.cleanup.task.minimumAge) "
+ "Parameter taskCleanupJobMinimumAge (kadai.jobs.cleanup.task.minimumAge) "
+ "must not be negative");
}
@@ -879,9 +879,9 @@ class TaskanaConfigurationTest {
void should_ThrowInvalidArgumentEx_When_TaskUpdatePriorityJobBatchSizeIsNotPositive(
int priorityJobBatchSize) {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.taskUpdatePriorityJobBatchSize(priorityJobBatchSize);
ThrowingCallable call = builder::build;
@@ -889,7 +889,7 @@ class TaskanaConfigurationTest {
assertThatThrownBy(call)
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
- "Parameter taskUpdatePriorityJobBatchSize (taskana.jobs.priority.task.batchSize)"
+ "Parameter taskUpdatePriorityJobBatchSize (kadai.jobs.priority.task.batchSize)"
+ " must be a positive integer");
}
@@ -897,9 +897,9 @@ class TaskanaConfigurationTest {
@ValueSource(strings = {"P-1D", "P0D"})
void should_ThrowInvalidArgumentEx_When_TaskPriorityUpdatePriorityJobRunEveryIsNotPositive(
String priorityJobRunEvery) {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.taskUpdatePriorityJobRunEvery(Duration.parse(priorityJobRunEvery));
ThrowingCallable call = builder::build;
@@ -907,7 +907,7 @@ class TaskanaConfigurationTest {
assertThatThrownBy(call)
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
- "Parameter taskUpdatePriorityJobRunEvery (taskana.jobs.priority.task.runEvery)"
+ "Parameter taskUpdatePriorityJobRunEvery (kadai.jobs.priority.task.runEvery)"
+ " must be a positive duration");
}
@@ -915,9 +915,9 @@ class TaskanaConfigurationTest {
@ValueSource(strings = {"P-1D", "P0D"})
void should_ThrowInvalidArgumentEx_When_UserRefreshJobRunEveryIsNotPositive(
String userRefreshJobRunEvery) {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.userRefreshJobRunEvery(Duration.parse(userRefreshJobRunEvery));
ThrowingCallable call = builder::build;
@@ -925,15 +925,15 @@ class TaskanaConfigurationTest {
assertThatThrownBy(call)
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
- "Parameter userRefreshJobRunEvery (taskana.jobs.refresh.user.runEvery)"
+ "Parameter userRefreshJobRunEvery (kadai.jobs.refresh.user.runEvery)"
+ " must be a positive duration");
}
@Test
void should_ThrowInvalidArgumentEx_When_JobSchedulerInitialStartDelayIsNegative() {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.jobSchedulerInitialStartDelay(-1);
ThrowingCallable call = builder::build;
@@ -941,15 +941,15 @@ class TaskanaConfigurationTest {
assertThatThrownBy(call)
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
- "Parameter jobSchedulerInitialStartDelay (taskana.jobs.scheduler.initialStartDelay)"
+ "Parameter jobSchedulerInitialStartDelay (kadai.jobs.scheduler.initialStartDelay)"
+ " must be a natural integer");
}
@Test
void should_ThrowInvalidArgumentEx_When_ClassificationTypesDoesNotExist() {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.classificationTypes(List.of("valid"))
.classificationCategoriesByType(Map.of("does_not_exist", List.of("a", "b")));
@@ -959,18 +959,17 @@ class TaskanaConfigurationTest {
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
"Parameter classificationCategoriesByType"
- + " (taskana.classification.categories.) is configured incorrectly. Please"
+ + " (kadai.classification.categories.) is configured incorrectly. Please"
+ " check whether all specified Classification Types exist. Additionally, check"
+ " whether the correct separator is used in the property"
- + " taskana.classification.types ."
- );
+ + " kadai.classification.types .");
}
@Test
void should_ThrowInvalidArgumentEx_When_ClassificationCategoryDoesNotExist() {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.classificationTypes(List.of("type1", "type2"))
.classificationCategoriesByType(Map.of("type1", List.of("a", "b")));
@@ -980,7 +979,7 @@ class TaskanaConfigurationTest {
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
"Some Classification Categories for parameter classificationTypes "
- + "(taskana.classification.types) are missing. "
+ + "(kadai.classification.types) are missing. "
+ "configured: [TYPE1, TYPE2] detected: [TYPE1]");
}
@@ -988,9 +987,9 @@ class TaskanaConfigurationTest {
@ValueSource(ints = {-1, 0})
void should_ThrowInvalidArgumentEx_When_JobSchedulerPeriodIsNotPositive(
int jobSchedulerPeriod) {
- TaskanaConfiguration.Builder builder =
- new TaskanaConfiguration.Builder(
- TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration.Builder builder =
+ new KadaiConfiguration.Builder(
+ TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.jobSchedulerPeriod(jobSchedulerPeriod);
ThrowingCallable call = builder::build;
@@ -998,7 +997,7 @@ class TaskanaConfigurationTest {
assertThatThrownBy(call)
.isInstanceOf(InvalidArgumentException.class)
.hasMessageContaining(
- "Parameter jobSchedulerPeriod (taskana.jobs.scheduler.period)"
+ "Parameter jobSchedulerPeriod (kadai.jobs.scheduler.period)"
+ " must be a positive integer");
}
}
@@ -1009,8 +1008,8 @@ class TaskanaConfigurationTest {
@Test
void should_MakeDomainUpperCase() {
- TaskanaConfiguration configuration =
- new Builder(TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration configuration =
+ new Builder(TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.domains(List.of("a", "b"))
.build();
@@ -1019,8 +1018,8 @@ class TaskanaConfigurationTest {
@Test
void should_MakeClassificationTypesUpperCase() {
- TaskanaConfiguration configuration =
- new Builder(TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration configuration =
+ new Builder(TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.classificationTypes(List.of("a", "b"))
.classificationCategoriesByType(
Map.ofEntries(Map.entry("a", List.of()), Map.entry("b", List.of())))
@@ -1031,8 +1030,8 @@ class TaskanaConfigurationTest {
@Test
void should_MakeClassificationCategoriesUpperCase() {
- TaskanaConfiguration configuration =
- new Builder(TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration configuration =
+ new Builder(TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.classificationTypes(List.of("type_a", "type_b"))
.classificationCategoriesByType(
Map.ofEntries(
@@ -1048,8 +1047,8 @@ class TaskanaConfigurationTest {
@Test
void should_OrderClassificationCategoriesByTypeOrder() {
- TaskanaConfiguration configuration =
- new Builder(TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration configuration =
+ new Builder(TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.classificationTypes(List.of("type_a", "type_c", "type_b"))
.classificationCategoriesByType(
Map.ofEntries(
@@ -1065,49 +1064,48 @@ class TaskanaConfigurationTest {
}
@Test
- void should_FillAllTaskanaRoles_When_RoleMapIsIncomplete() {
- TaskanaConfiguration configuration =
- new Builder(TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
- .roleMap(Map.ofEntries(Map.entry(TaskanaRole.ADMIN, Set.of("a", "b"))))
+ void should_FillAllKadaiRoles_When_RoleMapIsIncomplete() {
+ KadaiConfiguration configuration =
+ new Builder(TestContainerExtension.createDataSourceForH2(), false, "KADAI")
+ .roleMap(Map.ofEntries(Map.entry(KadaiRole.ADMIN, Set.of("a", "b"))))
.build();
assertThat(configuration.getRoleMap())
.containsExactlyInAnyOrderEntriesOf(
Map.ofEntries(
- Map.entry(TaskanaRole.USER, Set.of()),
- Map.entry(TaskanaRole.BUSINESS_ADMIN, Set.of()),
- Map.entry(TaskanaRole.ADMIN, Set.of("a", "b")),
- Map.entry(TaskanaRole.MONITOR, Set.of()),
- Map.entry(TaskanaRole.TASK_ADMIN, Set.of()),
- Map.entry(TaskanaRole.TASK_ROUTER, Set.of())));
+ Map.entry(KadaiRole.USER, Set.of()),
+ Map.entry(KadaiRole.BUSINESS_ADMIN, Set.of()),
+ Map.entry(KadaiRole.ADMIN, Set.of("a", "b")),
+ Map.entry(KadaiRole.MONITOR, Set.of()),
+ Map.entry(KadaiRole.TASK_ADMIN, Set.of()),
+ Map.entry(KadaiRole.TASK_ROUTER, Set.of())));
}
@Test
void should_MakeAccessIdsLowerCase() {
- TaskanaConfiguration configuration =
- new Builder(TestContainerExtension.createDataSourceForH2(), false, "TASKANA")
+ KadaiConfiguration configuration =
+ new Builder(TestContainerExtension.createDataSourceForH2(), false, "KADAI")
.roleMap(
Map.ofEntries(
- Map.entry(TaskanaRole.USER, Set.of("USER-1", "USER-2")),
+ Map.entry(KadaiRole.USER, Set.of("USER-1", "USER-2")),
Map.entry(
- TaskanaRole.BUSINESS_ADMIN,
- Set.of("BUSINESS_ADMIN-1", "BUSINESS_ADMIN-2")),
- Map.entry(TaskanaRole.ADMIN, Set.of("ADMIN-1", "ADMIN-2")),
- Map.entry(TaskanaRole.MONITOR, Set.of("MONITOR-1", "MONITOR-2")),
- Map.entry(TaskanaRole.TASK_ADMIN, Set.of("TASK_ADMIN-1", "TASK_ADMIN-2")),
- Map.entry(TaskanaRole.TASK_ROUTER, Set.of("TASK_ROUTER-1", "TASK_ROUTER-2"))))
+ KadaiRole.BUSINESS_ADMIN, Set.of("BUSINESS_ADMIN-1", "BUSINESS_ADMIN-2")),
+ Map.entry(KadaiRole.ADMIN, Set.of("ADMIN-1", "ADMIN-2")),
+ Map.entry(KadaiRole.MONITOR, Set.of("MONITOR-1", "MONITOR-2")),
+ Map.entry(KadaiRole.TASK_ADMIN, Set.of("TASK_ADMIN-1", "TASK_ADMIN-2")),
+ Map.entry(KadaiRole.TASK_ROUTER, Set.of("TASK_ROUTER-1", "TASK_ROUTER-2"))))
.build();
assertThat(configuration.getRoleMap())
.containsExactlyInAnyOrderEntriesOf(
Map.ofEntries(
- Map.entry(TaskanaRole.USER, Set.of("user-1", "user-2")),
+ Map.entry(KadaiRole.USER, Set.of("user-1", "user-2")),
Map.entry(
- TaskanaRole.BUSINESS_ADMIN, Set.of("business_admin-1", "business_admin-2")),
- Map.entry(TaskanaRole.ADMIN, Set.of("admin-1", "admin-2")),
- Map.entry(TaskanaRole.MONITOR, Set.of("monitor-1", "monitor-2")),
- Map.entry(TaskanaRole.TASK_ADMIN, Set.of("task_admin-1", "task_admin-2")),
- Map.entry(TaskanaRole.TASK_ROUTER, Set.of("task_router-1", "task_router-2"))));
+ KadaiRole.BUSINESS_ADMIN, Set.of("business_admin-1", "business_admin-2")),
+ Map.entry(KadaiRole.ADMIN, Set.of("admin-1", "admin-2")),
+ Map.entry(KadaiRole.MONITOR, Set.of("monitor-1", "monitor-2")),
+ Map.entry(KadaiRole.TASK_ADMIN, Set.of("task_admin-1", "task_admin-2")),
+ Map.entry(KadaiRole.TASK_ROUTER, Set.of("task_router-1", "task_router-2"))));
}
}
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/TaskanEngineInitalizationTest.java b/lib/kadai-core-test/src/test/java/acceptance/KadaiEngineInitalizationTest.java
similarity index 65%
rename from lib/taskana-core-test/src/test/java/acceptance/TaskanEngineInitalizationTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/KadaiEngineInitalizationTest.java
index c924d4fa1..40876b1f3 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/TaskanEngineInitalizationTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/KadaiEngineInitalizationTest.java
@@ -2,6 +2,14 @@ package acceptance;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.internal.KadaiEngineImpl;
+import io.kadai.spi.priority.api.PriorityServiceProvider;
+import io.kadai.spi.priority.internal.PriorityServiceManager;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
import java.lang.reflect.Field;
import java.util.List;
import java.util.OptionalInt;
@@ -10,25 +18,17 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.internal.TaskanaEngineImpl;
-import pro.taskana.spi.priority.api.PriorityServiceProvider;
-import pro.taskana.spi.priority.internal.PriorityServiceManager;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-@TaskanaIntegrationTest
-public class TaskanEngineInitalizationTest {
+@KadaiIntegrationTest
+public class KadaiEngineInitalizationTest {
static class MyPriorityServiceProvider implements PriorityServiceProvider {
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
@@ -43,12 +43,12 @@ public class TaskanEngineInitalizationTest {
serviceProviderInterface = PriorityServiceProvider.class,
serviceProviders = MyPriorityServiceProvider.class)
class PriorityServiceManagerTest {
- @TaskanaInject TaskanaEngineImpl taskanaEngine;
+ @KadaiInject KadaiEngineImpl kadaiEngine;
@Test
@SuppressWarnings("unchecked")
void should_InitializePriorityServiceProviders() throws Exception {
- PriorityServiceManager priorityServiceManager = taskanaEngine.getPriorityServiceManager();
+ PriorityServiceManager priorityServiceManager = kadaiEngine.getPriorityServiceManager();
Field priorityServiceProvidersField =
PriorityServiceManager.class.getDeclaredField("priorityServiceProviders");
priorityServiceProvidersField.setAccessible(true);
@@ -60,8 +60,8 @@ public class TaskanEngineInitalizationTest {
.asInstanceOf(InstanceOfAssertFactories.LIST)
.hasOnlyElementsOfType(MyPriorityServiceProvider.class)
.extracting(MyPriorityServiceProvider.class::cast)
- .extracting(sp -> sp.taskanaEngine)
- .containsOnly(taskanaEngine);
+ .extracting(sp -> sp.kadaiEngine)
+ .containsOnly(kadaiEngine);
}
}
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/PojoTest.java b/lib/kadai-core-test/src/test/java/acceptance/PojoTest.java
similarity index 99%
rename from lib/taskana-core-test/src/test/java/acceptance/PojoTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/PojoTest.java
index e678fa340..399e4ff14 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/PojoTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/PojoTest.java
@@ -113,7 +113,7 @@ class PojoTest {
private static List> getPojoClasses() {
// TODO how to identify pojos? Is overwritten equals method enough?
return new ClassFileImporter()
- .importPackages("pro.taskana").stream()
+ .importPackages("io.kadai").stream()
.filter(javaClass -> javaClass.tryGetMethod("equals", Object.class).isPresent())
.filter(
javaClass ->
diff --git a/lib/taskana-core-test/src/test/java/acceptance/classification/create/CreateClassificationAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/classification/create/CreateClassificationAccTest.java
similarity index 91%
rename from lib/taskana-core-test/src/test/java/acceptance/classification/create/CreateClassificationAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/classification/create/CreateClassificationAccTest.java
index c3f1119c7..a429a256a 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/classification/create/CreateClassificationAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/classification/create/CreateClassificationAccTest.java
@@ -1,10 +1,26 @@
package acceptance.classification.create;
+import static io.kadai.common.api.SharedConstants.MASTER_DOMAIN;
import static java.util.Objects.nonNull;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static pro.taskana.common.api.SharedConstants.MASTER_DOMAIN;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.exceptions.ClassificationAlreadyExistException;
+import io.kadai.classification.api.exceptions.MalformedServiceLevelException;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.classification.internal.models.ClassificationImpl;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.DomainNotFoundException;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.security.WithAccessId;
import java.time.Instant;
import java.util.Arrays;
import java.util.Iterator;
@@ -17,28 +33,12 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
-import pro.taskana.classification.api.exceptions.MalformedServiceLevelException;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.classification.internal.models.ClassificationImpl;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.DomainNotFoundException;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.security.WithAccessId;
/** Acceptance test for all "create classification" scenarios. */
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class CreateClassificationAccTest {
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject ClassificationService classificationService;
@WithAccessId(user = "businessadmin")
@Test
@@ -263,7 +263,7 @@ class CreateClassificationAccTest {
Classification classification =
classificationService.newClassification("KeyErrCreation", MASTER_DOMAIN, "TASK");
NotAuthorizedException expectedException =
- new NotAuthorizedException(accessId.user(), TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ new NotAuthorizedException(accessId.user(), KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
assertThatThrownBy(() -> classificationService.createClassification(classification))
.isInstanceOf(NotAuthorizedException.class)
diff --git a/lib/taskana-core-test/src/test/java/acceptance/classification/delete/DeleteClassificationAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/classification/delete/DeleteClassificationAccTest.java
similarity index 88%
rename from lib/taskana-core-test/src/test/java/acceptance/classification/delete/DeleteClassificationAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/classification/delete/DeleteClassificationAccTest.java
index e99a30f40..969a6e261 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/classification/delete/DeleteClassificationAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/classification/delete/DeleteClassificationAccTest.java
@@ -1,37 +1,37 @@
package acceptance.classification.delete;
+import static io.kadai.common.api.SharedConstants.MASTER_DOMAIN;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.common.api.SharedConstants.MASTER_DOMAIN;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.exceptions.ClassificationInUseException;
+import io.kadai.classification.api.exceptions.ClassificationNotFoundException;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.Attachment;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskAttachmentBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.Workbasket;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.exceptions.ClassificationInUseException;
-import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.Attachment;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskAttachmentBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.Workbasket;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class DeleteClassificationAccTest {
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
Workbasket defaultWorkbasket;
@@ -81,8 +81,7 @@ class DeleteClassificationAccTest {
NotAuthorizedException e = catchThrowableOfType(NotAuthorizedException.class, call);
assertThat(e.getCurrentUserId()).isEqualTo("user-1-1");
- assertThat(e.getRoles())
- .containsExactlyInAnyOrder(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ assertThat(e.getRoles()).containsExactlyInAnyOrder(KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
}
@WithAccessId(user = "user-1-1")
@@ -97,8 +96,7 @@ class DeleteClassificationAccTest {
NotAuthorizedException e = catchThrowableOfType(NotAuthorizedException.class, call);
assertThat(e.getCurrentUserId()).isEqualTo("user-1-1");
- assertThat(e.getRoles())
- .containsExactlyInAnyOrder(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ assertThat(e.getRoles()).containsExactlyInAnyOrder(KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
}
@WithAccessId(user = "businessadmin")
diff --git a/lib/taskana-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java
similarity index 80%
rename from lib/taskana-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java
index 5d4a953b2..f0e7f08be 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/classification/get/GetClassificationAccTest.java
@@ -1,34 +1,34 @@
package acceptance.classification.get;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_1;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_2;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_3;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_4;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_5;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_6;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_7;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_8;
+import static io.kadai.common.api.SharedConstants.MASTER_DOMAIN;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_1;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_2;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_3;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_4;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_5;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_6;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_7;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_8;
-import static pro.taskana.common.api.SharedConstants.MASTER_DOMAIN;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.exceptions.ClassificationNotFoundException;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ClassificationBuilder;
+import io.kadai.testapi.security.WithAccessId;
import java.time.Instant;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ClassificationBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class GetClassificationAccTest {
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject ClassificationService classificationService;
Classification defaultClassification;
Classification classificationWithAllProperties;
diff --git a/lib/taskana-core-test/src/test/java/acceptance/classification/query/ClassificationQueryFilteringAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/classification/query/ClassificationQueryFilteringAccTest.java
similarity index 94%
rename from lib/taskana-core-test/src/test/java/acceptance/classification/query/ClassificationQueryFilteringAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/classification/query/ClassificationQueryFilteringAccTest.java
index 057988fbd..b6a09f98c 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/classification/query/ClassificationQueryFilteringAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/classification/query/ClassificationQueryFilteringAccTest.java
@@ -1,20 +1,29 @@
package acceptance.classification.query;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_1;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_2;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_3;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_4;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_5;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_6;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_7;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_8;
+import static io.kadai.classification.api.ClassificationQueryColumnName.CREATED;
+import static io.kadai.classification.api.ClassificationQueryColumnName.NAME;
+import static io.kadai.classification.api.ClassificationQueryColumnName.TYPE;
+import static io.kadai.classification.api.ClassificationQueryColumnName.VALID_IN_DOMAIN;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_1;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_2;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_3;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_4;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_5;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_6;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_7;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_8;
-import static pro.taskana.classification.api.ClassificationQueryColumnName.CREATED;
-import static pro.taskana.classification.api.ClassificationQueryColumnName.NAME;
-import static pro.taskana.classification.api.ClassificationQueryColumnName.TYPE;
-import static pro.taskana.classification.api.ClassificationQueryColumnName.VALID_IN_DOMAIN;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
+import io.kadai.classification.api.ClassificationCustomField;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.security.WithAccessId;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
@@ -35,15 +44,6 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationCustomField;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.security.WithAccessId;
/**
* The QueryClassificationsFilteringAccTest for all "query classification with filtering" scenarios.
@@ -56,10 +56,10 @@ import pro.taskana.testapi.security.WithAccessId;
* The alternative is to create a "big" scenario as a test setup. But that would result to the
* same issues we have with the sql file.
*/
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
@TestMethodOrder(value = MethodOrderer.OrderAnnotation.class)
class ClassificationQueryFilteringAccTest {
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject ClassificationService classificationService;
ClassificationSummary classificationSummaryBeforeAll;
@WithAccessId(user = "businessadmin")
diff --git a/lib/taskana-core-test/src/test/java/acceptance/classification/query/ClassificationQueryOffsetAndPaginationAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/classification/query/ClassificationQueryOffsetAndPaginationAccTest.java
similarity index 91%
rename from lib/taskana-core-test/src/test/java/acceptance/classification/query/ClassificationQueryOffsetAndPaginationAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/classification/query/ClassificationQueryOffsetAndPaginationAccTest.java
index 851846853..6d6381653 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/classification/query/ClassificationQueryOffsetAndPaginationAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/classification/query/ClassificationQueryOffsetAndPaginationAccTest.java
@@ -1,21 +1,21 @@
package acceptance.classification.query;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.security.WithAccessId;
import java.util.List;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.security.WithAccessId;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
public class ClassificationQueryOffsetAndPaginationAccTest {
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject ClassificationService classificationService;
@WithAccessId(user = "businessadmin")
@BeforeAll
diff --git a/lib/taskana-core-test/src/test/java/acceptance/classification/query/ClassificationQuerySortingAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/classification/query/ClassificationQuerySortingAccTest.java
similarity index 95%
rename from lib/taskana-core-test/src/test/java/acceptance/classification/query/ClassificationQuerySortingAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/classification/query/ClassificationQuerySortingAccTest.java
index a6b6e6f73..c638d4001 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/classification/query/ClassificationQuerySortingAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/classification/query/ClassificationQuerySortingAccTest.java
@@ -1,12 +1,19 @@
package acceptance.classification.query;
+import static io.kadai.classification.api.ClassificationCustomField.CUSTOM_1;
+import static io.kadai.common.api.BaseQuery.SortDirection.ASCENDING;
+import static io.kadai.common.api.BaseQuery.SortDirection.DESCENDING;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
import static java.lang.String.CASE_INSENSITIVE_ORDER;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.classification.api.ClassificationCustomField.CUSTOM_1;
-import static pro.taskana.common.api.BaseQuery.SortDirection.ASCENDING;
-import static pro.taskana.common.api.BaseQuery.SortDirection.DESCENDING;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
+import io.kadai.classification.api.ClassificationCustomField;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.security.WithAccessId;
import java.text.Collator;
import java.util.Arrays;
import java.util.Comparator;
@@ -22,13 +29,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationCustomField;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.security.WithAccessId;
/**
* The QueryClassificationsWithSortingAccTest for all "query classification with sorting" scenarios.
@@ -41,11 +41,11 @@ import pro.taskana.testapi.security.WithAccessId;
*
The alternative is to create a "big" scenario as a test setup. But that would result to the
* same issues we have with the sql file.
*/
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
@TestMethodOrder(value = MethodOrderer.OrderAnnotation.class)
class ClassificationQuerySortingAccTest {
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject ClassificationService classificationService;
@WithAccessId(user = "businessadmin")
@TestFactory
diff --git a/lib/taskana-core-test/src/test/java/acceptance/classification/update/UpdateClassificationAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/classification/update/UpdateClassificationAccTest.java
similarity index 92%
rename from lib/taskana-core-test/src/test/java/acceptance/classification/update/UpdateClassificationAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/classification/update/UpdateClassificationAccTest.java
index 8caadb52f..2fbfe008b 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/classification/update/UpdateClassificationAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/classification/update/UpdateClassificationAccTest.java
@@ -1,13 +1,40 @@
package acceptance.classification.update;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import static io.kadai.testapi.builder.TaskBuilder.newTask;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
-import static pro.taskana.testapi.builder.TaskBuilder.newTask;
+import io.kadai.classification.api.ClassificationCustomField;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.exceptions.ClassificationNotFoundException;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.classification.internal.models.ClassificationImpl;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.WorkingTimeCalculator;
+import io.kadai.common.api.exceptions.ConcurrencyException;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.common.api.security.CurrentUserContext;
+import io.kadai.common.internal.jobs.JobRunner;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.Attachment;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.internal.models.TaskImpl;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
@@ -25,43 +52,16 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationCustomField;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.classification.internal.models.ClassificationImpl;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.WorkingTimeCalculator;
-import pro.taskana.common.api.exceptions.ConcurrencyException;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.api.security.CurrentUserContext;
-import pro.taskana.common.internal.jobs.JobRunner;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.Attachment;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.internal.models.TaskImpl;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** Acceptance test for all "update classification" scenarios. */
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class UpdateClassificationAccTest {
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject TaskanaEngine taskanaEngine;
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject WorkingTimeCalculator workingTimeCalculator;
- @TaskanaInject CurrentUserContext currentUserContext;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject KadaiEngine kadaiEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject WorkingTimeCalculator workingTimeCalculator;
+ @KadaiInject CurrentUserContext currentUserContext;
@WithAccessId(user = "businessadmin")
@Test
@@ -205,13 +205,14 @@ class UpdateClassificationAccTest {
.permission(WorkbasketPermission.APPEND)
.buildAndStore(workbasketService, "businessadmin");
- Task task = new TaskBuilder()
- .classificationSummary(classification.asSummary())
- .workbasketSummary(workbasketSummary)
- .primaryObjRef(defaultTestObjectReference().build())
- .planned(Instant.parse("2021-04-27T15:34:00.000Z"))
- .due(null)
- .buildAndStore(taskService);
+ Task task =
+ new TaskBuilder()
+ .classificationSummary(classification.asSummary())
+ .workbasketSummary(workbasketSummary)
+ .primaryObjRef(defaultTestObjectReference().build())
+ .planned(Instant.parse("2021-04-27T15:34:00.000Z"))
+ .due(null)
+ .buildAndStore(taskService);
classificationService.updateClassification(classification);
runAssociatedJobs();
@@ -644,7 +645,7 @@ class UpdateClassificationAccTest {
private void runAssociatedJobs() throws Exception {
Thread.sleep(10);
// run the ClassificationChangedJob
- JobRunner runner = new JobRunner(taskanaEngine);
+ JobRunner runner = new JobRunner(kadaiEngine);
// run the TaskRefreshJob that was scheduled by the ClassificationChangedJob.
runner.runJobs();
Thread.sleep(
@@ -704,7 +705,7 @@ class UpdateClassificationAccTest {
NotAuthorizedException expectedException =
new NotAuthorizedException(
- currentUserContext.getUserid(), TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ currentUserContext.getUserid(), KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
assertThatThrownBy(() -> classificationService.updateClassification(classification))
.usingRecursiveComparison()
.isEqualTo(expectedException);
@@ -722,7 +723,7 @@ class UpdateClassificationAccTest {
NotAuthorizedException expectedException =
new NotAuthorizedException(
- currentUserContext.getUserid(), TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ currentUserContext.getUserid(), KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
assertThatThrownBy(() -> classificationService.updateClassification(classification))
.usingRecursiveComparison()
.isEqualTo(expectedException);
diff --git a/lib/taskana-core-test/src/test/java/acceptance/classification/update/UpdateClassificationWithWorkingDayCalculatorAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/classification/update/UpdateClassificationWithWorkingDayCalculatorAccTest.java
similarity index 93%
rename from lib/taskana-core-test/src/test/java/acceptance/classification/update/UpdateClassificationWithWorkingDayCalculatorAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/classification/update/UpdateClassificationWithWorkingDayCalculatorAccTest.java
index c04153599..93d375f66 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/classification/update/UpdateClassificationWithWorkingDayCalculatorAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/classification/update/UpdateClassificationWithWorkingDayCalculatorAccTest.java
@@ -1,13 +1,42 @@
package acceptance.classification.update;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import static io.kadai.testapi.builder.TaskBuilder.newTask;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
-import static pro.taskana.testapi.builder.TaskBuilder.newTask;
+import io.kadai.KadaiConfiguration.Builder;
+import io.kadai.classification.api.ClassificationCustomField;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.exceptions.ClassificationNotFoundException;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.classification.internal.models.ClassificationImpl;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.WorkingTimeCalculator;
+import io.kadai.common.api.exceptions.ConcurrencyException;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.common.api.security.CurrentUserContext;
+import io.kadai.common.internal.jobs.JobRunner;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.Attachment;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.internal.models.TaskImpl;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Duration;
import java.time.Instant;
import java.time.ZoneId;
@@ -27,46 +56,17 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.TaskanaConfiguration.Builder;
-import pro.taskana.classification.api.ClassificationCustomField;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.classification.internal.models.ClassificationImpl;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.WorkingTimeCalculator;
-import pro.taskana.common.api.exceptions.ConcurrencyException;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.api.security.CurrentUserContext;
-import pro.taskana.common.internal.jobs.JobRunner;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.Attachment;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.internal.models.TaskImpl;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
public class UpdateClassificationWithWorkingDayCalculatorAccTest
- implements TaskanaConfigurationModifier {
+ implements KadaiConfigurationModifier {
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject TaskanaEngine taskanaEngine;
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject WorkingTimeCalculator workingTimeCalculator;
- @TaskanaInject CurrentUserContext currentUserContext;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject KadaiEngine kadaiEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject WorkingTimeCalculator workingTimeCalculator;
+ @KadaiInject CurrentUserContext currentUserContext;
@Override
public Builder modify(Builder builder) {
@@ -714,7 +714,7 @@ public class UpdateClassificationWithWorkingDayCalculatorAccTest
private void runAssociatedJobs() throws Exception {
Thread.sleep(10);
// run the ClassificationChangedJob
- JobRunner runner = new JobRunner(taskanaEngine);
+ JobRunner runner = new JobRunner(kadaiEngine);
// run the TaskRefreshJob that was scheduled by the ClassificationChangedJob.
runner.runJobs();
Thread.sleep(
@@ -772,7 +772,7 @@ public class UpdateClassificationWithWorkingDayCalculatorAccTest
NotAuthorizedException expectedException =
new NotAuthorizedException(
- currentUserContext.getUserid(), TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ currentUserContext.getUserid(), KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
assertThatThrownBy(() -> classificationService.updateClassification(classification))
.usingRecursiveComparison()
.isEqualTo(expectedException);
@@ -790,7 +790,7 @@ public class UpdateClassificationWithWorkingDayCalculatorAccTest
NotAuthorizedException expectedException =
new NotAuthorizedException(
- currentUserContext.getUserid(), TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ currentUserContext.getUserid(), KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
assertThatThrownBy(() -> classificationService.updateClassification(classification))
.usingRecursiveComparison()
.isEqualTo(expectedException);
diff --git a/lib/kadai-core-test/src/test/java/acceptance/common/KadaiEngineExplicitTest.java b/lib/kadai-core-test/src/test/java/acceptance/common/KadaiEngineExplicitTest.java
new file mode 100644
index 000000000..6463981dd
--- /dev/null
+++ b/lib/kadai-core-test/src/test/java/acceptance/common/KadaiEngineExplicitTest.java
@@ -0,0 +1,35 @@
+package acceptance.common;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.KadaiEngine.ConnectionManagementMode;
+import io.kadai.common.internal.configuration.DB;
+import io.kadai.common.internal.configuration.DbSchemaCreator;
+import io.kadai.testapi.OracleSchemaHelper;
+import io.kadai.testapi.extensions.TestContainerExtension;
+import org.junit.jupiter.api.Test;
+
+class KadaiEngineExplicitTest {
+
+ @Test
+ void should_CreateKadaiEngine_When_ExplizitModeIsActive() throws Exception {
+
+ String schemaName = TestContainerExtension.determineSchemaName();
+ if (DB.ORACLE == TestContainerExtension.EXECUTION_DATABASE) {
+ OracleSchemaHelper.initOracleSchema(TestContainerExtension.DATA_SOURCE, schemaName);
+ }
+
+ KadaiConfiguration kadaiConfiguration =
+ new KadaiConfiguration.Builder(TestContainerExtension.DATA_SOURCE, false, schemaName, true)
+ .initKadaiProperties()
+ .build();
+
+ KadaiEngine.buildKadaiEngine(kadaiConfiguration, ConnectionManagementMode.EXPLICIT);
+
+ DbSchemaCreator dsc =
+ new DbSchemaCreator(kadaiConfiguration.getDataSource(), kadaiConfiguration.getSchemaName());
+ assertThat(dsc.isValidSchemaVersion(KadaiEngine.MINIMAL_KADAI_SCHEMA_VERSION)).isTrue();
+ }
+}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/config/ConfigurationServiceImplAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/config/ConfigurationServiceImplAccTest.java
similarity index 81%
rename from lib/taskana-core-test/src/test/java/acceptance/config/ConfigurationServiceImplAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/config/ConfigurationServiceImplAccTest.java
index 394d4e9af..3a782639b 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/config/ConfigurationServiceImplAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/config/ConfigurationServiceImplAccTest.java
@@ -2,6 +2,11 @@ package acceptance.config;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.common.internal.ConfigurationMapper;
+import io.kadai.common.internal.ConfigurationServiceImpl;
+import io.kadai.common.internal.util.ResourceUtil;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
import java.util.Map;
import java.util.Optional;
import org.json.JSONObject;
@@ -12,17 +17,12 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.TestMethodOrder;
-import pro.taskana.common.internal.ConfigurationMapper;
-import pro.taskana.common.internal.ConfigurationServiceImpl;
-import pro.taskana.common.internal.util.ResourceUtil;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
public class ConfigurationServiceImplAccTest {
- @TaskanaInject ConfigurationServiceImpl configurationService;
- @TaskanaInject ConfigurationMapper configurationMapper;
+ @KadaiInject ConfigurationServiceImpl configurationService;
+ @KadaiInject ConfigurationMapper configurationMapper;
@Nested
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -31,9 +31,8 @@ public class ConfigurationServiceImplAccTest {
@Test
@Order(1)
- void
- should_SetDefaultCustomAttributesDuringTaskanaInitialization_When_NoCustomAttributesAreSet()
- throws Exception {
+ void should_SetDefaultCustomAttributesDuringKadaiInitialization_When_NoCustomAttributesAreSet()
+ throws Exception {
Map expectedCustomAttributes =
new JSONObject(
ResourceUtil.readResourceAsString(
diff --git a/lib/taskana-core-test/src/test/java/acceptance/jobs/AbstractTaskanaJobAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/jobs/AbstractKadaiJobAccTest.java
similarity index 60%
rename from lib/taskana-core-test/src/test/java/acceptance/jobs/AbstractTaskanaJobAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/jobs/AbstractKadaiJobAccTest.java
index bf2f2347d..472de2a79 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/jobs/AbstractTaskanaJobAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/jobs/AbstractKadaiJobAccTest.java
@@ -3,6 +3,25 @@ package acceptance.jobs;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
+import io.kadai.KadaiConfiguration;
+import io.kadai.KadaiConfiguration.Builder;
+import io.kadai.classification.internal.jobs.ClassificationChangedJob;
+import io.kadai.common.api.JobService;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.ScheduledJob;
+import io.kadai.common.api.exceptions.KadaiException;
+import io.kadai.common.internal.JobMapper;
+import io.kadai.common.internal.jobs.AbstractKadaiJob;
+import io.kadai.common.internal.jobs.JobRunner;
+import io.kadai.common.internal.transaction.KadaiTransactionProvider;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.simplehistory.impl.jobs.HistoryCleanupJob;
+import io.kadai.task.internal.jobs.TaskCleanupJob;
+import io.kadai.task.internal.jobs.TaskRefreshJob;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.security.WithAccessId;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
@@ -18,40 +37,21 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.TaskanaConfiguration.Builder;
-import pro.taskana.classification.internal.jobs.ClassificationChangedJob;
-import pro.taskana.common.api.JobService;
-import pro.taskana.common.api.ScheduledJob;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.common.internal.JobMapper;
-import pro.taskana.common.internal.jobs.AbstractTaskanaJob;
-import pro.taskana.common.internal.jobs.JobRunner;
-import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.simplehistory.impl.jobs.HistoryCleanupJob;
-import pro.taskana.task.internal.jobs.TaskCleanupJob;
-import pro.taskana.task.internal.jobs.TaskRefreshJob;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.security.WithAccessId;
-@TaskanaIntegrationTest
-class AbstractTaskanaJobAccTest {
+@KadaiIntegrationTest
+class AbstractKadaiJobAccTest {
- @TaskanaInject JobMapper jobMapper;
+ @KadaiInject JobMapper jobMapper;
- @TaskanaInject JobService jobService;
+ @KadaiInject JobService jobService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject KadaiEngine kadaiEngine;
- @TaskanaInject TaskanaConfiguration taskanaConfiguration;
+ @KadaiInject KadaiConfiguration kadaiConfiguration;
@AfterEach
void cleanupJobs() {
- // Dirty Hack, please refactor me with ticket https://github.com/Taskana/taskana/issues/2238
+ // Dirty Hack, please refactor me with ticket https://github.com/kadai-iokadai/issues/2238
jobMapper.deleteMultiple(TaskCleanupJob.class.getName());
jobMapper.deleteMultiple(TaskRefreshJob.class.getName());
jobMapper.deleteMultiple(ClassificationChangedJob.class.getName());
@@ -74,9 +74,9 @@ class AbstractTaskanaJobAccTest {
assertThat(jobsToRun).extracting(ScheduledJob::getDue).containsExactly(firstDue);
- JobRunner runner = new JobRunner(taskanaEngine);
+ JobRunner runner = new JobRunner(kadaiEngine);
runner.runJobs();
- Duration runEvery = taskanaConfiguration.getJobRunEvery();
+ Duration runEvery = kadaiConfiguration.getJobRunEvery();
jobsToRun = jobMapper.findJobsToRun(Instant.now().plus(runEvery));
assertThat(jobsToRun).extracting(ScheduledJob::getDue).containsExactly(firstDue.plus(runEvery));
@@ -84,10 +84,10 @@ class AbstractTaskanaJobAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class CleanCompletedTasks implements TaskanaConfigurationModifier {
- @TaskanaInject TaskanaEngine taskanaEngine;
+ class CleanCompletedTasks implements KadaiConfigurationModifier {
+ @KadaiInject KadaiEngine kadaiEngine;
- @TaskanaInject JobMapper jobMapper;
+ @KadaiInject JobMapper jobMapper;
@Override
public Builder modify(Builder builder) {
@@ -101,7 +101,7 @@ class AbstractTaskanaJobAccTest {
@Test
void should_FindNoJobsToRunUntilFirstRunIsReached_When_CleanupScheduleIsInitialized()
throws Exception {
- AbstractTaskanaJob.initializeSchedule(taskanaEngine, TaskCleanupJob.class);
+ AbstractKadaiJob.initializeSchedule(kadaiEngine, TaskCleanupJob.class);
List nextJobs = jobMapper.findJobsToRun(Instant.now());
assertThat(nextJobs).isEmpty();
@@ -120,11 +120,11 @@ class AbstractTaskanaJobAccTest {
for (int i = 0; i < 10; i++) {
ScheduledJob job = new ScheduledJob();
job.setType(t.getRight().getName());
- taskanaEngine.getJobService().createJob(job);
+ kadaiEngine.getJobService().createJob(job);
job.setType(TaskRefreshJob.class.getName());
- taskanaEngine.getJobService().createJob(job);
+ kadaiEngine.getJobService().createJob(job);
job.setType(ClassificationChangedJob.class.getName());
- taskanaEngine.getJobService().createJob(job);
+ kadaiEngine.getJobService().createJob(job);
}
List jobsToRun = jobMapper.findJobsToRun(Instant.now());
@@ -134,7 +134,7 @@ class AbstractTaskanaJobAccTest {
.filter(scheduledJob -> scheduledJob.getType().equals(t.getRight().getName()))
.collect(Collectors.toList());
- AbstractTaskanaJob.initializeSchedule(taskanaEngine, t.getRight());
+ AbstractKadaiJob.initializeSchedule(kadaiEngine, t.getRight());
jobsToRun = jobMapper.findJobsToRun(Instant.now());
@@ -146,44 +146,42 @@ class AbstractTaskanaJobAccTest {
}
@Test
- void should_CreateSampleTaskanaJob_When_JobHasMoreThenOneConstructor() {
+ void should_CreateSampleKadaiJob_When_JobHasMoreThenOneConstructor() {
ScheduledJob scheduledJob = new ScheduledJob();
- scheduledJob.setType(SampleTaskanaJob.class.getName());
+ scheduledJob.setType(SampleKadaiJob.class.getName());
ThrowingCallable call =
- () -> AbstractTaskanaJob.createFromScheduledJob(taskanaEngine, null, scheduledJob);
+ () -> AbstractKadaiJob.createFromScheduledJob(kadaiEngine, null, scheduledJob);
assertThatCode(call).doesNotThrowAnyException();
}
- public static class SampleTaskanaJob extends AbstractTaskanaJob {
+ public static class SampleKadaiJob extends AbstractKadaiJob {
- public SampleTaskanaJob() {
+ public SampleKadaiJob() {
super(null, null, null, true);
}
- public SampleTaskanaJob(
- TaskanaEngine taskanaEngine,
- TaskanaTransactionProvider txProvider,
- ScheduledJob scheduledJob) {
- super(taskanaEngine, txProvider, scheduledJob, true);
+ public SampleKadaiJob(
+ KadaiEngine kadaiEngine, KadaiTransactionProvider txProvider, ScheduledJob scheduledJob) {
+ super(kadaiEngine, txProvider, scheduledJob, true);
}
- public SampleTaskanaJob(
- TaskanaEngine taskanaEngine,
- TaskanaTransactionProvider txProvider,
+ public SampleKadaiJob(
+ KadaiEngine kadaiEngine,
+ KadaiTransactionProvider txProvider,
ScheduledJob job,
boolean async) {
- super(taskanaEngine, txProvider, job, async);
+ super(kadaiEngine, txProvider, job, async);
}
@Override
protected String getType() {
- return SampleTaskanaJob.class.getName();
+ return SampleKadaiJob.class.getName();
}
@Override
- protected void execute() throws TaskanaException {}
+ protected void execute() throws KadaiException {}
}
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/jobs/FakeClock.java b/lib/kadai-core-test/src/test/java/acceptance/jobs/FakeClock.java
similarity index 88%
rename from lib/taskana-core-test/src/test/java/acceptance/jobs/FakeClock.java
rename to lib/kadai-core-test/src/test/java/acceptance/jobs/FakeClock.java
index efca7ec33..a21ecf167 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/jobs/FakeClock.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/jobs/FakeClock.java
@@ -1,8 +1,8 @@
package acceptance.jobs;
+import io.kadai.common.internal.jobs.Clock;
import java.util.ArrayList;
import java.util.List;
-import pro.taskana.common.internal.jobs.Clock;
public class FakeClock implements Clock {
diff --git a/lib/taskana-core-test/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java
similarity index 89%
rename from lib/taskana-core-test/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java
index 31a01c5b7..dd4078982 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java
@@ -2,6 +2,20 @@ package acceptance.jobs;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.KadaiConfiguration.Builder;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.internal.util.IdGenerator;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.simplehistory.impl.SimpleHistoryServiceImpl;
+import io.kadai.simplehistory.impl.jobs.HistoryCleanupJob;
+import io.kadai.spi.history.api.KadaiHistory;
+import io.kadai.spi.history.api.events.task.TaskHistoryEvent;
+import io.kadai.spi.history.api.events.task.TaskHistoryEventType;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.security.WithAccessId;
import java.sql.SQLException;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
@@ -18,28 +32,14 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.TaskanaConfiguration.Builder;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.internal.util.IdGenerator;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
-import pro.taskana.simplehistory.impl.jobs.HistoryCleanupJob;
-import pro.taskana.spi.history.api.TaskanaHistory;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
-import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.security.WithAccessId;
@WithServiceProvider(
- serviceProviderInterface = TaskanaHistory.class,
+ serviceProviderInterface = KadaiHistory.class,
serviceProviders = SimpleHistoryServiceImpl.class)
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class HistoryCleanupJobAccTest {
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject KadaiEngine kadaiEngine;
SimpleHistoryServiceImpl historyService;
@@ -47,7 +47,7 @@ class HistoryCleanupJobAccTest {
@BeforeAll
void setup() throws Exception {
historyService = new SimpleHistoryServiceImpl();
- historyService.initialize(taskanaEngine);
+ historyService.initialize(kadaiEngine);
}
@WithAccessId(user = "admin")
@@ -82,7 +82,7 @@ class HistoryCleanupJobAccTest {
"sameParentId");
historyService.create(eventToBeCleaned2);
- HistoryCleanupJob job = new HistoryCleanupJob(taskanaEngine, null, null);
+ HistoryCleanupJob job = new HistoryCleanupJob(kadaiEngine, null, null);
job.run();
assertThat(historyService.createTaskHistoryQuery().count()).isEqualTo(2);
@@ -109,8 +109,8 @@ class HistoryCleanupJobAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
class SimpleHistoryCleanupJobAllCompletedSameParentBusinessIsTrue
- implements TaskanaConfigurationModifier {
- @TaskanaInject TaskanaEngine taskanaEngine;
+ implements KadaiConfigurationModifier {
+ @KadaiInject KadaiEngine kadaiEngine;
SimpleHistoryServiceImpl historyService;
@Override
@@ -122,7 +122,7 @@ class HistoryCleanupJobAccTest {
@BeforeAll
void setup() throws Exception {
historyService = new SimpleHistoryServiceImpl();
- historyService.initialize(taskanaEngine);
+ historyService.initialize(kadaiEngine);
}
@Test
@@ -184,7 +184,7 @@ class HistoryCleanupJobAccTest {
Instant.now().minus(20, ChronoUnit.DAYS),
"sameParentId");
historyService.create(eventToBeCleaned6);
- HistoryCleanupJob job = new HistoryCleanupJob(taskanaEngine, null, null);
+ HistoryCleanupJob job = new HistoryCleanupJob(kadaiEngine, null, null);
job.run();
assertThat(historyService.createTaskHistoryQuery().count()).isZero();
@@ -222,7 +222,7 @@ class HistoryCleanupJobAccTest {
"sameParentId");
historyService.create(eventToBeCleaned3);
- HistoryCleanupJob job = new HistoryCleanupJob(taskanaEngine, null, null);
+ HistoryCleanupJob job = new HistoryCleanupJob(kadaiEngine, null, null);
job.run();
assertThat(historyService.createTaskHistoryQuery().count()).isEqualTo(3);
@@ -270,7 +270,7 @@ class HistoryCleanupJobAccTest {
"sameParentId");
historyService.create(eventToBeCleaned4);
- HistoryCleanupJob job = new HistoryCleanupJob(taskanaEngine, null, null);
+ HistoryCleanupJob job = new HistoryCleanupJob(kadaiEngine, null, null);
job.run();
assertThat(historyService.createTaskHistoryQuery().count()).isEqualTo(4);
@@ -308,7 +308,7 @@ class HistoryCleanupJobAccTest {
"toBeIgnored3");
historyService.create(toBeIgnored3);
- HistoryCleanupJob job = new HistoryCleanupJob(taskanaEngine, null, null);
+ HistoryCleanupJob job = new HistoryCleanupJob(kadaiEngine, null, null);
job.run();
assertThat(historyService.createTaskHistoryQuery().count()).isEqualTo(3);
@@ -323,7 +323,7 @@ class HistoryCleanupJobAccTest {
String taskId1 = "taskId1";
String taskId2 = "taskId2";
- HistoryCleanupJob job = new HistoryCleanupJob(taskanaEngine, null, null);
+ HistoryCleanupJob job = new HistoryCleanupJob(kadaiEngine, null, null);
ThrowingConsumer test =
parentBusinessId -> {
@@ -335,10 +335,8 @@ class HistoryCleanupJobAccTest {
.map(
pair ->
createTaskHistoryEvent(
-
pair.getLeft(),
pair.getRight().getName(),
-
"someUserId",
"someDetails",
Instant.now().minus(20, ChronoUnit.DAYS),
@@ -365,8 +363,8 @@ class HistoryCleanupJobAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
class SimpleHistoryCleanupJobAllCompletedSameParentBusinessIsFalse
- implements TaskanaConfigurationModifier {
- @TaskanaInject TaskanaEngine taskanaEngine;
+ implements KadaiConfigurationModifier {
+ @KadaiInject KadaiEngine kadaiEngine;
SimpleHistoryServiceImpl historyService;
@Override
@@ -378,7 +376,7 @@ class HistoryCleanupJobAccTest {
@BeforeAll
void setup() throws Exception {
historyService = new SimpleHistoryServiceImpl();
- historyService.initialize(taskanaEngine);
+ historyService.initialize(kadaiEngine);
}
@Test
@@ -438,7 +436,7 @@ class HistoryCleanupJobAccTest {
Instant.now().minus(20, ChronoUnit.DAYS),
"someParentId3");
historyService.create(eventToBeCleaned6);
- HistoryCleanupJob job = new HistoryCleanupJob(taskanaEngine, null, null);
+ HistoryCleanupJob job = new HistoryCleanupJob(kadaiEngine, null, null);
job.run();
assertThat(historyService.createTaskHistoryQuery().count()).isEqualTo(2);
diff --git a/lib/taskana-core-test/src/test/java/acceptance/jobs/JobSchedulerExecutionAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/jobs/JobSchedulerExecutionAccTest.java
similarity index 66%
rename from lib/taskana-core-test/src/test/java/acceptance/jobs/JobSchedulerExecutionAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/jobs/JobSchedulerExecutionAccTest.java
index f00c8b5f6..7aa0ddc26 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/jobs/JobSchedulerExecutionAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/jobs/JobSchedulerExecutionAccTest.java
@@ -2,6 +2,31 @@ package acceptance.jobs;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.KadaiConfiguration;
+import io.kadai.KadaiConfiguration.Builder;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.KadaiEngine.ConnectionManagementMode;
+import io.kadai.common.api.ScheduledJob;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.JobMapper;
+import io.kadai.common.internal.jobs.AbstractKadaiJob;
+import io.kadai.common.internal.jobs.JobScheduler;
+import io.kadai.common.internal.transaction.KadaiTransactionProvider;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.task.internal.jobs.TaskCleanupJob;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
@@ -12,37 +37,12 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.TaskanaConfiguration.Builder;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.ScheduledJob;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.JobMapper;
-import pro.taskana.common.internal.jobs.AbstractTaskanaJob;
-import pro.taskana.common.internal.jobs.JobScheduler;
-import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.task.internal.jobs.TaskCleanupJob;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
-class JobSchedulerExecutionAccTest implements TaskanaConfigurationModifier {
- @TaskanaInject TaskanaConfiguration taskanaConfiguration;
- @TaskanaInject TaskService taskService;
- @TaskanaInject JobMapper jobMapper;
+@KadaiIntegrationTest
+class JobSchedulerExecutionAccTest implements KadaiConfigurationModifier {
+ @KadaiInject KadaiConfiguration kadaiConfiguration;
+ @KadaiInject TaskService taskService;
+ @KadaiInject JobMapper jobMapper;
WorkbasketSummary workbasket;
ClassificationSummary classification;
ObjectReference primaryObjRef;
@@ -72,9 +72,9 @@ class JobSchedulerExecutionAccTest implements TaskanaConfigurationModifier {
@Test
void should_ExecuteAJobSuccessfully() throws Exception {
Instant timeStampAnyJobIsOverdue = Instant.now().plus(10, ChronoUnit.DAYS);
- TaskanaEngine taskanaEngine =
- TaskanaEngine.buildTaskanaEngine(taskanaConfiguration, ConnectionManagementMode.EXPLICIT);
- JobScheduler jobScheduler = new JobScheduler(taskanaEngine, new FakeClock());
+ KadaiEngine kadaiEngine =
+ KadaiEngine.buildKadaiEngine(kadaiConfiguration, ConnectionManagementMode.EXPLICIT);
+ JobScheduler jobScheduler = new JobScheduler(kadaiEngine, new FakeClock());
TaskBuilder.newTask()
.workbasketSummary(workbasket)
.classificationSummary(classification)
@@ -93,11 +93,11 @@ class JobSchedulerExecutionAccTest implements TaskanaConfigurationModifier {
assertThat(jobsToRunAfter).isNotEmpty().doesNotContainAnyElementsOf(jobsToRun);
}
- public static class AlwaysFailJob extends AbstractTaskanaJob {
+ public static class AlwaysFailJob extends AbstractKadaiJob {
public AlwaysFailJob(
- TaskanaEngine taskanaEngine, TaskanaTransactionProvider txProvider, ScheduledJob job) {
- super(taskanaEngine, txProvider, job, true);
+ KadaiEngine kadaiEngine, KadaiTransactionProvider txProvider, ScheduledJob job) {
+ super(kadaiEngine, txProvider, job, true);
}
@Override
@@ -113,11 +113,11 @@ class JobSchedulerExecutionAccTest implements TaskanaConfigurationModifier {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class AJobFails implements TaskanaConfigurationModifier {
+ class AJobFails implements KadaiConfigurationModifier {
- @TaskanaInject TaskanaConfiguration taskanaConfiguration;
- @TaskanaInject TaskService taskService;
- @TaskanaInject JobMapper jobMapper;
+ @KadaiInject KadaiConfiguration kadaiConfiguration;
+ @KadaiInject TaskService taskService;
+ @KadaiInject JobMapper jobMapper;
WorkbasketSummary workbasket;
ClassificationSummary classification;
ObjectReference primaryObjRef;
@@ -148,9 +148,9 @@ class JobSchedulerExecutionAccTest implements TaskanaConfigurationModifier {
@Test
void should_ContinueExecutingJobs_When_ASingeJobFails() throws Exception {
Instant timeStampAnyJobIsOverdue = Instant.now().plus(10, ChronoUnit.DAYS);
- TaskanaEngine taskanaEngine =
- TaskanaEngine.buildTaskanaEngine(taskanaConfiguration, ConnectionManagementMode.EXPLICIT);
- JobScheduler jobScheduler = new JobScheduler(taskanaEngine, new FakeClock());
+ KadaiEngine kadaiEngine =
+ KadaiEngine.buildKadaiEngine(kadaiConfiguration, ConnectionManagementMode.EXPLICIT);
+ JobScheduler jobScheduler = new JobScheduler(kadaiEngine, new FakeClock());
TaskBuilder.newTask()
.workbasketSummary(workbasket)
.classificationSummary(classification)
diff --git a/lib/taskana-core-test/src/test/java/acceptance/jobs/JobSchedulerInitAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/jobs/JobSchedulerInitAccTest.java
similarity index 68%
rename from lib/taskana-core-test/src/test/java/acceptance/jobs/JobSchedulerInitAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/jobs/JobSchedulerInitAccTest.java
index 9ab1db495..af4630902 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/jobs/JobSchedulerInitAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/jobs/JobSchedulerInitAccTest.java
@@ -2,32 +2,32 @@ package acceptance.jobs;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.ScheduledJob;
+import io.kadai.common.internal.JobMapper;
+import io.kadai.task.internal.jobs.TaskCleanupJob;
+import io.kadai.task.internal.jobs.TaskUpdatePriorityJob;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.workbasket.internal.jobs.WorkbasketCleanupJob;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Test;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.api.ScheduledJob;
-import pro.taskana.common.internal.JobMapper;
-import pro.taskana.task.internal.jobs.TaskCleanupJob;
-import pro.taskana.task.internal.jobs.TaskUpdatePriorityJob;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.workbasket.internal.jobs.WorkbasketCleanupJob;
-@TaskanaIntegrationTest
-class JobSchedulerInitAccTest implements TaskanaConfigurationModifier {
+@KadaiIntegrationTest
+class JobSchedulerInitAccTest implements KadaiConfigurationModifier {
- @TaskanaInject JobMapper jobMapper;
+ @KadaiInject JobMapper jobMapper;
Instant firstRun = Instant.now().minus(2, ChronoUnit.MINUTES).truncatedTo(ChronoUnit.MILLIS);
Duration runEvery = Duration.ofMinutes(5);
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder
.jobRunEvery(runEvery)
.jobFirstRun(firstRun)
diff --git a/lib/taskana-core-test/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
similarity index 83%
rename from lib/taskana-core-test/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
index a65477420..828b1e70f 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
@@ -2,6 +2,23 @@ package acceptance.jobs;
import static org.assertj.core.api.Assertions.assertThat;
+import io.kadai.KadaiConfiguration.Builder;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.task.internal.jobs.TaskCleanupJob;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
@@ -17,31 +34,14 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.TaskanaConfiguration.Builder;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.task.internal.jobs.TaskCleanupJob;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
// All tests are executed as admin, because the jobrunner needs admin rights.
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class TaskCleanupJobAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
ClassificationSummary classification;
ObjectReference primaryObjRef;
@@ -57,11 +57,11 @@ class TaskCleanupJobAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class CleanCompletedTasks implements TaskanaConfigurationModifier {
+ class CleanCompletedTasks implements KadaiConfigurationModifier {
WorkbasketSummary workbasket;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject KadaiEngine kadaiEngine;
@Override
public Builder modify(Builder builder) {
@@ -91,7 +91,7 @@ class TaskCleanupJobAccTest {
.completed(Instant.now().minus(6, ChronoUnit.DAYS))
.buildAndStoreAsSummary(taskService);
- TaskCleanupJob job = new TaskCleanupJob(taskanaEngine, null, null);
+ TaskCleanupJob job = new TaskCleanupJob(kadaiEngine, null, null);
job.run();
List taskSummaries = taskService.createTaskQuery().list();
@@ -103,9 +103,9 @@ class TaskCleanupJobAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class NotCleanCompletedTasksWhereDateIsNotReached implements TaskanaConfigurationModifier {
+ class NotCleanCompletedTasksWhereDateIsNotReached implements KadaiConfigurationModifier {
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject KadaiEngine kadaiEngine;
@Override
public Builder modify(Builder builder) {
@@ -130,7 +130,7 @@ class TaskCleanupJobAccTest {
.completed(Instant.now().minus(3, ChronoUnit.DAYS))
.buildAndStoreAsSummary(taskService);
- TaskCleanupJob job = new TaskCleanupJob(taskanaEngine, null, null);
+ TaskCleanupJob job = new TaskCleanupJob(kadaiEngine, null, null);
job.run();
List taskSummaries = taskService.createTaskQuery().list();
@@ -156,7 +156,7 @@ class TaskCleanupJobAccTest {
taskBuilder
.completed(Instant.now().minus(10, ChronoUnit.DAYS))
.buildAndStoreAsSummary(taskService);
- TaskCleanupJob job = new TaskCleanupJob(taskanaEngine, null, null);
+ TaskCleanupJob job = new TaskCleanupJob(kadaiEngine, null, null);
job.run();
List taskSummaries = taskService.createTaskQuery().list();
@@ -169,9 +169,9 @@ class TaskCleanupJobAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class CleanCompletedTasksWithBusinessProcessId implements TaskanaConfigurationModifier {
+ class CleanCompletedTasksWithBusinessProcessId implements KadaiConfigurationModifier {
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject KadaiEngine kadaiEngine;
@Override
public Builder modify(Builder builder) {
@@ -199,7 +199,7 @@ class TaskCleanupJobAccTest {
taskBuilder.buildAndStoreAsSummary(taskService);
taskBuilder.buildAndStoreAsSummary(taskService);
- TaskCleanupJob job = new TaskCleanupJob(taskanaEngine, null, null);
+ TaskCleanupJob job = new TaskCleanupJob(kadaiEngine, null, null);
job.run();
List taskSummaries = taskService.createTaskQuery().list();
@@ -237,7 +237,7 @@ class TaskCleanupJobAccTest {
.completed(null)
.buildAndStoreAsSummary(taskService);
- TaskCleanupJob job = new TaskCleanupJob(taskanaEngine, null, null);
+ TaskCleanupJob job = new TaskCleanupJob(kadaiEngine, null, null);
job.run();
List taskSummaries = taskService.createTaskQuery().list();
@@ -275,7 +275,7 @@ class TaskCleanupJobAccTest {
.completed(null)
.buildAndStoreAsSummary(taskService);
- TaskCleanupJob job = new TaskCleanupJob(taskanaEngine, null, null);
+ TaskCleanupJob job = new TaskCleanupJob(kadaiEngine, null, null);
job.run();
List taskSummaries = taskService.createTaskQuery().list();
diff --git a/lib/taskana-core-test/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java
similarity index 77%
rename from lib/taskana-core-test/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java
index 21b58091c..5916f7189 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/jobs/helper/TaskUpdatePriorityWorkerAccTest.java
@@ -4,6 +4,26 @@ import static acceptance.jobs.helper.TaskUpdatePriorityWorkerAccTest.WithSpi.Dum
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.jobs.helper.TaskUpdatePriorityWorkerAccTest.WithSpi.DummyPriorityServiceProvider;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.spi.priority.api.PriorityServiceProvider;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.task.internal.jobs.helper.TaskUpdatePriorityWorker;
+import io.kadai.task.internal.models.TaskImpl;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import java.util.List;
import java.util.OptionalInt;
@@ -13,32 +33,12 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.spi.priority.api.PriorityServiceProvider;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.task.internal.jobs.helper.TaskUpdatePriorityWorker;
-import pro.taskana.task.internal.models.TaskImpl;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class TaskUpdatePriorityWorkerAccTest {
- @TaskanaInject TaskanaEngine taskanaEngine;
- @TaskanaInject TaskService taskService;
+ @KadaiInject KadaiEngine kadaiEngine;
+ @KadaiInject TaskService taskService;
TaskUpdatePriorityWorker worker;
@@ -77,7 +77,7 @@ class TaskUpdatePriorityWorkerAccTest {
task1 = taskBuilder.buildAndStoreAsSummary(taskService);
task2 = taskBuilder.buildAndStoreAsSummary(taskService);
completedTask = taskBuilder.state(TaskState.COMPLETED).buildAndStore(taskService);
- worker = new TaskUpdatePriorityWorker(taskanaEngine);
+ worker = new TaskUpdatePriorityWorker(kadaiEngine);
}
@Test
@@ -131,12 +131,12 @@ class TaskUpdatePriorityWorkerAccTest {
@TestInstance(Lifecycle.PER_CLASS)
class WithSpi {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
TaskUpdatePriorityWorker worker;
@BeforeAll
- void setup(TaskanaEngine taskanaEngine) {
- worker = new TaskUpdatePriorityWorker(taskanaEngine);
+ void setup(KadaiEngine kadaiEngine) {
+ worker = new TaskUpdatePriorityWorker(kadaiEngine);
}
@Test
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java
similarity index 85%
rename from lib/taskana-core-test/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java
index f49d5ebd4..1f4cc8703 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java
@@ -1,10 +1,31 @@
package acceptance.task;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration.Builder;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.BulkOperationResults;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.WorkingTimeCalculator;
+import io.kadai.common.api.exceptions.KadaiException;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.Attachment;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskAttachmentBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
@@ -13,33 +34,12 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.TaskanaConfiguration.Builder;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.BulkOperationResults;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.WorkingTimeCalculator;
-import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.Attachment;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskAttachmentBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
/**
- * Acceptance test for changing the {@linkplain pro.taskana.task.api.models.Task#getPlanned()
- * planned} Instant of {@linkplain pro.taskana.task.api.models.Task Tasks} in bulk.
+ * Acceptance test for changing the {@linkplain io.kadai.task.api.models.Task#getPlanned() planned}
+ * Instant of {@linkplain io.kadai.task.api.models.Task Tasks} in bulk.
*/
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class ServiceLevelOfAllTasksAccTest {
private static final String SMALL_CLASSIFICATION_SERVICE_LEVEL = "P2D";
@@ -48,9 +48,9 @@ class ServiceLevelOfAllTasksAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
class WithWorkingTimeCalculation {
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
ClassificationSummary classificationSummarySmallServiceLevel;
ClassificationSummary classificationSummaryGreatServiceLevel;
@@ -115,7 +115,7 @@ class ServiceLevelOfAllTasksAccTest {
.buildAndStoreAsSummary(taskService);
List taskIds = List.of(task1.getId(), task2.getId(), task3.getId());
- BulkOperationResults bulkLog =
+ BulkOperationResults bulkLog =
taskService.setPlannedPropertyOfTasks(planned, taskIds);
assertThat(bulkLog.containsErrors()).isFalse();
@@ -140,7 +140,7 @@ class ServiceLevelOfAllTasksAccTest {
.buildAndStoreAsSummary(taskService);
List taskIds = List.of(task1.getId(), task2.getId());
- BulkOperationResults bulkLog =
+ BulkOperationResults bulkLog =
taskService.setPlannedPropertyOfTasks(planned, taskIds);
assertThat(bulkLog.containsErrors()).isFalse();
@@ -167,7 +167,7 @@ class ServiceLevelOfAllTasksAccTest {
.buildAndStoreAsSummary(taskService);
List taskIds = List.of(task1.getId(), task2.getId());
- BulkOperationResults bulkLog =
+ BulkOperationResults bulkLog =
taskService.setPlannedPropertyOfTasks(planned, taskIds);
assertThat(bulkLog.containsErrors()).isFalse();
@@ -198,7 +198,7 @@ class ServiceLevelOfAllTasksAccTest {
.buildAndStoreAsSummary(taskService);
List taskIds = List.of(task1.getId(), task2.getId(), task3.getId());
- BulkOperationResults bulkLog =
+ BulkOperationResults bulkLog =
taskService.setPlannedPropertyOfTasks(planned, taskIds);
assertThat(bulkLog.containsErrors()).isFalse();
@@ -220,12 +220,12 @@ class ServiceLevelOfAllTasksAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class WithWorkingDaysCalculation implements TaskanaConfigurationModifier {
+ class WithWorkingDaysCalculation implements KadaiConfigurationModifier {
- @TaskanaInject TaskanaEngine taskanaEngine;
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject KadaiEngine kadaiEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
ClassificationSummary classificationSummarySmallServiceLevel;
ClassificationSummary classificationSummaryGreatServiceLevel;
Attachment attachmentSummarySmallServiceLevel;
@@ -273,7 +273,7 @@ class ServiceLevelOfAllTasksAccTest {
.permission(WorkbasketPermission.READTASKS)
.permission(WorkbasketPermission.APPEND)
.buildAndStore(workbasketService);
- converter = taskanaEngine.getWorkingTimeCalculator();
+ converter = kadaiEngine.getWorkingTimeCalculator();
}
@WithAccessId(user = "user-1-1")
@@ -296,7 +296,7 @@ class ServiceLevelOfAllTasksAccTest {
.buildAndStoreAsSummary(taskService);
List taskIds = List.of(task1.getId(), task2.getId(), task3.getId());
- BulkOperationResults bulkLog =
+ BulkOperationResults bulkLog =
taskService.setPlannedPropertyOfTasks(planned, taskIds);
assertThat(bulkLog.containsErrors()).isFalse();
@@ -321,7 +321,7 @@ class ServiceLevelOfAllTasksAccTest {
.buildAndStoreAsSummary(taskService);
List taskIds = List.of(task1.getId(), task2.getId());
- BulkOperationResults bulkLog =
+ BulkOperationResults bulkLog =
taskService.setPlannedPropertyOfTasks(planned, taskIds);
assertThat(bulkLog.containsErrors()).isFalse();
@@ -351,7 +351,7 @@ class ServiceLevelOfAllTasksAccTest {
.buildAndStoreAsSummary(taskService);
List taskIds = List.of(task1.getId(), task2.getId());
- BulkOperationResults bulkLog =
+ BulkOperationResults bulkLog =
taskService.setPlannedPropertyOfTasks(planned, taskIds);
assertThat(bulkLog.containsErrors()).isFalse();
@@ -385,7 +385,7 @@ class ServiceLevelOfAllTasksAccTest {
.buildAndStoreAsSummary(taskService);
List taskIds = List.of(task1.getId(), task2.getId(), task3.getId());
- BulkOperationResults bulkLog =
+ BulkOperationResults bulkLog =
taskService.setPlannedPropertyOfTasks(planned, taskIds);
assertThat(bulkLog.containsErrors()).isFalse();
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/claim/ClaimTaskAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/claim/ClaimTaskAccTest.java
similarity index 93%
rename from lib/taskana-core-test/src/test/java/acceptance/task/claim/ClaimTaskAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/claim/ClaimTaskAccTest.java
index 610c7bfcc..47612e59e 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/claim/ClaimTaskAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/claim/ClaimTaskAccTest.java
@@ -1,12 +1,34 @@
package acceptance.task.claim;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.internal.util.Triplet;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidOwnerException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.UserBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import java.util.List;
import java.util.stream.Stream;
@@ -19,35 +41,13 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidOwnerException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.UserBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
-class ClaimTaskAccTest implements TaskanaConfigurationModifier {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject UserService userService;
+@KadaiIntegrationTest
+class ClaimTaskAccTest implements KadaiConfigurationModifier {
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject UserService userService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -57,7 +57,7 @@ class ClaimTaskAccTest implements TaskanaConfigurationModifier {
WorkbasketSummary wbWithoutRead;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(true);
}
@@ -703,12 +703,12 @@ class ClaimTaskAccTest implements TaskanaConfigurationModifier {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class WithAdditionalUserInfoEnabled implements TaskanaConfigurationModifier {
+ class WithAdditionalUserInfoEnabled implements KadaiConfigurationModifier {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(true);
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/claim/SetOwnerAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/claim/SetOwnerAccTest.java
similarity index 89%
rename from lib/taskana-core-test/src/test/java/acceptance/task/claim/SetOwnerAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/claim/SetOwnerAccTest.java
index 3a1375e0d..0569adc8a 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/claim/SetOwnerAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/claim/SetOwnerAccTest.java
@@ -1,11 +1,31 @@
package acceptance.task.claim;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.BulkOperationResults;
+import io.kadai.common.api.exceptions.KadaiException;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidTaskStateException;
+import io.kadai.task.api.exceptions.TaskNotFoundException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
@@ -13,32 +33,12 @@ import org.assertj.core.api.Condition;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.BulkOperationResults;
-import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidTaskStateException;
-import pro.taskana.task.api.exceptions.TaskNotFoundException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class SetOwnerAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -160,7 +160,7 @@ class SetOwnerAccTest {
String anyUserName = "TestUser3";
taskService.setOwnerOfTasks(anyUserName, List.of(taskReady.getId()));
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.setOwnerOfTasks(anyUserName, List.of(taskReady.getId()));
assertThat(results.containsErrors()).isTrue();
assertThat(results.getErrorForId(taskReady.getId()))
@@ -186,7 +186,7 @@ class SetOwnerAccTest {
.buildAndStore(taskService, "admin");
List taskIds = List.of(taskReadyForReview.getId(), taskReady.getId());
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.setOwnerOfTasks("someUser", taskIds);
assertThat(results.containsErrors()).isFalse();
@@ -216,7 +216,7 @@ class SetOwnerAccTest {
taskReady.getId(),
taskReadyForReview.getId());
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.setOwnerOfTasks("someUser", taskIds);
assertThat(results.containsErrors()).isFalse();
@@ -246,7 +246,7 @@ class SetOwnerAccTest {
taskReadyForReview.getId(),
taskReady.getId());
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.setOwnerOfTasks("someUser", taskIds);
assertThat(results.containsErrors()).isTrue();
@@ -276,7 +276,7 @@ class SetOwnerAccTest {
List taskIds =
List.of(taskReady.getId(), taskReadyForReview.getId(), taskReady.getId());
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.setOwnerOfTasks("someUser", taskIds);
assertThat(results.containsErrors()).isTrue();
@@ -292,7 +292,7 @@ class SetOwnerAccTest {
void should_SetOwnerOfMultipleTask_When_TaskListIsEmpty() {
List taskIds = new ArrayList<>();
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.setOwnerOfTasks("someUser", taskIds);
assertThat(results.containsErrors()).isFalse();
@@ -339,7 +339,7 @@ class SetOwnerAccTest {
.state(TaskState.READY)
.buildAndStore(taskService, "admin");
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.setOwnerOfTasks(
"theWorkaholic", List.of(task1.getId(), task2.getId(), task3.getId(), task4.getId()));
@@ -403,7 +403,7 @@ class SetOwnerAccTest {
.state(TaskState.READY)
.buildAndStore(taskService, "admin");
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.setOwnerOfTasks(
"theWorkaholic", List.of(task1.getId(), task2.getId(), task3.getId(), task4.getId()));
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/complete/CancelTaskAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/complete/CancelTaskAccTest.java
similarity index 82%
rename from lib/taskana-core-test/src/test/java/acceptance/task/complete/CancelTaskAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/complete/CancelTaskAccTest.java
index 07642f788..3ed8b72ed 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/complete/CancelTaskAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/complete/CancelTaskAccTest.java
@@ -1,12 +1,33 @@
package acceptance.task.complete;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
import acceptance.task.complete.CompleteTaskWithSpiAccTest.SetCustomAttributeToEndstate;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.internal.util.Triplet;
+import io.kadai.spi.task.api.TaskEndstatePreprocessor;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidTaskStateException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.List;
import java.util.stream.Stream;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
@@ -19,34 +40,13 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.spi.task.api.TaskEndstatePreprocessor;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidTaskStateException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class CancelTaskAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject UserService userService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject UserService userService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -196,7 +196,7 @@ class CancelTaskAccTest {
serviceProviders = SetCustomAttributeToEndstate.class)
class ServiceProviderSetsCustomAttributeToCancelled {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-2")
@Test
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java
similarity index 90%
rename from lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java
index f716ccc1f..0a85ee36b 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/complete/CompleteTaskAccTest.java
@@ -1,11 +1,41 @@
package acceptance.task.complete;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.BulkOperationResults;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.KadaiException;
+import io.kadai.common.api.security.CurrentUserContext;
+import io.kadai.common.internal.util.EnumUtil;
+import io.kadai.common.internal.util.Triplet;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidOwnerException;
+import io.kadai.task.api.exceptions.InvalidTaskStateException;
+import io.kadai.task.api.exceptions.TaskNotFoundException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.UserBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
@@ -19,46 +49,16 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.BulkOperationResults;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.common.api.security.CurrentUserContext;
-import pro.taskana.common.internal.util.EnumUtil;
-import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidOwnerException;
-import pro.taskana.task.api.exceptions.InvalidTaskStateException;
-import pro.taskana.task.api.exceptions.TaskNotFoundException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.UserBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
-class CompleteTaskAccTest implements TaskanaConfigurationModifier {
+@KadaiIntegrationTest
+class CompleteTaskAccTest implements KadaiConfigurationModifier {
- @TaskanaInject TaskService taskService;
- @TaskanaInject CurrentUserContext currentUserContext;
+ @KadaiInject TaskService taskService;
+ @KadaiInject CurrentUserContext currentUserContext;
- @TaskanaInject UserService userService;
+ @KadaiInject UserService userService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject KadaiEngine kadaiEngine;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -68,7 +68,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
WorkbasketSummary wbWithoutRead;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(true);
}
@@ -499,7 +499,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
List taskIdList = List.of(claimedTask1.getId(), claimedTask2.getId());
Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS);
- BulkOperationResults results = taskService.completeTasks(taskIdList);
+ BulkOperationResults results = taskService.completeTasks(taskIdList);
assertThat(results.containsErrors()).isFalse();
Task completedTask1 = taskService.getTask(claimedTask1.getId());
@@ -515,7 +515,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
List taskIdList = List.of("invalid-id", claimedTask.getId());
final Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS);
- BulkOperationResults results = taskService.completeTasks(taskIdList);
+ BulkOperationResults results = taskService.completeTasks(taskIdList);
assertThat(results.containsErrors()).isTrue();
assertThat(results.getErrorMap()).hasSize(1);
@@ -535,7 +535,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
// we can't use List.of because of the null value we insert
List taskIdList = Arrays.asList(invalid1, invalid2, invalid3, notAuthorized);
- BulkOperationResults results = taskService.completeTasks(taskIdList);
+ BulkOperationResults results = taskService.completeTasks(taskIdList);
assertThat(results.containsErrors()).isTrue();
assertThat(results.getFailedIds())
@@ -549,7 +549,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
Task task = createDefaultTask().buildAndStore(taskService);
List taskIdList = List.of(task.getId());
- BulkOperationResults results = taskService.completeTasks(taskIdList);
+ BulkOperationResults results = taskService.completeTasks(taskIdList);
assertThat(results.containsErrors()).isTrue();
assertThat(results.getFailedIds()).containsExactlyInAnyOrder(task.getId());
@@ -570,7 +570,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
TaskState[] requiredStates =
EnumUtil.allValuesExceptFor(TaskState.TERMINATED, TaskState.CANCELLED);
- BulkOperationResults results = taskService.completeTasks(taskIdList);
+ BulkOperationResults results = taskService.completeTasks(taskIdList);
assertThat(results.containsErrors()).isTrue();
assertThat(results.getFailedIds()).containsExactlyInAnyOrder(task1.getId(), task2.getId());
@@ -597,7 +597,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
List taskIdList = List.of(task.getId());
Task before = taskService.getTask(task.getId());
- BulkOperationResults results = taskService.completeTasks(taskIdList);
+ BulkOperationResults results = taskService.completeTasks(taskIdList);
Task after = taskService.getTask(task.getId());
assertThat(results.containsErrors()).isFalse();
@@ -610,7 +610,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
Task task = createTaskClaimedByUser_1_1().owner("user-1-2").buildAndStore(taskService);
List taskIdList = List.of(task.getId());
- BulkOperationResults results = taskService.completeTasks(taskIdList);
+ BulkOperationResults results = taskService.completeTasks(taskIdList);
assertThat(results.containsErrors()).isTrue();
assertThat(results.getFailedIds()).containsExactlyInAnyOrder(task.getId());
@@ -625,7 +625,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
List taskIdList = List.of(claimedTask1.getId(), claimedTask2.getId());
Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS);
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.forceCompleteTasks(taskIdList);
assertThat(results.containsErrors()).isFalse();
@@ -642,7 +642,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
List taskIdList = List.of("invalid-id", claimedTask.getId());
final Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS);
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.forceCompleteTasks(taskIdList);
assertThat(results.containsErrors()).isTrue();
@@ -663,7 +663,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
// we can't use List.of because of the null value we insert
List taskIdList = Arrays.asList(invalid1, invalid2, invalid3, notAuthorized);
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.forceCompleteTasks(taskIdList);
assertThat(results.containsErrors()).isTrue();
@@ -681,7 +681,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
TaskState[] requiredStates =
EnumUtil.allValuesExceptFor(TaskState.TERMINATED, TaskState.CANCELLED);
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.forceCompleteTasks(taskIdList);
assertThat(results.containsErrors()).isTrue();
@@ -709,7 +709,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
List taskIdList = List.of(task.getId());
Task before = taskService.getTask(task.getId());
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.forceCompleteTasks(taskIdList);
Task after = taskService.getTask(task.getId());
@@ -726,7 +726,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
final Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS);
Task beforeComplete = taskService.getTask(claimedTask.getId());
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.forceCompleteTasks(taskIdList);
Task afterComplete = taskService.getTask(claimedTask.getId());
@@ -742,7 +742,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
List taskIdList = List.of(task.getId());
Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS);
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.forceCompleteTasks(taskIdList);
assertThat(results.containsErrors()).isFalse();
@@ -758,7 +758,7 @@ class CompleteTaskAccTest implements TaskanaConfigurationModifier {
List taskIdList = List.of(task1.getId(), task2.getId());
final Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS);
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.forceCompleteTasks(taskIdList);
assertThat(results.containsErrors()).isFalse();
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskWithSpiAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/complete/CompleteTaskWithSpiAccTest.java
similarity index 83%
rename from lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskWithSpiAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/complete/CompleteTaskWithSpiAccTest.java
index 740811c34..8690db298 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/complete/CompleteTaskWithSpiAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/complete/CompleteTaskWithSpiAccTest.java
@@ -1,9 +1,27 @@
package acceptance.task.complete;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.spi.task.api.ReviewRequiredProvider;
+import io.kadai.spi.task.api.TaskEndstatePreprocessor;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import java.util.List;
import java.util.stream.Stream;
@@ -15,29 +33,11 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.spi.task.api.ReviewRequiredProvider;
-import pro.taskana.spi.task.api.TaskEndstatePreprocessor;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class CompleteTaskWithSpiAccTest {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -115,7 +115,7 @@ class CompleteTaskWithSpiAccTest {
serviceProviders = AlwaysRequireReview.class)
class ServiceProviderAlwaysRequiringReview {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@TestFactory
@@ -141,7 +141,7 @@ class CompleteTaskWithSpiAccTest {
serviceProviders = NeverRequireReview.class)
class ServiceProviderNeverRequiringReview {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@TestFactory
@@ -169,7 +169,7 @@ class CompleteTaskWithSpiAccTest {
serviceProviders = {AlwaysRequireReview.class, NeverRequireReview.class})
class ServiceProvidersAlwaysAndNeverRequiringReview {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@TestFactory
@@ -196,7 +196,7 @@ class CompleteTaskWithSpiAccTest {
serviceProviders = SetCustomAttributeToEndstate.class)
class ServiceProviderSetsCustomAttributeToCompleted {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@Test
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/complete/TerminateTaskAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/complete/TerminateTaskAccTest.java
similarity index 80%
rename from lib/taskana-core-test/src/test/java/acceptance/task/complete/TerminateTaskAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/complete/TerminateTaskAccTest.java
index 6f3e6255f..801e10212 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/complete/TerminateTaskAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/complete/TerminateTaskAccTest.java
@@ -1,11 +1,32 @@
package acceptance.task.complete;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
import acceptance.task.complete.CompleteTaskWithSpiAccTest.SetCustomAttributeToEndstate;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.common.api.security.CurrentUserContext;
+import io.kadai.common.internal.util.Triplet;
+import io.kadai.spi.task.api.TaskEndstatePreprocessor;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidTaskStateException;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.List;
import java.util.stream.Stream;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
@@ -18,34 +39,13 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.api.security.CurrentUserContext;
-import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.spi.task.api.TaskEndstatePreprocessor;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidTaskStateException;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class TerminateTaskAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject CurrentUserContext currentUserContext;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject CurrentUserContext currentUserContext;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -115,7 +115,7 @@ class TerminateTaskAccTest {
NotAuthorizedException e = catchThrowableOfType(NotAuthorizedException.class, call);
assertThat(e.getCurrentUserId()).isEqualTo(currentUserContext.getUserid());
- assertThat(e.getRoles()).containsExactlyInAnyOrder(TaskanaRole.ADMIN, TaskanaRole.TASK_ADMIN);
+ assertThat(e.getRoles()).containsExactlyInAnyOrder(KadaiRole.ADMIN, KadaiRole.TASK_ADMIN);
}
@WithAccessId(user = "taskadmin")
@@ -172,7 +172,7 @@ class TerminateTaskAccTest {
serviceProviders = SetCustomAttributeToEndstate.class)
class ServiceProviderSetsCustomAttributeToTerminated {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "admin")
@Test
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/create/CreateTaskAccTest.java
similarity index 91%
rename from lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/create/CreateTaskAccTest.java
index 9db843e86..ef2545bbf 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/create/CreateTaskAccTest.java
@@ -1,12 +1,46 @@
package acceptance.task.create;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.exceptions.ClassificationNotFoundException;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.classification.internal.models.ClassificationSummaryImpl;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.WorkingTimeCalculator;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.task.api.TaskCustomField;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.TaskAlreadyExistException;
+import io.kadai.task.api.models.Attachment;
+import io.kadai.task.api.models.AttachmentSummary;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.internal.models.TaskImpl;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ClassificationBuilder;
+import io.kadai.testapi.builder.ObjectReferenceBuilder;
+import io.kadai.testapi.builder.TaskAttachmentBuilder;
+import io.kadai.testapi.builder.UserBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.user.api.models.User;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.exceptions.WorkbasketNotFoundException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
@@ -24,48 +58,14 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.classification.internal.models.ClassificationSummaryImpl;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.WorkingTimeCalculator;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.task.api.TaskCustomField;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
-import pro.taskana.task.api.models.Attachment;
-import pro.taskana.task.api.models.AttachmentSummary;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.internal.models.TaskImpl;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ClassificationBuilder;
-import pro.taskana.testapi.builder.ObjectReferenceBuilder;
-import pro.taskana.testapi.builder.TaskAttachmentBuilder;
-import pro.taskana.testapi.builder.UserBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.user.api.models.User;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class CreateTaskAccTest {
- @TaskanaInject TaskanaEngine taskanaEngine;
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject UserService userService;
+ @KadaiInject KadaiEngine kadaiEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject UserService userService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -125,7 +125,7 @@ class CreateTaskAccTest {
assertThat(createdTask).isNotNull();
}
- @WithAccessId(user = "user-1-1", groups = "cn=routers,cn=groups,OU=Test,O=TASKANA")
+ @WithAccessId(user = "user-1-1", groups = "cn=routers,cn=groups,OU=Test,O=KADAI")
@Test
void should_CreateTask_When_UserIsMemberOfGroupWithTaskRouterRole() throws Exception {
Task newTask = createDefaultTask();
@@ -172,8 +172,7 @@ class CreateTaskAccTest {
Instant expectedPlanned = moveForwardToWorkingDay(createdTask.getCreated());
assertThat(createdTask).isNotNull();
- assertThat(createdTask.getCreator())
- .isEqualTo(taskanaEngine.getCurrentUserContext().getUserid());
+ assertThat(createdTask.getCreator()).isEqualTo(kadaiEngine.getCurrentUserContext().getUserid());
assertThat(createdTask.getOwner()).isEqualTo("user-1-2");
assertThat(createdTask.getWorkbasketKey()).isEqualTo(defaultWorkbasketSummary.getKey());
assertThat(createdTask.getName()).isEqualTo(defaultClassificationSummary.getName());
@@ -357,8 +356,7 @@ class CreateTaskAccTest {
assertThat(createdTask.getCreator()).isEqualTo("user-1-2");
Task readTask = taskService.getTask(createdTask.getId());
assertThat(readTask).isNotNull();
- assertThat(createdTask.getCreator())
- .isEqualTo(taskanaEngine.getCurrentUserContext().getUserid());
+ assertThat(createdTask.getCreator()).isEqualTo(kadaiEngine.getCurrentUserContext().getUserid());
assertThat(readTask.getAttachments()).isNotNull();
assertThat(readTask.getAttachments()).hasSize(2);
assertThat(readTask.getAttachments().get(1).getCreated()).isNotNull();
@@ -797,7 +795,7 @@ class CreateTaskAccTest {
}
private Instant moveForwardToWorkingDay(Instant date) {
- WorkingTimeCalculator workingTimeCalculator = taskanaEngine.getWorkingTimeCalculator();
+ WorkingTimeCalculator workingTimeCalculator = kadaiEngine.getWorkingTimeCalculator();
return workingTimeCalculator.addWorkingTime(date, Duration.ZERO);
}
@@ -814,12 +812,12 @@ class CreateTaskAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class WithAdditionalUserInfoEnabled implements TaskanaConfigurationModifier {
+ class WithAdditionalUserInfoEnabled implements KadaiConfigurationModifier {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(true);
}
@@ -837,12 +835,12 @@ class CreateTaskAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class WithEnforceServiceLevelDisabled implements TaskanaConfigurationModifier {
+ class WithEnforceServiceLevelDisabled implements KadaiConfigurationModifier {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.enforceServiceLevel(false);
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java
similarity index 78%
rename from lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java
index 263f45b4e..242d8f4e1 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/create/CreateTaskWithSorAccTest.java
@@ -1,44 +1,44 @@
package acceptance.task.create;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.internal.ObjectReferenceMapper;
+import io.kadai.task.internal.models.TaskImpl;
+import io.kadai.testapi.KadaiEngineProxy;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ObjectReferenceBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.stream.Collectors;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.internal.ObjectReferenceMapper;
-import pro.taskana.task.internal.models.TaskImpl;
-import pro.taskana.testapi.TaskanaEngineProxy;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ObjectReferenceBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
/**
* Acceptance test for all "create task" scenarios that involve secondary {@link ObjectReference}.
*/
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class CreateTaskWithSorAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject KadaiEngine kadaiEngine;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -80,7 +80,7 @@ class CreateTaskWithSorAccTest {
Task createdTask = taskService.createTask(task);
- TaskanaEngineProxy engineProxy = new TaskanaEngineProxy(taskanaEngine);
+ KadaiEngineProxy engineProxy = new KadaiEngineProxy(kadaiEngine);
ObjectReferenceMapper objectReferenceMapper =
engineProxy.getEngine().getSqlSession().getMapper(ObjectReferenceMapper.class);
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/delete/DeleteTaskAccTest.java
similarity index 78%
rename from lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/delete/DeleteTaskAccTest.java
index fca218674..72a75101d 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/delete/DeleteTaskAccTest.java
@@ -1,49 +1,49 @@
package acceptance.task.delete;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.BulkOperationResults;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.exceptions.KadaiException;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidTaskStateException;
+import io.kadai.task.api.exceptions.TaskNotFoundException;
+import io.kadai.task.api.models.Attachment;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.internal.AttachmentMapper;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiEngineProxy;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskAttachmentBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.List;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestTemplate;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.BulkOperationResults;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidTaskStateException;
-import pro.taskana.task.api.exceptions.TaskNotFoundException;
-import pro.taskana.task.api.models.Attachment;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.internal.AttachmentMapper;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaEngineProxy;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskAttachmentBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class DeleteTaskAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject KadaiEngine kadaiEngine;
Task task1;
Task task2;
@@ -92,7 +92,7 @@ class DeleteTaskAccTest {
task2.addAttachment(createNewAttachment());
taskService.deleteTasks(List.of(task1.getId(), task2.getId()));
- TaskanaEngineProxy engineProxy = new TaskanaEngineProxy(taskanaEngine);
+ KadaiEngineProxy engineProxy = new KadaiEngineProxy(kadaiEngine);
AttachmentMapper attachmentMapper =
engineProxy.getEngine().getSqlSession().getMapper(AttachmentMapper.class);
try {
@@ -114,7 +114,7 @@ class DeleteTaskAccTest {
task1.addAttachment(createNewAttachment());
taskService.deleteTask(task1.getId());
- TaskanaEngineProxy engineProxy = new TaskanaEngineProxy(taskanaEngine);
+ KadaiEngineProxy engineProxy = new KadaiEngineProxy(kadaiEngine);
AttachmentMapper attachmentMapper =
engineProxy.getSqlSession().getMapper(AttachmentMapper.class);
try {
@@ -133,8 +133,8 @@ class DeleteTaskAccTest {
ThrowingCallable call = () -> taskService.deleteTasks(List.of(task1.getId(), task2.getId()));
NotAuthorizedException e = catchThrowableOfType(NotAuthorizedException.class, call);
- assertThat(e.getCurrentUserId()).isEqualTo(taskanaEngine.getCurrentUserContext().getUserid());
- assertThat(e.getRoles()).containsExactly(TaskanaRole.ADMIN);
+ assertThat(e.getCurrentUserId()).isEqualTo(kadaiEngine.getCurrentUserContext().getUserid());
+ assertThat(e.getRoles()).containsExactly(KadaiRole.ADMIN);
}
@WithAccessId(user = "admin")
@@ -157,8 +157,8 @@ class DeleteTaskAccTest {
ThrowingCallable call = () -> taskService.deleteTask(task1.getId());
NotAuthorizedException e = catchThrowableOfType(NotAuthorizedException.class, call);
- assertThat(e.getCurrentUserId()).isEqualTo(taskanaEngine.getCurrentUserContext().getUserid());
- assertThat(e.getRoles()).containsExactly(TaskanaRole.ADMIN);
+ assertThat(e.getCurrentUserId()).isEqualTo(kadaiEngine.getCurrentUserContext().getUserid());
+ assertThat(e.getRoles()).containsExactly(KadaiRole.ADMIN);
}
@WithAccessId(user = "admin")
@@ -204,7 +204,7 @@ class DeleteTaskAccTest {
void should_BulkDeleteTask() throws Exception {
task1 = createNewCompletedTask();
task2 = createNewCompletedTask();
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.deleteTasks(List.of(task1.getId(), task2.getId()));
assertThat(results.containsErrors()).isFalse();
@@ -230,7 +230,7 @@ class DeleteTaskAccTest {
.primaryObjRef(DefaultTestEntities.defaultTestObjectReference().build())
.state(TaskState.READY)
.buildAndStore(taskService);
- BulkOperationResults results =
+ BulkOperationResults results =
taskService.deleteTasks(
List.of(task1.getId(), task2.getId(), taskNotComplete.getId(), "INVALID_TASK_ID"));
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java
similarity index 68%
rename from lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java
index e5f3e1525..57be5455c 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/delete/DeleteTaskWithSorAccTest.java
@@ -1,42 +1,42 @@
package acceptance.task.delete;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.internal.ObjectReferenceMapper;
+import io.kadai.testapi.KadaiEngineProxy;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ObjectReferenceBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.List;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.internal.ObjectReferenceMapper;
-import pro.taskana.testapi.TaskanaEngineProxy;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ObjectReferenceBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
/**
* Acceptance test for all "delete task" scenarios that involve secondary {@link ObjectReference}s.
*/
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class DeleteTaskWithSorAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject KadaiEngine kadaiEngine;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -80,7 +80,7 @@ class DeleteTaskWithSorAccTest {
Task createdTask =
createCompletedTask().objectReferences(sor1, sor2).buildAndStore(taskService);
taskService.deleteTask(createdTask.getId());
- TaskanaEngineProxy engineProxy = new TaskanaEngineProxy(taskanaEngine);
+ KadaiEngineProxy engineProxy = new KadaiEngineProxy(kadaiEngine);
ObjectReferenceMapper objectReferenceMapper =
engineProxy.getEngine().getSqlSession().getMapper(ObjectReferenceMapper.class);
@@ -99,7 +99,7 @@ class DeleteTaskWithSorAccTest {
Task secondCreatedTask =
createCompletedTask().objectReferences(sor1, sor2).buildAndStore(taskService);
taskService.deleteTasks(List.of(firstCreatedTask.getId(), secondCreatedTask.getId()));
- TaskanaEngineProxy engineProxy = new TaskanaEngineProxy(taskanaEngine);
+ KadaiEngineProxy engineProxy = new KadaiEngineProxy(kadaiEngine);
ObjectReferenceMapper objectReferenceMapper =
engineProxy.getEngine().getSqlSession().getMapper(ObjectReferenceMapper.class);
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/get/GetTaskAccTest.java
similarity index 87%
rename from lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/get/GetTaskAccTest.java
index c9c48bed7..c41d3327b 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/get/GetTaskAccTest.java
@@ -1,12 +1,37 @@
package acceptance.task.get;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
import static org.assertj.core.api.AssertionsForClassTypes.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.task.api.CallbackState;
+import io.kadai.task.api.TaskCustomField;
+import io.kadai.task.api.TaskCustomIntField;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.TaskNotFoundException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.api.models.TaskComment;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.TaskCommentBuilder;
+import io.kadai.testapi.builder.UserBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import java.util.HashMap;
import java.util.Map;
@@ -19,38 +44,13 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.TestTemplate;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.task.api.CallbackState;
-import pro.taskana.task.api.TaskCustomField;
-import pro.taskana.task.api.TaskCustomIntField;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.TaskNotFoundException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.api.models.TaskComment;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.TaskCommentBuilder;
-import pro.taskana.testapi.builder.UserBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class GetTaskAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject UserService userService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject UserService userService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -323,12 +323,12 @@ class GetTaskAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class WithAdditionalUserInfoEnabled implements TaskanaConfigurationModifier {
+ class WithAdditionalUserInfoEnabled implements KadaiConfigurationModifier {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(true);
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java
similarity index 67%
rename from lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java
index 99d2bb0d9..02c29167c 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/get/GetTaskWithSorAccTest.java
@@ -1,33 +1,33 @@
package acceptance.task.get;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ObjectReferenceBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ObjectReferenceBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class GetTaskWithSorAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java
similarity index 96%
rename from lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java
index a4918bcc7..c5306d491 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/query/TaskQueryImplAccTest.java
@@ -1,13 +1,46 @@
package acceptance.task.query;
+import static io.kadai.task.api.CallbackState.CALLBACK_PROCESSING_REQUIRED;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.task.api.CallbackState.CALLBACK_PROCESSING_REQUIRED;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.IntInterval;
+import io.kadai.common.api.KeyDomain;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.api.security.CurrentUserContext;
+import io.kadai.common.api.security.UserPrincipal;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.common.internal.util.CheckedConsumer;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.common.test.util.ParallelThreadHelper;
+import io.kadai.task.api.CallbackState;
+import io.kadai.task.api.TaskCustomField;
+import io.kadai.task.api.TaskCustomIntField;
+import io.kadai.task.api.TaskQuery;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.WildcardSearchField;
+import io.kadai.task.api.models.Attachment;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ObjectReferenceBuilder;
+import io.kadai.testapi.builder.TaskAttachmentBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.security.PrivilegedAction;
import java.time.Instant;
import java.util.ArrayList;
@@ -28,48 +61,15 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.IntInterval;
-import pro.taskana.common.api.KeyDomain;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.api.security.CurrentUserContext;
-import pro.taskana.common.api.security.UserPrincipal;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.common.internal.util.CheckedConsumer;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.common.test.util.ParallelThreadHelper;
-import pro.taskana.task.api.CallbackState;
-import pro.taskana.task.api.TaskCustomField;
-import pro.taskana.task.api.TaskCustomIntField;
-import pro.taskana.task.api.TaskQuery;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.WildcardSearchField;
-import pro.taskana.task.api.models.Attachment;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ObjectReferenceBuilder;
-import pro.taskana.testapi.builder.TaskAttachmentBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class TaskQueryImplAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject InternalTaskanaEngine internalTaskanaEngine;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject CurrentUserContext currentUserContext;
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject InternalKadaiEngine internalKadaiEngine;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject CurrentUserContext currentUserContext;
+ @KadaiInject ClassificationService classificationService;
ClassificationSummary defaultClassificationSummary;
@@ -126,28 +126,24 @@ class TaskQueryImplAccTest {
void setup() throws Exception {
wb1 = createWorkbasketWithPermission();
- taskSummary1 = taskInWorkbasket(wb1).state(TaskState.READY)
- .buildAndStoreAsSummary(taskService);
- taskSummary2 = taskInWorkbasket(wb1).state(TaskState.READY)
- .buildAndStoreAsSummary(taskService);
+ taskSummary1 =
+ taskInWorkbasket(wb1).state(TaskState.READY).buildAndStoreAsSummary(taskService);
+ taskSummary2 =
+ taskInWorkbasket(wb1).state(TaskState.READY).buildAndStoreAsSummary(taskService);
taskSummary3 =
- taskInWorkbasket(wb1).state(TaskState.READY)
- .buildAndStoreAsSummary(taskService);
- taskSummary4 = taskInWorkbasket(wb1).state(TaskState.READY)
- .buildAndStoreAsSummary(taskService);
-
+ taskInWorkbasket(wb1).state(TaskState.READY).buildAndStoreAsSummary(taskService);
+ taskSummary4 =
+ taskInWorkbasket(wb1).state(TaskState.READY).buildAndStoreAsSummary(taskService);
}
@Test
void should_ReturnDifferentTasks_For_LockResultsEqualsTwo() throws Exception {
- if (System.getenv("DB") != null && (System.getenv("DB").equals("POSTGRES")
- || System.getenv("DB").equals("DB2"))) {
+ if (System.getenv("DB") != null
+ && (System.getenv("DB").equals("POSTGRES") || System.getenv("DB").equals("DB2"))) {
List returnedTasks = Collections.synchronizedList(new ArrayList<>());
List accessIds =
- Collections.synchronizedList(
- Stream.of("admin", "admin")
- .collect(Collectors.toList()));
+ Collections.synchronizedList(Stream.of("admin", "admin").collect(Collectors.toList()));
ParallelThreadHelper.runInThread(
getRunnableTest(returnedTasks, accessIds), accessIds.size());
@@ -155,22 +151,29 @@ class TaskQueryImplAccTest {
assertThat(returnedTasks)
.extracting(TaskSummary::getId)
.containsExactlyInAnyOrder(
- taskSummary1.getId(), taskSummary2.getId(), taskSummary3.getId(),
+ taskSummary1.getId(),
+ taskSummary2.getId(),
+ taskSummary3.getId(),
taskSummary4.getId());
}
}
@Test
void should_ThrowException_When_UsingLockResultsWithSelectAndClaim() {
- ThrowingCallable call = () -> taskService.selectAndClaim(taskService
- .createTaskQuery()
- .workbasketIdIn(wb1.getId())
- .stateIn(TaskState.READY)
- .lockResultsEquals(LOCK_RESULTS_EQUALS));
+ ThrowingCallable call =
+ () ->
+ taskService.selectAndClaim(
+ taskService
+ .createTaskQuery()
+ .workbasketIdIn(wb1.getId())
+ .stateIn(TaskState.READY)
+ .lockResultsEquals(LOCK_RESULTS_EQUALS));
IllegalArgumentException e = catchThrowableOfType(IllegalArgumentException.class, call);
assertThat(e).isNotNull();
- assertThat(e.getMessage()).isEqualTo("The params \"lockResultsEquals\" and "
- + "\"selectAndClaim\" cannot be used together!");
+ assertThat(e.getMessage())
+ .isEqualTo(
+ "The params \"lockResultsEquals\" and "
+ + "\"selectAndClaim\" cannot be used together!");
}
private Runnable getRunnableTest(List listedTasks, List accessIds) {
@@ -181,24 +184,26 @@ class TaskQueryImplAccTest {
Consumer consumer =
CheckedConsumer.wrap(
taskService -> {
- internalTaskanaEngine.executeInDatabaseConnection(() -> {
- List results = taskService
- .createTaskQuery()
- .workbasketIdIn(wb1.getId())
- .stateIn(TaskState.READY)
- .lockResultsEquals(LOCK_RESULTS_EQUALS).list();
- listedTasks.addAll(results);
- for (TaskSummary task : results) {
- try {
- taskService.claim(task.getId());
- } catch (Exception e) {
- throw new SystemException(e.getMessage());
- }
- }
- });
+ internalKadaiEngine.executeInDatabaseConnection(
+ () -> {
+ List results =
+ taskService
+ .createTaskQuery()
+ .workbasketIdIn(wb1.getId())
+ .stateIn(TaskState.READY)
+ .lockResultsEquals(LOCK_RESULTS_EQUALS)
+ .list();
+ listedTasks.addAll(results);
+ for (TaskSummary task : results) {
+ try {
+ taskService.claim(task.getId());
+ } catch (Exception e) {
+ throw new SystemException(e.getMessage());
+ }
+ }
+ });
});
-
PrivilegedAction action =
() -> {
consumer.accept(taskService);
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplGroupByAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/query/TaskQueryImplGroupByAccTest.java
similarity index 85%
rename from lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplGroupByAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/query/TaskQueryImplGroupByAccTest.java
index 34432c9cb..e0e709c5b 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/query/TaskQueryImplGroupByAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/query/TaskQueryImplGroupByAccTest.java
@@ -1,45 +1,45 @@
package acceptance.task.query;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.BaseQuery.SortDirection;
+import io.kadai.common.api.security.CurrentUserContext;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ObjectReferenceBuilder;
+import io.kadai.testapi.builder.TaskAttachmentBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.UserBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import java.util.List;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.BaseQuery.SortDirection;
-import pro.taskana.common.api.security.CurrentUserContext;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ObjectReferenceBuilder;
-import pro.taskana.testapi.builder.TaskAttachmentBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.UserBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
@DisabledIfEnvironmentVariable(named = "DB", matches = "ORACLE")
-class TaskQueryImplGroupByAccTest implements TaskanaConfigurationModifier {
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject CurrentUserContext currentUserContext;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject UserService userService;
+class TaskQueryImplGroupByAccTest implements KadaiConfigurationModifier {
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject CurrentUserContext currentUserContext;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject UserService userService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasket;
@@ -48,7 +48,7 @@ class TaskQueryImplGroupByAccTest implements TaskanaConfigurationModifier {
TaskSummary taskSummary3;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(true).useSpecificDb2Taskquery(false);
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java
similarity index 84%
rename from lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java
index 880d9196e..2453ab869 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesAccTest.java
@@ -1,10 +1,29 @@
package acceptance.task.requestchanges;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.internal.util.EnumUtil;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidOwnerException;
+import io.kadai.task.api.exceptions.InvalidTaskStateException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import java.util.Arrays;
import java.util.List;
@@ -15,29 +34,10 @@ import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.internal.util.EnumUtil;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidOwnerException;
-import pro.taskana.task.api.exceptions.InvalidTaskStateException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class RequestChangesAccTest {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithAfterSpiAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithAfterSpiAccTest.java
similarity index 75%
rename from lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithAfterSpiAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithAfterSpiAccTest.java
index ffc121bea..264b3bec9 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithAfterSpiAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithAfterSpiAccTest.java
@@ -1,42 +1,42 @@
package acceptance.task.requestchanges;
+import static io.kadai.common.internal.util.CheckedSupplier.wrap;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
-import static pro.taskana.common.internal.util.CheckedSupplier.wrap;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.jobs.PlainJavaTransactionProvider;
+import io.kadai.spi.task.api.AfterRequestChangesProvider;
+import io.kadai.task.api.TaskCustomField;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.jobs.PlainJavaTransactionProvider;
-import pro.taskana.spi.task.api.AfterRequestChangesProvider;
-import pro.taskana.task.api.TaskCustomField;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
public class RequestChangesWithAfterSpiAccTest {
private static final String NEW_WORKBASKET_KEY = "W1000";
@@ -91,17 +91,17 @@ public class RequestChangesWithAfterSpiAccTest {
static class ExceptionThrower implements AfterRequestChangesProvider {
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task afterRequestChanges(Task task) throws Exception {
task.setDescription("should not matter. Will get rolled back anyway");
- taskanaEngine.getTaskService().updateTask(task);
+ kadaiEngine.getTaskService().updateTask(task);
throw new SystemException("I AM THE EXCEPTION THROWER (*_*)");
}
}
@@ -109,18 +109,18 @@ public class RequestChangesWithAfterSpiAccTest {
static class TaskModifierAndTransferrer implements AfterRequestChangesProvider {
private static final String NEW_CUSTOM_3_VALUE = "bla";
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task afterRequestChanges(Task task) throws Exception {
task.setCustomField(TaskCustomField.CUSTOM_3, NEW_CUSTOM_3_VALUE);
- task = taskanaEngine.getTaskService().updateTask(task);
- task = taskanaEngine.getTaskService().transfer(task.getId(), NEW_WORKBASKET_KEY, "DOMAIN_A");
+ task = kadaiEngine.getTaskService().updateTask(task);
+ task = kadaiEngine.getTaskService().transfer(task.getId(), NEW_WORKBASKET_KEY, "DOMAIN_A");
return task;
}
}
@@ -129,23 +129,23 @@ public class RequestChangesWithAfterSpiAccTest {
public static final String SPI_CLASSIFICATION_NAME = "Neuer Classification Name";
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task afterRequestChanges(Task task) throws Exception {
Classification newClassification =
- defaultTestClassification().buildAndStore(taskanaEngine.getClassificationService());
+ defaultTestClassification().buildAndStore(kadaiEngine.getClassificationService());
task.setClassificationKey(newClassification.getKey());
- task = taskanaEngine.getTaskService().updateTask(task);
+ task = kadaiEngine.getTaskService().updateTask(task);
newClassification.setName(SPI_CLASSIFICATION_NAME);
- taskanaEngine.getClassificationService().updateClassification(newClassification);
+ kadaiEngine.getClassificationService().updateClassification(newClassification);
return task;
}
@@ -158,7 +158,7 @@ public class RequestChangesWithAfterSpiAccTest {
serviceProviders = TaskModifierAndTransferrer.class)
class SpiModifiesTask {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@Test
@@ -193,7 +193,7 @@ public class RequestChangesWithAfterSpiAccTest {
serviceProviders = ClassificationUpdater.class)
class SpiModifiesTaskAndClassification {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1", groups = "businessadmin")
@Test
@@ -217,7 +217,7 @@ public class RequestChangesWithAfterSpiAccTest {
serviceProviders = {TaskModifierAndTransferrer.class, ClassificationUpdater.class})
class MultipleSpisAreDefined {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1", groups = "businessadmin")
@Test
@@ -245,14 +245,14 @@ public class RequestChangesWithAfterSpiAccTest {
serviceProviderInterface = AfterRequestChangesProvider.class,
serviceProviders = ExceptionThrower.class)
class SpiThrowsException {
- @TaskanaInject TaskService taskService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject KadaiEngine kadaiEngine;
PlainJavaTransactionProvider transactionProvider;
@BeforeAll
- void setup(TaskanaConfiguration taskanaConfiguration) {
+ void setup(KadaiConfiguration kadaiConfiguration) {
transactionProvider =
- new PlainJavaTransactionProvider(taskanaEngine, taskanaConfiguration.getDataSource());
+ new PlainJavaTransactionProvider(kadaiEngine, kadaiConfiguration.getDataSource());
}
@WithAccessId(user = "user-1-1")
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithBeforeSpiAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithBeforeSpiAccTest.java
similarity index 74%
rename from lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithBeforeSpiAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithBeforeSpiAccTest.java
index eb693f05e..b6286fbb3 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithBeforeSpiAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/requestchanges/RequestChangesWithBeforeSpiAccTest.java
@@ -1,44 +1,44 @@
package acceptance.task.requestchanges;
+import static io.kadai.common.internal.util.CheckedSupplier.wrap;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
-import static pro.taskana.common.internal.util.CheckedSupplier.wrap;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.jobs.PlainJavaTransactionProvider;
+import io.kadai.spi.task.api.BeforeRequestChangesProvider;
+import io.kadai.task.api.TaskCustomField;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidOwnerException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.jobs.PlainJavaTransactionProvider;
-import pro.taskana.spi.task.api.BeforeRequestChangesProvider;
-import pro.taskana.task.api.TaskCustomField;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidOwnerException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
public class RequestChangesWithBeforeSpiAccTest {
ClassificationSummary defaultClassificationSummary;
@@ -79,17 +79,17 @@ public class RequestChangesWithBeforeSpiAccTest {
static class ExceptionThrower implements BeforeRequestChangesProvider {
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task beforeRequestChanges(Task task) throws Exception {
task.setDescription("should not matter. Will get rolled back anyway");
- taskanaEngine.getTaskService().updateTask(task);
+ kadaiEngine.getTaskService().updateTask(task);
throw new SystemException("I AM THE EXCEPTION THROWER (*_*)");
}
}
@@ -97,17 +97,17 @@ public class RequestChangesWithBeforeSpiAccTest {
static class TaskModifier implements BeforeRequestChangesProvider {
private static final String NEW_CUSTOM_3_VALUE = "bla";
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task beforeRequestChanges(Task task) throws Exception {
task.setCustomField(TaskCustomField.CUSTOM_3, NEW_CUSTOM_3_VALUE);
- task = taskanaEngine.getTaskService().updateTask(task);
+ task = kadaiEngine.getTaskService().updateTask(task);
return task;
}
}
@@ -116,23 +116,23 @@ public class RequestChangesWithBeforeSpiAccTest {
public static final String SPI_CLASSIFICATION_NAME = "Neuer Classification Name";
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task beforeRequestChanges(Task task) throws Exception {
Classification newClassification =
- defaultTestClassification().buildAndStore(taskanaEngine.getClassificationService());
+ defaultTestClassification().buildAndStore(kadaiEngine.getClassificationService());
task.setClassificationKey(newClassification.getKey());
- task = taskanaEngine.getTaskService().updateTask(task);
+ task = kadaiEngine.getTaskService().updateTask(task);
newClassification.setName(SPI_CLASSIFICATION_NAME);
- taskanaEngine.getClassificationService().updateClassification(newClassification);
+ kadaiEngine.getClassificationService().updateClassification(newClassification);
return task;
}
@@ -140,17 +140,17 @@ public class RequestChangesWithBeforeSpiAccTest {
static class SetTaskOwner implements BeforeRequestChangesProvider {
- TaskanaEngine taskanaEngine;
+ KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task beforeRequestChanges(Task task) throws Exception {
task.setOwner("new owner");
- return taskanaEngine.getTaskService().updateTask(task);
+ return kadaiEngine.getTaskService().updateTask(task);
}
}
@@ -161,7 +161,7 @@ public class RequestChangesWithBeforeSpiAccTest {
serviceProviders = TaskModifier.class)
class SpiModifiesTask {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@Test
@@ -192,9 +192,9 @@ public class RequestChangesWithBeforeSpiAccTest {
@WithServiceProvider(
serviceProviderInterface = BeforeRequestChangesProvider.class,
serviceProviders = SetTaskOwner.class)
- class SpiSetsValuesWhichGetOverridenByTaskana {
+ class SpiSetsValuesWhichGetOverridenByKadai {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@Test
@@ -227,7 +227,7 @@ public class RequestChangesWithBeforeSpiAccTest {
serviceProviders = ClassificationUpdater.class)
class SpiModifiesTaskAndClassification {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1", groups = "businessadmin")
@Test
@@ -251,7 +251,7 @@ public class RequestChangesWithBeforeSpiAccTest {
serviceProviders = {TaskModifier.class, ClassificationUpdater.class})
class MultipleSpisAreDefined {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1", groups = "businessadmin")
@Test
@@ -278,14 +278,14 @@ public class RequestChangesWithBeforeSpiAccTest {
serviceProviderInterface = BeforeRequestChangesProvider.class,
serviceProviders = ExceptionThrower.class)
class SpiThrowsException {
- @TaskanaInject TaskService taskService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject KadaiEngine kadaiEngine;
PlainJavaTransactionProvider transactionProvider;
@BeforeAll
- void setup(TaskanaConfiguration taskanaConfiguration) {
+ void setup(KadaiConfiguration kadaiConfiguration) {
transactionProvider =
- new PlainJavaTransactionProvider(taskanaEngine, taskanaConfiguration.getDataSource());
+ new PlainJavaTransactionProvider(kadaiEngine, kadaiConfiguration.getDataSource());
}
@WithAccessId(user = "user-1-1")
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/requestreview/RequestReviewAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/requestreview/RequestReviewAccTest.java
similarity index 86%
rename from lib/taskana-core-test/src/test/java/acceptance/task/requestreview/RequestReviewAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/requestreview/RequestReviewAccTest.java
index dd4029e12..412e1824b 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/requestreview/RequestReviewAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/requestreview/RequestReviewAccTest.java
@@ -1,10 +1,29 @@
package acceptance.task.requestreview;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.internal.util.EnumUtil;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidOwnerException;
+import io.kadai.task.api.exceptions.InvalidTaskStateException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import java.util.Arrays;
import java.util.List;
@@ -15,29 +34,10 @@ import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.internal.util.EnumUtil;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidOwnerException;
-import pro.taskana.task.api.exceptions.InvalidTaskStateException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class RequestReviewAccTest {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithAfterSpiAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithAfterSpiAccTest.java
similarity index 75%
rename from lib/taskana-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithAfterSpiAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithAfterSpiAccTest.java
index 9817c24e1..7ee1573f5 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithAfterSpiAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithAfterSpiAccTest.java
@@ -1,11 +1,34 @@
package acceptance.task.requestreview;
+import static io.kadai.common.internal.util.CheckedSupplier.wrap;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
-import static pro.taskana.common.internal.util.CheckedSupplier.wrap;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.jobs.PlainJavaTransactionProvider;
+import io.kadai.spi.task.api.AfterRequestReviewProvider;
+import io.kadai.task.api.TaskCustomField;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
@@ -13,31 +36,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.jobs.PlainJavaTransactionProvider;
-import pro.taskana.spi.task.api.AfterRequestReviewProvider;
-import pro.taskana.task.api.TaskCustomField;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
public class RequestReviewWithAfterSpiAccTest {
private static final String NEW_WORKBASKET_KEY = "W1000";
@@ -92,17 +92,17 @@ public class RequestReviewWithAfterSpiAccTest {
static class ExceptionThrower implements AfterRequestReviewProvider {
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task afterRequestReview(Task task) throws Exception {
task.setDescription("should not matter. Will get rolled back anyway");
- taskanaEngine.getTaskService().updateTask(task);
+ kadaiEngine.getTaskService().updateTask(task);
throw new SystemException("I AM THE EXCEPTION THROWER (*_*)");
}
}
@@ -110,18 +110,18 @@ public class RequestReviewWithAfterSpiAccTest {
static class TaskModifierAndTransferrer implements AfterRequestReviewProvider {
private static final String NEW_CUSTOM_3_VALUE = "bla";
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task afterRequestReview(Task task) throws Exception {
task.setCustomField(TaskCustomField.CUSTOM_3, NEW_CUSTOM_3_VALUE);
- task = taskanaEngine.getTaskService().updateTask(task);
- task = taskanaEngine.getTaskService().transfer(task.getId(), NEW_WORKBASKET_KEY, "DOMAIN_A");
+ task = kadaiEngine.getTaskService().updateTask(task);
+ task = kadaiEngine.getTaskService().transfer(task.getId(), NEW_WORKBASKET_KEY, "DOMAIN_A");
return task;
}
}
@@ -130,23 +130,23 @@ public class RequestReviewWithAfterSpiAccTest {
public static final String SPI_CLASSIFICATION_NAME = "Neuer Classification Name";
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task afterRequestReview(Task task) throws Exception {
Classification newClassification =
- defaultTestClassification().buildAndStore(taskanaEngine.getClassificationService());
+ defaultTestClassification().buildAndStore(kadaiEngine.getClassificationService());
task.setClassificationKey(newClassification.getKey());
- task = taskanaEngine.getTaskService().updateTask(task);
+ task = kadaiEngine.getTaskService().updateTask(task);
newClassification.setName(SPI_CLASSIFICATION_NAME);
- taskanaEngine.getClassificationService().updateClassification(newClassification);
+ kadaiEngine.getClassificationService().updateClassification(newClassification);
return task;
}
@@ -159,7 +159,7 @@ public class RequestReviewWithAfterSpiAccTest {
serviceProviders = TaskModifierAndTransferrer.class)
class SpiModifiesTask {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@Test
@@ -194,7 +194,7 @@ public class RequestReviewWithAfterSpiAccTest {
serviceProviders = ClassificationUpdater.class)
class SpiModifiesTaskAndClassification {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1", groups = "businessadmin")
@Test
@@ -218,7 +218,7 @@ public class RequestReviewWithAfterSpiAccTest {
serviceProviders = {TaskModifierAndTransferrer.class, ClassificationUpdater.class})
class MultipleSpisAreDefined {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1", groups = "businessadmin")
@Test
@@ -246,14 +246,14 @@ public class RequestReviewWithAfterSpiAccTest {
serviceProviderInterface = AfterRequestReviewProvider.class,
serviceProviders = ExceptionThrower.class)
class SpiThrowsException {
- @TaskanaInject TaskService taskService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject KadaiEngine kadaiEngine;
PlainJavaTransactionProvider transactionProvider;
@BeforeAll
- void setup(TaskanaConfiguration taskanaConfiguration) {
+ void setup(KadaiConfiguration kadaiConfiguration) {
transactionProvider =
- new PlainJavaTransactionProvider(taskanaEngine, taskanaConfiguration.getDataSource());
+ new PlainJavaTransactionProvider(kadaiEngine, kadaiConfiguration.getDataSource());
}
@WithAccessId(user = "user-1-1")
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithBeforeSpiAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithBeforeSpiAccTest.java
similarity index 74%
rename from lib/taskana-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithBeforeSpiAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithBeforeSpiAccTest.java
index 169b846e8..f86c2d967 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithBeforeSpiAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/requestreview/RequestReviewWithBeforeSpiAccTest.java
@@ -1,12 +1,36 @@
package acceptance.task.requestreview;
+import static io.kadai.common.internal.util.CheckedSupplier.wrap;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
-import static pro.taskana.common.internal.util.CheckedSupplier.wrap;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.jobs.PlainJavaTransactionProvider;
+import io.kadai.spi.task.api.BeforeRequestReviewProvider;
+import io.kadai.task.api.TaskCustomField;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.InvalidOwnerException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
@@ -14,32 +38,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.jobs.PlainJavaTransactionProvider;
-import pro.taskana.spi.task.api.BeforeRequestReviewProvider;
-import pro.taskana.task.api.TaskCustomField;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.InvalidOwnerException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
public class RequestReviewWithBeforeSpiAccTest {
ClassificationSummary defaultClassificationSummary;
@@ -80,17 +80,17 @@ public class RequestReviewWithBeforeSpiAccTest {
static class ExceptionThrower implements BeforeRequestReviewProvider {
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task beforeRequestReview(Task task) throws Exception {
task.setDescription("should not matter. Will get rolled back anyway");
- taskanaEngine.getTaskService().updateTask(task);
+ kadaiEngine.getTaskService().updateTask(task);
throw new SystemException("I AM THE EXCEPTION THROWER (*_*)");
}
}
@@ -98,17 +98,17 @@ public class RequestReviewWithBeforeSpiAccTest {
static class TaskModifier implements BeforeRequestReviewProvider {
private static final String NEW_CUSTOM_3_VALUE = "bla";
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task beforeRequestReview(Task task) throws Exception {
task.setCustomField(TaskCustomField.CUSTOM_3, NEW_CUSTOM_3_VALUE);
- task = taskanaEngine.getTaskService().updateTask(task);
+ task = kadaiEngine.getTaskService().updateTask(task);
return task;
}
}
@@ -117,23 +117,23 @@ public class RequestReviewWithBeforeSpiAccTest {
public static final String SPI_CLASSIFICATION_NAME = "Neuer Classification Name";
- private TaskanaEngine taskanaEngine;
+ private KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task beforeRequestReview(Task task) throws Exception {
Classification newClassification =
- defaultTestClassification().buildAndStore(taskanaEngine.getClassificationService());
+ defaultTestClassification().buildAndStore(kadaiEngine.getClassificationService());
task.setClassificationKey(newClassification.getKey());
- task = taskanaEngine.getTaskService().updateTask(task);
+ task = kadaiEngine.getTaskService().updateTask(task);
newClassification.setName(SPI_CLASSIFICATION_NAME);
- taskanaEngine.getClassificationService().updateClassification(newClassification);
+ kadaiEngine.getClassificationService().updateClassification(newClassification);
return task;
}
@@ -141,17 +141,17 @@ public class RequestReviewWithBeforeSpiAccTest {
static class SetTaskOwner implements BeforeRequestReviewProvider {
- TaskanaEngine taskanaEngine;
+ KadaiEngine kadaiEngine;
@Override
- public void initialize(TaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ public void initialize(KadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
}
@Override
public Task beforeRequestReview(Task task) throws Exception {
task.setOwner("new owner");
- return taskanaEngine.getTaskService().updateTask(task);
+ return kadaiEngine.getTaskService().updateTask(task);
}
}
@@ -162,7 +162,7 @@ public class RequestReviewWithBeforeSpiAccTest {
serviceProviders = TaskModifier.class)
class SpiModifiesTask {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@Test
@@ -193,9 +193,9 @@ public class RequestReviewWithBeforeSpiAccTest {
@WithServiceProvider(
serviceProviderInterface = BeforeRequestReviewProvider.class,
serviceProviders = SetTaskOwner.class)
- class SpiSetsValuesWhichGetOverridenByTaskana {
+ class SpiSetsValuesWhichGetOverridenByKadai {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1")
@Test
@@ -228,7 +228,7 @@ public class RequestReviewWithBeforeSpiAccTest {
serviceProviders = ClassificationUpdater.class)
class SpiModifiesTaskAndClassification {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1", groups = "businessadmin")
@Test
@@ -252,7 +252,7 @@ public class RequestReviewWithBeforeSpiAccTest {
serviceProviders = {TaskModifier.class, ClassificationUpdater.class})
class MultipleSpisAreDefined {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@WithAccessId(user = "user-1-1", groups = "businessadmin")
@Test
@@ -279,14 +279,14 @@ public class RequestReviewWithBeforeSpiAccTest {
serviceProviderInterface = BeforeRequestReviewProvider.class,
serviceProviders = ExceptionThrower.class)
class SpiThrowsException {
- @TaskanaInject TaskService taskService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject KadaiEngine kadaiEngine;
PlainJavaTransactionProvider transactionProvider;
@BeforeAll
- void setup(TaskanaConfiguration taskanaConfiguration) {
+ void setup(KadaiConfiguration kadaiConfiguration) {
transactionProvider =
- new PlainJavaTransactionProvider(taskanaEngine, taskanaConfiguration.getDataSource());
+ new PlainJavaTransactionProvider(kadaiEngine, kadaiConfiguration.getDataSource());
}
@WithAccessId(user = "user-1-1")
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/servicelevel/ServiceLevelCalculationAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/servicelevel/ServiceLevelCalculationAccTest.java
similarity index 89%
rename from lib/taskana-core-test/src/test/java/acceptance/task/servicelevel/ServiceLevelCalculationAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/servicelevel/ServiceLevelCalculationAccTest.java
index 39c98763a..a8f4c5821 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/servicelevel/ServiceLevelCalculationAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/servicelevel/ServiceLevelCalculationAccTest.java
@@ -3,31 +3,31 @@ package acceptance.task.servicelevel;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.Workbasket;
import java.time.Instant;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.Workbasket;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class ServiceLevelCalculationAccTest {
private static final String TWO_HOURS = "PT2H";
private static final String ZERO_SECONDS = "PT0S";
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject ClassificationService classificationService;
Workbasket workbasket;
ObjectReference primaryObjRef;
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java
similarity index 79%
rename from lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java
index d5136e77c..3ea4ed2d9 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityAccTest.java
@@ -1,39 +1,39 @@
package acceptance.task.update;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.internal.jobs.JobRunner;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ClassificationBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.internal.jobs.JobRunner;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ClassificationBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class UpdateManualPriorityAccTest {
private static final int CLASSIFICATION_PRIORITY = 9;
- @TaskanaInject TaskanaEngine taskanaEngine;
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
+ @KadaiInject KadaiEngine kadaiEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -167,7 +167,7 @@ class UpdateManualPriorityAccTest {
classificationService.updateClassification(classification);
Thread.sleep(10);
// run the ClassificationChangedJob
- JobRunner runner = new JobRunner(taskanaEngine);
+ JobRunner runner = new JobRunner(kadaiEngine);
// run the TaskRefreshJob that was scheduled by the ClassificationChangedJob.
runner.runJobs();
Thread.sleep(10); // otherwise the next runJobs call intermittently doesn't find the Job created
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java
similarity index 78%
rename from lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java
index 2cf2f6629..441f30152 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateManualPriorityWithSpiAccTest.java
@@ -1,11 +1,29 @@
package acceptance.task.update;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
import acceptance.task.update.UpdateManualPriorityWithSpiAccTest.TestStaticValuePriorityServiceProvider;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.spi.priority.api.PriorityServiceProvider;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.task.internal.jobs.helper.TaskUpdatePriorityWorker;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.List;
import java.util.OptionalInt;
import org.junit.jupiter.api.BeforeAll;
@@ -13,26 +31,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.spi.priority.api.PriorityServiceProvider;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.task.internal.jobs.helper.TaskUpdatePriorityWorker;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
@WithServiceProvider(
serviceProviderInterface = PriorityServiceProvider.class,
serviceProviders = TestStaticValuePriorityServiceProvider.class)
@@ -40,10 +40,10 @@ class UpdateManualPriorityWithSpiAccTest {
private static final int SPI_PRIORITY = 5;
- @TaskanaInject TaskanaEngine taskanaEngine;
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
+ @KadaiInject KadaiEngine kadaiEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
static class TestStaticValuePriorityServiceProvider implements PriorityServiceProvider {
@Override
@@ -64,7 +64,7 @@ class UpdateManualPriorityWithSpiAccTest {
@WithAccessId(user = "businessadmin")
@BeforeAll
void setup() throws Exception {
- worker = new TaskUpdatePriorityWorker(taskanaEngine);
+ worker = new TaskUpdatePriorityWorker(kadaiEngine);
defaultClassificationSummary =
defaultTestClassification().buildAndStoreAsSummary(classificationService);
defaultWorkbasketSummary = defaultTestWorkbasket().buildAndStoreAsSummary(workbasketService);
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateTaskAccTest.java
similarity index 91%
rename from lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateTaskAccTest.java
index a9207d037..cf685a8cc 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateTaskAccTest.java
@@ -1,22 +1,52 @@
package acceptance.task.update;
+import static io.kadai.task.api.TaskCustomField.CUSTOM_1;
+import static io.kadai.task.api.TaskCustomField.CUSTOM_10;
+import static io.kadai.task.api.TaskCustomField.CUSTOM_12;
+import static io.kadai.task.api.TaskCustomField.CUSTOM_14;
+import static io.kadai.task.api.TaskCustomField.CUSTOM_16;
+import static io.kadai.task.api.TaskCustomField.CUSTOM_2;
+import static io.kadai.task.api.TaskCustomField.CUSTOM_3;
+import static io.kadai.task.api.TaskCustomField.CUSTOM_5;
+import static io.kadai.task.api.TaskCustomField.CUSTOM_7;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.task.api.TaskCustomField.CUSTOM_1;
-import static pro.taskana.task.api.TaskCustomField.CUSTOM_10;
-import static pro.taskana.task.api.TaskCustomField.CUSTOM_12;
-import static pro.taskana.task.api.TaskCustomField.CUSTOM_14;
-import static pro.taskana.task.api.TaskCustomField.CUSTOM_16;
-import static pro.taskana.task.api.TaskCustomField.CUSTOM_2;
-import static pro.taskana.task.api.TaskCustomField.CUSTOM_3;
-import static pro.taskana.task.api.TaskCustomField.CUSTOM_5;
-import static pro.taskana.task.api.TaskCustomField.CUSTOM_7;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.exceptions.ConcurrencyException;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.common.internal.util.Triplet;
+import io.kadai.task.api.TaskCustomField;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.TaskState;
+import io.kadai.task.api.exceptions.TaskNotFoundException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.task.internal.models.ObjectReferenceImpl;
+import io.kadai.task.internal.models.TaskImpl;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ObjectReferenceBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.UserBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.time.Instant;
import java.util.HashMap;
import java.util.List;
@@ -32,44 +62,14 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.exceptions.ConcurrencyException;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.task.api.TaskCustomField;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.TaskState;
-import pro.taskana.task.api.exceptions.TaskNotFoundException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.task.internal.models.ObjectReferenceImpl;
-import pro.taskana.task.internal.models.TaskImpl;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ObjectReferenceBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.UserBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
public class UpdateTaskAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject UserService userService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject UserService userService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
@@ -724,11 +724,11 @@ public class UpdateTaskAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
class WithEnforceServiceLevelDisabledAndAdditionalUserInfoEnabled
- implements TaskanaConfigurationModifier {
- @TaskanaInject TaskService taskService;
+ implements KadaiConfigurationModifier {
+ @KadaiInject TaskService taskService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(true).enforceServiceLevel(false);
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java
similarity index 82%
rename from lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java
index 78567c8ca..354863684 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/task/update/UpdateTaskWithSorAccTest.java
@@ -1,34 +1,34 @@
package acceptance.task.update;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.ObjectReferenceBuilder;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.ObjectReferenceBuilder;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** Acceptance test for "update task" scenarios that involve secondary {@link ObjectReference}s. */
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class UpdateTaskWithSorAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/create/CreateTaskCommentAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/create/CreateTaskCommentAccTest.java
similarity index 80%
rename from lib/taskana-core-test/src/test/java/acceptance/taskcomment/create/CreateTaskCommentAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/taskcomment/create/CreateTaskCommentAccTest.java
index fb80c74b9..ec034d62f 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/create/CreateTaskCommentAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/create/CreateTaskCommentAccTest.java
@@ -3,34 +3,34 @@ package acceptance.taskcomment.create;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.exceptions.TaskNotFoundException;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.api.models.TaskComment;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.TaskCommentBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.Workbasket;
import java.time.Instant;
import java.util.List;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.exceptions.TaskNotFoundException;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.api.models.TaskComment;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.TaskCommentBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.Workbasket;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class CreateTaskCommentAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
Classification defaultClassification;
Workbasket defaultWorkbasket;
@@ -104,8 +104,7 @@ class CreateTaskCommentAccTest {
taskCommentToCreate.setTextField("Some text");
taskService.createTaskComment(taskCommentToCreate);
- List taskCommentsAfterInsert =
- taskService.getTaskComments(task.getId());
+ List taskCommentsAfterInsert = taskService.getTaskComments(task.getId());
assertThat(taskCommentsAfterInsert)
.containsExactlyInAnyOrder(comment1, comment2, taskCommentToCreate);
assertThat(taskService.getTask(task.getId()).getNumberOfComments()).isEqualTo(3);
@@ -133,10 +132,10 @@ class CreateTaskCommentAccTest {
throws Exception {
Task task =
TaskBuilder.newTask()
- .classificationSummary(defaultClassification.asSummary())
- .workbasketSummary(defaultWorkbasket.asSummary())
- .primaryObjRef(DefaultTestEntities.defaultTestObjectReference().build())
- .buildAndStore(taskService);
+ .classificationSummary(defaultClassification.asSummary())
+ .workbasketSummary(defaultWorkbasket.asSummary())
+ .primaryObjRef(DefaultTestEntities.defaultTestObjectReference().build())
+ .buildAndStore(taskService);
comment1 =
TaskCommentBuilder.newTaskComment()
.taskId(task.getId())
@@ -155,8 +154,7 @@ class CreateTaskCommentAccTest {
taskService.createTaskComment(taskCommentToCreate);
- List taskCommentsAfterInsert =
- taskService.getTaskComments(task.getId());
+ List taskCommentsAfterInsert = taskService.getTaskComments(task.getId());
assertThat(taskCommentsAfterInsert)
.containsExactlyInAnyOrder(comment1, comment2, taskCommentToCreate);
assertThat(taskService.getTask(task.getId()).getNumberOfComments()).isEqualTo(3);
diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/delete/DeleteTaskCommentAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/delete/DeleteTaskCommentAccTest.java
similarity index 78%
rename from lib/taskana-core-test/src/test/java/acceptance/taskcomment/delete/DeleteTaskCommentAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/taskcomment/delete/DeleteTaskCommentAccTest.java
index ff98b2ab2..720c15d6c 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/delete/DeleteTaskCommentAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/delete/DeleteTaskCommentAccTest.java
@@ -4,42 +4,42 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.exceptions.NotAuthorizedOnTaskCommentException;
+import io.kadai.task.api.exceptions.TaskCommentNotFoundException;
+import io.kadai.task.api.exceptions.TaskNotFoundException;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.api.models.TaskComment;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.TaskCommentBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.Workbasket;
import java.time.Instant;
import java.util.List;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestTemplate;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.exceptions.NotAuthorizedOnTaskCommentException;
-import pro.taskana.task.api.exceptions.TaskCommentNotFoundException;
-import pro.taskana.task.api.exceptions.TaskNotFoundException;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.api.models.TaskComment;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.TaskCommentBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.Workbasket;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class DeleteTaskCommentAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject KadaiEngine kadaiEngine;
Classification defaultClassification;
Workbasket defaultWorkbasket;
@@ -100,12 +100,12 @@ class DeleteTaskCommentAccTest {
NotAuthorizedOnTaskCommentException e =
catchThrowableOfType(NotAuthorizedOnTaskCommentException.class, call);
assertThat(e.getTaskCommentId()).isEqualTo(comment1.getId());
- assertThat(e.getCurrentUserId()).isEqualTo(taskanaEngine.getCurrentUserContext().getUserid());
+ assertThat(e.getCurrentUserId()).isEqualTo(kadaiEngine.getCurrentUserContext().getUserid());
List taskCommentsAfterDeletion = taskService.getTaskComments(task1.getId());
assertThat(taskCommentsAfterDeletion).hasSize(1);
- taskanaEngine.runAsAdmin(
+ kadaiEngine.runAsAdmin(
() -> {
try {
taskService.deleteTaskComment(comment1.getId());
diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/get/GetTaskCommentAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/get/GetTaskCommentAccTest.java
similarity index 81%
rename from lib/taskana-core-test/src/test/java/acceptance/taskcomment/get/GetTaskCommentAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/taskcomment/get/GetTaskCommentAccTest.java
index 933114937..e6849ee01 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/get/GetTaskCommentAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/get/GetTaskCommentAccTest.java
@@ -1,9 +1,31 @@
package acceptance.taskcomment.get;
+import static io.kadai.common.internal.util.CheckedConsumer.wrap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.common.internal.util.CheckedConsumer.wrap;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.exceptions.TaskCommentNotFoundException;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.api.models.TaskComment;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.TaskCommentBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.user.api.models.User;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.Workbasket;
import java.time.Instant;
import java.util.List;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
@@ -12,36 +34,14 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.exceptions.TaskCommentNotFoundException;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.api.models.TaskComment;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.TaskCommentBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.user.api.models.User;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.Workbasket;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class GetTaskCommentAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject KadaiEngine kadaiEngine;
Classification defaultClassification;
Workbasket defaultWorkbasket;
@@ -83,12 +83,12 @@ class GetTaskCommentAccTest {
.primaryObjRef(DefaultTestEntities.defaultTestObjectReference().build())
.buildAndStore(taskService);
- User userWithName = taskanaEngine.getUserService().newUser();
+ User userWithName = kadaiEngine.getUserService().newUser();
userWithName.setId("user-1-1");
userWithName.setFirstName("Max");
userWithName.setLastName("Mustermann");
userWithName.setFullName("Max Mustermann");
- taskanaEngine.getUserService().createUser(userWithName);
+ kadaiEngine.getUserService().createUser(userWithName);
}
@WithAccessId(user = "user-1-1")
@@ -190,14 +190,14 @@ class GetTaskCommentAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class WithAdditionalUserInfoEnabled implements TaskanaConfigurationModifier {
+ class WithAdditionalUserInfoEnabled implements KadaiConfigurationModifier {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
- @TaskanaInject UserService userService;
+ @KadaiInject UserService userService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(true);
}
@@ -245,12 +245,12 @@ class GetTaskCommentAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class WithAdditionalUserInfoDisabled implements TaskanaConfigurationModifier {
+ class WithAdditionalUserInfoDisabled implements KadaiConfigurationModifier {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(false);
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/query/QueryTaskCommentAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/query/QueryTaskCommentAccTest.java
similarity index 89%
rename from lib/taskana-core-test/src/test/java/acceptance/taskcomment/query/QueryTaskCommentAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/taskcomment/query/QueryTaskCommentAccTest.java
index e37254097..8cda3aea7 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/query/QueryTaskCommentAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/query/QueryTaskCommentAccTest.java
@@ -3,6 +3,29 @@ package acceptance.taskcomment.query;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import io.kadai.KadaiConfiguration;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.task.api.TaskCommentQuery;
+import io.kadai.task.api.TaskCommentQueryColumnName;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.api.models.TaskComment;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.TaskCommentBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.user.api.models.User;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException;
+import io.kadai.workbasket.api.models.Workbasket;
import java.time.Instant;
import java.util.List;
import org.apache.ibatis.exceptions.TooManyResultsException;
@@ -13,37 +36,14 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.task.api.TaskCommentQuery;
-import pro.taskana.task.api.TaskCommentQueryColumnName;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.api.models.TaskComment;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.TaskCommentBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.user.api.models.User;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException;
-import pro.taskana.workbasket.api.models.Workbasket;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class QueryTaskCommentAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject UserService userService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject UserService userService;
Classification defaultClassification;
Workbasket defaultWorkbasket;
@@ -398,13 +398,13 @@ class QueryTaskCommentAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class CreatorFullNameWhenAdditionalUserInfoIsTrue implements TaskanaConfigurationModifier {
+ class CreatorFullNameWhenAdditionalUserInfoIsTrue implements KadaiConfigurationModifier {
- @TaskanaInject TaskService taskService;
- @TaskanaInject UserService userService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject UserService userService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(true);
}
@@ -451,11 +451,11 @@ class QueryTaskCommentAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class CreatorFullNameWhenAdditionalUserInfoIsFalse implements TaskanaConfigurationModifier {
- @TaskanaInject TaskService taskService;
+ class CreatorFullNameWhenAdditionalUserInfoIsFalse implements KadaiConfigurationModifier {
+ @KadaiInject TaskService taskService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.addAdditionalUserInfo(false);
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java
similarity index 74%
rename from lib/taskana-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java
index 99d02c726..20841a2b2 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/taskcomment/update/UpdateTaskCommentAccTest.java
@@ -1,41 +1,41 @@
package acceptance.taskcomment.update;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.exceptions.ConcurrencyException;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.exceptions.NotAuthorizedOnTaskCommentException;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.task.api.models.Task;
+import io.kadai.task.api.models.TaskComment;
+import io.kadai.task.internal.models.TaskCommentImpl;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.TaskBuilder;
+import io.kadai.testapi.builder.TaskCommentBuilder;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.List;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.exceptions.ConcurrencyException;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.exceptions.NotAuthorizedOnTaskCommentException;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.task.api.models.TaskComment;
-import pro.taskana.task.internal.models.TaskCommentImpl;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.TaskBuilder;
-import pro.taskana.testapi.builder.TaskCommentBuilder;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class UpdateTaskCommentAccTest {
- @TaskanaInject TaskService taskService;
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject ClassificationService classificationService;
+ @KadaiInject TaskService taskService;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java
similarity index 73%
rename from lib/taskana-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java
index c634696f2..3cb959b15 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java
@@ -4,32 +4,32 @@ import static acceptance.taskpreprocessing.CreateTaskPreprocessingAccTest.TestCr
import static org.assertj.core.api.Assertions.assertThat;
import acceptance.taskpreprocessing.CreateTaskPreprocessingAccTest.TestCreateTaskPreprocessorProvider;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.spi.task.api.CreateTaskPreprocessor;
+import io.kadai.task.api.TaskCustomField;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.spi.task.api.CreateTaskPreprocessor;
-import pro.taskana.task.api.TaskCustomField;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** Acceptance test for "task preprocessing" scenario. */
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
@WithServiceProvider(
serviceProviderInterface = CreateTaskPreprocessor.class,
serviceProviders = TestCreateTaskPreprocessorProvider.class)
class CreateTaskPreprocessingAccTest {
- @TaskanaInject TaskService taskService;
+ @KadaiInject TaskService taskService;
WorkbasketSummary workbasketSummary;
ClassificationSummary classificationSummary;
diff --git a/lib/taskana-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java
similarity index 72%
rename from lib/taskana-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java
index 892440a79..8a59e35c7 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java
@@ -4,33 +4,33 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import acceptance.taskrouting.TaskRoutingAccTest.TaskRoutingProviderForDomainA;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.spi.routing.api.TaskRoutingProvider;
+import io.kadai.task.api.TaskService;
+import io.kadai.task.api.models.Task;
+import io.kadai.testapi.DefaultTestEntities;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.WithServiceProvider;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.spi.routing.api.TaskRoutingProvider;
-import pro.taskana.task.api.TaskService;
-import pro.taskana.task.api.models.Task;
-import pro.taskana.testapi.DefaultTestEntities;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.WithServiceProvider;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
@WithServiceProvider(
serviceProviderInterface = TaskRoutingProvider.class,
serviceProviders = TaskRoutingProviderForDomainA.class)
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class TaskRoutingAccTest {
- @TaskanaInject TaskanaEngine taskanaEngine;
- @TaskanaInject TaskService taskService;
+ @KadaiInject KadaiEngine kadaiEngine;
+ @KadaiInject TaskService taskService;
ClassificationSummary classificationSummary;
WorkbasketSummary domainAWorkbasket;
@@ -83,7 +83,7 @@ class TaskRoutingAccTest {
class TaskRoutingProviderForDomainA implements TaskRoutingProvider {
@Override
- public void initialize(TaskanaEngine taskanaEngine) {}
+ public void initialize(KadaiEngine kadaiEngine) {}
@Override
public String determineWorkbasketId(Task task) {
diff --git a/lib/taskana-core-test/src/test/java/acceptance/user/UserServiceAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/user/UserServiceAccTest.java
similarity index 95%
rename from lib/taskana-core-test/src/test/java/acceptance/user/UserServiceAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/user/UserServiceAccTest.java
index 39a61cc29..7fcec3446 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/user/UserServiceAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/user/UserServiceAccTest.java
@@ -1,13 +1,32 @@
package acceptance.user;
+import static io.kadai.common.internal.util.CheckedSupplier.wrap;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestWorkbasket;
+import static io.kadai.testapi.DefaultTestEntities.randomTestUser;
+import static io.kadai.testapi.builder.UserBuilder.newUser;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.common.internal.util.CheckedSupplier.wrap;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestWorkbasket;
-import static pro.taskana.testapi.DefaultTestEntities.randomTestUser;
-import static pro.taskana.testapi.builder.UserBuilder.newUser;
+import io.kadai.KadaiConfiguration;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.common.internal.util.Triplet;
+import io.kadai.testapi.KadaiConfigurationModifier;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.user.api.UserService;
+import io.kadai.user.api.exceptions.UserAlreadyExistException;
+import io.kadai.user.api.exceptions.UserNotFoundException;
+import io.kadai.user.api.models.User;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.models.Workbasket;
+import io.kadai.workbasket.api.models.WorkbasketAccessItem;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -24,33 +43,14 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.TaskanaConfiguration;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.testapi.TaskanaConfigurationModifier;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.user.api.UserService;
-import pro.taskana.user.api.exceptions.UserAlreadyExistException;
-import pro.taskana.user.api.exceptions.UserNotFoundException;
-import pro.taskana.user.api.models.User;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.models.Workbasket;
-import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
/** Acceptance test which tests the functionality of the UserService. */
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class UserServiceAccTest {
- @TaskanaInject WorkbasketService workbasketService;
- @TaskanaInject UserService userService;
- @TaskanaInject TaskanaEngine taskanaEngine;
+ @KadaiInject WorkbasketService workbasketService;
+ @KadaiInject UserService userService;
+ @KadaiInject KadaiEngine kadaiEngine;
private WorkbasketAccessItem createAccessItem(
String accessId, Workbasket workbasket, WorkbasketPermission... permissions)
@@ -78,9 +78,9 @@ class UserServiceAccTest {
.id("max-mustermann")
.groups(
Set.of(
- "cn=ksc-users,cn=groups,OU=Test,O=TASKANA",
+ "cn=ksc-users,cn=groups,OU=Test,O=KADAI",
"cn=Organisationseinheit KSC 1,cn=Organisationseinheit"
- + " KSC,cn=organisation,OU=Test,O=TASKANA"))
+ + " KSC,cn=organisation,OU=Test,O=KADAI"))
.firstName("Max")
.lastName("Mustermann")
.fullName("Max Mustermann")
@@ -535,7 +535,7 @@ class UserServiceAccTest {
NotAuthorizedException ex = catchThrowableOfType(NotAuthorizedException.class, callable);
assertThat(ex.getCurrentUserId()).isEqualTo("user-1-1");
assertThat(ex.getRoles())
- .isEqualTo(new TaskanaRole[] {TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN});
+ .isEqualTo(new KadaiRole[] {KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN});
}
@WithAccessId(user = "businessadmin")
@@ -659,7 +659,7 @@ class UserServiceAccTest {
NotAuthorizedException ex = catchThrowableOfType(NotAuthorizedException.class, callable);
assertThat(ex.getCurrentUserId()).isEqualTo("user-1-1");
assertThat(ex.getRoles())
- .isEqualTo(new TaskanaRole[] {TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN});
+ .isEqualTo(new KadaiRole[] {KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN});
}
@WithAccessId(user = "businessadmin")
@@ -973,7 +973,7 @@ class UserServiceAccTest {
NotAuthorizedException ex = catchThrowableOfType(NotAuthorizedException.class, callable);
assertThat(ex.getCurrentUserId()).isEqualTo("user-1-1");
assertThat(ex.getRoles())
- .isEqualTo(new TaskanaRole[] {TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN});
+ .isEqualTo(new KadaiRole[] {KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN});
}
}
@@ -1074,7 +1074,7 @@ class UserServiceAccTest {
// then permission gets revoked
wai.setPermission(WorkbasketPermission.OPEN, false);
- taskanaEngine.runAsAdmin(wrap(() -> workbasketService.updateWorkbasketAccessItem(wai)));
+ kadaiEngine.runAsAdmin(wrap(() -> workbasketService.updateWorkbasketAccessItem(wai)));
userInDatabase = userService.getUser(user.getId());
@@ -1201,13 +1201,13 @@ class UserServiceAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class DifferentMinimalPermissionsToAssignDomains implements TaskanaConfigurationModifier {
+ class DifferentMinimalPermissionsToAssignDomains implements KadaiConfigurationModifier {
- @TaskanaInject UserService userService;
- @TaskanaInject WorkbasketService workbasketService;
+ @KadaiInject UserService userService;
+ @KadaiInject WorkbasketService workbasketService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.minimalPermissionsToAssignDomains(Set.of(WorkbasketPermission.APPEND));
}
@@ -1296,14 +1296,13 @@ class UserServiceAccTest {
@Nested
@TestInstance(Lifecycle.PER_CLASS)
- class PropertyMinimalPermissionsToAssignDomainsIsNotSet
- implements TaskanaConfigurationModifier {
+ class PropertyMinimalPermissionsToAssignDomainsIsNotSet implements KadaiConfigurationModifier {
- @TaskanaInject UserService userService;
- @TaskanaInject WorkbasketService workbasketService;
+ @KadaiInject UserService userService;
+ @KadaiInject WorkbasketService workbasketService;
@Override
- public TaskanaConfiguration.Builder modify(TaskanaConfiguration.Builder builder) {
+ public KadaiConfiguration.Builder modify(KadaiConfiguration.Builder builder) {
return builder.minimalPermissionsToAssignDomains(Set.of());
}
diff --git a/lib/taskana-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java b/lib/kadai-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java
similarity index 79%
rename from lib/taskana-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java
rename to lib/kadai-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java
index 2a605a01b..032cde31a 100644
--- a/lib/taskana-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java
+++ b/lib/kadai-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java
@@ -1,18 +1,34 @@
package acceptance.workbasket.get;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestClassification;
+import static io.kadai.testapi.DefaultTestEntities.defaultTestObjectReference;
+import static io.kadai.workbasket.api.WorkbasketCustomField.CUSTOM_1;
+import static io.kadai.workbasket.api.WorkbasketCustomField.CUSTOM_2;
+import static io.kadai.workbasket.api.WorkbasketCustomField.CUSTOM_3;
+import static io.kadai.workbasket.api.WorkbasketCustomField.CUSTOM_4;
+import static io.kadai.workbasket.api.WorkbasketCustomField.CUSTOM_5;
+import static io.kadai.workbasket.api.WorkbasketCustomField.CUSTOM_6;
+import static io.kadai.workbasket.api.WorkbasketCustomField.CUSTOM_7;
+import static io.kadai.workbasket.api.WorkbasketCustomField.CUSTOM_8;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestClassification;
-import static pro.taskana.testapi.DefaultTestEntities.defaultTestObjectReference;
-import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_1;
-import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_2;
-import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_3;
-import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_4;
-import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_5;
-import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_6;
-import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_7;
-import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_8;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.internal.util.Triplet;
+import io.kadai.task.api.models.ObjectReference;
+import io.kadai.testapi.KadaiInject;
+import io.kadai.testapi.KadaiIntegrationTest;
+import io.kadai.testapi.builder.WorkbasketAccessItemBuilder;
+import io.kadai.testapi.builder.WorkbasketBuilder;
+import io.kadai.testapi.security.WithAccessId;
+import io.kadai.workbasket.api.WorkbasketPermission;
+import io.kadai.workbasket.api.WorkbasketService;
+import io.kadai.workbasket.api.WorkbasketType;
+import io.kadai.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
+import io.kadai.workbasket.api.exceptions.WorkbasketNotFoundException;
+import io.kadai.workbasket.api.models.Workbasket;
+import io.kadai.workbasket.api.models.WorkbasketSummary;
import java.util.List;
import java.util.stream.Stream;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
@@ -22,27 +38,11 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.function.ThrowingConsumer;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.task.api.models.ObjectReference;
-import pro.taskana.testapi.TaskanaInject;
-import pro.taskana.testapi.TaskanaIntegrationTest;
-import pro.taskana.testapi.builder.WorkbasketAccessItemBuilder;
-import pro.taskana.testapi.builder.WorkbasketBuilder;
-import pro.taskana.testapi.security.WithAccessId;
-import pro.taskana.workbasket.api.WorkbasketPermission;
-import pro.taskana.workbasket.api.WorkbasketService;
-import pro.taskana.workbasket.api.WorkbasketType;
-import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException;
-import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
-import pro.taskana.workbasket.api.models.Workbasket;
-import pro.taskana.workbasket.api.models.WorkbasketSummary;
-@TaskanaIntegrationTest
+@KadaiIntegrationTest
class GetWorkbasketAccTest {
- @TaskanaInject ClassificationService classificationService;
- @TaskanaInject WorkbasketService workbasketService;
+ @KadaiInject ClassificationService classificationService;
+ @KadaiInject WorkbasketService workbasketService;
ClassificationSummary defaultClassificationSummary;
WorkbasketSummary defaultWorkbasketSummary;
ObjectReference defaultObjectReference;
diff --git a/lib/taskana-core-test/src/test/resources/archunit.properties b/lib/kadai-core-test/src/test/resources/archunit.properties
similarity index 100%
rename from lib/taskana-core-test/src/test/resources/archunit.properties
rename to lib/kadai-core-test/src/test/resources/archunit.properties
diff --git a/lib/kadai-core-test/src/test/resources/fullKadai.properties b/lib/kadai-core-test/src/test/resources/fullKadai.properties
new file mode 100644
index 000000000..77cd62e64
--- /dev/null
+++ b/lib/kadai-core-test/src/test/resources/fullKadai.properties
@@ -0,0 +1,67 @@
+# general configuration
+kadai.domains=DOMAIN_A | DOMAIN_B
+kadai.servicelevel.validation.enforce=false
+# authentication configuration
+kadai.roles.user=user-1 | user-2
+kadai.roles.admin=admin-1 | admin-2
+kadai.roles.business_admin=business_admin-1 | business_admin-2
+kadai.roles.monitor=monitor-1 | monitor-2
+kadai.roles.task_admin=taskadmin-1 | taskadmin-2
+kadai.roles.task_router=taskrouter-1 | taskrouter-2
+# classification configuration
+kadai.classification.types=TASK | document
+kadai.classification.categories.task=EXTERNAL| manual| autoMAtic| Process
+kadai.classification.categories.document=EXTERNAL
+# working time configuration
+kadai.workingTime.useWorkingTimeCalculation=false
+kadai.workingTime.schedule.MONDAY=09:00-18:00
+kadai.workingTime.schedule.TUESDAY=09:00-18:00
+kadai.workingTime.schedule.WEDNESDAY=09:00-18:00
+kadai.workingTime.schedule.THURSDAY=09:00-18:00
+kadai.workingTime.schedule.FRIDAY=09:00-18:00
+kadai.workingTime.timezone=UTC
+kadai.workingTime.holidays.custom=31.07|16.12
+kadai.workingTime.holidays.german.enabled=false
+kadai.workingTime.holidays.german.corpus-christi.enabled=true
+# history configuration
+kadai.history.simple.deleteOnTaskDeletion.enabled=true
+kadai.history.logger.name=AUDIT
+# job configuration
+kadai.jobs.scheduler.enabled=false
+kadai.jobs.scheduler.initialStartDelay=30
+kadai.jobs.scheduler.period=12
+kadai.jobs.scheduler.periodTimeUnit=HOURS
+kadai.jobs.maxRetries=4
+kadai.jobs.batchSize=50
+kadai.jobs.firstRunAt=2018-07-25T08:00:00Z
+kadai.jobs.runEvery=P2D
+kadai.jobs.lockExpirationPeriod=PT7M
+kadai.jobs.cleanup.task.enable=false
+kadai.jobs.cleanup.task.minimumAge=P15D
+kadai.jobs.cleanup.task.allCompletedSameParentBusiness=false
+kadai.jobs.cleanup.task.lockExpirationPeriod=PT4M
+kadai.jobs.cleanup.workbasket.enable=false
+kadai.jobs.cleanup.workbasket.lockExpirationPeriod=PT3M
+kadai.jobs.cleanup.history.simple.enable=true
+kadai.jobs.cleanup.history.simple.batchSize=50
+kadai.jobs.cleanup.history.simple.minimumAge=P17D
+kadai.jobs.cleanup.history.simple.allCompletedSameParentBusiness=false
+kadai.jobs.cleanup.history.simple.lockExpirationPeriod=PT2M
+kadai.jobs.priority.task.enable=true
+kadai.jobs.priority.task.batchSize=50
+kadai.jobs.priority.task.firstRunAt=2018-07-25T08:00:00Z
+kadai.jobs.priority.task.runEvery=P3D
+kadai.jobs.priority.task.lockExpirationPeriod=PT8M
+kadai.jobs.refresh.user.enable=true
+kadai.jobs.refresh.user.firstRunAt=2018-07-25T08:00:00Z
+kadai.jobs.refresh.user.runEvery=P4D
+kadai.jobs.refresh.user.lockExpirationPeriod=PT5M
+kadai.jobs.customJobs=A | B | C
+# user configuration
+kadai.user.addAdditionalUserInfo=true
+kadai.user.minimalPermissionsToAssignDomains=READ | OPEN
+# database configuration
+kadai.feature.useSpecificDb2Taskquery=false
+# custom configuration
+my_custom_property1=my_custom_value1
+my_custom_property2=my_custom_value2
diff --git a/lib/kadai-core-test/src/test/resources/kadai.properties b/lib/kadai-core-test/src/test/resources/kadai.properties
new file mode 100644
index 000000000..1989c2937
--- /dev/null
+++ b/lib/kadai-core-test/src/test/resources/kadai.properties
@@ -0,0 +1,36 @@
+kadai.roles.user=cn=ksc-users,cn=groups,OU=Test,O=KADAI | teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2
+kadai.roles.admin=admin | uid=admin,cn=users,OU=Test,O=KADAI
+kadai.roles.business_admin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=KADAI
+kadai.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=KADAI
+kadai.roles.task_admin=taskadmin
+kadai.roles.task_router=cn=routers,cn=groups,OU=Test,O=KADAI | user-taskrouter
+kadai.domains=DOMAIN_A | DOMAIN_B
+kadai.user.minimalPermissionsToAssignDomains=READ | OPEN
+kadai.classification.types=TASK | document
+kadai.classification.categories.task=EXTERNAL | manual | autoMAtic | Process
+kadai.classification.categories.document=EXTERNAL
+kadai.jobs.maxRetries=3
+kadai.jobs.batchSize=50
+kadai.jobs.runEvery=P1D
+kadai.jobs.firstRunAt=2018-07-25T08:00:00Z
+kadai.jobs.cleanup.task.minimumAge=P14D
+kadai.workingTime.holidays.german.enabled=true
+kadai.workingTime.holidays.german.corpus-christi.enabled=false
+kadai.history.simple.deleteOnTaskDeletion.enabled=true
+kadai.servicelevel.validation.enforce=true
+kadai.query.includeLongName=false
+# enable or disable the jobscheduler at all
+# set it to false and no jobs are running
+kadai.jobs.scheduler.enabled=true
+# wait time before the first job run
+kadai.jobs.scheduler.initialStartDelay=100000
+# sleeping time befor the next job runs
+kadai.jobs.scheduler.period=12
+# timeunit for the initial start delay and the sleeping period
+# Possible values: MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
+kadai.jobs.scheduler.periodTimeUnit=HOURS
+kadai.jobs.cleanup.task.enable=false
+kadai.jobs.priority.task.enable=false
+kadai.jobs.cleanup.workbasket.enable=false
+kadai.jobs.refresh.user.enable=false
+kadai.jobs.cleanup.history.simple.enable=false
diff --git a/lib/kadai-core/pom.xml b/lib/kadai-core/pom.xml
new file mode 100644
index 000000000..aa13aa707
--- /dev/null
+++ b/lib/kadai-core/pom.xml
@@ -0,0 +1,129 @@
+
+ 4.0.0
+ kadai-core
+
+ ${project.groupId}:${project.artifactId}
+ The kadai library to include in your project.
+
+
+ io.kadai
+ kadai-lib-parent
+ 8.2.1-SNAPSHOT
+ ../pom.xml
+
+
+
+
+ io.kadai
+ kadai-common-logging
+ ${project.version}
+
+
+ io.kadai
+ kadai-common
+ ${project.version}
+
+
+ org.mybatis
+ mybatis
+ ${version.mybatis}
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.json
+ json
+ ${version.json}
+
+
+
+ io.kadai
+ kadai-common-data
+ ${project.version}
+ test
+
+
+ io.kadai
+ kadai-common-test
+ ${project.version}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+ org.assertj
+ assertj-core
+ ${version.assertj}
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ com.h2database
+ h2
+ test
+
+
+ org.postgresql
+ postgresql
+ test
+
+
+ com.ibm.db2
+ jcc
+ ${version.db2}
+ test
+
+
+ com.oracle.database.jdbc
+ ojdbc8
+ ${version.oracle}
+ test
+
+
+ org.slf4j
+ jcl-over-slf4j
+ test
+
+
+ org.slf4j
+ slf4j-simple
+ test
+
+
+ org.testcontainers
+ db2
+ ${version.testcontainers}
+ test
+
+
+ junit
+ junit
+
+
+
+
+ org.testcontainers
+ postgresql
+ ${version.testcontainers}
+ test
+
+
+ junit
+ junit
+
+
+
+
+
+
diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskanaConfiguration.java b/lib/kadai-core/src/main/java/io/kadai/KadaiConfiguration.java
similarity index 86%
rename from lib/taskana-core/src/main/java/pro/taskana/TaskanaConfiguration.java
rename to lib/kadai-core/src/main/java/io/kadai/KadaiConfiguration.java
index c74c16c9f..0009e48e0 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/TaskanaConfiguration.java
+++ b/lib/kadai-core/src/main/java/io/kadai/KadaiConfiguration.java
@@ -1,7 +1,19 @@
-package pro.taskana;
+package io.kadai;
-import static pro.taskana.common.api.SharedConstants.MASTER_DOMAIN;
+import static io.kadai.common.api.SharedConstants.MASTER_DOMAIN;
+import io.kadai.common.api.CustomHoliday;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.LocalTimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.configuration.DB;
+import io.kadai.common.internal.configuration.KadaiProperty;
+import io.kadai.common.internal.configuration.parser.PropertyParser;
+import io.kadai.common.internal.util.FileLoaderUtil;
+import io.kadai.common.internal.util.Pair;
+import io.kadai.common.internal.util.ReflectionUtil;
+import io.kadai.workbasket.api.WorkbasketPermission;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
@@ -33,26 +45,14 @@ import java.util.stream.Collectors;
import javax.sql.DataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.common.api.CustomHoliday;
-import pro.taskana.common.api.LocalTimeInterval;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.configuration.DB;
-import pro.taskana.common.internal.configuration.TaskanaProperty;
-import pro.taskana.common.internal.configuration.parser.PropertyParser;
-import pro.taskana.common.internal.util.FileLoaderUtil;
-import pro.taskana.common.internal.util.Pair;
-import pro.taskana.common.internal.util.ReflectionUtil;
-import pro.taskana.workbasket.api.WorkbasketPermission;
/**
- * This central class creates the TaskanaEngine and holds all the information about DB and Security.
+ * This central class creates the KadaiEngine and holds all the information about DB and Security.
*
* Security is enabled by default.
* All members are immutable, also Lists and Maps and Sets.
*/
-public class TaskanaConfiguration {
+public class KadaiConfiguration {
// region general configuration
private final DataSource dataSource;
@@ -65,7 +65,7 @@ public class TaskanaConfiguration {
// endregion
// region authentication configuration
- private final Map> roleMap;
+ private final Map> roleMap;
// endregion
// region classification configuration
@@ -136,9 +136,10 @@ public class TaskanaConfiguration {
// region custom configuration
private final Map properties;
+
// endregion
- private TaskanaConfiguration(Builder builder) {
+ private KadaiConfiguration(Builder builder) {
// general configuration
this.dataSource = builder.dataSource;
this.useManagedTransactions = builder.useManagedTransactions;
@@ -275,7 +276,7 @@ public class TaskanaConfiguration {
return enforceServiceLevel;
}
- public Map> getRoleMap() {
+ public Map> getRoleMap() {
return roleMap;
}
@@ -448,11 +449,11 @@ public class TaskanaConfiguration {
}
/**
- * return all properties loaded from taskana properties file. Per Design the normal Properties are
+ * return all properties loaded from kadai properties file. Per Design the normal Properties are
* not immutable, so we return here an ImmutableMap, because we don't want direct changes in the
* configuration.
*
- * @return all properties loaded from taskana properties file
+ * @return all properties loaded from kadai properties file
*/
public Map getProperties() {
return properties;
@@ -523,10 +524,10 @@ public class TaskanaConfiguration {
if (this == obj) {
return true;
}
- if (!(obj instanceof TaskanaConfiguration)) {
+ if (!(obj instanceof KadaiConfiguration)) {
return false;
}
- TaskanaConfiguration other = (TaskanaConfiguration) obj;
+ KadaiConfiguration other = (KadaiConfiguration) obj;
return useManagedTransactions == other.useManagedTransactions
&& securityEnabled == other.securityEnabled
&& enforceServiceLevel == other.enforceServiceLevel
@@ -596,7 +597,7 @@ public class TaskanaConfiguration {
@Override
public String toString() {
- return "TaskanaConfiguration{"
+ return "KadaiConfiguration{"
+ "dataSource="
+ dataSource
+ ", useManagedTransactions="
@@ -709,8 +710,8 @@ public class TaskanaConfiguration {
public static class Builder {
private static final Logger LOGGER = LoggerFactory.getLogger(Builder.class);
- private static final String DEFAULT_TASKANA_PROPERTIES = "/taskana.properties";
- private static final String DEFAULT_TASKANA_PROPERTY_SEPARATOR = "|";
+ private static final String DEFAULT_KADAI_PROPERTIES = "/kadai.properties";
+ private static final String DEFAULT_KADAI_PROPERTY_SEPARATOR = "|";
// region general configuration
private final DataSource dataSource;
@@ -718,163 +719,172 @@ public class TaskanaConfiguration {
private final String schemaName;
private final boolean securityEnabled;
- @TaskanaProperty("taskana.domains")
+ @KadaiProperty("kadai.domains")
private List domains = new ArrayList<>();
- @TaskanaProperty("taskana.servicelevel.validation.enforce")
+ @KadaiProperty("kadai.servicelevel.validation.enforce")
private boolean enforceServiceLevel = true;
+
// endregion
// region authentication configuration
- @TaskanaProperty("taskana.roles")
- private Map> roleMap = new EnumMap<>(TaskanaRole.class);
+ @KadaiProperty("kadai.roles")
+ private Map> roleMap = new EnumMap<>(KadaiRole.class);
+
// endregion
// region classification configuration
- @TaskanaProperty("taskana.classification.types")
+ @KadaiProperty("kadai.classification.types")
private List classificationTypes = new ArrayList<>();
- @TaskanaProperty("taskana.classification.categories")
+ @KadaiProperty("kadai.classification.categories")
private Map> classificationCategoriesByType = new HashMap<>();
+
// endregion
// region working time configuration
- @TaskanaProperty("taskana.workingTime.useWorkingTimeCalculation")
+ @KadaiProperty("kadai.workingTime.useWorkingTimeCalculation")
private boolean useWorkingTimeCalculation = true;
- @TaskanaProperty("taskana.workingTime.schedule")
+ @KadaiProperty("kadai.workingTime.schedule")
private Map> workingTimeSchedule =
initDefaultWorkingTimeSchedule();
- @TaskanaProperty("taskana.workingTime.timezone")
+ @KadaiProperty("kadai.workingTime.timezone")
private ZoneId workingTimeScheduleTimeZone = ZoneId.of("Europe/Berlin");
- @TaskanaProperty("taskana.workingTime.holidays.custom")
+ @KadaiProperty("kadai.workingTime.holidays.custom")
private Set customHolidays = new HashSet<>();
- @TaskanaProperty("taskana.workingTime.holidays.german.enabled")
+ @KadaiProperty("kadai.workingTime.holidays.german.enabled")
private boolean germanPublicHolidaysEnabled = true;
- @TaskanaProperty("taskana.workingTime.holidays.german.corpus-christi.enabled")
+ @KadaiProperty("kadai.workingTime.holidays.german.corpus-christi.enabled")
private boolean germanPublicHolidaysCorpusChristiEnabled = false;
+
// endregion
// region history configuration
- @TaskanaProperty("taskana.history.simple.deleteOnTaskDeletion.enabled")
+ @KadaiProperty("kadai.history.simple.deleteOnTaskDeletion.enabled")
private boolean deleteHistoryEventsOnTaskDeletionEnabled = false;
- @TaskanaProperty("taskana.history.logger.name")
+ @KadaiProperty("kadai.history.logger.name")
private String logHistoryLoggerName = null; // default value will be set in the logger class.
+
// endregion
// region job configuration
- @TaskanaProperty("taskana.jobs.scheduler.enabled")
+ @KadaiProperty("kadai.jobs.scheduler.enabled")
private boolean jobSchedulerEnabled = true;
- @TaskanaProperty("taskana.jobs.scheduler.initialStartDelay")
+ @KadaiProperty("kadai.jobs.scheduler.initialStartDelay")
private long jobSchedulerInitialStartDelay = 0;
- @TaskanaProperty("taskana.jobs.scheduler.period")
+ @KadaiProperty("kadai.jobs.scheduler.period")
private long jobSchedulerPeriod = 5;
- @TaskanaProperty("taskana.jobs.scheduler.periodTimeUnit")
+ @KadaiProperty("kadai.jobs.scheduler.periodTimeUnit")
private TimeUnit jobSchedulerPeriodTimeUnit = TimeUnit.MINUTES;
- @TaskanaProperty("taskana.jobs.maxRetries")
+ @KadaiProperty("kadai.jobs.maxRetries")
private int maxNumberOfJobRetries = 3;
- @TaskanaProperty("taskana.jobs.batchSize")
+ @KadaiProperty("kadai.jobs.batchSize")
private int jobBatchSize = 100;
- @TaskanaProperty("taskana.jobs.firstRunAt")
+ @KadaiProperty("kadai.jobs.firstRunAt")
private Instant jobFirstRun = Instant.parse("2023-01-01T00:00:00Z");
- @TaskanaProperty("taskana.jobs.runEvery")
+ @KadaiProperty("kadai.jobs.runEvery")
private Duration jobRunEvery = Duration.ofDays(1);
- @TaskanaProperty("taskana.jobs.lockExpirationPeriod")
+ @KadaiProperty("kadai.jobs.lockExpirationPeriod")
private Duration jobLockExpirationPeriod = Duration.ofMinutes(30);
- @TaskanaProperty("taskana.jobs.cleanup.task.enable")
+ @KadaiProperty("kadai.jobs.cleanup.task.enable")
private boolean taskCleanupJobEnabled = true;
- @TaskanaProperty("taskana.jobs.cleanup.task.minimumAge")
+ @KadaiProperty("kadai.jobs.cleanup.task.minimumAge")
private Duration taskCleanupJobMinimumAge = Duration.ofDays(14);
- @TaskanaProperty("taskana.jobs.cleanup.task.allCompletedSameParentBusiness")
+ @KadaiProperty("kadai.jobs.cleanup.task.allCompletedSameParentBusiness")
private boolean taskCleanupJobAllCompletedSameParentBusiness = true;
- @TaskanaProperty("taskana.jobs.cleanup.task.lockExpirationPeriod")
+ @KadaiProperty("kadai.jobs.cleanup.task.lockExpirationPeriod")
private Duration taskCleanupJobLockExpirationPeriod = Duration.ofMinutes(30);
- @TaskanaProperty("taskana.jobs.cleanup.workbasket.enable")
+ @KadaiProperty("kadai.jobs.cleanup.workbasket.enable")
private boolean workbasketCleanupJobEnabled = true;
- @TaskanaProperty("taskana.jobs.cleanup.workbasket.lockExpirationPeriod")
+ @KadaiProperty("kadai.jobs.cleanup.workbasket.lockExpirationPeriod")
private Duration workbasketCleanupJobLockExpirationPeriod = Duration.ofMinutes(30);
- @TaskanaProperty("taskana.jobs.cleanup.history.simple.enable")
+ @KadaiProperty("kadai.jobs.cleanup.history.simple.enable")
private boolean simpleHistoryCleanupJobEnabled = false;
- @TaskanaProperty("taskana.jobs.cleanup.history.simple.batchSize")
+ @KadaiProperty("kadai.jobs.cleanup.history.simple.batchSize")
private int simpleHistoryCleanupJobBatchSize = 100;
- @TaskanaProperty("taskana.jobs.cleanup.history.simple.minimumAge")
+ @KadaiProperty("kadai.jobs.cleanup.history.simple.minimumAge")
private Duration simpleHistoryCleanupJobMinimumAge = Duration.ofDays(14);
- @TaskanaProperty("taskana.jobs.cleanup.history.simple.allCompletedSameParentBusiness")
+ @KadaiProperty("kadai.jobs.cleanup.history.simple.allCompletedSameParentBusiness")
private boolean simpleHistoryCleanupJobAllCompletedSameParentBusiness = true;
- @TaskanaProperty("taskana.jobs.cleanup.history.simple.lockExpirationPeriod")
+ @KadaiProperty("kadai.jobs.cleanup.history.simple.lockExpirationPeriod")
private Duration simpleHistoryCleanupJobLockExpirationPeriod = Duration.ofMinutes(30);
- @TaskanaProperty("taskana.jobs.priority.task.enable")
+ @KadaiProperty("kadai.jobs.priority.task.enable")
private boolean taskUpdatePriorityJobEnabled = false;
- @TaskanaProperty("taskana.jobs.priority.task.batchSize")
+ @KadaiProperty("kadai.jobs.priority.task.batchSize")
private int taskUpdatePriorityJobBatchSize = 100;
- @TaskanaProperty("taskana.jobs.priority.task.firstRunAt")
+ @KadaiProperty("kadai.jobs.priority.task.firstRunAt")
private Instant taskUpdatePriorityJobFirstRun = Instant.parse("2023-01-01T00:00:00Z");
- @TaskanaProperty("taskana.jobs.priority.task.runEvery")
+ @KadaiProperty("kadai.jobs.priority.task.runEvery")
private Duration taskUpdatePriorityJobRunEvery = Duration.ofDays(1);
- @TaskanaProperty("taskana.jobs.priority.task.lockExpirationPeriod")
+ @KadaiProperty("kadai.jobs.priority.task.lockExpirationPeriod")
private Duration taskUpdatePriorityJobLockExpirationPeriod = Duration.ofMinutes(30);
- @TaskanaProperty("taskana.jobs.refresh.user.enable")
+ @KadaiProperty("kadai.jobs.refresh.user.enable")
private boolean userInfoRefreshJobEnabled = false;
- @TaskanaProperty("taskana.jobs.refresh.user.firstRunAt")
+ @KadaiProperty("kadai.jobs.refresh.user.firstRunAt")
private Instant userRefreshJobFirstRun = Instant.parse("2023-01-01T23:00:00Z");
- @TaskanaProperty("taskana.jobs.refresh.user.runEvery")
+ @KadaiProperty("kadai.jobs.refresh.user.runEvery")
private Duration userRefreshJobRunEvery = Duration.ofDays(1);
- @TaskanaProperty("taskana.jobs.refresh.user.lockExpirationPeriod")
+ @KadaiProperty("kadai.jobs.refresh.user.lockExpirationPeriod")
private Duration userRefreshJobLockExpirationPeriod = Duration.ofMinutes(30);
- @TaskanaProperty("taskana.jobs.customJobs")
+ @KadaiProperty("kadai.jobs.customJobs")
private Set customJobs = new HashSet<>();
+
// endregion
// region user configuration
- @TaskanaProperty("taskana.user.addAdditionalUserInfo")
+ @KadaiProperty("kadai.user.addAdditionalUserInfo")
private boolean addAdditionalUserInfo = false;
- @TaskanaProperty("taskana.user.minimalPermissionsToAssignDomains")
+ @KadaiProperty("kadai.user.minimalPermissionsToAssignDomains")
private Set minimalPermissionsToAssignDomains = new HashSet<>();
+
// endregion
// region database configuration
- @TaskanaProperty("taskana.feature.useSpecificDb2Taskquery")
+ @KadaiProperty("kadai.feature.useSpecificDb2Taskquery")
private boolean useSpecificDb2Taskquery = true;
+
// endregion
// region custom configuration
private Map properties = Collections.emptyMap();
+
// endregion
public Builder(DataSource dataSource, boolean useManagedTransactions, String schemaName) {
@@ -892,7 +902,7 @@ public class TaskanaConfiguration {
this.schemaName = initSchemaName(schemaName);
}
- public Builder(TaskanaConfiguration conf) {
+ public Builder(KadaiConfiguration conf) {
this(
conf,
conf.dataSource,
@@ -901,17 +911,16 @@ public class TaskanaConfiguration {
conf.securityEnabled);
}
- public Builder(TaskanaConfiguration conf, DataSource dataSource) {
+ public Builder(KadaiConfiguration conf, DataSource dataSource) {
this(conf, dataSource, conf.useManagedTransactions, conf.schemaName, conf.securityEnabled);
}
- public Builder(
- TaskanaConfiguration conf, DataSource dataSource, boolean useManagedTransactions) {
+ public Builder(KadaiConfiguration conf, DataSource dataSource, boolean useManagedTransactions) {
this(conf, dataSource, useManagedTransactions, conf.schemaName, conf.securityEnabled);
}
public Builder(
- TaskanaConfiguration conf,
+ KadaiConfiguration conf,
DataSource dataSource,
boolean useManagedTransactions,
String schemaName) {
@@ -919,7 +928,7 @@ public class TaskanaConfiguration {
}
public Builder(
- TaskanaConfiguration conf,
+ KadaiConfiguration conf,
DataSource dataSource,
boolean useManagedTransactions,
String schemaName,
@@ -991,34 +1000,34 @@ public class TaskanaConfiguration {
}
/**
- * Configure the {@linkplain TaskanaConfiguration} with the default {@linkplain
- * #DEFAULT_TASKANA_PROPERTIES property file location} and {@linkplain
- * #DEFAULT_TASKANA_PROPERTY_SEPARATOR property separator}.
+ * Configure the {@linkplain KadaiConfiguration} with the default {@linkplain
+ * #DEFAULT_KADAI_PROPERTIES property file location} and {@linkplain
+ * #DEFAULT_KADAI_PROPERTY_SEPARATOR property separator}.
*
- * @see #initTaskanaProperties(String, String)
+ * @see #initKadaiProperties(String, String)
*/
@SuppressWarnings({"unused", "checkstyle:JavadocMethod"})
- public Builder initTaskanaProperties() {
- return initTaskanaProperties(DEFAULT_TASKANA_PROPERTIES, DEFAULT_TASKANA_PROPERTY_SEPARATOR);
+ public Builder initKadaiProperties() {
+ return initKadaiProperties(DEFAULT_KADAI_PROPERTIES, DEFAULT_KADAI_PROPERTY_SEPARATOR);
}
/**
- * Configure the {@linkplain TaskanaConfiguration} with the default {@linkplain
- * #DEFAULT_TASKANA_PROPERTY_SEPARATOR property separator}.
+ * Configure the {@linkplain KadaiConfiguration} with the default {@linkplain
+ * #DEFAULT_KADAI_PROPERTY_SEPARATOR property separator}.
*
- * @see #initTaskanaProperties(String, String)
+ * @see #initKadaiProperties(String, String)
*/
@SuppressWarnings({"unused", "checkstyle:JavadocMethod"})
- public Builder initTaskanaProperties(String propertiesFile) {
- return initTaskanaProperties(propertiesFile, DEFAULT_TASKANA_PROPERTY_SEPARATOR);
+ public Builder initKadaiProperties(String propertiesFile) {
+ return initKadaiProperties(propertiesFile, DEFAULT_KADAI_PROPERTY_SEPARATOR);
}
/**
- * Configure the {@linkplain TaskanaConfiguration} using a property file from the classpath of
- * {@linkplain TaskanaConfiguration TaskanaConfigurations} or the system.
+ * Configure the {@linkplain KadaiConfiguration} using a property file from the classpath of
+ * {@linkplain KadaiConfiguration KadaiConfigurations} or the system.
*
- * Please check this builders instance fields for the {@linkplain TaskanaProperty} for
- * property naming.
+ *
Please check this builders instance fields for the {@linkplain KadaiProperty} for property
+ * naming.
*
* @param propertiesFile path to the properties file.
* @param separator if a property is a collection type, this separator determines which sequence
@@ -1026,7 +1035,7 @@ public class TaskanaConfiguration {
* @return the builder
* @throws SystemException if propertiesFile or separator is null or empty
*/
- public Builder initTaskanaProperties(String propertiesFile, String separator) {
+ public Builder initKadaiProperties(String propertiesFile, String separator) {
if (propertiesFile == null || propertiesFile.isEmpty() || propertiesFile.isBlank()) {
throw new SystemException("property file can't be null or empty");
}
@@ -1035,7 +1044,7 @@ public class TaskanaConfiguration {
}
LOGGER.debug(
- "Reading taskana configuration from {} with separator {}", propertiesFile, separator);
+ "Reading kadai configuration from {} with separator {}", propertiesFile, separator);
properties = loadProperties(propertiesFile);
configureAnnotatedFields(separator, properties);
addMasterDomain();
@@ -1055,11 +1064,12 @@ public class TaskanaConfiguration {
this.enforceServiceLevel = enforceServiceLevel;
return this;
}
+
// endregion
// region authentication configuration
- public Builder roleMap(Map> roleMap) {
+ public Builder roleMap(Map> roleMap) {
this.roleMap = roleMap;
return this;
}
@@ -1313,10 +1323,10 @@ public class TaskanaConfiguration {
return this;
}
- public TaskanaConfiguration build() {
+ public KadaiConfiguration build() {
adjustConfiguration();
validateConfiguration();
- return new TaskanaConfiguration(this);
+ return new KadaiConfiguration(this);
}
// endregion
@@ -1333,11 +1343,11 @@ public class TaskanaConfiguration {
private void configureAnnotatedFields(String separator, Map props) {
final List fields = ReflectionUtil.retrieveAllFields(getClass());
for (Field field : fields) {
- Optional.ofNullable(field.getAnnotation(TaskanaProperty.class))
+ Optional.ofNullable(field.getAnnotation(KadaiProperty.class))
.flatMap(
- taskanaProperty ->
+ kadaiProperty ->
PropertyParser.getPropertyParser(field.getType())
- .parse(props, separator, field, taskanaProperty))
+ .parse(props, separator, field, kadaiProperty))
.ifPresent(value -> setFieldValue(field, value));
}
}
@@ -1370,11 +1380,11 @@ public class TaskanaConfiguration {
(oldValue, newValue) -> oldValue,
LinkedHashMap::new));
roleMap =
- Arrays.stream(TaskanaRole.values())
+ Arrays.stream(KadaiRole.values())
.map(role -> Pair.of(role, roleMap.getOrDefault(role, Set.of())))
.map(
pair -> {
- if (TaskanaConfiguration.shouldUseLowerCaseForAccessIds()) {
+ if (KadaiConfiguration.shouldUseLowerCaseForAccessIds()) {
return Pair.of(
pair.getLeft(),
pair.getRight().stream()
@@ -1389,72 +1399,71 @@ public class TaskanaConfiguration {
private void validateConfiguration() {
if (jobBatchSize <= 0) {
throw new InvalidArgumentException(
- "Parameter jobBatchSize (taskana.jobs.batchSize) must be a positive integer");
+ "Parameter jobBatchSize (kadai.jobs.batchSize) must be a positive integer");
}
if (maxNumberOfJobRetries <= 0) {
throw new InvalidArgumentException(
- "Parameter maxNumberOfJobRetries (taskana.jobs.maxRetries)"
+ "Parameter maxNumberOfJobRetries (kadai.jobs.maxRetries)"
+ " must be a positive integer");
}
if (jobRunEvery == null || jobRunEvery.isNegative() || jobRunEvery.isZero()) {
throw new InvalidArgumentException(
- "Parameter jobRunEvery (taskana.jobs.runEvery) must be a positive duration");
+ "Parameter jobRunEvery (kadai.jobs.runEvery) must be a positive duration");
}
if (simpleHistoryCleanupJobMinimumAge == null
|| simpleHistoryCleanupJobMinimumAge.isNegative()) {
throw new InvalidArgumentException(
"Parameter simpleHistoryCleanupJobMinimumAge "
- + "(taskana.jobs.cleanup.history.simple.minimumAge) must not be negative");
+ + "(kadai.jobs.cleanup.history.simple.minimumAge) must not be negative");
}
if (taskCleanupJobMinimumAge == null || taskCleanupJobMinimumAge.isNegative()) {
throw new InvalidArgumentException(
"Parameter taskCleanupJobMinimumAge "
- + "(taskana.jobs.cleanup.task.minimumAge) must not be negative");
+ + "(kadai.jobs.cleanup.task.minimumAge) must not be negative");
}
if (taskUpdatePriorityJobBatchSize <= 0) {
throw new InvalidArgumentException(
- "Parameter taskUpdatePriorityJobBatchSize (taskana.jobs.priority.task.batchSize)"
+ "Parameter taskUpdatePriorityJobBatchSize (kadai.jobs.priority.task.batchSize)"
+ " must be a positive integer");
}
if (taskUpdatePriorityJobRunEvery == null
|| taskUpdatePriorityJobRunEvery.isNegative()
|| taskUpdatePriorityJobRunEvery.isZero()) {
throw new InvalidArgumentException(
- "Parameter taskUpdatePriorityJobRunEvery (taskana.jobs.priority.task.runEvery)"
+ "Parameter taskUpdatePriorityJobRunEvery (kadai.jobs.priority.task.runEvery)"
+ " must be a positive duration");
}
if (userRefreshJobRunEvery == null
|| userRefreshJobRunEvery.isNegative()
|| userRefreshJobRunEvery.isZero()) {
throw new InvalidArgumentException(
- "Parameter userRefreshJobRunEvery (taskana.jobs.refresh.user.runEvery)"
+ "Parameter userRefreshJobRunEvery (kadai.jobs.refresh.user.runEvery)"
+ " must be a positive duration");
}
if (jobSchedulerInitialStartDelay < 0) {
throw new InvalidArgumentException(
- "Parameter jobSchedulerInitialStartDelay (taskana.jobs.scheduler.initialStartDelay)"
+ "Parameter jobSchedulerInitialStartDelay (kadai.jobs.scheduler.initialStartDelay)"
+ " must be a natural integer");
}
if (jobSchedulerPeriod <= 0) {
throw new InvalidArgumentException(
- "Parameter jobSchedulerPeriod (taskana.jobs.scheduler.period) "
+ "Parameter jobSchedulerPeriod (kadai.jobs.scheduler.period) "
+ "must be a positive integer");
}
if (!new HashSet<>(classificationTypes)
.containsAll(classificationCategoriesByType.keySet())) {
throw new InvalidArgumentException(
- "Parameter classificationCategoriesByType (taskana.classification.categories.)"
- + " is configured incorrectly. Please check whether all specified"
- + " Classification Types exist. Additionally, check whether the correct"
- + " separator is used in the property taskana.classification.types ."
- );
+ "Parameter classificationCategoriesByType (kadai.classification.categories.)"
+ + " is configured incorrectly. Please check whether all specified"
+ + " Classification Types exist. Additionally, check whether the correct"
+ + " separator is used in the property kadai.classification.types .");
}
if (!classificationCategoriesByType.keySet().containsAll(classificationTypes)) {
throw new InvalidArgumentException(
String.format(
"Some Classification Categories for parameter classificationTypes "
- + "(taskana.classification.types) are missing. "
+ + "(kadai.classification.types) are missing. "
+ "configured: %s "
+ "detected: %s",
classificationTypes, classificationCategoriesByType.keySet()));
@@ -1482,8 +1491,7 @@ public class TaskanaConfiguration {
private Map loadProperties(String propertiesFile) {
Properties props = new Properties();
try (InputStream stream =
- FileLoaderUtil.openFileFromClasspathOrSystem(
- propertiesFile, TaskanaConfiguration.class)) {
+ FileLoaderUtil.openFileFromClasspathOrSystem(propertiesFile, KadaiConfiguration.class)) {
props.load(stream);
} catch (IOException e) {
throw new SystemException(
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationCustomField.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationCustomField.java
similarity index 77%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationCustomField.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationCustomField.java
index 7b1e8033c..c719fdacc 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationCustomField.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationCustomField.java
@@ -1,4 +1,4 @@
-package pro.taskana.classification.api;
+package io.kadai.classification.api;
public enum ClassificationCustomField {
CUSTOM_1,
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationQuery.java
similarity index 97%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationQuery.java
index 63ba16c20..d254d72fc 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationQuery.java
@@ -1,10 +1,10 @@
-package pro.taskana.classification.api;
+package io.kadai.classification.api;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.BaseQuery;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.BaseQuery;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
/**
* The ClassificationQuery allows for a custom search across all {@linkplain Classification
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQueryColumnName.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationQueryColumnName.java
similarity index 82%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQueryColumnName.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationQueryColumnName.java
index d29e508ec..3f4eca04f 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQueryColumnName.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationQueryColumnName.java
@@ -1,10 +1,10 @@
-package pro.taskana.classification.api;
+package io.kadai.classification.api;
-import pro.taskana.common.api.QueryColumnName;
+import io.kadai.common.api.QueryColumnName;
/**
* Enum containing the column names for {@link
- * pro.taskana.classification.internal.ClassificationQueryMapper#queryClassificationColumnValues}.
+ * io.kadai.classification.internal.ClassificationQueryMapper#queryClassificationColumnValues}.
*/
public enum ClassificationQueryColumnName implements QueryColumnName {
ID("id"),
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationService.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationService.java
similarity index 88%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationService.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationService.java
index c898ef50c..bc29951b3 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationService.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/ClassificationService.java
@@ -1,16 +1,16 @@
-package pro.taskana.classification.api;
+package io.kadai.classification.api;
-import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
-import pro.taskana.classification.api.exceptions.ClassificationInUseException;
-import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
-import pro.taskana.classification.api.exceptions.MalformedServiceLevelException;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.exceptions.ConcurrencyException;
-import pro.taskana.common.api.exceptions.DomainNotFoundException;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.task.api.models.Task;
+import io.kadai.classification.api.exceptions.ClassificationAlreadyExistException;
+import io.kadai.classification.api.exceptions.ClassificationInUseException;
+import io.kadai.classification.api.exceptions.ClassificationNotFoundException;
+import io.kadai.classification.api.exceptions.MalformedServiceLevelException;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.exceptions.ConcurrencyException;
+import io.kadai.common.api.exceptions.DomainNotFoundException;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.task.api.models.Task;
/**
* The ClassificationService manages all operations on {@linkplain Classification Classifications}.
@@ -60,7 +60,7 @@ public interface ClassificationService {
* @throws ClassificationAlreadyExistException if the {@linkplain Classification} already exists
* in the given {@linkplain Classification#getDomain() domain}.
* @throws NotAuthorizedException if the current user is not member of {@linkplain
- * TaskanaRole#BUSINESS_ADMIN} or {@linkplain TaskanaRole#ADMIN}
+ * KadaiRole#BUSINESS_ADMIN} or {@linkplain KadaiRole#ADMIN}
* @throws DomainNotFoundException if the {@linkplain Classification#getDomain() domain} does not
* exist in the configuration
* @throws MalformedServiceLevelException if the {@linkplain Classification#getServiceLevel()
@@ -118,7 +118,7 @@ public interface ClassificationService {
* @throws ClassificationNotFoundException if the specified {@linkplain Classification} or its
* parent does not exist
* @throws NotAuthorizedException if the caller is neither member of{@linkplain
- * TaskanaRole#BUSINESS_ADMIN} nor {@linkplain TaskanaRole#ADMIN}
+ * KadaiRole#BUSINESS_ADMIN} nor {@linkplain KadaiRole#ADMIN}
* @throws ConcurrencyException if the {@linkplain Classification} was modified in the meantime
* and is not the most up to date anymore; that's the case if the given {@linkplain
* Classification#getModified() modified} timestamp differs from the one in the database
@@ -146,7 +146,7 @@ public interface ClassificationService {
* @throws ClassificationNotFoundException if no {@linkplain Classification} with the specified
* {@linkplain Classification#getId() id} was found
* @throws NotAuthorizedException if the current user is not member of {@linkplain
- * TaskanaRole#BUSINESS_ADMIN} or {@linkplain TaskanaRole#ADMIN}
+ * KadaiRole#BUSINESS_ADMIN} or {@linkplain KadaiRole#ADMIN}
*/
void deleteClassification(String id)
throws ClassificationInUseException, ClassificationNotFoundException, NotAuthorizedException;
@@ -168,7 +168,7 @@ public interface ClassificationService {
* {@linkplain Classification#getKey() key} and {@linkplain Classification#getDomain() domain}
* was found
* @throws NotAuthorizedException if the current user is not member of {@linkplain
- * TaskanaRole#BUSINESS_ADMIN} or {@linkplain TaskanaRole#ADMIN}
+ * KadaiRole#BUSINESS_ADMIN} or {@linkplain KadaiRole#ADMIN}
*/
void deleteClassification(String classificationKey, String domain)
throws ClassificationInUseException, ClassificationNotFoundException, NotAuthorizedException;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationAlreadyExistException.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/ClassificationAlreadyExistException.java
similarity index 79%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationAlreadyExistException.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/ClassificationAlreadyExistException.java
index 734fb0bb0..65a2e0871 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationAlreadyExistException.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/ClassificationAlreadyExistException.java
@@ -1,16 +1,16 @@
-package pro.taskana.classification.api.exceptions;
+package io.kadai.classification.api.exceptions;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.exceptions.ErrorCode;
+import io.kadai.common.api.exceptions.KadaiException;
import java.util.Map;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.exceptions.ErrorCode;
-import pro.taskana.common.api.exceptions.TaskanaException;
/**
* This exception is thrown when a {@linkplain Classification} does already exits, but was tried to
* be created with the same {@linkplain Classification#getId() id} and {@linkplain
* Classification#getDomain() domain}.
*/
-public class ClassificationAlreadyExistException extends TaskanaException {
+public class ClassificationAlreadyExistException extends KadaiException {
public static final String ERROR_KEY = "CLASSIFICATION_ALREADY_EXISTS";
private final String domain;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationInUseException.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/ClassificationInUseException.java
similarity index 78%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationInUseException.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/ClassificationInUseException.java
index c0da9d432..7f0d06e5b 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationInUseException.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/ClassificationInUseException.java
@@ -1,11 +1,11 @@
-package pro.taskana.classification.api.exceptions;
+package io.kadai.classification.api.exceptions;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.exceptions.ErrorCode;
+import io.kadai.common.api.exceptions.KadaiException;
+import io.kadai.task.api.models.Attachment;
+import io.kadai.task.api.models.Task;
import java.util.Map;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.exceptions.ErrorCode;
-import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.task.api.models.Attachment;
-import pro.taskana.task.api.models.Task;
/**
* This exception is thrown when a specific {@linkplain Classification} was tried to be deleted
@@ -13,7 +13,7 @@ import pro.taskana.task.api.models.Task;
* This could mean that there are either {@linkplain Task Tasks} or {@linkplain Attachment
* Attachments} associated with it.
*/
-public class ClassificationInUseException extends TaskanaException {
+public class ClassificationInUseException extends KadaiException {
public static final String ERROR_KEY = "CLASSIFICATION_IN_USE";
private final String classificationKey;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationNotFoundException.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/ClassificationNotFoundException.java
similarity index 83%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationNotFoundException.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/ClassificationNotFoundException.java
index bc0090ca2..4c2a8c817 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationNotFoundException.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/ClassificationNotFoundException.java
@@ -1,12 +1,12 @@
-package pro.taskana.classification.api.exceptions;
+package io.kadai.classification.api.exceptions;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.exceptions.ErrorCode;
+import io.kadai.common.api.exceptions.KadaiException;
import java.util.Map;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.exceptions.ErrorCode;
-import pro.taskana.common.api.exceptions.TaskanaException;
/** Thrown if a specific {@linkplain Classification} is not in the database. */
-public class ClassificationNotFoundException extends TaskanaException {
+public class ClassificationNotFoundException extends KadaiException {
public static final String ERROR_KEY_ID = "CLASSIFICATION_WITH_ID_NOT_FOUND";
public static final String ERROR_KEY_KEY_DOMAIN = "CLASSIFICATION_WITH_KEY_NOT_FOUND";
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/MalformedServiceLevelException.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/MalformedServiceLevelException.java
similarity index 78%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/MalformedServiceLevelException.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/MalformedServiceLevelException.java
index 09e5b8884..44f34be57 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/MalformedServiceLevelException.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/exceptions/MalformedServiceLevelException.java
@@ -1,17 +1,17 @@
-package pro.taskana.classification.api.exceptions;
+package io.kadai.classification.api.exceptions;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.common.api.exceptions.ErrorCode;
+import io.kadai.common.api.exceptions.KadaiException;
import java.util.Map;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.common.api.exceptions.ErrorCode;
-import pro.taskana.common.api.exceptions.TaskanaException;
/**
* This exception is thrown when the {@linkplain Classification#getServiceLevel() service level} of
* the {@linkplain Classification} has not the required format. The {@linkplain
* Classification#getServiceLevel() service level} has to be a positive ISO-8601 duration format and
- * TASKANA only supports whole days. The format must be 'PnD'.
+ * KADAI only supports whole days. The format must be 'PnD'.
*/
-public class MalformedServiceLevelException extends TaskanaException {
+public class MalformedServiceLevelException extends KadaiException {
public static final String ERROR_KEY = "CLASSIFICATION_SERVICE_LEVEL_MALFORMED";
private final String serviceLevel;
@@ -25,7 +25,7 @@ public class MalformedServiceLevelException extends TaskanaException {
"The provided service level '%s' of the "
+ "Classification with key '%s' and domain '%s' is invalid."
+ "The service level has to be a positive ISO-8601 duration format. "
- + "Furthermore, TASKANA only supports whole days; "
+ + "Furthermore, KADAI only supports whole days; "
+ "the service level must be in the format 'PnD'",
serviceLevel, classificationKey, domain),
ErrorCode.of(
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/models/Classification.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/models/Classification.java
similarity index 97%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/models/Classification.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/models/Classification.java
index 5fe087b07..78c82f325 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/models/Classification.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/models/Classification.java
@@ -1,7 +1,7 @@
-package pro.taskana.classification.api.models;
+package io.kadai.classification.api.models;
+import io.kadai.classification.api.ClassificationCustomField;
import java.time.Instant;
-import pro.taskana.classification.api.ClassificationCustomField;
/** Interface used to specify the Classification-Model. */
public interface Classification extends ClassificationSummary {
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/models/ClassificationSummary.java b/lib/kadai-core/src/main/java/io/kadai/classification/api/models/ClassificationSummary.java
similarity index 96%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/models/ClassificationSummary.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/api/models/ClassificationSummary.java
index 9a40df866..045be84e0 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/models/ClassificationSummary.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/api/models/ClassificationSummary.java
@@ -1,6 +1,6 @@
-package pro.taskana.classification.api.models;
+package io.kadai.classification.api.models;
-import pro.taskana.classification.api.ClassificationCustomField;
+import io.kadai.classification.api.ClassificationCustomField;
/**
* Interface for ClassificationSummaries. This is a specific short model-object which only requieres
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java b/lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationMapper.java
similarity index 98%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationMapper.java
index 1eac8bfc4..a06282fbb 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationMapper.java
@@ -1,12 +1,12 @@
-package pro.taskana.classification.internal;
+package io.kadai.classification.internal;
+import io.kadai.classification.internal.models.ClassificationImpl;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
-import pro.taskana.classification.internal.models.ClassificationImpl;
/** This class is the mybatis mapping of classifications. */
@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"})
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java b/lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationQueryImpl.java
similarity index 88%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationQueryImpl.java
index c0c15f79d..304975734 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationQueryImpl.java
@@ -1,34 +1,34 @@
-package pro.taskana.classification.internal;
+package io.kadai.classification.internal;
-import static pro.taskana.common.api.BaseQuery.toLowerCopy;
+import static io.kadai.common.api.BaseQuery.toLowerCopy;
+import io.kadai.classification.api.ClassificationCustomField;
+import io.kadai.classification.api.ClassificationQuery;
+import io.kadai.classification.api.ClassificationQueryColumnName;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.common.api.TimeInterval;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.KadaiRuntimeException;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.InternalKadaiEngine;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.ibatis.exceptions.PersistenceException;
import org.apache.ibatis.session.RowBounds;
-import pro.taskana.classification.api.ClassificationCustomField;
-import pro.taskana.classification.api.ClassificationQuery;
-import pro.taskana.classification.api.ClassificationQueryColumnName;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.common.api.TimeInterval;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.api.exceptions.TaskanaRuntimeException;
-import pro.taskana.common.internal.InternalTaskanaEngine;
/** Implementation of ClassificationQuery interface. */
public class ClassificationQueryImpl implements ClassificationQuery {
private static final String LINK_TO_SUMMARYMAPPER =
- "pro.taskana.classification.internal.ClassificationQueryMapper.queryClassificationSummaries";
+ "io.kadai.classification.internal.ClassificationQueryMapper.queryClassificationSummaries";
private static final String LINK_TO_COUNTER =
- "pro.taskana.classification.internal.ClassificationQueryMapper.countQueryClassifications";
+ "io.kadai.classification.internal.ClassificationQueryMapper.countQueryClassifications";
private static final String LINK_TO_VALUEMAPPER =
- "pro.taskana.classification.internal.ClassificationQueryMapper."
+ "io.kadai.classification.internal.ClassificationQueryMapper."
+ "queryClassificationColumnValues";
- private final InternalTaskanaEngine taskanaEngine;
+ private final InternalKadaiEngine kadaiEngine;
private final List orderBy;
private final List orderColumns;
private ClassificationQueryColumnName columnName;
@@ -67,8 +67,8 @@ public class ClassificationQueryImpl implements ClassificationQuery {
private String[] custom8In;
private String[] custom8Like;
- ClassificationQueryImpl(InternalTaskanaEngine taskanaEngine) {
- this.taskanaEngine = taskanaEngine;
+ ClassificationQueryImpl(InternalKadaiEngine kadaiEngine) {
+ this.kadaiEngine = kadaiEngine;
this.orderBy = new ArrayList<>();
this.orderColumns = new ArrayList<>();
}
@@ -316,21 +316,21 @@ public class ClassificationQueryImpl implements ClassificationQuery {
@Override
public List list() {
- return taskanaEngine.executeInDatabaseConnection(
- () -> taskanaEngine.getSqlSession().selectList(LINK_TO_SUMMARYMAPPER, this));
+ return kadaiEngine.executeInDatabaseConnection(
+ () -> kadaiEngine.getSqlSession().selectList(LINK_TO_SUMMARYMAPPER, this));
}
@Override
public List list(int offset, int limit) {
List result = new ArrayList<>();
try {
- taskanaEngine.openConnection();
+ kadaiEngine.openConnection();
RowBounds rowBounds = new RowBounds(offset, limit);
- result = taskanaEngine.getSqlSession().selectList(LINK_TO_SUMMARYMAPPER, this, rowBounds);
+ result = kadaiEngine.getSqlSession().selectList(LINK_TO_SUMMARYMAPPER, this, rowBounds);
return result;
} catch (PersistenceException e) {
if (e.getMessage().contains("ERRORCODE=-4470")) {
- TaskanaRuntimeException ex =
+ KadaiRuntimeException ex =
new SystemException(
"The offset beginning was set over the amount of result-rows.", e.getCause());
ex.setStackTrace(e.getStackTrace());
@@ -338,7 +338,7 @@ public class ClassificationQueryImpl implements ClassificationQuery {
}
throw e;
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
}
@@ -347,14 +347,14 @@ public class ClassificationQueryImpl implements ClassificationQuery {
ClassificationQueryColumnName columnName, SortDirection sortDirection) {
List result = new ArrayList<>();
try {
- taskanaEngine.openConnection();
+ kadaiEngine.openConnection();
this.columnName = columnName;
this.orderBy.clear();
this.addOrderCriteria(columnName.toString(), sortDirection);
- result = taskanaEngine.getSqlSession().selectList(LINK_TO_VALUEMAPPER, this);
+ result = kadaiEngine.getSqlSession().selectList(LINK_TO_VALUEMAPPER, this);
return result;
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
}
@@ -362,11 +362,11 @@ public class ClassificationQueryImpl implements ClassificationQuery {
public ClassificationSummary single() {
ClassificationSummary result = null;
try {
- taskanaEngine.openConnection();
- result = taskanaEngine.getSqlSession().selectOne(LINK_TO_SUMMARYMAPPER, this);
+ kadaiEngine.openConnection();
+ result = kadaiEngine.getSqlSession().selectOne(LINK_TO_SUMMARYMAPPER, this);
return result;
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
}
@@ -374,11 +374,11 @@ public class ClassificationQueryImpl implements ClassificationQuery {
public long count() {
Long rowCount = null;
try {
- taskanaEngine.openConnection();
- rowCount = taskanaEngine.getSqlSession().selectOne(LINK_TO_COUNTER, this);
+ kadaiEngine.openConnection();
+ rowCount = kadaiEngine.getSqlSession().selectOne(LINK_TO_COUNTER, this);
return (rowCount == null) ? 0L : rowCount;
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryMapper.java b/lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationQueryMapper.java
similarity index 99%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryMapper.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationQueryMapper.java
index 9ae1e6053..91f6a45e1 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryMapper.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationQueryMapper.java
@@ -1,9 +1,9 @@
-package pro.taskana.classification.internal;
+package io.kadai.classification.internal;
+import io.kadai.classification.internal.models.ClassificationSummaryImpl;
import java.util.List;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Select;
-import pro.taskana.classification.internal.models.ClassificationSummaryImpl;
/** This class provides a mapper for all classification queries. */
@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"})
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java b/lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationServiceImpl.java
similarity index 84%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationServiceImpl.java
index 5cfbef8d3..1af51648d 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/internal/ClassificationServiceImpl.java
@@ -1,7 +1,34 @@
-package pro.taskana.classification.internal;
+package io.kadai.classification.internal;
-import static pro.taskana.common.api.SharedConstants.MASTER_DOMAIN;
+import static io.kadai.common.api.SharedConstants.MASTER_DOMAIN;
+import io.kadai.classification.api.ClassificationQuery;
+import io.kadai.classification.api.ClassificationService;
+import io.kadai.classification.api.exceptions.ClassificationAlreadyExistException;
+import io.kadai.classification.api.exceptions.ClassificationInUseException;
+import io.kadai.classification.api.exceptions.ClassificationNotFoundException;
+import io.kadai.classification.api.exceptions.MalformedServiceLevelException;
+import io.kadai.classification.api.models.Classification;
+import io.kadai.classification.api.models.ClassificationSummary;
+import io.kadai.classification.internal.jobs.ClassificationChangedJob;
+import io.kadai.classification.internal.models.ClassificationImpl;
+import io.kadai.common.api.KadaiRole;
+import io.kadai.common.api.ScheduledJob;
+import io.kadai.common.api.exceptions.ConcurrencyException;
+import io.kadai.common.api.exceptions.DomainNotFoundException;
+import io.kadai.common.api.exceptions.InvalidArgumentException;
+import io.kadai.common.api.exceptions.NotAuthorizedException;
+import io.kadai.common.internal.InternalKadaiEngine;
+import io.kadai.common.internal.util.IdGenerator;
+import io.kadai.common.internal.util.LogSanitizer;
+import io.kadai.common.internal.util.ObjectAttributeChangeDetector;
+import io.kadai.spi.history.api.events.classification.ClassificationCreatedEvent;
+import io.kadai.spi.history.api.events.classification.ClassificationDeletedEvent;
+import io.kadai.spi.history.api.events.classification.ClassificationUpdatedEvent;
+import io.kadai.spi.history.internal.HistoryEventManager;
+import io.kadai.spi.priority.internal.PriorityServiceManager;
+import io.kadai.task.api.models.TaskSummary;
+import io.kadai.task.internal.TaskMapper;
import java.sql.SQLException;
import java.sql.SQLIntegrityConstraintViolationException;
import java.time.Duration;
@@ -14,33 +41,6 @@ import java.util.Objects;
import org.apache.ibatis.exceptions.PersistenceException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.classification.api.ClassificationQuery;
-import pro.taskana.classification.api.ClassificationService;
-import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
-import pro.taskana.classification.api.exceptions.ClassificationInUseException;
-import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
-import pro.taskana.classification.api.exceptions.MalformedServiceLevelException;
-import pro.taskana.classification.api.models.Classification;
-import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.classification.internal.jobs.ClassificationChangedJob;
-import pro.taskana.classification.internal.models.ClassificationImpl;
-import pro.taskana.common.api.ScheduledJob;
-import pro.taskana.common.api.TaskanaRole;
-import pro.taskana.common.api.exceptions.ConcurrencyException;
-import pro.taskana.common.api.exceptions.DomainNotFoundException;
-import pro.taskana.common.api.exceptions.InvalidArgumentException;
-import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.common.internal.util.IdGenerator;
-import pro.taskana.common.internal.util.LogSanitizer;
-import pro.taskana.common.internal.util.ObjectAttributeChangeDetector;
-import pro.taskana.spi.history.api.events.classification.ClassificationCreatedEvent;
-import pro.taskana.spi.history.api.events.classification.ClassificationDeletedEvent;
-import pro.taskana.spi.history.api.events.classification.ClassificationUpdatedEvent;
-import pro.taskana.spi.history.internal.HistoryEventManager;
-import pro.taskana.spi.priority.internal.PriorityServiceManager;
-import pro.taskana.task.api.models.TaskSummary;
-import pro.taskana.task.internal.TaskMapper;
/** This is the implementation of ClassificationService. */
public class ClassificationServiceImpl implements ClassificationService {
@@ -50,18 +50,18 @@ public class ClassificationServiceImpl implements ClassificationService {
private final PriorityServiceManager priorityServiceManager;
private final ClassificationMapper classificationMapper;
private final TaskMapper taskMapper;
- private final InternalTaskanaEngine taskanaEngine;
+ private final InternalKadaiEngine kadaiEngine;
public ClassificationServiceImpl(
- InternalTaskanaEngine taskanaEngine,
+ InternalKadaiEngine kadaiEngine,
PriorityServiceManager priorityServiceManager,
ClassificationMapper classificationMapper,
TaskMapper taskMapper) {
- this.taskanaEngine = taskanaEngine;
+ this.kadaiEngine = kadaiEngine;
this.priorityServiceManager = priorityServiceManager;
this.classificationMapper = classificationMapper;
this.taskMapper = taskMapper;
- this.historyEventManager = taskanaEngine.getHistoryEventManager();
+ this.historyEventManager = kadaiEngine.getHistoryEventManager();
}
@Override
@@ -73,7 +73,7 @@ public class ClassificationServiceImpl implements ClassificationService {
Classification result;
try {
- taskanaEngine.openConnection();
+ kadaiEngine.openConnection();
result = classificationMapper.findByKeyAndDomain(key, domain);
if (result == null) {
result = classificationMapper.findByKeyAndDomain(key, MASTER_DOMAIN);
@@ -83,7 +83,7 @@ public class ClassificationServiceImpl implements ClassificationService {
}
return result;
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
}
@@ -94,23 +94,23 @@ public class ClassificationServiceImpl implements ClassificationService {
}
Classification result;
try {
- taskanaEngine.openConnection();
+ kadaiEngine.openConnection();
result = classificationMapper.findById(id);
if (result == null) {
throw new ClassificationNotFoundException(id);
}
return result;
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
}
@Override
public void deleteClassification(String classificationId)
throws ClassificationInUseException, ClassificationNotFoundException, NotAuthorizedException {
- taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ kadaiEngine.getEngine().checkRoleMembership(KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
try {
- taskanaEngine.openConnection();
+ kadaiEngine.openConnection();
Classification classification = this.classificationMapper.findById(classificationId);
if (classification == null) {
throw new ClassificationNotFoundException(classificationId);
@@ -146,7 +146,7 @@ public class ClassificationServiceImpl implements ClassificationService {
IdGenerator.generateWithPrefix(
IdGenerator.ID_PREFIX_CLASSIFICATION_HISTORY_EVENT),
classification,
- taskanaEngine.getEngine().getCurrentUserContext().getUserid(),
+ kadaiEngine.getEngine().getCurrentUserContext().getUserid(),
details));
}
@@ -157,16 +157,16 @@ public class ClassificationServiceImpl implements ClassificationService {
throw e;
}
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
}
@Override
public void deleteClassification(String classificationKey, String domain)
throws ClassificationInUseException, ClassificationNotFoundException, NotAuthorizedException {
- taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ kadaiEngine.getEngine().checkRoleMembership(KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
try {
- taskanaEngine.openConnection();
+ kadaiEngine.openConnection();
Classification classification =
this.classificationMapper.findByKeyAndDomain(classificationKey, domain);
if (classification == null) {
@@ -174,23 +174,26 @@ public class ClassificationServiceImpl implements ClassificationService {
}
deleteClassification(classification.getId());
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
}
@Override
public Classification createClassification(Classification classification)
- throws ClassificationAlreadyExistException, DomainNotFoundException, InvalidArgumentException,
- MalformedServiceLevelException, NotAuthorizedException {
- taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
- if (!taskanaEngine.domainExists(classification.getDomain())
+ throws ClassificationAlreadyExistException,
+ DomainNotFoundException,
+ InvalidArgumentException,
+ MalformedServiceLevelException,
+ NotAuthorizedException {
+ kadaiEngine.getEngine().checkRoleMembership(KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
+ if (!kadaiEngine.domainExists(classification.getDomain())
&& !MASTER_DOMAIN.equals(classification.getDomain())) {
throw new DomainNotFoundException(classification.getDomain());
}
ClassificationImpl classificationImpl;
final boolean isClassificationExisting;
try {
- taskanaEngine.openConnection();
+ kadaiEngine.openConnection();
isClassificationExisting =
doesClassificationExist(classification.getKey(), classification.getDomain());
if (isClassificationExisting) {
@@ -215,7 +218,7 @@ public class ClassificationServiceImpl implements ClassificationService {
new ClassificationCreatedEvent(
IdGenerator.generateWithPrefix(IdGenerator.ID_PREFIX_CLASSIFICATION_HISTORY_EVENT),
classificationImpl,
- taskanaEngine.getEngine().getCurrentUserContext().getUserid(),
+ kadaiEngine.getEngine().getCurrentUserContext().getUserid(),
details));
}
@@ -229,19 +232,22 @@ public class ClassificationServiceImpl implements ClassificationService {
addClassificationToMasterDomain(classificationImpl);
}
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
return classificationImpl;
}
@Override
public Classification updateClassification(Classification classification)
- throws ConcurrencyException, ClassificationNotFoundException, InvalidArgumentException,
- MalformedServiceLevelException, NotAuthorizedException {
- taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN);
+ throws ConcurrencyException,
+ ClassificationNotFoundException,
+ InvalidArgumentException,
+ MalformedServiceLevelException,
+ NotAuthorizedException {
+ kadaiEngine.getEngine().checkRoleMembership(KadaiRole.BUSINESS_ADMIN, KadaiRole.ADMIN);
ClassificationImpl classificationImpl;
try {
- taskanaEngine.openConnection();
+ kadaiEngine.openConnection();
if (classification.getKey().equals(classification.getParentKey())) {
throw new InvalidArgumentException(
String.format(
@@ -275,7 +281,7 @@ public class ClassificationServiceImpl implements ClassificationService {
new ClassificationUpdatedEvent(
IdGenerator.generateWithPrefix(IdGenerator.ID_PREFIX_CLASSIFICATION_HISTORY_EVENT),
classificationImpl,
- taskanaEngine.getEngine().getCurrentUserContext().getUserid(),
+ kadaiEngine.getEngine().getCurrentUserContext().getUserid(),
details));
}
if (LOGGER.isDebugEnabled()) {
@@ -285,13 +291,13 @@ public class ClassificationServiceImpl implements ClassificationService {
}
return classification;
} finally {
- taskanaEngine.returnConnection();
+ kadaiEngine.returnConnection();
}
}
@Override
public ClassificationQuery createClassificationQuery() {
- return new ClassificationQueryImpl(taskanaEngine);
+ return new ClassificationQueryImpl(kadaiEngine);
}
@Override
@@ -443,7 +449,7 @@ public class ClassificationServiceImpl implements ClassificationService {
}
if (classification.getType() != null
- && !taskanaEngine
+ && !kadaiEngine
.getEngine()
.getConfiguration()
.getClassificationTypes()
@@ -455,7 +461,7 @@ public class ClassificationServiceImpl implements ClassificationService {
}
if (classification.getCategory() != null
- && !taskanaEngine
+ && !kadaiEngine
.getEngine()
.getConfiguration()
.getClassificationCategoriesByType(classification.getType())
@@ -538,7 +544,7 @@ public class ClassificationServiceImpl implements ClassificationService {
private void updateCategoryOnAssociatedTasks(
ClassificationImpl classificationImpl, Classification oldClassification) {
List taskSummaries =
- taskanaEngine
+ kadaiEngine
.getEngine()
.getTaskService()
.createTaskQuery()
@@ -595,7 +601,7 @@ public class ClassificationServiceImpl implements ClassificationService {
ScheduledJob job = new ScheduledJob();
job.setArguments(args);
job.setType(ClassificationChangedJob.class.getName());
- taskanaEngine.getEngine().getJobService().createJob(job);
+ kadaiEngine.getEngine().getJobService().createJob(job);
}
}
}
diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/jobs/ClassificationChangedJob.java b/lib/kadai-core/src/main/java/io/kadai/classification/internal/jobs/ClassificationChangedJob.java
similarity index 73%
rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/jobs/ClassificationChangedJob.java
rename to lib/kadai-core/src/main/java/io/kadai/classification/internal/jobs/ClassificationChangedJob.java
index 2056c51bf..5e75d4ac8 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/jobs/ClassificationChangedJob.java
+++ b/lib/kadai-core/src/main/java/io/kadai/classification/internal/jobs/ClassificationChangedJob.java
@@ -1,26 +1,26 @@
-package pro.taskana.classification.internal.jobs;
+package io.kadai.classification.internal.jobs;
+import io.kadai.common.api.KadaiEngine;
+import io.kadai.common.api.ScheduledJob;
+import io.kadai.common.api.exceptions.KadaiException;
+import io.kadai.common.api.exceptions.SystemException;
+import io.kadai.common.internal.jobs.AbstractKadaiJob;
+import io.kadai.common.internal.transaction.KadaiTransactionProvider;
+import io.kadai.common.internal.util.CollectionUtil;
+import io.kadai.task.internal.TaskServiceImpl;
+import io.kadai.task.internal.jobs.TaskRefreshJob;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import pro.taskana.common.api.ScheduledJob;
-import pro.taskana.common.api.TaskanaEngine;
-import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.common.internal.jobs.AbstractTaskanaJob;
-import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
-import pro.taskana.common.internal.util.CollectionUtil;
-import pro.taskana.task.internal.TaskServiceImpl;
-import pro.taskana.task.internal.jobs.TaskRefreshJob;
/**
* This class executes a job of type {@linkplain
- * pro.taskana.classification.internal.jobs.ClassificationChangedJob}.
+ * io.kadai.classification.internal.jobs.ClassificationChangedJob}.
*/
-public class ClassificationChangedJob extends AbstractTaskanaJob {
+public class ClassificationChangedJob extends AbstractKadaiJob {
public static final String CLASSIFICATION_ID = "classificationId";
public static final String PRIORITY_CHANGED = "priorityChanged";
@@ -32,7 +32,7 @@ public class ClassificationChangedJob extends AbstractTaskanaJob {
private final boolean serviceLevelChanged;
public ClassificationChangedJob(
- TaskanaEngine engine, TaskanaTransactionProvider txProvider, ScheduledJob job) {
+ KadaiEngine engine, KadaiTransactionProvider txProvider, ScheduledJob job) {
super(engine, txProvider, job, false);
Map args = job.getArguments();
classificationId = args.get(CLASSIFICATION_ID);
@@ -41,10 +41,10 @@ public class ClassificationChangedJob extends AbstractTaskanaJob {
}
@Override
- public void execute() throws TaskanaException {
+ public void execute() throws KadaiException {
LOGGER.info("Running ClassificationChangedJob for classification ({})", classificationId);
try {
- TaskServiceImpl taskService = (TaskServiceImpl) taskanaEngineImpl.getTaskService();
+ TaskServiceImpl taskService = (TaskServiceImpl) kadaiEngineImpl.getTaskService();
List affectedTaskIds =
taskService.findTasksIdsAffectedByClassificationChange(classificationId);
if (!affectedTaskIds.isEmpty()) {
@@ -62,7 +62,7 @@ public class ClassificationChangedJob extends AbstractTaskanaJob {
}
private void scheduleTaskRefreshJobs(List affectedTaskIds) {
- int batchSize = taskanaEngineImpl.getConfiguration().getJobBatchSize();
+ int batchSize = kadaiEngineImpl.getConfiguration().getJobBatchSize();
Collection