> createDockerContainer(DB db) {
+ switch (db) {
+ case ORACLE:
+ return Optional.of(
+ new OracleContainer("gvenzl/oracle-xe:18-slim-faststart")
+ .withDatabaseName("kadai")
+ .withUsername("TEST_USER")
+ .withPassword("testPassword")
+ .withEnv("TZ", "Europe/Berlin"));
+ case DB2:
+ return Optional.of(
+ new Db2Container(
+ DockerImageName.parse("taskana/db2:11.5")
+ .asCompatibleSubstituteFor("ibmcom/db2"))
+ .waitingFor(
+ new LogMessageWaitStrategy()
+ .withRegEx(".*DB2START processing was successful.*")
+ .withStartupTimeout(Duration.of(60, SECONDS)))
+ .withUsername("db2inst1")
+ .withPassword("db2inst1-pwd")
+ .withDatabaseName("TSKDB"));
+ case POSTGRES:
+ return Optional.of(
+ new PostgreSQLContainer<>(DockerImageName.parse("postgres:14.7"))
+ .withUsername("postgres")
+ .withPassword("postgres")
+ .withDatabaseName("postgres")
+ .withCommand(
+ "/bin/sh",
+ "-c",
+ "localedef -i de_DE -c -f UTF-8 -A /usr/share/locale/locale.alias de_DE.UTF-8 "
+ + "&& export LANG=de_DE.UTF-8 "
+ + "&& /usr/local/bin/docker-entrypoint.sh postgres -c fsync=off")
+ .waitingFor(
+ new LogMessageWaitStrategy()
+ .withRegEx(".*Datenbanksystem ist bereit, um Verbindungen anzunehmen.*\\s")
+ .withTimes(2)
+ .withStartupTimeout(Duration.of(60, SECONDS))));
+ default:
+ return Optional.empty();
+ }
+ }
+
+ public static DataSource createDataSource(JdbcDatabaseContainer container) {
+ PooledDataSource ds =
+ new PooledDataSource(
+ Thread.currentThread().getContextClassLoader(),
+ container.getDriverClassName(),
+ container.getJdbcUrl(),
+ container.getUsername(),
+ container.getPassword());
+ ds.setPoolTimeToWait(50);
+ ds.forceCloseAll(); // otherwise, the MyBatis pool is not initialized correctly
+ return ds;
+ }
+}
diff --git a/common/kadai-common-test/src/main/java/io/kadai/common/test/OracleSchemaHelper.java b/common/kadai-common-test/src/main/java/io/kadai/common/test/OracleSchemaHelper.java
new file mode 100644
index 0000000000..9788cd7b55
--- /dev/null
+++ b/common/kadai-common-test/src/main/java/io/kadai/common/test/OracleSchemaHelper.java
@@ -0,0 +1,68 @@
+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;
+
+public final class OracleSchemaHelper {
+
+ private static final String DEFAULT_PASSWORD = "testPassword";
+
+ private OracleSchemaHelper() {
+ // hide implicitpublic one
+ }
+
+ public static void initOracleSchema(DataSource dataSource, String schemaName)
+ throws SystemException {
+ try (Connection connection = dataSource.getConnection();
+ // connect as SYSTEM user to create schemas
+ Connection conn =
+ DriverManager.getConnection(
+ connection.getMetaData().getURL(), "SYSTEM", DEFAULT_PASSWORD);
+ Statement stmt = conn.createStatement()) {
+ stmt.execute("GRANT ALL PRIVILEGES TO TEST_USER");
+
+ dropExistingSchema(schemaName, stmt);
+
+ stmt.addBatch(
+ String.format(
+ "create tablespace %s datafile '%s.dat' size 5M autoextend "
+ + "on NEXT 5M MAXSIZE UNLIMITED",
+ schemaName, schemaName));
+ stmt.addBatch(
+ String.format(
+ "create temporary tablespace %s_TMP tempfile '%s_tmp.dat' size 5M autoextend "
+ + "on NEXT 5M MAXSIZE UNLIMITED",
+ schemaName, schemaName));
+ stmt.addBatch(
+ String.format(
+ "create user %s identified by %s default tablespace %s "
+ + "temporary tablespace %s_TMP",
+ schemaName, DEFAULT_PASSWORD, schemaName, schemaName));
+ stmt.addBatch(String.format("ALTER USER %s quota unlimited on %s", schemaName, schemaName));
+ stmt.addBatch(String.format("GRANT UNLIMITED TABLESPACE TO %s", schemaName));
+ stmt.executeBatch();
+ } catch (Exception e) {
+ throw new SystemException("Failed to setup ORACLE Schema", e);
+ }
+ }
+
+ private static void dropExistingSchema(String schemaName, Statement stmt) {
+ try {
+ stmt.addBatch(String.format("DROP USER %s CASCADE", schemaName));
+ stmt.addBatch(
+ String.format(
+ "DROP TABLESPACE %s_TMP INCLUDING CONTENTS AND DATAFILES CASCADE CONSTRAINTS",
+ schemaName));
+ stmt.addBatch(
+ String.format(
+ "DROP TABLESPACE %s INCLUDING CONTENTS AND DATAFILES CASCADE CONSTRAINTS",
+ schemaName));
+ stmt.executeBatch();
+ } catch (Exception e) {
+ // IGNORE exceptions from dropping
+ }
+ }
+}
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 7d8fd16512..15bc3f1e02 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 static String getSchemaName() {
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 static DataSource createDataSourceForH2() {
}
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/kadai-common-test/src/main/java/io/kadai/common/test/security/JaasExtension.java b/common/kadai-common-test/src/main/java/io/kadai/common/test/security/JaasExtension.java
new file mode 100644
index 0000000000..5e55f17e7a
--- /dev/null
+++ b/common/kadai-common-test/src/main/java/io/kadai/common/test/security/JaasExtension.java
@@ -0,0 +1,331 @@
+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 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;
+import java.security.Principal;
+import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import javax.security.auth.Subject;
+import org.junit.jupiter.api.DynamicContainer;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.extension.DynamicTestInvocationContext;
+import org.junit.jupiter.api.extension.Extension;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.InvocationInterceptor;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
+import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
+import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
+import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.support.AnnotationSupport;
+import org.opentest4j.TestAbortedException;
+
+/** Runner for integration tests that enables JAAS subject. */
+public class JaasExtension implements InvocationInterceptor, TestTemplateInvocationContextProvider {
+
+ private static final String ACCESS_IDS_STORE_KEY = "accessIds";
+
+ // region InvocationInterceptor
+
+ @Override
+ public T interceptTestClassConstructor(
+ Invocation invocation,
+ ReflectiveInvocationContext> invocationContext,
+ ExtensionContext extensionContext) {
+ return extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
+ }
+
+ @Override
+ public void interceptBeforeAllMethod(
+ Invocation invocation,
+ ReflectiveInvocationContext invocationContext,
+ ExtensionContext extensionContext) {
+ extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
+ }
+
+ @Override
+ public void interceptBeforeEachMethod(
+ Invocation invocation,
+ ReflectiveInvocationContext invocationContext,
+ ExtensionContext extensionContext) {
+ extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
+ }
+
+ @Override
+ public void interceptTestMethod(
+ Invocation invocation,
+ ReflectiveInvocationContext invocationContext,
+ ExtensionContext extensionContext) {
+ if (isAnnotated(invocationContext.getExecutable(), WithAccessIds.class)) {
+ throw new JUnitException("Please use @TestTemplate instead of @Test for multiple accessIds");
+ }
+ extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public T interceptTestFactoryMethod(
+ Invocation invocation,
+ ReflectiveInvocationContext invocationContext,
+ ExtensionContext extensionContext) {
+ WithAccessIds annotation = invocationContext.getExecutable().getAnnotation(WithAccessIds.class);
+ if (annotation != null) {
+ // our goal is to run each test returned from the test factory X times. X is the amount of
+ // WithAccessId annotations. In order to achieve this we are wrapping the result from the
+ // factory (the returning tests) in a dynamicContainer for each accessId. Since we don't know
+ // what the factory will return we have to check for every possible return type. All possible
+ // return types can be found here:
+ // https://junit.org/junit5/docs/current/user-guide/#writing-tests-dynamic-tests
+ // After checking each return type we abuse the return type of T and hardly change it to
+ // Stream no matter what the factory returns. This return type is allowed
+ // per definition (See link above), but is not the type T. Hence we have an unchecked cast at
+ // the end to keep the compiler happy...
+
+ // we are using the first annotation to run the factory method with.
+ T factoryResult = performInvocationWithAccessId(invocation, annotation.value()[0]);
+
+ Iterable newChildrenForDynamicContainer;
+ // TestFactory must have one of the following return types. See link above for further details
+ if (factoryResult instanceof DynamicNode) {
+ newChildrenForDynamicContainer = Collections.singleton((DynamicNode) factoryResult);
+ } else if (factoryResult instanceof Stream) {
+ Stream nodes = (Stream) factoryResult;
+ newChildrenForDynamicContainer = nodes.toList();
+ } else if (factoryResult instanceof Iterable) {
+ newChildrenForDynamicContainer = (Iterable) factoryResult;
+ } else if (factoryResult instanceof Iterator) {
+ newChildrenForDynamicContainer = () -> (Iterator) factoryResult;
+ } else if (factoryResult instanceof DynamicNode[]) {
+ newChildrenForDynamicContainer = Arrays.asList((DynamicNode[]) factoryResult);
+ } else {
+ throw new SystemException(
+ String.format(
+ "Testfactory '%s' did not return a proper type",
+ invocationContext.getExecutable().getName()));
+ }
+
+ // Currently, a DynamicContainer has children from this type: Stream
+ // Because of this the children can only be extracted once (Streams can only be operated
+ // once). This is obviously not ok since we want to execute each node X times. So we have to
+ // manually insert all children recursively to extract them X times...
+ Map> childrenMap = new HashMap<>();
+ persistDynamicContainerChildren(newChildrenForDynamicContainer, childrenMap);
+
+ Function wrapTestsInDynamicContainer =
+ accessId ->
+ DynamicContainer.dynamicContainer(
+ getDisplayNameForAccessId(accessId),
+ StreamSupport.stream(newChildrenForDynamicContainer.spliterator(), false)
+ .map(x -> duplicateDynamicNode(x, childrenMap)));
+
+ Store store = getMethodLevelStore(extensionContext);
+ return (T)
+ Stream.of(annotation.value())
+ .map(
+ a -> {
+ store.put(ACCESS_IDS_STORE_KEY, a);
+ return wrapTestsInDynamicContainer.apply(a);
+ });
+ }
+
+ return extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
+ }
+
+ @Override
+ public void interceptTestTemplateMethod(
+ Invocation invocation,
+ ReflectiveInvocationContext invocationContext,
+ ExtensionContext extensionContext) {
+ WithAccessId accessId =
+ getMethodLevelStore(extensionContext).get(ACCESS_IDS_STORE_KEY, WithAccessId.class);
+ performInvocationWithAccessId(invocation, accessId);
+ }
+
+ @Override
+ public void interceptDynamicTest(
+ Invocation invocation,
+ DynamicTestInvocationContext invocationContext,
+ ExtensionContext extensionContext) {
+ ExtensionContext testContext = getParentMethodExtensionContent(extensionContext);
+ // Check if the test factory provided an access Id for this dynamic test.
+ WithAccessId o = getMethodLevelStore(testContext).get(ACCESS_IDS_STORE_KEY, WithAccessId.class);
+ if (o != null) {
+ performInvocationWithAccessId(invocation, o);
+ } else {
+ extractAccessIdAndPerformInvocation(invocation, testContext.getRequiredTestMethod());
+ }
+ }
+
+ @Override
+ public void interceptAfterEachMethod(
+ Invocation invocation,
+ ReflectiveInvocationContext invocationContext,
+ ExtensionContext extensionContext) {
+ extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
+ }
+
+ @Override
+ public void interceptAfterAllMethod(
+ Invocation invocation,
+ ReflectiveInvocationContext invocationContext,
+ ExtensionContext extensionContext) {
+ extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
+ }
+
+ // endregion
+
+ // region TestTemplateInvocationContextProvider
+
+ @Override
+ public boolean supportsTestTemplate(ExtensionContext context) {
+ return isAnnotated(context.getElement(), WithAccessIds.class)
+ || isAnnotated(context.getElement(), WithAccessId.class);
+ }
+
+ @Override
+ public Stream provideTestTemplateInvocationContexts(
+ ExtensionContext context) {
+ List accessIds =
+ AnnotationSupport.findRepeatableAnnotations(context.getElement(), WithAccessId.class);
+ Store store = getMethodLevelStore(context);
+ return accessIds.stream()
+ .map(
+ a -> {
+ store.put(ACCESS_IDS_STORE_KEY, a);
+ return new JaasExtensionInvocationContext(a);
+ });
+ }
+
+ // endregion
+
+ private static void persistDynamicContainerChildren(
+ Iterable nodes, Map> childrenMap) {
+ nodes.forEach(
+ node -> {
+ if (node instanceof DynamicContainer) {
+ DynamicContainer container = (DynamicContainer) node;
+ List children = container.getChildren().collect(Collectors.toList());
+ childrenMap.put(container.hashCode() + container.getDisplayName(), children);
+ persistDynamicContainerChildren(children, childrenMap);
+ }
+ });
+ }
+
+ private static DynamicNode duplicateDynamicNode(
+ DynamicNode node, Map> lookupMap) {
+ if (node instanceof DynamicContainer) {
+ DynamicContainer container = (DynamicContainer) node;
+ Stream children =
+ lookupMap.get(node.hashCode() + node.getDisplayName()).stream()
+ .map(x -> duplicateDynamicNode(x, lookupMap));
+ return DynamicContainer.dynamicContainer(container.getDisplayName(), children);
+ }
+ return node;
+ }
+
+ private static T extractAccessIdAndPerformInvocation(
+ Invocation invocation, AnnotatedElement executable) {
+ return performInvocationWithAccessId(invocation, executable.getAnnotation(WithAccessId.class));
+ }
+
+ private static T performInvocationWithAccessId(
+ Invocation invocation, WithAccessId withAccessId) {
+ Subject subject = new Subject();
+ subject.getPrincipals().addAll(getPrincipals(withAccessId));
+
+ Function, T> proceedInvocation =
+ wrapExceptFor(Invocation::proceed, TestAbortedException.class);
+ PrivilegedAction performInvocation = () -> proceedInvocation.apply(invocation);
+ return Subject.doAs(subject, performInvocation);
+ }
+
+ private static List getPrincipals(WithAccessId withAccessId) {
+ if (withAccessId != null) {
+ return Stream.concat(
+ Stream.of(withAccessId.user()).map(UserPrincipal::new),
+ Arrays.stream(withAccessId.groups()).map(GroupPrincipal::new))
+ .toList();
+ }
+ return Collections.emptyList();
+ }
+
+ private ExtensionContext getParentMethodExtensionContent(ExtensionContext extensionContext) {
+ Optional parent = extensionContext.getParent();
+ // the class MethodExtensionContext is part of junit-jupiter-engine and has only a
+ // package-private visibility thus this workaround is needed.
+ while (!parent
+ .map(Object::getClass)
+ .map(Class::getName)
+ .filter(s -> s.endsWith("MethodExtensionContext"))
+ .isPresent()) {
+ parent = parent.flatMap(ExtensionContext::getParent);
+ }
+ return parent.orElseThrow(
+ () ->
+ new JUnitException(
+ String.format(
+ "Test '%s' does not have a parent method", extensionContext.getUniqueId())));
+ }
+
+ private static Store getMethodLevelStore(ExtensionContext context) {
+ return context.getStore(
+ Namespace.create(context.getRequiredTestClass(), context.getRequiredTestMethod()));
+ }
+
+ private static String getDisplayNameForAccessId(WithAccessId withAccessId) {
+ return String.format("for user '%s'", withAccessId.user());
+ }
+
+ private static class JaasExtensionInvocationContext implements TestTemplateInvocationContext {
+ private final WithAccessId withAccessId;
+
+ private JaasExtensionInvocationContext(WithAccessId withAccessId) {
+ this.withAccessId = withAccessId;
+ }
+
+ @Override
+ public String getDisplayName(int invocationIndex) {
+ return getDisplayNameForAccessId(withAccessId);
+ }
+
+ @Override
+ public List getAdditionalExtensions() {
+ return Collections.singletonList(new WithAccessIdParameterResolver());
+ }
+
+ private class WithAccessIdParameterResolver implements ParameterResolver {
+ @Override
+ public boolean supportsParameter(
+ ParameterContext parameterContext, ExtensionContext extensionContext) {
+ return parameterContext.getParameter().getType().equals(WithAccessId.class);
+ }
+
+ @Override
+ public Object resolveParameter(
+ ParameterContext parameterContext, ExtensionContext extensionContext) {
+ return withAccessId;
+ }
+ }
+ }
+}
diff --git a/common/kadai-common-test/src/main/java/io/kadai/common/test/security/WithAccessId.java b/common/kadai-common-test/src/main/java/io/kadai/common/test/security/WithAccessId.java
new file mode 100644
index 0000000000..e20d6ded3d
--- /dev/null
+++ b/common/kadai-common-test/src/main/java/io/kadai/common/test/security/WithAccessId.java
@@ -0,0 +1,26 @@
+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;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
+@Repeatable(WithAccessIds.class)
+public @interface WithAccessId {
+
+ String user();
+
+ String[] groups() default {};
+
+ String[] permissions() default {};
+
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target(ElementType.METHOD)
+ @interface WithAccessIds {
+ WithAccessId[] value();
+ }
+}
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 09cbab7604..7cb705feb3 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/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTest.java b/common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTest.java
new file mode 100644
index 0000000000..53e01ca7ec
--- /dev/null
+++ b/common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTest.java
@@ -0,0 +1,735 @@
+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;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicContainer;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+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;
+
+@ExtendWith(JaasExtension.class)
+class JaasExtensionTest {
+
+ private static final String INSIDE_DYNAMIC_TEST_USER = "inside_dynamic_test";
+ private static final CurrentUserContext CURRENT_USER_CONTEXT = new CurrentUserContextImpl(true);
+ private static final DynamicTest NOT_NULL_DYNAMIC_TEST =
+ dynamicTest("dynamic test", () -> assertThat(CURRENT_USER_CONTEXT.getUserid()).isNotNull());
+ private static final DynamicTest NULL_DYNAMIC_TEST =
+ dynamicTest("dynamic test", () -> assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull());
+ private static final DynamicTest DYNAMIC_TEST_USER_DYNAMIC_TEST =
+ dynamicTest(
+ "dynamic test",
+ () -> assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo(INSIDE_DYNAMIC_TEST_USER));
+
+ // region JaasExtension#interceptBeforeAllMethod
+
+ @BeforeAll
+ static void should_NotSetJaasSubject_When_AnnotationIsMissing_On_BeforeAll() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ @WithAccessId(user = "beforeall")
+ @BeforeAll
+ static void should_SetJaasSubject_When_AnnotationExists_On_BeforeAll() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("beforeall");
+ }
+
+ @WithAccessId(user = "beforeall")
+ @WithAccessId(user = "beforeall2")
+ @BeforeAll
+ static void should_NotSetJaasSubject_When_MultipleAnnotationsExist_On_BeforeAll() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ // endregion
+
+ // region JaasExtension#interceptBeforeEachMethod
+
+ @BeforeEach
+ void should_NotSetJaasSubject_When_AnnotationIsMissing_On_BeforeEach() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ @WithAccessId(user = "beforeeach")
+ @BeforeEach
+ void should_SetJaasSubject_When_AnnotationExists_On_BeforeEach() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("beforeeach");
+ }
+
+ @WithAccessId(user = "beforeeach")
+ @WithAccessId(user = "beforeeach2")
+ @BeforeEach
+ void should_NotSetJaasSubject_When_MultipleAnnotationsExist_On_BeforeEach() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ // endregion
+
+ // region JaasExtension#interceptAfterEachMethod
+
+ @AfterEach
+ void should_NotSetJaasSubject_When_AnnotationIsMissing_On_AfterEach() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ @WithAccessId(user = "aftereach")
+ @AfterEach
+ void should_SetJaasSubject_When_AnnotationExists_On_AfterEach() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("aftereach");
+ }
+
+ @WithAccessId(user = "aftereach")
+ @WithAccessId(user = "afterach2")
+ @AfterEach
+ void should_NotSetJaasSubject_When_MultipleAnnotationsExist_On_AfterEach() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ // endregion
+
+ // region JaasExtension#interceptAfterAllMethod
+
+ @AfterAll
+ static void should_NotSetJaasSubject_When_AnnotationIsMissing_On_AfterAll() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ @WithAccessId(user = "afterall")
+ @AfterAll
+ static void should_SetJaasSubject_When_AnnotationExists_On_AfterAll() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("afterall");
+ }
+
+ @WithAccessId(user = "afterall")
+ @WithAccessId(user = "afterall2")
+ @AfterAll
+ static void should_NotSetJaasSubject_When_MultipleAnnotationsExist_On_AfterAll() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ // endregion
+
+ // region JaasExtension#interceptTestMethod
+
+ @Test
+ void should_NotSetJaasSubject_When_AnnotationIsMissing_On_Test() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ @WithAccessId(user = "user")
+ @Test
+ void should_SetJaasSubject_When_AnnotationExists_On_Test() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("user");
+ assertThat(CURRENT_USER_CONTEXT.getGroupIds()).isEmpty();
+ }
+
+ @WithAccessId(
+ user = "user",
+ groups = {"group1", "group2"})
+ @Test
+ void should_SetJaasSubjectWithGroups_When_AnnotationExistsWithGroups_On_Test() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("user");
+ assertThat(CURRENT_USER_CONTEXT.getGroupIds()).containsExactlyInAnyOrder("group1", "group2");
+ }
+
+ @WithAccessId(user = "user")
+ @Test
+ @ExtendWith(ShouldThrowParameterResolutionException.class)
+ void should_NotInjectParameter_When_TestTemplateIsNotUsed(
+ @SuppressWarnings("unused") WithAccessId accessId) {
+ // THIS IS NOT RELEVANT
+ assertThat(true).isTrue();
+ }
+
+ @WithAccessId(user = "user")
+ @WithAccessId(user = "user2")
+ @Test
+ @ExtendWith(ShouldThrowJunitException.class)
+ void should_ThrowJunitException_When_MultipleAnnotationsExist_On_Test() {
+ // THIS IS NOT RELEVANT
+ assertThat(true).isTrue();
+ }
+
+ // endregion
+
+ // region JaasExtension#interceptTestFactory
+
+ @TestFactory
+ List should_NotSetJaasSubject_When_AnnotationIsMissing_On_TestFactory() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ return List.of();
+ }
+
+ @WithAccessId(user = "testfactory")
+ @TestFactory
+ List should_SetJaasSubject_When_AnnotationExists_On_TestFactory() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("testfactory");
+ return List.of();
+ }
+
+ @WithAccessId(user = "testfactory1")
+ @WithAccessId(user = "testfactory2")
+ @TestFactory
+ List
+ should_SetJaasSubjectFromFirstAnnotation_When_MultipleAnnotationsExists_On_TestFactory() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("testfactory1");
+ return List.of();
+ }
+
+ // endregion
+
+ // region JaasExtension#interceptTestTemplateMethod
+
+ @WithAccessId(user = "testtemplate")
+ @TestTemplate
+ void should_SetJaasSubject_When_AnnotationExists_On_TestTemplate() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("testtemplate");
+ }
+
+ @WithAccessId(user = "testtemplate1")
+ @WithAccessId(user = "testtemplate2")
+ @WithAccessId(user = "testtemplate3")
+ @TestTemplate
+ void should_SetMultipleJaasSubjects_When_MultipleAnnotationsExist_On_TestTemplate(
+ WithAccessId accessId) {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo(accessId.user());
+ }
+
+ @WithAccessId(user = "testtemplate1", groups = "abc", permissions = "perm")
+ @TestTemplate
+ void should_InjectCorrectAccessId_When_AnnotationExists_On_TestTemplate(WithAccessId accessId) {
+ assertThat(accessId.user()).isEqualTo("testtemplate1");
+ assertThat(accessId.groups()).containsExactly("abc");
+ assertThat(accessId.permissions()).containsExactly("perm");
+ }
+
+ // endregion
+
+ // region JaasExtension#interceptDynamicTest
+
+ // region RETURNING DynamicNode
+
+ // WITH DynamicTest
+
+ @TestFactory
+ DynamicTest should_NotSetAccessIdForDynamicTest_When_AnnotationIsMissing() {
+ return NULL_DYNAMIC_TEST;
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicTest should_SetAccessIdForDynamicTest_When_AnnotationExists() {
+ return DYNAMIC_TEST_USER_DYNAMIC_TEST;
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicTest should_SetMultipleAccessIdForDynamicTest_When_AnnotationsExist() {
+ return NOT_NULL_DYNAMIC_TEST;
+ }
+
+ // WITH DynamicContainer
+
+ @TestFactory
+ DynamicContainer should_NotSetAccessIdForDynamicContainer_When_AnnotationIsMissing() {
+ return dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicContainer should_SetAccessIdForDynamicContainer_When_AnnotationExists() {
+ return dynamicContainer(
+ "dynamic container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicContainer should_SetMultipleAccessIdForDynamicContainer_When_AnnotationsExist() {
+ return dynamicContainer(
+ "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ }
+
+ // WITH nested DynamicContainer
+
+ @TestFactory
+ DynamicContainer should_NotSetAccessIdForNestedDynamicContainer_When_AnnotationIsMissing() {
+ DynamicContainer container =
+ dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ return dynamicContainer("outside container", Stream.of(container, NULL_DYNAMIC_TEST));
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicContainer should_SetAccessIdForNestedDynamicContainer_When_AnnotationExists() {
+ DynamicContainer container =
+ dynamicContainer(
+ "nested container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ return dynamicContainer(
+ "outside container", Stream.of(container, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicContainer should_SetMultipleAccessIdForNestedDynamicContainer_When_AnnotationsExist() {
+ DynamicContainer container =
+ dynamicContainer(
+ "inside container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ return dynamicContainer("outside container", Stream.of(container, NOT_NULL_DYNAMIC_TEST));
+ }
+
+ // endregion
+
+ // region RETURNING Stream
+
+ @TestFactory
+ Stream should_NotSetAccessIdForDynamicTestInStream_When_AnnotationIsMissing() {
+ return Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Stream should_SetAccessIdForDynamicTestInStream_When_AnnotationExists() {
+ return Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Stream should_SetMultipleAccessIdForDynamicTestInStream_When_AnnotationsExist() {
+ return Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST);
+ }
+
+ // WITH DynamicContainer
+
+ @TestFactory
+ Stream
+ should_NotSetAccessIdForDynamicContainerInStream_When_AnnotationIsMissing() {
+ Supplier supplier =
+ () ->
+ dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Stream should_SetAccessIdForDynamicContainerInStream_When_AnnotationExists() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "dynamic container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Stream
+ should_SetMultipleAccessIdForDynamicContainerInStream_When_AnnotationsExist() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2);
+ }
+
+ // WITH nested DynamicContainer
+
+ @TestFactory
+ Stream
+ should_NotSetAccessIdForNestedDynamicContainerInStream_When_AnnotationIsMissing() {
+ Supplier supplier =
+ () -> dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () -> dynamicContainer("outside container", Stream.of(supplier.get(), NULL_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Stream
+ should_SetAccessIdForNestedDynamicContainerInStream_When_AnnotationExists() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "inside container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () ->
+ dynamicContainer(
+ "outside container", Stream.of(supplier.get(), DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Stream
+ should_SetMultipleAccessIdForNestedDynamicContainerInStream_When_AnnotationsExist() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "inside container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () ->
+ dynamicContainer("outside container", Stream.of(supplier.get(), NOT_NULL_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2);
+ }
+
+ // endregion
+
+ // region RETURNING Iterable
+
+ @TestFactory
+ Iterable should_NotSetAccessIdForDynamicTestInIterable_When_AnnotationIsMissing() {
+ return Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST).toList();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterable should_SetAccessIdForDynamicTestInIterable_When_AnnotationExists() {
+ return Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST)
+ .toList();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterable should_SetMultipleAccessIdForDynamicTestInIterable_When_AnnotationsExist() {
+ return Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST).toList();
+ }
+
+ // WITH DynamicContainer
+
+ @TestFactory
+ Iterable
+ should_NotSetAccessIdForDynamicContainerInIterable_When_AnnotationIsMissing() {
+ Supplier supplier =
+ () ->
+ dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2).toList();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterable
+ should_SetAccessIdForDynamicContainerInIterable_When_AnnotationExists() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "dynamic container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2).toList();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterable
+ should_SetMultipleAccessIdForDynamicContainerInIterable_When_AnnotationsExist() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2).toList();
+ }
+
+ // WITH nested DynamicContainer
+
+ @TestFactory
+ Iterable
+ should_NotSetAccessIdForNestedDynamicContainerInIterable_When_AnnotationIsMissing() {
+ Supplier supplier =
+ () -> dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () -> dynamicContainer("outside container", Stream.of(supplier.get(), NULL_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2).toList();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterable
+ should_SetAccessIdForNestedDynamicContainerInIterable_When_AnnotationExists() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "inside container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () ->
+ dynamicContainer(
+ "outside container", Stream.of(supplier.get(), DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2).toList();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterable
+ should_SetMultipleAccessIdForNestedDynamicContainerInIterable_When_AnnotationsExist() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "inside container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () ->
+ dynamicContainer("outside container", Stream.of(supplier.get(), NOT_NULL_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2).toList();
+ }
+
+ // endregion
+
+ // region RETURNING Iterator
+
+ @TestFactory
+ Iterator should_NotSetAccessIdForDynamicTestInIterator_When_AnnotationIsMissing() {
+ return Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST).iterator();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterator should_SetAccessIdForDynamicTestInIterator_When_AnnotationExists() {
+ return Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST).iterator();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterator should_SetMultipleAccessIdForDynamicTestInIterator_When_AnnotationsExist() {
+ return Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST).iterator();
+ }
+
+ // WITH DynamicContainer
+
+ @TestFactory
+ Iterator
+ should_NotSetAccessIdForDynamicContainerInIterator_When_AnnotationIsMissing() {
+ Supplier supplier =
+ () ->
+ dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2).iterator();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterator
+ should_SetAccessIdForDynamicContainerInIterator_When_AnnotationExists() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "dynamic container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2).iterator();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterator
+ should_SetMultipleAccessIdForDynamicContainerInIterator_When_AnnotationsExist() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2).iterator();
+ }
+
+ // WITH nested DynamicContainer
+
+ @TestFactory
+ Iterator
+ should_NotSetAccessIdForNestedDynamicContainerInIterator_When_AnnotationIsMissing() {
+ Supplier supplier =
+ () -> dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () -> dynamicContainer("outside container", Stream.of(supplier.get(), NULL_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2).iterator();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterator
+ should_SetAccessIdForNestedDynamicContainerInIterator_When_AnnotationExists() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "inside container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () ->
+ dynamicContainer(
+ "outside container", Stream.of(supplier.get(), DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2).iterator();
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ Iterator
+ should_SetMultipleAccessIdForNestedDynamicContainerInIterator_When_AnnotationsExist() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "inside container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () ->
+ dynamicContainer("outside container", Stream.of(supplier.get(), NOT_NULL_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2).iterator();
+ }
+
+ // endregion
+
+ // region RETURNING DynamicNode[]
+
+ @TestFactory
+ DynamicTest[] should_NotSetAccessIdForDynamicTestInArray_When_AnnotationIsMissing() {
+ return Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST).toArray(DynamicTest[]::new);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicTest[] should_SetAccessIdForDynamicTestInArray_When_AnnotationExists() {
+ return Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST)
+ .toArray(DynamicTest[]::new);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicTest[] should_SetMultipleAccessIdForDynamicTestInArray_When_AnnotationsExist() {
+ return Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST).toArray(DynamicTest[]::new);
+ }
+
+ // WITH DynamicContainer
+
+ @TestFactory
+ DynamicContainer[] should_NotSetAccessIdForDynamicContainerInArray_When_AnnotationIsMissing() {
+ Supplier supplier =
+ () ->
+ dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2).toArray(DynamicContainer[]::new);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicContainer[] should_SetAccessIdForDynamicContainerInArray_When_AnnotationExists() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "dynamic container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2).toArray(DynamicContainer[]::new);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicContainer[] should_SetMultipleAccessIdForDynamicContainerInArray_When_AnnotationsExist() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ return Stream.generate(supplier).limit(2).toArray(DynamicContainer[]::new);
+ }
+
+ // WITH nested DynamicContainer
+
+ @TestFactory
+ DynamicContainer[]
+ should_NotSetAccessIdForNestedDynamicContainerInArray_When_AnnotationIsMissing() {
+ Supplier supplier =
+ () -> dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () -> dynamicContainer("outside container", Stream.of(supplier.get(), NULL_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2).toArray(DynamicContainer[]::new);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicContainer[] should_SetAccessIdForNestedDynamicContainerInArray_When_AnnotationExists() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "inside container",
+ Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () ->
+ dynamicContainer(
+ "outside container", Stream.of(supplier.get(), DYNAMIC_TEST_USER_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2).toArray(DynamicContainer[]::new);
+ }
+
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
+ @TestFactory
+ DynamicContainer[]
+ should_SetMultipleAccessIdForNestedDynamicContainerInArray_When_AnnotationsExist() {
+ Supplier supplier =
+ () ->
+ dynamicContainer(
+ "inside container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
+ Supplier outsideSupplier =
+ () ->
+ dynamicContainer("outside container", Stream.of(supplier.get(), NOT_NULL_DYNAMIC_TEST));
+ return Stream.generate(outsideSupplier).limit(2).toArray(DynamicContainer[]::new);
+ }
+
+ // endregion
+
+ // region JaasExtension#interceptTestClassConstructor
+
+ @Nested
+ @TestInstance(Lifecycle.PER_CLASS)
+ class ConstructorWithoutAccessId {
+ ConstructorWithoutAccessId() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+
+ @Test
+ void should_NotSetJaasSubject_When_AnnotationIsMissing_On_Constructor() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+ }
+
+ @Nested
+ @TestInstance(Lifecycle.PER_CLASS)
+ class ConstructorWithAccessId {
+ @WithAccessId(user = "constructor")
+ ConstructorWithAccessId() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("constructor");
+ }
+
+ @Test
+ void should_SetJaasSubject_When_AnnotationExists_On_Constructor() {
+ assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
+ }
+ }
+
+ // endregion
+
+ // endregion
+}
diff --git a/common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTestExtensions.java b/common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTestExtensions.java
new file mode 100644
index 0000000000..d7d1d375e3
--- /dev/null
+++ b/common/kadai-common-test/src/test/java/io/kadai/common/test/security/JaasExtensionTestExtensions.java
@@ -0,0 +1,37 @@
+package io.kadai.common.test.security;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;
+import org.junit.platform.commons.JUnitException;
+
+public class JaasExtensionTestExtensions {
+ static class ShouldThrowParameterResolutionException implements TestExecutionExceptionHandler {
+
+ @Override
+ public void handleTestExecutionException(ExtensionContext context, Throwable throwable)
+ throws Throwable {
+ if (throwable instanceof ParameterResolutionException) {
+ return;
+ }
+ throw throwable;
+ }
+ }
+
+ static class ShouldThrowJunitException implements TestExecutionExceptionHandler {
+
+ @Override
+ public void handleTestExecutionException(ExtensionContext context, Throwable throwable)
+ throws Throwable {
+ if (throwable instanceof JUnitException) {
+ JUnitException exception = (JUnitException) throwable;
+ assertThat(exception.getMessage())
+ .isEqualTo("Please use @TestTemplate instead of @Test for multiple accessIds");
+ return;
+ }
+ throw throwable;
+ }
+ }
+}
diff --git a/common/kadai-common/pom.xml b/common/kadai-common/pom.xml
new file mode 100644
index 0000000000..5cf2f2b302
--- /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 d5d90b5ed4..1bb4a86c52 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 67c0603e1e..a5b50f8596 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 0a7b93e15b..c0509f3ab1 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 adabce0959..7403a224f7 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 0000000000..266f6497e3
--- /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 cb224e1379..1e86f04452 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 8ead568355..2e0332a7b5 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 69813087a3..173518366b 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 155cc19eb5..87d91c969e 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 853fda9049..e423f27a8a 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/kadai-common/src/main/java/io/kadai/common/api/exceptions/AutocommitFailedException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/AutocommitFailedException.java
new file mode 100644
index 0000000000..7aa8ed8a64
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/AutocommitFailedException.java
@@ -0,0 +1,14 @@
+package io.kadai.common.api.exceptions;
+
+/**
+ * This exception is thrown when using KADAI with the AUTOCOMMIT ConnectionManagementMode and an
+ * attempt to commit fails.
+ */
+public class AutocommitFailedException extends KadaiRuntimeException {
+
+ public static final String ERROR_KEY = "CONNECTION_AUTOCOMMIT_FAILED";
+
+ public AutocommitFailedException(Throwable cause) {
+ super("Autocommit failed", ErrorCode.of(ERROR_KEY), cause);
+ }
+}
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 a7c59f2c78..f9dcebedfb 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 @@
* 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 0000000000..0d54353225
--- /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 717e2d5b85..1560e3a2cc 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 6a0a76110b..06dd0480f0 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/kadai-common/src/main/java/io/kadai/common/api/exceptions/InvalidArgumentException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/InvalidArgumentException.java
new file mode 100644
index 0000000000..ae402b5ebb
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/InvalidArgumentException.java
@@ -0,0 +1,15 @@
+package io.kadai.common.api.exceptions;
+
+/** This exception is thrown when a method is called with an invalid argument. */
+public class InvalidArgumentException extends KadaiRuntimeException {
+
+ public static final String ERROR_KEY = "INVALID_ARGUMENT";
+
+ public InvalidArgumentException(String msg) {
+ this(msg, null);
+ }
+
+ public InvalidArgumentException(String msg, Throwable cause) {
+ super(msg, ErrorCode.of(ERROR_KEY), cause);
+ }
+}
diff --git a/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiException.java
new file mode 100644
index 0000000000..d1050613ad
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiException.java
@@ -0,0 +1,36 @@
+package io.kadai.common.api.exceptions;
+
+import java.io.Serializable;
+
+/** common base class for KADAI's checked exceptions. */
+public class KadaiException extends Exception {
+
+ private final ErrorCode errorCode;
+
+ protected KadaiException(String message, ErrorCode errorCode) {
+ this(message, errorCode, null);
+ }
+
+ protected KadaiException(String message, ErrorCode errorCode, Throwable cause) {
+ super(message, cause);
+ this.errorCode = errorCode;
+ }
+
+ public ErrorCode getErrorCode() {
+ return errorCode;
+ }
+
+ protected static Serializable ensureNullIsHandled(Serializable o) {
+ return o == null ? "null" : o;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName()
+ + " [errorCode="
+ + errorCode
+ + ", message="
+ + getMessage()
+ + "]";
+ }
+}
diff --git a/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiRuntimeException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiRuntimeException.java
new file mode 100644
index 0000000000..c3ad948ce6
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/KadaiRuntimeException.java
@@ -0,0 +1,36 @@
+package io.kadai.common.api.exceptions;
+
+import java.io.Serializable;
+
+/** The common base class for KADAI's runtime exceptions. */
+public class KadaiRuntimeException extends RuntimeException {
+
+ private final ErrorCode errorCode;
+
+ protected KadaiRuntimeException(String message, ErrorCode errorCode) {
+ this(message, errorCode, null);
+ }
+
+ protected KadaiRuntimeException(String message, ErrorCode errorCode, Throwable cause) {
+ super(message, cause);
+ this.errorCode = errorCode;
+ }
+
+ public ErrorCode getErrorCode() {
+ return errorCode;
+ }
+
+ protected static Serializable ensureNullIsHandled(Serializable o) {
+ return o == null ? "null" : o;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName()
+ + " [errorCode="
+ + errorCode
+ + ", message="
+ + getMessage()
+ + "]";
+ }
+}
diff --git a/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/NotAuthorizedException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/NotAuthorizedException.java
new file mode 100644
index 0000000000..2f954ec720
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/NotAuthorizedException.java
@@ -0,0 +1,39 @@
+package io.kadai.common.api.exceptions;
+
+import io.kadai.common.api.KadaiRole;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 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 KadaiException {
+
+ public static final String ERROR_KEY = "NOT_AUTHORIZED";
+ private final String currentUserId;
+ private final KadaiRole[] roles;
+
+ public NotAuthorizedException(String currentUserId, KadaiRole... roles) {
+ super(
+ String.format(
+ "Not authorized. The current user '%s' is not member of role(s) '%s'.",
+ currentUserId, Arrays.toString(roles)),
+ ErrorCode.of(
+ ERROR_KEY,
+ Map.ofEntries(
+ Map.entry("roles", ensureNullIsHandled(roles)),
+ Map.entry("currentUserId", ensureNullIsHandled(currentUserId)))));
+
+ this.currentUserId = currentUserId;
+ this.roles = roles;
+ }
+
+ public KadaiRole[] getRoles() {
+ return roles;
+ }
+
+ public String getCurrentUserId() {
+ return currentUserId;
+ }
+}
diff --git a/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/SystemException.java b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/SystemException.java
new file mode 100644
index 0000000000..d7e39c646f
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/api/exceptions/SystemException.java
@@ -0,0 +1,15 @@
+package io.kadai.common.api.exceptions;
+
+/** 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";
+
+ public SystemException(String msg) {
+ this(msg, null);
+ }
+
+ public SystemException(String msg, Throwable cause) {
+ super(msg, ErrorCode.of(ERROR_KEY), cause);
+ }
+}
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 12d470493e..87a67f5bb1 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 0f8b1bfd1e..51d8921836 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 bdbf4d2a3e..3eb6a3ac68 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 0bacfa9cfb..ee53fe8780 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 e79c231693..4b8ac9424a 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.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 boolean isValidSchemaVersion(String expectedMinVersion) {
}
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 boolean isValidSchemaVersion(String expectedMinVersion) {
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 boolean isValidSchemaVersion(String expectedMinVersion) {
} 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/kadai-common/src/main/java/io/kadai/common/internal/configuration/KadaiProperty.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/KadaiProperty.java
new file mode 100644
index 0000000000..40dca7589f
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/KadaiProperty.java
@@ -0,0 +1,13 @@
+package io.kadai.common.internal.configuration;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+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 52c59e916b..fc50b1c8a3 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/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/CustomHolidayParser.java b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/CustomHolidayParser.java
new file mode 100644
index 0000000000..34f4432f2a
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/configuration/parser/CustomHolidayParser.java
@@ -0,0 +1,19 @@
+package io.kadai.common.internal.configuration.parser;
+
+import io.kadai.common.api.CustomHoliday;
+import io.kadai.common.api.exceptions.WrongCustomHolidayFormatException;
+import java.util.List;
+
+public class CustomHolidayParser extends SimpleParser {
+ public CustomHolidayParser() {
+ super(CustomHoliday.class, CustomHolidayParser::parse);
+ }
+
+ private static CustomHoliday parse(String value) {
+ List parts = splitStringAndTrimElements(value, ".");
+ if (parts.size() == 2) {
+ return CustomHoliday.of(Integer.valueOf(parts.get(0)), Integer.valueOf(parts.get(1)));
+ }
+ throw new WrongCustomHolidayFormatException(value);
+ }
+}
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 042552df73..0d50852264 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.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 b7f8c3e6f6..e572a90f5f 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 e0ac0c1392..5e8ed68ae0 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.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 getTargetClass() {
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 getTargetClass() {
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 ee7cdb8fc4..e26b68aa67 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.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 @@ default Optional parse(String value, String separator, Field field) {
}
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 dcdef8bc0d..b889a69643 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 e78cb5a3d8..3ec1d561da 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 7f22d7f46d..e37fe063a0 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 3dc52b12a2..9aa8111ad6 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/kadai-common/src/main/java/io/kadai/common/internal/transaction/KadaiTransactionProvider.java b/common/kadai-common/src/main/java/io/kadai/common/internal/transaction/KadaiTransactionProvider.java
new file mode 100644
index 0000000000..2d51f2a7d5
--- /dev/null
+++ b/common/kadai-common/src/main/java/io/kadai/common/internal/transaction/KadaiTransactionProvider.java
@@ -0,0 +1,27 @@
+package io.kadai.common.internal.transaction;
+
+import java.util.function.Supplier;
+
+/** This functional interface provides support for transactions. */
+@FunctionalInterface
+public interface KadaiTransactionProvider {
+
+ T executeInTransaction(Supplier supplier);
+
+ static T executeInTransactionIfPossible(
+ KadaiTransactionProvider transactionProvider, Supplier supplier) {
+ return transactionProvider != null
+ ? transactionProvider.executeInTransaction(supplier)
+ : supplier.get();
+ }
+
+ static void executeInTransactionIfPossible(
+ KadaiTransactionProvider transactionProvider, Runnable runnable) {
+ executeInTransactionIfPossible(
+ transactionProvider,
+ () -> {
+ runnable.run();
+ return null;
+ });
+ }
+}
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 49704ffced..e084d4d269 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 f886fec6b6..40b83df2f2 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 49b6ccc110..4690e72317 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 817db73094..2a8d893a14 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 b33c7b3deb..56204573a0 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 1fadbbed6b..8a95aace1b 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 @@ private static class StringItem implements Item {
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 37578081ba..e702b56da5 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 f4eee956ee..f45753d2e3 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 02bdf73cdc..510d22afe0 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 5d74acb1fd..e38e4b5f06 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 9ecc538427..b6492b0fd0 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 453edf2484..be6532b8d4 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 c8b57d3893..e5b4572a8e 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 e94476bb05..fae6f2c236 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 bf51c7b76b..b74d040fb9 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 f02fb133a1..4d6d6fa9be 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 0e933fbebb..2056e47a76 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 c6736b3395..12d166dcec 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 1a10ebf840..89a17f274b 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.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 boolean isHoliday(LocalDate date) {
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 ddaf46d8b2..3daec7857e 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.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 b4ccd4aad4..7e454ce4b0 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.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 33d2666d28..1b00b6d814 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.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/kadai-common/src/main/resources/sql/db2/kadai-schema-db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai-schema-db2.sql
new file mode 100644
index 0000000000..5880e0239f
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai-schema-db2.sql
@@ -0,0 +1,468 @@
+SET SCHEMA %schemaName%;
+
+CREATE TABLE KADAI_SCHEMA_VERSION
+(
+ ID INT NOT NULL,
+ VERSION VARCHAR(255) NOT NULL,
+ CREATED TIMESTAMP NOT NULL,
+ PRIMARY KEY (ID)
+);
+
+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 (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.1.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE CLASSIFICATION
+(
+ ID VARCHAR(40) NOT NULL,
+ KEY VARCHAR(32) NOT NULL,
+ PARENT_ID VARCHAR(40) NOT NULL,
+ PARENT_KEY VARCHAR(32) NOT NULL,
+ CATEGORY VARCHAR(32),
+ TYPE VARCHAR(32),
+ DOMAIN VARCHAR(32) NOT NULL,
+ VALID_IN_DOMAIN SMALLINT NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ NAME VARCHAR(255) NULL,
+ DESCRIPTION VARCHAR(255) NULL,
+ PRIORITY INT NOT NULL,
+ SERVICE_LEVEL VARCHAR(255) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT UC_CLASS_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
+);
+
+CREATE TABLE WORKBASKET
+(
+ ID VARCHAR(40) NOT NULL,
+ KEY VARCHAR(64) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ NAME VARCHAR(255) NOT NULL,
+ DOMAIN VARCHAR(32) NOT NULL,
+ TYPE VARCHAR(16) NOT NULL,
+ DESCRIPTION VARCHAR(255) NULL,
+ OWNER VARCHAR(128) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ ORG_LEVEL_1 VARCHAR(255) NULL,
+ ORG_LEVEL_2 VARCHAR(255) NULL,
+ ORG_LEVEL_3 VARCHAR(255) NULL,
+ ORG_LEVEL_4 VARCHAR(255) NULL,
+ MARKED_FOR_DELETION SMALLINT NOT NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT WB_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
+);
+
+CREATE TABLE TASK
+(
+ ID VARCHAR(40) NOT NULL,
+ EXTERNAL_ID VARCHAR(64) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ CLAIMED TIMESTAMP NULL,
+ COMPLETED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ RECEIVED TIMESTAMP NULL,
+ PLANNED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ NAME VARCHAR(255) NULL,
+ CREATOR VARCHAR(32) NULL,
+ DESCRIPTION VARCHAR(1024) NULL,
+ NOTE VARCHAR(4096) NULL,
+ PRIORITY INT NULL,
+ MANUAL_PRIORITY INT NULL,
+ STATE VARCHAR(20) NULL,
+ CLASSIFICATION_CATEGORY VARCHAR(32) NULL,
+ CLASSIFICATION_KEY VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ WORKBASKET_ID VARCHAR(40) NULL,
+ WORKBASKET_KEY VARCHAR(64) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ PARENT_BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ OWNER VARCHAR(32) NULL,
+ POR_COMPANY VARCHAR(32) NOT NULL,
+ POR_SYSTEM VARCHAR(32),
+ POR_INSTANCE VARCHAR(32),
+ POR_TYPE VARCHAR(32) NOT NULL,
+ POR_VALUE VARCHAR(128) NOT NULL,
+ IS_READ SMALLINT NOT NULL,
+ IS_TRANSFERRED SMALLINT NOT NULL,
+ CALLBACK_INFO CLOB NULL,
+ CALLBACK_STATE VARCHAR(30) NULL,
+ CUSTOM_ATTRIBUTES CLOB NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ CUSTOM_9 VARCHAR(255) NULL,
+ CUSTOM_10 VARCHAR(255) NULL,
+ CUSTOM_11 VARCHAR(255) NULL,
+ CUSTOM_12 VARCHAR(255) NULL,
+ CUSTOM_13 VARCHAR(255) NULL,
+ CUSTOM_14 VARCHAR(255) NULL,
+ CUSTOM_15 VARCHAR(255) NULL,
+ CUSTOM_16 VARCHAR(255) NULL,
+ CUSTOM_INT_1 INT NULL,
+ CUSTOM_INT_2 INT NULL,
+ CUSTOM_INT_3 INT NULL,
+ CUSTOM_INT_4 INT NULL,
+ CUSTOM_INT_5 INT NULL,
+ CUSTOM_INT_6 INT NULL,
+ CUSTOM_INT_7 INT NULL,
+ CUSTOM_INT_8 INT NULL,
+ NUMBER_OF_COMMENTS INT NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT UC_EXTERNAL_ID UNIQUE (EXTERNAL_ID),
+ CONSTRAINT TASK_WB FOREIGN KEY (WORKBASKET_ID) REFERENCES WORKBASKET ON DELETE NO ACTION,
+ CONSTRAINT TASK_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION ON DELETE NO ACTION
+);
+
+CREATE TABLE DISTRIBUTION_TARGETS
+(
+ SOURCE_ID VARCHAR(40) NOT NULL,
+ TARGET_ID VARCHAR(40) NOT NULL,
+ PRIMARY KEY (SOURCE_ID, TARGET_ID)
+);
+
+CREATE TABLE WORKBASKET_ACCESS_LIST
+(
+ ID VARCHAR(40) NOT NULL,
+ WORKBASKET_ID VARCHAR(40) NOT NULL,
+ ACCESS_ID VARCHAR(255) NOT NULL,
+ ACCESS_NAME VARCHAR(255) NULL,
+ PERM_READ SMALLINT NOT NULL,
+ PERM_OPEN SMALLINT NOT NULL,
+ PERM_APPEND SMALLINT NOT NULL,
+ PERM_TRANSFER SMALLINT NOT NULL,
+ PERM_DISTRIBUTE SMALLINT NOT NULL,
+ PERM_CUSTOM_1 SMALLINT NOT NULL,
+ PERM_CUSTOM_2 SMALLINT NOT NULL,
+ PERM_CUSTOM_3 SMALLINT NOT NULL,
+ PERM_CUSTOM_4 SMALLINT NOT NULL,
+ PERM_CUSTOM_5 SMALLINT NOT NULL,
+ PERM_CUSTOM_6 SMALLINT NOT NULL,
+ PERM_CUSTOM_7 SMALLINT NOT NULL,
+ PERM_CUSTOM_8 SMALLINT NOT NULL,
+ PERM_CUSTOM_9 SMALLINT NOT NULL,
+ PERM_CUSTOM_10 SMALLINT NOT NULL,
+ PERM_CUSTOM_11 SMALLINT NOT NULL,
+ PERM_CUSTOM_12 SMALLINT NOT NULL,
+ PERM_READTASKS SMALLINT NOT NULL,
+ PERM_EDITTASKS SMALLINT NOT NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT UC_ACCESSID_WBID UNIQUE (ACCESS_ID, WORKBASKET_ID),
+ CONSTRAINT ACCESS_LIST_WB FOREIGN KEY (WORKBASKET_ID) REFERENCES WORKBASKET ON DELETE CASCADE
+);
+
+CREATE TABLE OBJECT_REFERENCE
+(
+ ID VARCHAR(40) NOT NULL,
+ TASK_ID VARCHAR(40) NOT NULL,
+ COMPANY VARCHAR(32) NOT NULL,
+ SYSTEM VARCHAR(32),
+ SYSTEM_INSTANCE VARCHAR(32),
+ TYPE VARCHAR(32) NOT NULL,
+ VALUE VARCHAR(128) NOT NULL
+);
+
+CREATE TABLE ATTACHMENT
+(
+ ID VARCHAR(40) NOT NULL,
+ TASK_ID VARCHAR(40) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ CLASSIFICATION_KEY VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ REF_COMPANY VARCHAR(32) NOT NULL,
+ REF_SYSTEM VARCHAR(32),
+ REF_INSTANCE VARCHAR(32),
+ REF_TYPE VARCHAR(32) NOT NULL,
+ REF_VALUE VARCHAR(128) NOT NULL,
+ CHANNEL VARCHAR(64) NULL,
+ RECEIVED TIMESTAMP NULL,
+ CUSTOM_ATTRIBUTES CLOB NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT ATT_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION ON DELETE NO ACTION
+);
+
+CREATE TABLE CONFIGURATION
+(
+ NAME VARCHAR(8) NOT NULL,
+ ENFORCE_SECURITY BOOLEAN NULL,
+ CUSTOM_ATTRIBUTES CLOB NULL,
+ PRIMARY KEY (NAME)
+);
+
+INSERT INTO CONFIGURATION (NAME)
+VALUES ('MASTER');
+
+CREATE TABLE TASK_COMMENT
+(
+ ID VARCHAR(40) NOT NULL,
+ TASK_ID VARCHAR(40) NOT NULL,
+ TEXT_FIELD VARCHAR(1024) NULL,
+ CREATOR VARCHAR(32) NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT COMMENT_TASK FOREIGN KEY (TASK_ID) REFERENCES TASK ON DELETE CASCADE
+);
+
+CREATE TABLE SCHEDULED_JOB
+(
+ JOB_ID INTEGER NOT NULL,
+ PRIORITY INTEGER NULL,
+ CREATED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ STATE VARCHAR(32) NULL,
+ LOCKED_BY VARCHAR(128) NULL,
+ LOCK_EXPIRES TIMESTAMP NULL,
+ TYPE VARCHAR(255) NULL,
+ RETRY_COUNT INTEGER NOT NULL,
+ ARGUMENTS CLOB NULL,
+ PRIMARY KEY (JOB_ID)
+);
+
+CREATE TABLE TASK_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ PARENT_BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ TASK_ID VARCHAR(40) NULL,
+ EVENT_TYPE VARCHAR(32) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ WORKBASKET_KEY VARCHAR(64) NULL,
+ WORKBASKET_NAME VARCHAR(255) NULL,
+ POR_COMPANY VARCHAR(32) NULL,
+ POR_SYSTEM VARCHAR(32) NULL,
+ POR_INSTANCE VARCHAR(32) NULL,
+ POR_TYPE VARCHAR(32) NULL,
+ POR_VALUE VARCHAR(128) NULL,
+ TASK_PRIORITY INT NULL,
+ TASK_PLANNED TIMESTAMP NULL,
+ TASK_DUE TIMESTAMP NULL,
+ TASK_OWNER VARCHAR(32) NULL,
+ TASK_CLASSIFICATION_KEY VARCHAR(32) NULL,
+ TASK_CLASSIFICATION_NAME VARCHAR(32) NULL,
+ TASK_CLASSIFICATION_CATEGORY VARCHAR(32) NULL,
+ ATTACHMENT_CLASSIFICATION_KEY VARCHAR(32) NULL,
+ ATTACHMENT_CLASSIFICATION_NAME VARCHAR(255) NULL,
+ OLD_VALUE VARCHAR(255) NULL,
+ NEW_VALUE VARCHAR(255) NULL,
+ CUSTOM_1 VARCHAR(128) NULL,
+ CUSTOM_2 VARCHAR(128) NULL,
+ CUSTOM_3 VARCHAR(128) NULL,
+ CUSTOM_4 VARCHAR(128) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ WORKBASKET_ID VARCHAR(40) NULL,
+ KEY VARCHAR(64) NULL,
+ TYPE VARCHAR(64) NULL,
+ OWNER VARCHAR(128) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ ORGLEVEL_1 VARCHAR(255) NULL,
+ ORGLEVEL_2 VARCHAR(255) NULL,
+ ORGLEVEL_3 VARCHAR(255) NULL,
+ ORGLEVEL_4 VARCHAR(255) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CLASSIFICATION_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
+ CATEGORY VARCHAR(64) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ KEY VARCHAR(40) NULL,
+ NAME VARCHAR(255) NULL,
+ PARENT_ID VARCHAR(40) NOT NULL,
+ PARENT_KEY VARCHAR(32) NOT NULL,
+ PRIORITY INT NOT NULL,
+ SERVICE_LEVEL VARCHAR(255) NULL,
+ TYPE VARCHAR(32),
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
+-- USER can not be taken as table name because it is a reserved keyword.
+CREATE TABLE USER_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ FIRST_NAME VARCHAR(32) NULL,
+ LASTNAME VARCHAR(32) NULL,
+ FULL_NAME VARCHAR(64) NULL,
+ LONG_NAME VARCHAR(64) NULL,
+ E_MAIL VARCHAR(64) NULL,
+ PHONE VARCHAR(32) NULL,
+ MOBILE_PHONE VARCHAR(32) NULL,
+ ORG_LEVEL_4 VARCHAR(32) NULL,
+ ORG_LEVEL_3 VARCHAR(32) NULL,
+ ORG_LEVEL_2 VARCHAR(32) NULL,
+ ORG_LEVEL_1 VARCHAR(32) NULL,
+ DATA CLOB NULL,
+ PRIMARY KEY (USER_ID)
+);
+
+CREATE TABLE GROUP_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ GROUP_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, GROUP_ID)
+);
+
+CREATE TABLE PERMISSION_INFO
+(
+ USER_ID VARCHAR(32) NOT NUll,
+ PERMISSION_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, PERMISSION_ID)
+);
+
+CREATE SEQUENCE SCHEDULED_JOB_SEQ
+ MINVALUE 1
+ START WITH 1
+ INCREMENT BY 1 CACHE 10;
+
+
+-- 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 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",
+ "CUSTOM_1", "APPLICATION_ENTRY_POINT", "SERVICE_LEVEL", "PRIORITY", "DESCRIPTION", "NAME",
+ "CREATED", "VALID_IN_DOMAIN", "DOMAIN", "TYPE", "CATEGORY", "PARENT_KEY", "PARENT_ID", "KEY")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE INDEX IDX_CLASSIFICATION_CATEGORY ON CLASSIFICATION
+ ("CATEGORY" ASC, "DOMAIN" ASC, "TYPE" ASC, "CUSTOM_1" ASC, "CUSTOM_8" ASC, "CUSTOM_7" ASC,
+ "CUSTOM_6" ASC, "CUSTOM_5" ASC, "CUSTOM_4" ASC, "CUSTOM_3" ASC, "CUSTOM_2" ASC,
+ "APPLICATION_ENTRY_POINT" ASC, "SERVICE_LEVEL" ASC, "PRIORITY" ASC, "DESCRIPTION" ASC,
+ "NAME" ASC, "CREATED" ASC, "VALID_IN_DOMAIN" ASC, "PARENT_KEY" ASC, "PARENT_ID" ASC, "KEY" ASC,
+ "ID" ASC) ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE UNIQUE INDEX IDX_CLASSIFICATION_KEY_DOMAIN ON CLASSIFICATION
+ ("KEY" ASC, "DOMAIN" ASC) INCLUDE ("CUSTOM_8", "CUSTOM_7", "CUSTOM_6", "CUSTOM_5", "CUSTOM_4", "CUSTOM_3", "CUSTOM_2",
+ "CUSTOM_1", "APPLICATION_ENTRY_POINT", "SERVICE_LEVEL", "PRIORITY", "DESCRIPTION", "NAME",
+ "CREATED", "VALID_IN_DOMAIN", "TYPE", "CATEGORY", "PARENT_KEY", "PARENT_ID", "ID")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE INDEX IDX_TASK_WORKBASKET_KEY_DOMAIN ON TASK
+ ("WORKBASKET_KEY" ASC, "DOMAIN" DESC) ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE INDEX IDX_TASK_POR_VALUE ON TASK
+ ("POR_VALUE" ASC, "WORKBASKET_ID" ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE INDEX IDX_TASK_LOWER_POR_VALUE ON TASK
+ (LOWER("POR_VALUE") ASC, "WORKBASKET_ID" ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE INDEX IDX_ATTACHMENT_TASK_ID ON ATTACHMENT
+ ("TASK_ID" ASC, "RECEIVED" ASC, "CLASSIFICATION_ID" ASC, "CLASSIFICATION_KEY" ASC,
+ "MODIFIED" ASC, "CREATED" ASC, "ID"
+ ASC) ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE UNIQUE INDEX IDX_WORKBASKET_ID ON WORKBASKET
+ ("ID" ASC) INCLUDE ("ORG_LEVEL_4", "ORG_LEVEL_3", "ORG_LEVEL_2", "ORG_LEVEL_1", "OWNER", "DESCRIPTION",
+ "TYPE", "DOMAIN", "NAME", "KEY")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE UNIQUE INDEX IDX_WORKBASKET_KEY_DOMAIN ON WORKBASKET
+ ("KEY" ASC, "DOMAIN" ASC) INCLUDE ("ORG_LEVEL_4", "ORG_LEVEL_3", "ORG_LEVEL_2", "ORG_LEVEL_1", "CUSTOM_4", "CUSTOM_3",
+ "CUSTOM_2", "CUSTOM_1", "OWNER", "DESCRIPTION", "TYPE", "NAME", "MODIFIED", "CREATED", "ID")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE UNIQUE INDEX IDX_WORKBASKET_KEY_DOMAIN_ID ON WORKBASKET
+ ("KEY" ASC, "DOMAIN" ASC) INCLUDE ("ID")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_ACCESS_ID ON WORKBASKET_ACCESS_LIST
+ ("ACCESS_ID" ASC, "WORKBASKET_ID" ASC, "PERM_READ" ASC) ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_WORKBASKET_ID ON WORKBASKET_ACCESS_LIST
+ ("WORKBASKET_ID" ASC, "PERM_CUSTOM_12" ASC, "PERM_CUSTOM_11" ASC, "PERM_CUSTOM_10" ASC,
+ "PERM_CUSTOM_9" ASC, "PERM_CUSTOM_8" ASC, "PERM_CUSTOM_7" ASC, "PERM_CUSTOM_6" ASC,
+ "PERM_CUSTOM_5" ASC, "PERM_CUSTOM_4" ASC, "PERM_CUSTOM_3" ASC, "PERM_CUSTOM_2" ASC,
+ "PERM_CUSTOM_1" ASC, "PERM_DISTRIBUTE" ASC, "PERM_TRANSFER" ASC, "PERM_APPEND" ASC,
+ "PERM_OPEN" ASC, "PERM_READ" ASC, "ACCESS_ID"
+ ASC) ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK;
+
+CREATE INDEX IDX_OBJECT_REFERE_PK_ID ON OBJECT_REFERENCE
+ (ID ASC) ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+CREATE INDEX IDX_OBJECT_REFERE_FK_TASK_ID ON OBJECT_REFERENCE
+ (TASK_ID ASC) ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+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)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+CREATE INDEX IDX_TASK_ID_HISTORY_EVENT ON TASK_HISTORY_EVENT
+ (TASK_ID ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..b305da4b52
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_0.9.2_to_1.0.2_db2.sql
@@ -0,0 +1,56 @@
+-- this script migrates the schema only.
+-- data is not migrated, as this is currently not necessary.
+
+SET SCHEMA %schemaName%;
+
+DROP TABLE KADAI_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 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;
+
+CREATE TABLE SCHEDULED_JOB(
+ JOB_ID INTEGER NOT NULL,
+ PRIORITY INTEGER NULL,
+ CREATED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ STATE VARCHAR(32) NULL,
+ LOCKED_BY VARCHAR(32) NULL,
+ LOCK_EXPIRES TIMESTAMP NULL,
+ TYPE VARCHAR(32) NULL,
+ RETRY_COUNT INTEGER NOT NULL,
+ ARGUMENTS CLOB NULL,
+ PRIMARY KEY (JOB_ID)
+);
+
+DROP SEQUENCE JOB_SEQ;
+
+CREATE SEQUENCE SCHEDULED_JOB_SEQ
+ MINVALUE 1
+ START WITH 1
+ INCREMENT BY 1
+ CACHE 10;
+
+ALTER TABLE CLASSIFICATION
+ ADD COLUMN PARENT_KEY
+ VARCHAR(32) NOT NULL DEFAULT '';
+
+UPDATE CLASSIFICATION C
+ SET C.PARENT_KEY =
+ (SELECT KEY FROM CLASSIFICATION WHERE ID = C.PARENT_ID)
+ WHERE C.PARENT_ID != '';
+
+ALTER TABLE TASK
+ ADD COLUMN CALLBACK_INFO
+ CLOB NULL DEFAULT NULL;
+
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ADD COLUMN ACCESS_NAME
+ VARCHAR(255) NULL DEFAULT NULL;
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..ef3d415028
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_1.0.4_to_1.0.6_db2.sql
@@ -0,0 +1,11 @@
+-- this script update the tables KADAI_SCHEMA_VERSION and TASK.
+
+SET SCHEMA %schemaName%;
+
+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 '';
+
+UPDATE TASK T1 SET(EXTERNAL_ID) = ('ETI:' CONCAT (SELECT RIGHT(ID, (LENGTH(ID) - 4) ) FROM TASK T2 WHERE T1.ID = T2.ID));
+
+ALTER TABLE TASK ADD CONSTRAINT UC_EXTERNAL_ID UNIQUE (EXTERNAL_ID);
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..2a434784cd
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_2.0.2_to_3.0.0_db2.sql
@@ -0,0 +1,66 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
+
+SET SCHEMA %schemaName%;
+
+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;
+
+ALTER TABLE CLASSIFICATION ALTER COLUMN ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE CLASSIFICATION allow read access' );
+
+ALTER TABLE WORKBASKET ALTER COLUMN ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE WORKBASKET allow read access' );
+
+ALTER TABLE TASK ALTER COLUMN ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE TASK allow read access' );
+
+ALTER TABLE TASK ALTER COLUMN WORKBASKET_ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE TASK allow read access' );
+
+ALTER TABLE TASK ALTER COLUMN CLASSIFICATION_ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE TASK allow read access' );
+
+ALTER TABLE DISTRIBUTION_TARGETS ALTER COLUMN SOURCE_ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE DISTRIBUTION_TARGETS allow read access' );
+
+ALTER TABLE DISTRIBUTION_TARGETS ALTER COLUMN TARGET_ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE DISTRIBUTION_TARGETS allow read access' );
+
+ALTER TABLE WORKBASKET_ACCESS_LIST ALTER COLUMN ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE WORKBASKET_ACCESS_LIST allow read access' );
+
+ALTER TABLE WORKBASKET_ACCESS_LIST ALTER COLUMN WORKBASKET_ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE WORKBASKET_ACCESS_LIST allow read access' );
+
+ALTER TABLE OBJECT_REFERENCE ALTER COLUMN ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE OBJECT_REFERENCE allow read access' );
+
+ALTER TABLE ATTACHMENT ALTER COLUMN ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE ATTACHMENT allow read access' );
+
+ALTER TABLE ATTACHMENT ALTER COLUMN TASK_ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE ATTACHMENT allow read access' );
+
+ALTER TABLE ATTACHMENT ALTER COLUMN CLASSIFICATION_ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE ATTACHMENT allow read access' );
+
+ALTER TABLE TASK_COMMENT ALTER COLUMN ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE TASK_COMMENT allow read access' );
+
+ALTER TABLE TASK_COMMENT ALTER COLUMN TASK_ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE TASK_COMMENT allow read access' );
+
+CREATE TABLE CONFIGURATION (
+ ENFORCE_SECURITY BOOLEAN NOT NULL
+);
+
+-- TSK-1227 allow null values in OBJECT_REFERENCE#SYSTEM and OBJECT_REFERENCE#SYSTEM_INSTANCE
+
+ALTER TABLE OBJECT_REFERENCE ALTER COLUMN SYSTEM DROP NOT NULL;
+ALTER TABLE OBJECT_REFERENCE ALTER COLUMN SYSTEM_INSTANCE DROP NOT NULL;
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE OBJECT_REFERENCE allow read access' );
+
+ALTER TABLE TASK ALTER COLUMN POR_SYSTEM DROP NOT NULL;
+ALTER TABLE TASK ALTER COLUMN POR_INSTANCE DROP NOT NULL;
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE TASK allow read access' );
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..f09e2a1377
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_3.0.0_to_4.0.0_db2.sql
@@ -0,0 +1,72 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
+
+SET SCHEMA %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.0.0', CURRENT_TIMESTAMP);
+
+ALTER TABLE HISTORY_EVENTS ALTER COLUMN ID DROP IDENTITY;
+
+ALTER TABLE HISTORY_EVENTS DROP PRIMARY KEY;
+
+ALTER TABLE HISTORY_EVENTS ALTER COLUMN ID SET DATA TYPE VARCHAR(40);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE HISTORY_EVENTS allow read access' );
+
+ALTER TABLE HISTORY_EVENTS ADD PRIMARY KEY (ID);
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE HISTORY_EVENTS allow read access' );
+
+RENAME TABLE HISTORY_EVENTS TO TASK_HISTORY_EVENT;
+
+UPDATE TASK_HISTORY_EVENT SET ID = REPLACE(ID,'HEI','THI') WHERE ID LIKE '%HEI%';
+
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ WORKBASKET_ID VARCHAR(40) NULL,
+ KEY VARCHAR(64) NULL,
+ TYPE VARCHAR(64) NULL,
+ OWNER VARCHAR(128) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ ORGLEVEL_1 VARCHAR(255) NULL,
+ ORGLEVEL_2 VARCHAR(255) NULL,
+ ORGLEVEL_3 VARCHAR(255) NULL,
+ ORGLEVEL_4 VARCHAR(255) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CLASSIFICATION_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
+ CATEGORY VARCHAR(64) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ KEY VARCHAR(40) NULL,
+ NAME VARCHAR(255) NULL,
+ PARENT_ID VARCHAR(40) NOT NULL,
+ PARENT_KEY VARCHAR(32) NOT NULL,
+ PRIORITY INT NOT NULL,
+ SERVICE_LEVEL VARCHAR(255) NULL,
+ TYPE VARCHAR(32),
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..b8ec679afb
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.0.0_to_4.3.0_db2.sql
@@ -0,0 +1,9 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and ATTACHMENT.
+
+SET SCHEMA %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;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ATTACHMENT');
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..5d871edb70
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.11.0_to_5.0.0_db2.sql
@@ -0,0 +1,97 @@
+-- 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 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';
+
+DROP INDEX "DB2ADMIN"."IDX1805212017540";
+DROP INDEX "DB2ADMIN"."IDX1805212018000";
+DROP INDEX "DB2ADMIN"."IDX1805212018030";
+DROP INDEX "DB2ADMIN"."IDX1805212020000";
+DROP INDEX "DB2ADMIN"."IDX1805212021410";
+DROP INDEX "DB2ADMIN"."IDX1805212021430";
+DROP INDEX "DB2ADMIN"."IDX1805212024540";
+DROP INDEX "DB2ADMIN"."IDX1805212025210";
+DROP INDEX "DB2ADMIN"."IDX1805212028580";
+DROP INDEX "DB2ADMIN"."IDX1805212034070";
+DROP INDEX "DB2ADMIN"."IDX1805212039070";
+DROP INDEX "DB2ADMIN"."IDX1805212040470";
+DROP INDEX "DB2ADMIN"."IDX1805212042430";
+
+
+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",
+ "CUSTOM_1", "APPLICATION_ENTRY_POINT", "SERVICE_LEVEL", "PRIORITY", "DESCRIPTION", "NAME",
+ "CREATED", "VALID_IN_DOMAIN", "DOMAIN", "TYPE", "CATEGORY", "PARENT_KEY", "PARENT_ID", "KEY")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE INDEX IDX_CLASSIFICATION_CATEGORY ON CLASSIFICATION
+ ("CATEGORY" ASC, "DOMAIN" ASC, "TYPE" ASC, "CUSTOM_1" ASC, "CUSTOM_8" ASC, "CUSTOM_7" ASC,
+ "CUSTOM_6" ASC, "CUSTOM_5" ASC, "CUSTOM_4" ASC, "CUSTOM_3" ASC, "CUSTOM_2" ASC,
+ "APPLICATION_ENTRY_POINT" ASC, "SERVICE_LEVEL" ASC, "PRIORITY" ASC, "DESCRIPTION" ASC,
+ "NAME" ASC, "CREATED" ASC, "VALID_IN_DOMAIN" ASC, "PARENT_KEY" ASC, "PARENT_ID" ASC, "KEY" ASC,
+ "ID" ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE UNIQUE INDEX IDX_CLASSIFICATION_KEY_DOMAIN ON CLASSIFICATION
+ ("KEY" ASC, "DOMAIN" ASC)
+ INCLUDE ("CUSTOM_8", "CUSTOM_7", "CUSTOM_6", "CUSTOM_5", "CUSTOM_4", "CUSTOM_3", "CUSTOM_2",
+ "CUSTOM_1", "APPLICATION_ENTRY_POINT", "SERVICE_LEVEL", "PRIORITY", "DESCRIPTION", "NAME",
+ "CREATED", "VALID_IN_DOMAIN", "TYPE", "CATEGORY", "PARENT_KEY", "PARENT_ID", "ID")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE INDEX IDX_TASK_WORKBASKET_KEY_DOMAIN ON TASK
+ ("WORKBASKET_KEY" ASC, "DOMAIN" DESC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE INDEX IDX_TASK_POR_VALUE ON TASK
+ (LOWER("POR_VALUE") ASC, "WORKBASKET_ID" ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE INDEX IDX_ATTACHMENT_TASK_ID ON ATTACHMENT
+ ("TASK_ID" ASC, "RECEIVED" ASC, "CLASSIFICATION_ID" ASC, "CLASSIFICATION_KEY" ASC,
+ "MODIFIED" ASC, "CREATED" ASC, "ID" ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE UNIQUE INDEX IDX_WORKBASKET_ID ON WORKBASKET
+ ("ID" ASC)
+ INCLUDE ("ORG_LEVEL_4", "ORG_LEVEL_3", "ORG_LEVEL_2", "ORG_LEVEL_1", "OWNER", "DESCRIPTION",
+ "TYPE", "DOMAIN", "NAME", "KEY")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE UNIQUE INDEX IDX_WORKBASKET_KEY_DOMAIN ON WORKBASKET
+ ("KEY" ASC, "DOMAIN" ASC)
+ INCLUDE ("ORG_LEVEL_4", "ORG_LEVEL_3", "ORG_LEVEL_2", "ORG_LEVEL_1", "CUSTOM_4", "CUSTOM_3",
+ "CUSTOM_2", "CUSTOM_1", "OWNER", "DESCRIPTION", "TYPE", "NAME", "MODIFIED", "CREATED", "ID")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE UNIQUE INDEX IDX_WORKBASKET_KEY_DOMAIN_ID ON WORKBASKET
+ ("KEY" ASC, "DOMAIN" ASC)
+ INCLUDE ("ID")
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_ACCESS_ID ON WORKBASKET_ACCESS_LIST
+ ("ACCESS_ID" ASC, "WORKBASKET_ID" ASC, "PERM_READ" ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_WORKBASKET_ID ON WORKBASKET_ACCESS_LIST
+ ("WORKBASKET_ID" ASC, "PERM_CUSTOM_12" ASC, "PERM_CUSTOM_11" ASC, "PERM_CUSTOM_10" ASC,
+ "PERM_CUSTOM_9" ASC, "PERM_CUSTOM_8" ASC, "PERM_CUSTOM_7" ASC, "PERM_CUSTOM_6" ASC,
+ "PERM_CUSTOM_5" ASC, "PERM_CUSTOM_4" ASC, "PERM_CUSTOM_3" ASC, "PERM_CUSTOM_2" ASC,
+ "PERM_CUSTOM_1" ASC, "PERM_DISTRIBUTE" ASC, "PERM_TRANSFER" ASC, "PERM_APPEND" ASC,
+ "PERM_OPEN" ASC, "PERM_READ" ASC, "ACCESS_ID" ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+ COMMIT WORK ;
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..68b6a52753
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.3.0_to_4.8.0_db2.sql
@@ -0,0 +1,49 @@
+-- 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 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;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_1 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_2 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_3 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_4 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_5 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_6 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_7 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_8 INT NULL;
+
+ALTER TABLE CONFIGURATION ADD COLUMN CUSTOM_ATTRIBUTES CLOB NULL;
+
+ALTER TABLE SCHEDULED_JOB ALTER COLUMN TYPE SET DATA TYPE VARCHAR(255);
+
+ALTER TABLE CLASSIFICATION ALTER COLUMN DOMAIN SET DATA TYPE VARCHAR(32);
+-- reorg necessary since column has an index defined
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE CLASSIFICATION');
+
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_PRIORITY INT NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_PLANNED TIMESTAMP NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_DUE TIMESTAMP NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_OWNER VARCHAR(32) NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_CLASSIFICATION_NAME VARCHAR(255) NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN ATTACHMENT_CLASSIFICATION_NAME VARCHAR(255) NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN WORKBASKET_NAME VARCHAR(255) NULL;
+
+CREATE TABLE USER_INFO (
+ USER_ID VARCHAR(32) NOT NULL,
+ FIRST_NAME VARCHAR(32) NULL,
+ LASTNAME VARCHAR(32) NULL,
+ FULL_NAME VARCHAR(64) NULL,
+ LONG_NAME VARCHAR(64) NULL,
+ E_MAIL VARCHAR(64) NULL,
+ PHONE VARCHAR(32) NULL,
+ MOBILE_PHONE VARCHAR(32) NULL,
+ ORG_LEVEL_4 VARCHAR(32) NULL,
+ ORG_LEVEL_3 VARCHAR(32) NULL,
+ ORG_LEVEL_2 VARCHAR(32) NULL,
+ ORG_LEVEL_1 VARCHAR(32) NULL,
+ DATA CLOB NULL,
+ PRIMARY KEY (USER_ID)
+);
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..811b55ca5c
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_4.8.0_to_4.11.0_db2.sql
@@ -0,0 +1,46 @@
+-- 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 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;
+ALTER TABLE CONFIGURATION ALTER COLUMN NAME DROP DEFAULT;
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE CONFIGURATION allow read access' );
+ALTER TABLE CONFIGURATION ADD PRIMARY KEY (NAME);
+
+insert into CONFIGURATION (NAME) (select 'MASTER' from sysibm.sysdummy1
+where not exists (select * from CONFIGURATION where NAME = 'MASTER'));
+
+UPDATE TASK SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
+UPDATE TASK SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
+UPDATE TASK SET CUSTOM_3 = '' WHERE CUSTOM_3 IS NULL;
+UPDATE TASK SET CUSTOM_4 = '' WHERE CUSTOM_4 IS NULL;
+UPDATE TASK SET CUSTOM_5 = '' WHERE CUSTOM_5 IS NULL;
+UPDATE TASK SET CUSTOM_6 = '' WHERE CUSTOM_6 IS NULL;
+UPDATE TASK SET CUSTOM_7 = '' WHERE CUSTOM_7 IS NULL;
+UPDATE TASK SET CUSTOM_8 = '' WHERE CUSTOM_8 IS NULL;
+UPDATE TASK SET CUSTOM_9 = '' WHERE CUSTOM_9 IS NULL;
+UPDATE TASK SET CUSTOM_10 = '' WHERE CUSTOM_10 IS NULL;
+UPDATE TASK SET CUSTOM_11 = '' WHERE CUSTOM_11 IS NULL;
+UPDATE TASK SET CUSTOM_12 = '' WHERE CUSTOM_12 IS NULL;
+UPDATE TASK SET CUSTOM_13 = '' WHERE CUSTOM_13 IS NULL;
+UPDATE TASK SET CUSTOM_14 = '' WHERE CUSTOM_14 IS NULL;
+UPDATE TASK SET CUSTOM_15 = '' WHERE CUSTOM_15 IS NULL;
+UPDATE TASK SET CUSTOM_16 = '' WHERE CUSTOM_16 IS NULL;
+
+UPDATE WORKBASKET SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
+UPDATE WORKBASKET SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
+UPDATE WORKBASKET SET CUSTOM_3 = '' WHERE CUSTOM_3 IS NULL;
+UPDATE WORKBASKET SET CUSTOM_4 = '' WHERE CUSTOM_4 IS NULL;
+
+UPDATE CLASSIFICATION SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_3 = '' WHERE CUSTOM_3 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_4 = '' WHERE CUSTOM_4 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_5 = '' WHERE CUSTOM_5 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_6 = '' WHERE CUSTOM_6 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_7 = '' WHERE CUSTOM_7 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_8 = '' WHERE CUSTOM_8 IS NULL;
+
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..d7fdb43f1f
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.0.0_to_5.1.0_db2.sql
@@ -0,0 +1,17 @@
+-- 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 KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.1.0', CURRENT_TIMESTAMP);
+
+DROP INDEX IDX_TASK_POR_VALUE;
+
+CREATE INDEX IDX_TASK_POR_VALUE ON TASK
+ ("POR_VALUE" ASC, "WORKBASKET_ID" ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
+
+CREATE INDEX IDX_TASK_LOWER_POR_VALUE ON TASK
+ (LOWER("POR_VALUE") ASC, "WORKBASKET_ID" ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.1.0_to_5.2.0_db2.sql b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.1.0_to_5.2.0_db2.sql
new file mode 100644
index 0000000000..faa42fdb45
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.1.0_to_5.2.0_db2.sql
@@ -0,0 +1,12 @@
+-- this script updates the KADAI database schema from version 5.1.0 to version 5.2.0.
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.2.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE GROUP_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ GROUP_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, GROUP_ID)
+);
+
+ALTER TABLE SCHEDULED_JOB ALTER COLUMN LOCKED_BY SET DATA TYPE VARCHAR(128);
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..05d9385b1a
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.10.0_to_6.2.0_db2.sql
@@ -0,0 +1,19 @@
+-- this script updates the KADAI database schema from version 5.10.0 to version 6.2.0.
+SET SCHEMA %schemaName%;
+
+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;
+UPDATE WORKBASKET_ACCESS_LIST
+SET PERM_READTASKS=PERM_READ;
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ALTER COLUMN PERM_READTASKS DROP DEFAULT;
+
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ADD COLUMN PERM_EDITTASKS SMALLINT NOT NULL DEFAULT 0;
+UPDATE WORKBASKET_ACCESS_LIST
+SET PERM_EDITTASKS=PERM_READ;
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ALTER COLUMN PERM_EDITTASKS DROP DEFAULT;
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..a70e5cc2ef
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_5.2.0_to_5.10.0_db2.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 (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;
+COMMIT WORK ;
+CREATE INDEX IDX_OBJECT_REFERE_FK_TASK_ID ON OBJECT_REFERENCE
+ (TASK_ID ASC) ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+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)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..18d47357a6
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_6.2.0_to_7.0.0_db2.sql
@@ -0,0 +1,23 @@
+-- this script updates the KADAI database schema from version 6.2.0 to version 7.0.0.
+SET SCHEMA %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (KADAI_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '7.0.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE PERMISSION_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ PERMISSION_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, PERMISSION_ID)
+);
+
+ALTER TABLE WORKBASKET
+ ADD COLUMN CUSTOM_5 VARCHAR(255) NULL
+ ADD COLUMN CUSTOM_6 VARCHAR(255) NULL
+ ADD COLUMN CUSTOM_7 VARCHAR(255) NULL
+ ADD COLUMN CUSTOM_8 VARCHAR(255) NULL;
+
+CREATE INDEX IDX_TASK_ID_HISTORY_EVENT ON TASK_HISTORY_EVENT
+ (TASK_ID ASC)
+ ALLOW REVERSE SCANS COLLECT SAMPLED DETAILED STATISTICS;
+COMMIT WORK ;
\ No newline at end of file
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..b3e54dbcca
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_7.0.0_to_7.1.0_db2.sql
@@ -0,0 +1,19 @@
+-- this script updates the KADAI database schema from version 7.0.0. to version 7.1.0.
+SET SCHEMA %schemaName%;
+
+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;
+
+UPDATE TASK t
+SET NUMBER_OF_COMMENTS = subquery.COMMENT_COUNT
+FROM (
+ SELECT t.ID, COUNT(tc.ID) AS COMMENT_COUNT
+ FROM TASK t
+ RIGHT OUTER JOIN TASK_COMMENT tc
+ ON t.ID = tc.TASK_ID
+ GROUP BY t.ID
+) AS subquery
+WHERE t.ID = subquery.ID;
diff --git a/common/kadai-common/src/main/resources/sql/db2/kadai_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
new file mode 100644
index 0000000000..5234bc4028
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/db2/kadai_schema_update_8.1.0_to_8.2.0_db2.sql
@@ -0,0 +1,19 @@
+-- this script updates the KADAI database schema from version 8.1.0. to version 8.2.0.
+SET SCHEMA %schemaName%;
+
+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;
+
+UPDATE TASK t
+SET NUMBER_OF_COMMENTS = subquery.COMMENT_COUNT
+FROM (
+ SELECT t.ID, COUNT(tc.ID) AS COMMENT_COUNT
+ FROM TASK t
+ RIGHT OUTER JOIN TASK_COMMENT tc
+ ON t.ID = tc.TASK_ID
+ GROUP BY t.ID
+) AS subquery
+WHERE t.ID = subquery.ID;
\ No newline at end of file
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 0000000000..dd128e1071
--- /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/kadai-common/src/main/resources/sql/h2/kadai-schema-h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai-schema-h2.sql
new file mode 100644
index 0000000000..7c2d3c608b
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai-schema-h2.sql
@@ -0,0 +1,462 @@
+CREATE SCHEMA IF NOT EXISTS %schemaName%;
+
+SET SCHEMA %schemaName%;
+
+-- 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 KADAI_SCHEMA_VERSION
+(
+ ID INT NOT NULL,
+ VERSION VARCHAR(255) NOT NULL,
+ CREATED TIMESTAMP NOT NULL,
+ PRIMARY KEY (ID)
+);
+
+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'), '7.1.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE CLASSIFICATION
+(
+ ID VARCHAR(40) NOT NULL,
+ KEY VARCHAR(32) NOT NULL,
+ PARENT_ID VARCHAR(40) NOT NULL,
+ PARENT_KEY VARCHAR(32) NOT NULL,
+ CATEGORY VARCHAR(32),
+ TYPE VARCHAR(32),
+ DOMAIN VARCHAR(32) NOT NULL,
+ VALID_IN_DOMAIN SMALLINT NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ NAME VARCHAR(255) NULL,
+ DESCRIPTION VARCHAR(255) NULL,
+ PRIORITY INT NOT NULL,
+ SERVICE_LEVEL VARCHAR(255) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT UC_CLASS_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
+);
+
+CREATE TABLE WORKBASKET
+(
+ ID VARCHAR(40) NOT NULL,
+ KEY VARCHAR(64) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ NAME VARCHAR(255) NOT NULL,
+ DOMAIN VARCHAR(32) NOT NULL,
+ TYPE VARCHAR(16) NOT NULL,
+ DESCRIPTION VARCHAR(255) NULL,
+ OWNER VARCHAR(128) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ ORG_LEVEL_1 VARCHAR(255) NULL,
+ ORG_LEVEL_2 VARCHAR(255) NULL,
+ ORG_LEVEL_3 VARCHAR(255) NULL,
+ ORG_LEVEL_4 VARCHAR(255) NULL,
+ MARKED_FOR_DELETION SMALLINT NOT NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT WB_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
+);
+
+CREATE TABLE TASK
+(
+ ID VARCHAR(40) NOT NULL,
+ EXTERNAL_ID VARCHAR(64) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ CLAIMED TIMESTAMP NULL,
+ COMPLETED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ RECEIVED TIMESTAMP NULL,
+ PLANNED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ NAME VARCHAR(255) NULL,
+ CREATOR VARCHAR(32) NULL,
+ DESCRIPTION VARCHAR(1024) NULL,
+ NOTE VARCHAR(4096) NULL,
+ PRIORITY INT NULL,
+ MANUAL_PRIORITY INT NULL,
+ STATE VARCHAR(20) NULL,
+ CLASSIFICATION_CATEGORY VARCHAR(32) NULL,
+ CLASSIFICATION_KEY VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ WORKBASKET_ID VARCHAR(40) NULL,
+ WORKBASKET_KEY VARCHAR(64) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ PARENT_BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ OWNER VARCHAR(32) NULL,
+ POR_COMPANY VARCHAR(32) NOT NULL,
+ POR_SYSTEM VARCHAR(32),
+ POR_INSTANCE VARCHAR(32),
+ POR_TYPE VARCHAR(32) NOT NULL,
+ POR_VALUE VARCHAR(128) NOT NULL,
+ IS_READ SMALLINT NOT NULL,
+ IS_TRANSFERRED SMALLINT NOT NULL,
+ CALLBACK_INFO CLOB NULL,
+ CALLBACK_STATE VARCHAR(30) NULL,
+ CUSTOM_ATTRIBUTES CLOB NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ CUSTOM_9 VARCHAR(255) NULL,
+ CUSTOM_10 VARCHAR(255) NULL,
+ CUSTOM_11 VARCHAR(255) NULL,
+ CUSTOM_12 VARCHAR(255) NULL,
+ CUSTOM_13 VARCHAR(255) NULL,
+ CUSTOM_14 VARCHAR(255) NULL,
+ CUSTOM_15 VARCHAR(255) NULL,
+ CUSTOM_16 VARCHAR(255) NULL,
+ CUSTOM_INT_1 INT NULL,
+ CUSTOM_INT_2 INT NULL,
+ CUSTOM_INT_3 INT NULL,
+ CUSTOM_INT_4 INT NULL,
+ CUSTOM_INT_5 INT NULL,
+ CUSTOM_INT_6 INT NULL,
+ CUSTOM_INT_7 INT NULL,
+ CUSTOM_INT_8 INT NULL,
+ NUMBER_OF_COMMENTS INT NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT UC_EXTERNAL_ID UNIQUE (EXTERNAL_ID),
+ CONSTRAINT TASK_WB FOREIGN KEY (WORKBASKET_ID) REFERENCES WORKBASKET ON DELETE NO ACTION,
+ CONSTRAINT TASK_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION ON DELETE NO ACTION
+);
+
+CREATE TABLE DISTRIBUTION_TARGETS
+(
+ SOURCE_ID VARCHAR(40) NOT NULL,
+ TARGET_ID VARCHAR(40) NOT NULL,
+ PRIMARY KEY (SOURCE_ID, TARGET_ID)
+);
+
+CREATE TABLE WORKBASKET_ACCESS_LIST
+(
+ ID VARCHAR(40) NOT NULL,
+ WORKBASKET_ID VARCHAR(40) NOT NULL,
+ ACCESS_ID VARCHAR(255) NOT NULL,
+ ACCESS_NAME VARCHAR(255) NULL,
+ PERM_READ SMALLINT NOT NULL,
+ PERM_OPEN SMALLINT NOT NULL,
+ PERM_APPEND SMALLINT NOT NULL,
+ PERM_TRANSFER SMALLINT NOT NULL,
+ PERM_DISTRIBUTE SMALLINT NOT NULL,
+ PERM_CUSTOM_1 SMALLINT NOT NULL,
+ PERM_CUSTOM_2 SMALLINT NOT NULL,
+ PERM_CUSTOM_3 SMALLINT NOT NULL,
+ PERM_CUSTOM_4 SMALLINT NOT NULL,
+ PERM_CUSTOM_5 SMALLINT NOT NULL,
+ PERM_CUSTOM_6 SMALLINT NOT NULL,
+ PERM_CUSTOM_7 SMALLINT NOT NULL,
+ PERM_CUSTOM_8 SMALLINT NOT NULL,
+ PERM_CUSTOM_9 SMALLINT NOT NULL,
+ PERM_CUSTOM_10 SMALLINT NOT NULL,
+ PERM_CUSTOM_11 SMALLINT NOT NULL,
+ PERM_CUSTOM_12 SMALLINT NOT NULL,
+ PERM_READTASKS SMALLINT NOT NULL,
+ PERM_EDITTASKS SMALLINT NOT NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT UC_ACCESSID_WBID UNIQUE (ACCESS_ID, WORKBASKET_ID),
+ CONSTRAINT ACCESS_LIST_WB FOREIGN KEY (WORKBASKET_ID) REFERENCES WORKBASKET ON DELETE CASCADE
+);
+
+CREATE TABLE OBJECT_REFERENCE
+(
+ ID VARCHAR(40) NOT NULL,
+ TASK_ID VARCHAR(40) NOT NULL,
+ COMPANY VARCHAR(32) NOT NULL,
+ SYSTEM VARCHAR(32),
+ SYSTEM_INSTANCE VARCHAR(32),
+ TYPE VARCHAR(32) NOT NULL,
+ VALUE VARCHAR(128) NOT NULL
+);
+
+CREATE TABLE ATTACHMENT
+(
+ ID VARCHAR(40) NOT NULL,
+ TASK_ID VARCHAR(40) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ CLASSIFICATION_KEY VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ REF_COMPANY VARCHAR(32) NOT NULL,
+ REF_SYSTEM VARCHAR(32),
+ REF_INSTANCE VARCHAR(32),
+ REF_TYPE VARCHAR(32) NOT NULL,
+ REF_VALUE VARCHAR(128) NOT NULL,
+ CHANNEL VARCHAR(64) NULL,
+ RECEIVED TIMESTAMP NULL,
+ CUSTOM_ATTRIBUTES CLOB NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT ATT_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION ON DELETE NO ACTION
+);
+
+CREATE TABLE TASK_COMMENT
+(
+ ID VARCHAR(40) NOT NULL,
+ TASK_ID VARCHAR(40) NOT NULL,
+ TEXT_FIELD VARCHAR(1024) NULL,
+ CREATOR VARCHAR(32) NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT COMMENT_TASK FOREIGN KEY (TASK_ID) REFERENCES TASK ON DELETE CASCADE
+);
+
+CREATE TABLE SCHEDULED_JOB
+(
+ JOB_ID INTEGER NOT NULL,
+ PRIORITY INTEGER NULL,
+ CREATED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ STATE VARCHAR(32) NULL,
+ LOCKED_BY VARCHAR(128) NULL,
+ LOCK_EXPIRES TIMESTAMP NULL,
+ TYPE VARCHAR(255) NULL,
+ RETRY_COUNT INTEGER NOT NULL,
+ ARGUMENTS CLOB NULL,
+ PRIMARY KEY (JOB_ID)
+);
+
+CREATE TABLE TASK_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ PARENT_BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ TASK_ID VARCHAR(40) NULL,
+ EVENT_TYPE VARCHAR(32) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ WORKBASKET_KEY VARCHAR(64) NULL,
+ WORKBASKET_NAME VARCHAR(255) NULL,
+ POR_COMPANY VARCHAR(32) NULL,
+ POR_SYSTEM VARCHAR(32) NULL,
+ POR_INSTANCE VARCHAR(32) NULL,
+ POR_TYPE VARCHAR(32) NULL,
+ POR_VALUE VARCHAR(128) NULL,
+ TASK_PRIORITY INT NULL,
+ TASK_PLANNED TIMESTAMP NULL,
+ TASK_DUE TIMESTAMP NULL,
+ TASK_OWNER VARCHAR(32) NULL,
+ TASK_CLASSIFICATION_KEY VARCHAR(32) NULL,
+ TASK_CLASSIFICATION_NAME VARCHAR(32) NULL,
+ TASK_CLASSIFICATION_CATEGORY VARCHAR(32) NULL,
+ ATTACHMENT_CLASSIFICATION_KEY VARCHAR(32) NULL,
+ ATTACHMENT_CLASSIFICATION_NAME VARCHAR(255) NULL,
+ OLD_VALUE VARCHAR(255) NULL,
+ NEW_VALUE VARCHAR(255) NULL,
+ CUSTOM_1 VARCHAR(128) NULL,
+ CUSTOM_2 VARCHAR(128) NULL,
+ CUSTOM_3 VARCHAR(128) NULL,
+ CUSTOM_4 VARCHAR(128) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ WORKBASKET_ID VARCHAR(40) NULL,
+ KEY VARCHAR(64) NULL,
+ TYPE VARCHAR(64) NULL,
+ OWNER VARCHAR(128) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ ORGLEVEL_1 VARCHAR(255) NULL,
+ ORGLEVEL_2 VARCHAR(255) NULL,
+ ORGLEVEL_3 VARCHAR(255) NULL,
+ ORGLEVEL_4 VARCHAR(255) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CLASSIFICATION_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
+ CATEGORY VARCHAR(64) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ KEY VARCHAR(40) NULL,
+ NAME VARCHAR(255) NULL,
+ PARENT_ID VARCHAR(40) NOT NULL,
+ PARENT_KEY VARCHAR(32) NOT NULL,
+ PRIORITY INT NOT NULL,
+ SERVICE_LEVEL VARCHAR(255) NULL,
+ TYPE VARCHAR(32),
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CONFIGURATION
+(
+ NAME VARCHAR(8) NOT NULL,
+ ENFORCE_SECURITY BOOLEAN NULL,
+ CUSTOM_ATTRIBUTES CLOB NULL,
+ PRIMARY KEY (NAME)
+);
+
+INSERT INTO CONFIGURATION (NAME)
+VALUES ('MASTER');
+
+CREATE TABLE USER_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ FIRST_NAME VARCHAR(32) NULL,
+ LASTNAME VARCHAR(32) NULL,
+ FULL_NAME VARCHAR(64) NULL,
+ LONG_NAME VARCHAR(64) NULL,
+ E_MAIL VARCHAR(64) NULL,
+ PHONE VARCHAR(32) NULL,
+ MOBILE_PHONE VARCHAR(32) NULL,
+ ORG_LEVEL_4 VARCHAR(32) NULL,
+ ORG_LEVEL_3 VARCHAR(32) NULL,
+ ORG_LEVEL_2 VARCHAR(32) NULL,
+ ORG_LEVEL_1 VARCHAR(32) NULL,
+ DATA CLOB NULL,
+ PRIMARY KEY (USER_ID)
+);
+
+CREATE TABLE GROUP_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ GROUP_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, GROUP_ID)
+);
+
+CREATE TABLE PERMISSION_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ PERMISSION_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, PERMISSION_ID)
+);
+
+CREATE SEQUENCE SCHEDULED_JOB_SEQ
+ MINVALUE 1
+ START WITH 1
+ INCREMENT BY 1 CACHE 10;
+
+CREATE INDEX IDX_CLASSIFICATION_ID ON CLASSIFICATION
+ (ID ASC, CUSTOM_8, CUSTOM_7, CUSTOM_6, CUSTOM_5, CUSTOM_4,
+ CUSTOM_3, CUSTOM_2, CUSTOM_1, APPLICATION_ENTRY_POINT,
+ SERVICE_LEVEL, PRIORITY, DESCRIPTION, NAME, MODIFIED,
+ CREATED, VALID_IN_DOMAIN, DOMAIN, TYPE, CATEGORY, PARENT_KEY,
+ PARENT_ID, KEY);
+COMMIT WORK;
+CREATE INDEX IDX_CLASSIFICATION_CATEGORY ON CLASSIFICATION
+ (CATEGORY ASC, DOMAIN ASC, TYPE ASC, CUSTOM_1
+ ASC, CUSTOM_8 ASC, CUSTOM_7 ASC, CUSTOM_6 ASC,
+ CUSTOM_5 ASC, CUSTOM_4 ASC, CUSTOM_3 ASC, CUSTOM_2
+ ASC, APPLICATION_ENTRY_POINT ASC, SERVICE_LEVEL
+ ASC, PRIORITY ASC, DESCRIPTION ASC, NAME ASC,
+ CREATED ASC, VALID_IN_DOMAIN ASC, PARENT_KEY ASC, PARENT_ID
+ ASC, KEY ASC, ID ASC);
+COMMIT WORK;
+CREATE INDEX IDX_CLASSIFICATION_KEY_DOMAIN ON CLASSIFICATION
+ (KEY ASC, DOMAIN ASC, CUSTOM_8, CUSTOM_7, CUSTOM_6,
+ CUSTOM_5, CUSTOM_4, CUSTOM_3, CUSTOM_2, CUSTOM_1,
+ APPLICATION_ENTRY_POINT, SERVICE_LEVEL, PRIORITY,
+ DESCRIPTION, NAME, CREATED, VALID_IN_DOMAIN,
+ TYPE, CATEGORY, PARENT_KEY, PARENT_ID, ID);
+COMMIT WORK;
+
+
+ CREATE INDEX IDX_TASK_WORKBASKET_KEY_DOMAIN ON TASK
+ (WORKBASKET_KEY ASC, DOMAIN DESC);
+ COMMIT WORK ;
+-- function indecies are not supported
+-- CREATE INDEX IDX_TASK_LOWER_POR_VALUE ON TASK
+-- (LOWER(POR_VALUE) ASC, WORKBASKET_ID ASC);
+-- COMMIT WORK ;
+ CREATE INDEX IDX_TASK_POR_VALUE ON TASK
+ (POR_VALUE ASC, WORKBASKET_ID ASC);
+ COMMIT WORK ;
+
+CREATE INDEX IDX_ATTACHMENT_TASK_ID ON ATTACHMENT
+ (TASK_ID ASC, RECEIVED ASC, CLASSIFICATION_ID
+ ASC, CLASSIFICATION_KEY ASC, MODIFIED ASC, CREATED
+ ASC, ID ASC);
+COMMIT WORK;
+
+
+CREATE INDEX IDX_WORKBASKET_ID ON WORKBASKET
+ (ID ASC, ORG_LEVEL_4, ORG_LEVEL_3, ORG_LEVEL_2,
+ ORG_LEVEL_1, OWNER, DESCRIPTION, TYPE, DOMAIN, NAME, KEY);
+COMMIT WORK;
+CREATE INDEX IDX_WORKBASKET_KEY_DOMAIN ON WORKBASKET
+ (KEY ASC, DOMAIN ASC, ORG_LEVEL_4,
+ ORG_LEVEL_3, ORG_LEVEL_2, ORG_LEVEL_1, CUSTOM_4,
+ CUSTOM_3, CUSTOM_2, CUSTOM_1, OWNER, DESCRIPTION,
+ TYPE, NAME, MODIFIED, CREATED, ID);
+COMMIT WORK;
+CREATE INDEX IDX_WORKBASKET_KEY_DOMAIN_ID ON WORKBASKET
+ (KEY ASC, DOMAIN ASC, ID);
+COMMIT WORK;
+
+
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_ACCESS_ID ON WORKBASKET_ACCESS_LIST
+ (ACCESS_ID ASC, WORKBASKET_ID ASC, PERM_READ ASC);
+COMMIT WORK;
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_WORKBASKET_ID ON WORKBASKET_ACCESS_LIST
+ (WORKBASKET_ID ASC, PERM_CUSTOM_12 ASC, PERM_CUSTOM_11
+ ASC, PERM_CUSTOM_10 ASC, PERM_CUSTOM_9 ASC, PERM_CUSTOM_8
+ ASC, PERM_CUSTOM_7 ASC, PERM_CUSTOM_6 ASC, PERM_CUSTOM_5
+ ASC, PERM_CUSTOM_4 ASC, PERM_CUSTOM_3 ASC, PERM_CUSTOM_2
+ ASC, PERM_CUSTOM_1 ASC, PERM_DISTRIBUTE ASC, PERM_TRANSFER
+ ASC, PERM_APPEND ASC, PERM_OPEN ASC, PERM_READ
+ ASC, ACCESS_ID ASC);
+COMMIT WORK;
+
+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 ;
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..b305da4b52
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_0.9.2_to_1.0.2_h2.sql
@@ -0,0 +1,56 @@
+-- this script migrates the schema only.
+-- data is not migrated, as this is currently not necessary.
+
+SET SCHEMA %schemaName%;
+
+DROP TABLE KADAI_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 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;
+
+CREATE TABLE SCHEDULED_JOB(
+ JOB_ID INTEGER NOT NULL,
+ PRIORITY INTEGER NULL,
+ CREATED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ STATE VARCHAR(32) NULL,
+ LOCKED_BY VARCHAR(32) NULL,
+ LOCK_EXPIRES TIMESTAMP NULL,
+ TYPE VARCHAR(32) NULL,
+ RETRY_COUNT INTEGER NOT NULL,
+ ARGUMENTS CLOB NULL,
+ PRIMARY KEY (JOB_ID)
+);
+
+DROP SEQUENCE JOB_SEQ;
+
+CREATE SEQUENCE SCHEDULED_JOB_SEQ
+ MINVALUE 1
+ START WITH 1
+ INCREMENT BY 1
+ CACHE 10;
+
+ALTER TABLE CLASSIFICATION
+ ADD COLUMN PARENT_KEY
+ VARCHAR(32) NOT NULL DEFAULT '';
+
+UPDATE CLASSIFICATION C
+ SET C.PARENT_KEY =
+ (SELECT KEY FROM CLASSIFICATION WHERE ID = C.PARENT_ID)
+ WHERE C.PARENT_ID != '';
+
+ALTER TABLE TASK
+ ADD COLUMN CALLBACK_INFO
+ CLOB NULL DEFAULT NULL;
+
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ADD COLUMN ACCESS_NAME
+ VARCHAR(255) NULL DEFAULT NULL;
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 0000000000..e78eb622fe
--- /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/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..ac16333d97
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.0.4_to_1.0.6_h2.sql
@@ -0,0 +1,11 @@
+-- this script update the tables KADAI_SCHEMA_VERSION and TASK.
+
+SET SCHEMA %schemaName%;
+
+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 '';
+
+UPDATE TASK T1 SET(EXTERNAL_ID) = (CONCAT('ETI:', (SELECT RIGHT(ID, (LENGTH(ID) - 4)) FROM TASK T2 WHERE T1.ID = T2.ID)));
+
+ALTER TABLE TASK ADD CONSTRAINT UC_EXTERNAL_ID UNIQUE (EXTERNAL_ID);
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 0000000000..444862cbb1
--- /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/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..61d4364b8f
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.1.5_to_1.2.1_h2.sql
@@ -0,0 +1,12 @@
+-- this script adds a unique constraint to WORKBASKET_ACCESS_LIST
+-- allowing a maximum of one WORKBASKET_ACCESS_LIST per workbasket and access_id
+-- Please replace %schemaName% before executing the script
+
+SET SCHEMA %schemaName%;
+
+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
+
+ALTER TABLE WORKBASKET_ACCESS_LIST ADD CONSTRAINT UC_ACCESSID_WBID UNIQUE (ACCESS_ID, WORKBASKET_ID);
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..3f89062307
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_1.2.1_to_2.0.2_h2.sql
@@ -0,0 +1,16 @@
+-- this script adds a TASK_COMMENT table and updates the table KADAI_SCHEMA_VERSION.
+
+SET SCHEMA %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('2.0.2', CURRENT_TIMESTAMP);
+
+CREATE TABLE TASK_COMMENT(
+ ID CHAR(40) NOT NULL,
+ TASK_ID CHAR(40) NOT NULL,
+ TEXT_FIELD VARCHAR(1024) NULL,
+ CREATOR VARCHAR(32) NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT COMMENT_TASK FOREIGN KEY (TASK_ID) REFERENCES TASK ON DELETE CASCADE
+);
\ No newline at end of file
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..c492083dfa
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_2.0.2_to_3.0.0_h2.sql
@@ -0,0 +1,50 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
+
+SET SCHEMA %schemaName%;
+
+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;
+
+ALTER TABLE CLASSIFICATION ALTER COLUMN ID VARCHAR(40);
+
+ALTER TABLE WORKBASKET ALTER COLUMN ID VARCHAR(40);
+
+ALTER TABLE TASK ALTER COLUMN ID VARCHAR(40);
+
+ALTER TABLE TASK ALTER COLUMN WORKBASKET_ID VARCHAR(40);
+
+ALTER TABLE TASK ALTER COLUMN CLASSIFICATION_ID VARCHAR(40);
+
+ALTER TABLE DISTRIBUTION_TARGETS ALTER COLUMN SOURCE_ID VARCHAR(40);
+
+ALTER TABLE DISTRIBUTION_TARGETS ALTER COLUMN TARGET_ID VARCHAR(40);
+
+ALTER TABLE WORKBASKET_ACCESS_LIST ALTER COLUMN ID VARCHAR(40);
+
+ALTER TABLE WORKBASKET_ACCESS_LIST ALTER COLUMN WORKBASKET_ID VARCHAR(40);
+
+ALTER TABLE OBJECT_REFERENCE ALTER COLUMN ID VARCHAR(40);
+
+ALTER TABLE ATTACHMENT ALTER COLUMN ID VARCHAR(40);
+
+ALTER TABLE ATTACHMENT ALTER COLUMN TASK_ID VARCHAR(40);
+
+ALTER TABLE ATTACHMENT ALTER COLUMN CLASSIFICATION_ID VARCHAR(40);
+
+ALTER TABLE TASK_COMMENT ALTER COLUMN ID VARCHAR(40);
+
+ALTER TABLE TASK_COMMENT ALTER COLUMN TASK_ID VARCHAR(40);
+
+CREATE TABLE CONFIGURATION (
+ ENFORCE_SECURITY BOOLEAN NOT NULL
+);
+
+-- TSK-1227 allow null values in OBJECT_REFERENCE#SYSTEM and OBJECT_REFERENCE#SYSTEM_INSTANCE
+
+ALTER TABLE OBJECT_REFERENCE ALTER COLUMN SYSTEM SET NULL;
+ALTER TABLE OBJECT_REFERENCE ALTER COLUMN SYSTEM_INSTANCE SET NULL;
+
+ALTER TABLE TASK ALTER COLUMN POR_SYSTEM SET NULL;
+ALTER TABLE TASK ALTER COLUMN POR_INSTANCE SET NULL;
+
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..1cf9da1821
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_3.0.0_to_4.0.0_h2.sql
@@ -0,0 +1,65 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
+
+SET SCHEMA %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.0.0', CURRENT_TIMESTAMP);
+
+ALTER TABLE HISTORY_EVENTS ALTER COLUMN ID VARCHAR(40);
+
+ALTER TABLE HISTORY_EVENTS RENAME TO TASK_HISTORY_EVENT;
+
+UPDATE TASK_HISTORY_EVENT SET ID = REPLACE(ID,'HEI','THI') WHERE ID LIKE '%HEI%';
+
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ WORKBASKET_ID VARCHAR(40) NULL,
+ KEY VARCHAR(64) NULL,
+ TYPE VARCHAR(64) NULL,
+ OWNER VARCHAR(128) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ ORGLEVEL_1 VARCHAR(255) NULL,
+ ORGLEVEL_2 VARCHAR(255) NULL,
+ ORGLEVEL_3 VARCHAR(255) NULL,
+ ORGLEVEL_4 VARCHAR(255) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CLASSIFICATION_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
+ CATEGORY VARCHAR(64) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ KEY VARCHAR(40) NULL,
+ NAME VARCHAR(255) NULL,
+ PARENT_ID VARCHAR(40) NOT NULL,
+ PARENT_KEY VARCHAR(32) NOT NULL,
+ PRIORITY INT NOT NULL,
+ SERVICE_LEVEL VARCHAR(255) NULL,
+ TYPE VARCHAR(32),
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ DETAILS CLOB NULL,
+ PRIMARY KEY (ID)
+);
+
+
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 0000000000..f331327cb3
--- /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 0000000000..d17468107d
--- /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/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..6fe063e7b5
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.3.0_to_4.8.0_h2.sql
@@ -0,0 +1,45 @@
+-- this script updates the KADAI database schema from version 4.3.0 to version 4.8.0.
+
+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;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_1 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_2 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_3 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_4 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_5 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_6 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_7 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_8 INT NULL;
+
+ALTER TABLE CONFIGURATION ADD COLUMN CUSTOM_ATTRIBUTES CLOB NULL;
+
+ALTER TABLE SCHEDULED_JOB ALTER COLUMN TYPE SET DATA TYPE VARCHAR(255);
+
+ALTER TABLE CLASSIFICATION ALTER COLUMN DOMAIN SET DATA TYPE VARCHAR(32);
+
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_PRIORITY INT NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_PLANNED TIMESTAMP NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_DUE TIMESTAMP NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_OWNER VARCHAR(32) NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_CLASSIFICATION_NAME VARCHAR(255) NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN ATTACHMENT_CLASSIFICATION_NAME VARCHAR(255) NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN WORKBASKET_NAME VARCHAR(255) NULL;
+
+CREATE TABLE USER_INFO (
+ USER_ID VARCHAR(32) NOT NULL,
+ FIRST_NAME VARCHAR(32) NULL,
+ LASTNAME VARCHAR(32) NULL,
+ FULL_NAME VARCHAR(64) NULL,
+ LONG_NAME VARCHAR(64) NULL,
+ E_MAIL VARCHAR(64) NULL,
+ PHONE VARCHAR(32) NULL,
+ MOBILE_PHONE VARCHAR(32) NULL,
+ ORG_LEVEL_4 VARCHAR(32) NULL,
+ ORG_LEVEL_3 VARCHAR(32) NULL,
+ ORG_LEVEL_2 VARCHAR(32) NULL,
+ ORG_LEVEL_1 VARCHAR(32) NULL,
+ DATA CLOB NULL,
+ PRIMARY KEY (USER_ID)
+);
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..a18d4d9bbd
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_4.8.0_to_4.11.0_h2.sql
@@ -0,0 +1,41 @@
+-- this script updates the KADAI database schema from version 4.8.0 to version 4.11.0.
+
+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;
+ALTER TABLE CONFIGURATION ALTER COLUMN NAME DROP DEFAULT;
+ALTER TABLE CONFIGURATION ADD PRIMARY KEY (NAME);
+
+INSERT INTO CONFIGURATION (NAME) VALUES ('MASTER');
+
+UPDATE TASK SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
+UPDATE TASK SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
+UPDATE TASK SET CUSTOM_3 = '' WHERE CUSTOM_3 IS NULL;
+UPDATE TASK SET CUSTOM_4 = '' WHERE CUSTOM_4 IS NULL;
+UPDATE TASK SET CUSTOM_5 = '' WHERE CUSTOM_5 IS NULL;
+UPDATE TASK SET CUSTOM_6 = '' WHERE CUSTOM_6 IS NULL;
+UPDATE TASK SET CUSTOM_7 = '' WHERE CUSTOM_7 IS NULL;
+UPDATE TASK SET CUSTOM_8 = '' WHERE CUSTOM_8 IS NULL;
+UPDATE TASK SET CUSTOM_9 = '' WHERE CUSTOM_9 IS NULL;
+UPDATE TASK SET CUSTOM_10 = '' WHERE CUSTOM_10 IS NULL;
+UPDATE TASK SET CUSTOM_11 = '' WHERE CUSTOM_11 IS NULL;
+UPDATE TASK SET CUSTOM_12 = '' WHERE CUSTOM_12 IS NULL;
+UPDATE TASK SET CUSTOM_13 = '' WHERE CUSTOM_13 IS NULL;
+UPDATE TASK SET CUSTOM_14 = '' WHERE CUSTOM_14 IS NULL;
+UPDATE TASK SET CUSTOM_15 = '' WHERE CUSTOM_15 IS NULL;
+UPDATE TASK SET CUSTOM_16 = '' WHERE CUSTOM_16 IS NULL;
+
+UPDATE WORKBASKET SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
+UPDATE WORKBASKET SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
+UPDATE WORKBASKET SET CUSTOM_3 = '' WHERE CUSTOM_3 IS NULL;
+UPDATE WORKBASKET SET CUSTOM_4 = '' WHERE CUSTOM_4 IS NULL;
+
+UPDATE CLASSIFICATION SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_3 = '' WHERE CUSTOM_3 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_4 = '' WHERE CUSTOM_4 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_5 = '' WHERE CUSTOM_5 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_6 = '' WHERE CUSTOM_6 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_7 = '' WHERE CUSTOM_7 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_8 = '' WHERE CUSTOM_8 IS 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 0000000000..16a4b48534
--- /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/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.1.0_to_5.2.0_h2.sql b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.1.0_to_5.2.0_h2.sql
new file mode 100644
index 0000000000..faa42fdb45
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.1.0_to_5.2.0_h2.sql
@@ -0,0 +1,12 @@
+-- this script updates the KADAI database schema from version 5.1.0 to version 5.2.0.
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.2.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE GROUP_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ GROUP_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, GROUP_ID)
+);
+
+ALTER TABLE SCHEDULED_JOB ALTER COLUMN LOCKED_BY SET DATA TYPE VARCHAR(128);
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..be7fca524d
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_5.10.0_to_6.2.0_h2.sql
@@ -0,0 +1,19 @@
+-- this script updates the KADAI database schema from version 5.10.0 to version 6.2.0.
+SET SCHEMA %schemaName%;
+
+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;
+UPDATE WORKBASKET_ACCESS_LIST
+SET PERM_READTASKS=PERM_READ;
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ALTER COLUMN PERM_READTASKS DROP DEFAULT;
+
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ADD COLUMN PERM_EDITTASKS SMALLINT NOT NULL DEFAULT 0;
+UPDATE WORKBASKET_ACCESS_LIST
+SET PERM_EDITTASKS=PERM_READ;
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ALTER COLUMN PERM_EDITTASKS DROP DEFAULT;
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 0000000000..43a7b64ba7
--- /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/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..7032b965d4
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_6.2.0_to_7.0.0_h2.sql
@@ -0,0 +1,19 @@
+-- this script updates the KADAI database schema from version 6.2.0 to version 7.0.0.
+
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.0.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE PERMISSION_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ PERMISSION_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, PERMISSION_ID)
+);
+
+ALTER TABLE WORKBASKET
+ ADD (
+ `CUSTOM_5` VARCHAR(255) NULL,
+ `CUSTOM_6` VARCHAR(255) NULL,
+ `CUSTOM_7` VARCHAR(255) NULL,
+ `CUSTOM_8` VARCHAR(255) NULL
+ ) AFTER `MARKED_FOR_DELETION`;
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..e0068dd914
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_7.0.0_to_7.1.0_h2.sql
@@ -0,0 +1,20 @@
+-- this script updates the KADAI database schema from version 7.0.0 to version 7.1.0.
+SET SCHEMA %schemaName%;
+
+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;
+
+UPDATE TASK t
+SET NUMBER_OF_COMMENTS = (
+ SELECT COUNT(tc.ID)
+ FROM TASK_COMMENT tc
+ WHERE tc.TASK_ID = t.ID
+)
+WHERE EXISTS (
+ SELECT 1
+ FROM TASK_COMMENT tc
+ WHERE tc.TASK_ID = t.ID
+);
diff --git a/common/kadai-common/src/main/resources/sql/h2/kadai_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
new file mode 100644
index 0000000000..c72edb38f0
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/h2/kadai_schema_update_8.1.0_to_8.2.0_h2.sql
@@ -0,0 +1,20 @@
+-- this script updates the KADAI database schema from version 8.1.0 to version 8.2.0.
+SET SCHEMA %schemaName%;
+
+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;
+
+UPDATE TASK t
+SET NUMBER_OF_COMMENTS = (
+ SELECT COUNT(tc.ID)
+ FROM TASK_COMMENT tc
+ WHERE tc.TASK_ID = t.ID
+)
+WHERE EXISTS (
+ SELECT 1
+ FROM TASK_COMMENT tc
+ WHERE tc.TASK_ID = t.ID
+);
\ No newline at end of file
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 0000000000..dd128e1071
--- /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/kadai-common/src/main/resources/sql/oracle/kadai-schema-oracle.sql b/common/kadai-common/src/main/resources/sql/oracle/kadai-schema-oracle.sql
new file mode 100644
index 0000000000..ccf663b22e
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai-schema-oracle.sql
@@ -0,0 +1,465 @@
+ALTER SESSION SET CURRENT_SCHEMA = %schemaName%;
+
+CREATE TABLE KADAI_SCHEMA_VERSION (
+ ID NUMBER(10) NOT NULL,
+ VERSION VARCHAR2(255) NOT NULL,
+ CREATED TIMESTAMP NOT NULL,
+ CONSTRAINT KADAI_SCHEMA_VERSION_PKEY PRIMARY KEY (ID)
+);
+
+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 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
+(
+ ID VARCHAR2(40) NOT NULL,
+ KEY VARCHAR2(32) NOT NULL,
+ PARENT_ID VARCHAR2(40) NOT NULL,
+ PARENT_KEY VARCHAR2(32) NOT NULL,
+ CATEGORY VARCHAR2(32),
+ TYPE VARCHAR2(32),
+ DOMAIN VARCHAR2(32) NOT NULL,
+ VALID_IN_DOMAIN NUMBER(1) NOT NULL CHECK (VALID_IN_DOMAIN IN (0,1)),
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ NAME VARCHAR2(255) NULL,
+ DESCRIPTION VARCHAR2(255) NULL,
+ PRIORITY NUMBER(10) NOT NULL,
+ SERVICE_LEVEL VARCHAR2(255) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR2(255) NULL,
+ CUSTOM_1 VARCHAR2(255) NULL,
+ CUSTOM_2 VARCHAR2(255) NULL,
+ CUSTOM_3 VARCHAR2(255) NULL,
+ CUSTOM_4 VARCHAR2(255) NULL,
+ CUSTOM_5 VARCHAR2(255) NULL,
+ CUSTOM_6 VARCHAR2(255) NULL,
+ CUSTOM_7 VARCHAR2(255) NULL,
+ CUSTOM_8 VARCHAR2(255) NULL,
+ CONSTRAINT CLASSIFICATION_PKEY PRIMARY KEY (ID),
+ CONSTRAINT UC_CLASS_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
+);
+
+CREATE TABLE WORKBASKET
+(
+ ID VARCHAR2(40) NOT NULL,
+ KEY VARCHAR2(64) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ NAME VARCHAR2(255) NOT NULL,
+ DOMAIN VARCHAR2(32) NOT NULL,
+ TYPE VARCHAR2(16) NOT NULL,
+ DESCRIPTION VARCHAR2(255) NULL,
+ OWNER VARCHAR2(128) NULL,
+ CUSTOM_1 VARCHAR2(255) NULL,
+ CUSTOM_2 VARCHAR2(255) NULL,
+ CUSTOM_3 VARCHAR2(255) NULL,
+ CUSTOM_4 VARCHAR2(255) NULL,
+ ORG_LEVEL_1 VARCHAR2(255) NULL,
+ ORG_LEVEL_2 VARCHAR2(255) NULL,
+ ORG_LEVEL_3 VARCHAR2(255) NULL,
+ ORG_LEVEL_4 VARCHAR2(255) NULL,
+ MARKED_FOR_DELETION NUMBER(1) NOT NULL CHECK (MARKED_FOR_DELETION IN (0,1)),
+ CUSTOM_5 VARCHAR2(255) NULL,
+ CUSTOM_6 VARCHAR2(255) NULL,
+ CUSTOM_7 VARCHAR2(255) NULL,
+ CUSTOM_8 VARCHAR2(255) NULL,
+ CONSTRAINT WORKBASKET_PKEY PRIMARY KEY (ID),
+ CONSTRAINT WB_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
+);
+
+CREATE TABLE TASK
+(
+ ID VARCHAR2(40) NOT NULL,
+ EXTERNAL_ID VARCHAR2(64) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ CLAIMED TIMESTAMP NULL,
+ COMPLETED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ RECEIVED TIMESTAMP NULL,
+ PLANNED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ NAME VARCHAR2(255) NULL,
+ CREATOR VARCHAR2(32) NULL,
+ DESCRIPTION VARCHAR2(1024) NULL,
+ NOTE VARCHAR2(4000) NULL,
+ PRIORITY NUMBER(10) NULL,
+ MANUAL_PRIORITY NUMBER(10) NULL,
+ STATE VARCHAR2(20) NULL,
+ CLASSIFICATION_CATEGORY VARCHAR2(32) NULL,
+ CLASSIFICATION_KEY VARCHAR2(32) NULL,
+ CLASSIFICATION_ID VARCHAR2(40) NULL,
+ WORKBASKET_ID VARCHAR2(40) NULL,
+ WORKBASKET_KEY VARCHAR2(64) NULL,
+ DOMAIN VARCHAR2(32) NULL,
+ BUSINESS_PROCESS_ID VARCHAR2(128) NULL,
+ PARENT_BUSINESS_PROCESS_ID VARCHAR2(128) NULL,
+ OWNER VARCHAR2(32) NULL,
+ POR_COMPANY VARCHAR2(32) NOT NULL,
+ POR_SYSTEM VARCHAR2(32),
+ POR_INSTANCE VARCHAR2(32),
+ POR_TYPE VARCHAR2(32) NOT NULL,
+ POR_VALUE VARCHAR2(128) NOT NULL,
+ IS_READ NUMBER(1) NOT NULL CHECK (IS_READ IN (0,1)),
+ IS_TRANSFERRED NUMBER(1) NOT NULL CHECK (IS_TRANSFERRED IN (0,1)),
+ CALLBACK_INFO CLOB NULL,
+ CALLBACK_STATE VARCHAR2(30) NULL,
+ CUSTOM_ATTRIBUTES CLOB NULL,
+ CUSTOM_1 VARCHAR2(255) NULL,
+ CUSTOM_2 VARCHAR2(255) NULL,
+ CUSTOM_3 VARCHAR2(255) NULL,
+ CUSTOM_4 VARCHAR2(255) NULL,
+ CUSTOM_5 VARCHAR2(255) NULL,
+ CUSTOM_6 VARCHAR2(255) NULL,
+ CUSTOM_7 VARCHAR2(255) NULL,
+ CUSTOM_8 VARCHAR2(255) NULL,
+ CUSTOM_9 VARCHAR2(255) NULL,
+ CUSTOM_10 VARCHAR2(255) NULL,
+ CUSTOM_11 VARCHAR2(255) NULL,
+ CUSTOM_12 VARCHAR2(255) NULL,
+ CUSTOM_13 VARCHAR2(255) NULL,
+ CUSTOM_14 VARCHAR2(255) NULL,
+ CUSTOM_15 VARCHAR2(255) NULL,
+ CUSTOM_16 VARCHAR2(255) NULL,
+ CUSTOM_INT_1 NUMBER(10) NULL,
+ CUSTOM_INT_2 NUMBER(10) NULL,
+ CUSTOM_INT_3 NUMBER(10) NULL,
+ CUSTOM_INT_4 NUMBER(10) NULL,
+ CUSTOM_INT_5 NUMBER(10) NULL,
+ CUSTOM_INT_6 NUMBER(10) NULL,
+ CUSTOM_INT_7 NUMBER(10) NULL,
+ CUSTOM_INT_8 NUMBER(10) NULL,
+ NUMBER_OF_COMMENTS INT NULL,
+ CONSTRAINT TASK_PKEY PRIMARY KEY (ID),
+ CONSTRAINT UC_EXTERNAL_ID UNIQUE (EXTERNAL_ID),
+ CONSTRAINT TASK_WB FOREIGN KEY (WORKBASKET_ID) REFERENCES WORKBASKET(ID),
+ CONSTRAINT TASK_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION(ID)
+);
+
+CREATE TABLE DISTRIBUTION_TARGETS
+(
+ SOURCE_ID VARCHAR2(40) NOT NULL,
+ TARGET_ID VARCHAR2(40) NOT NULL,
+ CONSTRAINT DISTRIBUTION_TARGETS_PKEY PRIMARY KEY (SOURCE_ID, TARGET_ID)
+);
+
+CREATE TABLE WORKBASKET_ACCESS_LIST
+(
+ ID VARCHAR2(40) NOT NULL,
+ WORKBASKET_ID VARCHAR2(40) NOT NULL,
+ ACCESS_ID VARCHAR2(255) NOT NULL,
+ ACCESS_NAME VARCHAR2(255) NULL,
+ PERM_READ NUMBER(1) NOT NULL CHECK (PERM_READ IN (0,1)),
+ PERM_OPEN NUMBER(1) NOT NULL CHECK (PERM_OPEN IN (0,1)),
+ PERM_APPEND NUMBER(1) NOT NULL CHECK (PERM_APPEND IN (0,1)),
+ PERM_TRANSFER NUMBER(1) NOT NULL CHECK (PERM_TRANSFER IN (0,1)),
+ PERM_DISTRIBUTE NUMBER(1) NOT NULL CHECK (PERM_DISTRIBUTE IN (0,1)),
+ PERM_CUSTOM_1 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_1 IN (0,1)),
+ PERM_CUSTOM_2 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_2 IN (0,1)),
+ PERM_CUSTOM_3 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_3 IN (0,1)),
+ PERM_CUSTOM_4 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_4 IN (0,1)),
+ PERM_CUSTOM_5 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_5 IN (0,1)),
+ PERM_CUSTOM_6 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_6 IN (0,1)),
+ PERM_CUSTOM_7 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_7 IN (0,1)),
+ PERM_CUSTOM_8 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_8 IN (0,1)),
+ PERM_CUSTOM_9 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_9 IN (0,1)),
+ PERM_CUSTOM_10 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_10 IN (0,1)),
+ PERM_CUSTOM_11 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_11 IN (0,1)),
+ PERM_CUSTOM_12 NUMBER(1) NOT NULL CHECK (PERM_CUSTOM_12 IN (0,1)),
+ PERM_READTASKS NUMBER(1) NOT NULL CHECK (PERM_READTASKS IN (0,1)),
+ PERM_EDITTASKS NUMBER(1) NOT NULL CHECK (PERM_EDITTASKS IN (0,1)),
+ CONSTRAINT WORKBASKET_ACCESS_LIST_PKEY PRIMARY KEY (ID),
+ CONSTRAINT UC_ACCESSID_WBID UNIQUE (ACCESS_ID, WORKBASKET_ID),
+ CONSTRAINT ACCESS_LIST_WB FOREIGN KEY (WORKBASKET_ID) REFERENCES WORKBASKET(ID) ON DELETE CASCADE
+);
+
+CREATE TABLE OBJECT_REFERENCE
+(
+ ID VARCHAR2(40) NOT NULL,
+ TASK_ID VARCHAR2(40) NOT NULL,
+ COMPANY VARCHAR2(32) NOT NULL,
+ SYSTEM VARCHAR2(32),
+ SYSTEM_INSTANCE VARCHAR2(32),
+ TYPE VARCHAR2(32) NOT NULL,
+ VALUE VARCHAR2(128) NOT NULL
+);
+
+CREATE TABLE ATTACHMENT
+(
+ ID VARCHAR2(40) NOT NULL,
+ TASK_ID VARCHAR2(40) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ CLASSIFICATION_KEY VARCHAR2(32) NULL,
+ CLASSIFICATION_ID VARCHAR2(40) NULL,
+ REF_COMPANY VARCHAR2(32) NOT NULL,
+ REF_SYSTEM VARCHAR2(32),
+ REF_INSTANCE VARCHAR2(32),
+ REF_TYPE VARCHAR2(32) NOT NULL,
+ REF_VALUE VARCHAR2(128) NOT NULL,
+ CHANNEL VARCHAR2(64) NULL,
+ RECEIVED TIMESTAMP NULL,
+ CUSTOM_ATTRIBUTES CLOB NULL,
+ CONSTRAINT ATTACHMENT_PKEY PRIMARY KEY (ID),
+ CONSTRAINT ATT_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION(ID)
+);
+
+CREATE TABLE CONFIGURATION
+(
+ NAME VARCHAR2(8) NOT NULL,
+ ENFORCE_SECURITY NUMBER(1) NULL CHECK (ENFORCE_SECURITY IN (0,1)),
+ CUSTOM_ATTRIBUTES CLOB NULL,
+ CONSTRAINT CONFIGURATION_PKEY PRIMARY KEY (NAME)
+);
+
+INSERT INTO CONFIGURATION (NAME)
+VALUES ('MASTER');
+
+CREATE TABLE TASK_COMMENT
+(
+ ID VARCHAR2(40) NOT NULL,
+ TASK_ID VARCHAR2(40) NOT NULL,
+ TEXT_FIELD VARCHAR2(1024) NULL,
+ CREATOR VARCHAR2(32) NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ CONSTRAINT TASK_COMMENT_PKEY PRIMARY KEY (ID),
+ CONSTRAINT COMMENT_TASK FOREIGN KEY (TASK_ID) REFERENCES TASK(ID) ON DELETE CASCADE
+);
+
+CREATE TABLE SCHEDULED_JOB
+(
+ JOB_ID NUMBER(10) NOT NULL,
+ PRIORITY NUMBER(10) NULL,
+ CREATED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ STATE VARCHAR2(32) NULL,
+ LOCKED_BY VARCHAR2(128) NULL,
+ LOCK_EXPIRES TIMESTAMP NULL,
+ TYPE VARCHAR2(255) NULL,
+ RETRY_COUNT NUMBER(10) NOT NULL,
+ ARGUMENTS CLOB NULL,
+ CONSTRAINT SCHEDULED_JOB_PKEY PRIMARY KEY (JOB_ID)
+);
+
+CREATE TABLE TASK_HISTORY_EVENT
+(
+ ID VARCHAR2(40) NOT NULL,
+ BUSINESS_PROCESS_ID VARCHAR2(128) NULL,
+ PARENT_BUSINESS_PROCESS_ID VARCHAR2(128) NULL,
+ TASK_ID VARCHAR2(40) NULL,
+ EVENT_TYPE VARCHAR2(32) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR2(32) NULL,
+ DOMAIN VARCHAR2(32) NULL,
+ WORKBASKET_KEY VARCHAR2(64) NULL,
+ WORKBASKET_NAME VARCHAR2(255) NULL,
+ POR_COMPANY VARCHAR2(32) NULL,
+ POR_SYSTEM VARCHAR2(32) NULL,
+ POR_INSTANCE VARCHAR2(32) NULL,
+ POR_TYPE VARCHAR2(32) NULL,
+ POR_VALUE VARCHAR2(128) NULL,
+ TASK_PRIORITY NUMBER(10) NULL,
+ TASK_PLANNED TIMESTAMP NULL,
+ TASK_DUE TIMESTAMP NULL,
+ TASK_OWNER VARCHAR2(32) NULL,
+ TASK_CLASSIFICATION_KEY VARCHAR2(32) NULL,
+ TASK_CLASSIFICATION_NAME VARCHAR2(32) NULL,
+ TASK_CLASSIFICATION_CATEGORY VARCHAR2(32) NULL,
+ ATTACHMENT_CLASSIFICATION_KEY VARCHAR2(32) NULL,
+ ATTACHMENT_CLASSIFICATION_NAME VARCHAR2(255) NULL,
+ OLD_VALUE VARCHAR2(255) NULL,
+ NEW_VALUE VARCHAR2(255) NULL,
+ CUSTOM_1 VARCHAR2(128) NULL,
+ CUSTOM_2 VARCHAR2(128) NULL,
+ CUSTOM_3 VARCHAR2(128) NULL,
+ CUSTOM_4 VARCHAR2(128) NULL,
+ DETAILS CLOB NULL,
+ CONSTRAINT TASK_HISTORY_EVENT_PKEY PRIMARY KEY (ID)
+);
+
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+ ID VARCHAR2(40) NOT NULL,
+ EVENT_TYPE VARCHAR2(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR2(32) NULL,
+ DOMAIN VARCHAR2(32) NULL,
+ WORKBASKET_ID VARCHAR2(40) NULL,
+ KEY VARCHAR2(64) NULL,
+ TYPE VARCHAR2(64) NULL,
+ OWNER VARCHAR2(128) NULL,
+ CUSTOM_1 VARCHAR2(255) NULL,
+ CUSTOM_2 VARCHAR2(255) NULL,
+ CUSTOM_3 VARCHAR2(255) NULL,
+ CUSTOM_4 VARCHAR2(255) NULL,
+ ORGLEVEL_1 VARCHAR2(255) NULL,
+ ORGLEVEL_2 VARCHAR2(255) NULL,
+ ORGLEVEL_3 VARCHAR2(255) NULL,
+ ORGLEVEL_4 VARCHAR2(255) NULL,
+ DETAILS CLOB NULL,
+ CONSTRAINT WORKBASKET_HISTORY_EVENT_PKEY PRIMARY KEY (ID)
+);
+
+CREATE TABLE CLASSIFICATION_HISTORY_EVENT
+(
+ ID VARCHAR2(40) NOT NULL,
+ EVENT_TYPE VARCHAR2(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR2(32) NULL,
+ CLASSIFICATION_ID VARCHAR2(40) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR2(255) NULL,
+ CATEGORY VARCHAR2(64) NULL,
+ DOMAIN VARCHAR2(32) NULL,
+ KEY VARCHAR2(40) NULL,
+ NAME VARCHAR2(255) NULL,
+ PARENT_ID VARCHAR2(40) NOT NULL,
+ PARENT_KEY VARCHAR2(32) NOT NULL,
+ PRIORITY NUMBER(38) NOT NULL,
+ SERVICE_LEVEL VARCHAR2(255) NULL,
+ TYPE VARCHAR2(32),
+ CUSTOM_1 VARCHAR2(255) NULL,
+ CUSTOM_2 VARCHAR2(255) NULL,
+ CUSTOM_3 VARCHAR2(255) NULL,
+ CUSTOM_4 VARCHAR2(255) NULL,
+ CUSTOM_5 VARCHAR2(255) NULL,
+ CUSTOM_6 VARCHAR2(255) NULL,
+ CUSTOM_7 VARCHAR2(255) NULL,
+ CUSTOM_8 VARCHAR2(255) NULL,
+ DETAILS CLOB NULL,
+ CONSTRAINT CLASSIFICATION_HISTORY_EVENT_PKEY PRIMARY KEY (ID)
+);
+
+-- USER can not be taken as table name because it is a reserved keyword.
+CREATE TABLE USER_INFO
+(
+ USER_ID VARCHAR2(32) NOT NULL,
+ FIRST_NAME VARCHAR2(32) NULL,
+ LASTNAME VARCHAR2(32) NULL,
+ FULL_NAME VARCHAR2(64) NULL,
+ LONG_NAME VARCHAR2(64) NULL,
+ E_MAIL VARCHAR2(64) NULL,
+ PHONE VARCHAR2(32) NULL,
+ MOBILE_PHONE VARCHAR2(32) NULL,
+ ORG_LEVEL_4 VARCHAR2(32) NULL,
+ ORG_LEVEL_3 VARCHAR2(32) NULL,
+ ORG_LEVEL_2 VARCHAR2(32) NULL,
+ ORG_LEVEL_1 VARCHAR2(32) NULL,
+ DATA CLOB NULL,
+ CONSTRAINT USER_INFO_PKEY PRIMARY KEY (USER_ID)
+);
+
+CREATE TABLE GROUP_INFO
+(
+ USER_ID VARCHAR2(32) NOT NULL,
+ GROUP_ID VARCHAR2(256) NOT NULL,
+ CONSTRAINT GROUP_INFO_PKEY PRIMARY KEY (USER_ID, GROUP_ID)
+);
+
+CREATE TABLE PERMISSION_INFO
+(
+ USER_ID VARCHAR2(32) NOT NULL,
+ PERMISSION_ID VARCHAR2(256) NOT NULL,
+ CONSTRAINT PERMISSION_INFO_PKEY PRIMARY KEY (USER_ID, PERMISSION_ID)
+);
+
+CREATE SEQUENCE SCHEDULED_JOB_SEQ
+ START WITH 1
+ INCREMENT BY 1
+ CACHE 10;
+
+-- 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 KADAI setup.
+-- ===========================
+CREATE UNIQUE INDEX IDX_CLASSIFICATION_ID ON CLASSIFICATION
+ (ID ASC, CUSTOM_8, CUSTOM_7, CUSTOM_6, CUSTOM_5, CUSTOM_4,
+ CUSTOM_3, CUSTOM_2, CUSTOM_1, APPLICATION_ENTRY_POINT,
+ SERVICE_LEVEL, PRIORITY, DESCRIPTION, NAME, MODIFIED,
+ CREATED, VALID_IN_DOMAIN, DOMAIN, TYPE, CATEGORY, PARENT_KEY,
+ PARENT_ID, KEY);
+COMMIT WORK;
+
+ CREATE INDEX IDX_CLASSIFICATION_CATEGORY ON CLASSIFICATION
+ (CATEGORY ASC, DOMAIN ASC, TYPE ASC, CUSTOM_1
+ ASC, CUSTOM_8 ASC, CUSTOM_7 ASC, CUSTOM_6 ASC,
+ CUSTOM_5 ASC, CUSTOM_4 ASC, CUSTOM_3 ASC, CUSTOM_2
+ ASC, APPLICATION_ENTRY_POINT ASC, SERVICE_LEVEL
+ ASC, PRIORITY ASC, DESCRIPTION ASC, NAME ASC,
+ CREATED ASC, VALID_IN_DOMAIN ASC, PARENT_KEY ASC, PARENT_ID
+ ASC, KEY ASC, ID ASC);
+COMMIT WORK;
+
+CREATE UNIQUE INDEX IDX_CLASSIFICATION_KEY_DOMAIN ON CLASSIFICATION
+ (KEY ASC, DOMAIN ASC, CUSTOM_8, CUSTOM_7, CUSTOM_6,
+ CUSTOM_5, CUSTOM_4, CUSTOM_3, CUSTOM_2, CUSTOM_1,
+ APPLICATION_ENTRY_POINT, SERVICE_LEVEL, PRIORITY,
+ DESCRIPTION, NAME, CREATED, VALID_IN_DOMAIN,
+ TYPE, CATEGORY, PARENT_KEY, PARENT_ID, ID);
+COMMIT WORK;
+
+CREATE INDEX IDX_TASK_WORKBASKET_KEY_DOMAIN ON TASK
+ (WORKBASKET_KEY ASC, DOMAIN DESC);
+COMMIT WORK;
+
+ CREATE INDEX IDX_TASK_POR_VALUE ON TASK
+ (POR_VALUE ASC, WORKBASKET_ID ASC);
+COMMIT WORK;
+
+ CREATE INDEX IDX_TASK_LOWER_POR_VALUE ON TASK
+ (LOWER(POR_VALUE) ASC, WORKBASKET_ID ASC);
+COMMIT WORK;
+
+CREATE INDEX IDX_ATTACHMENT_TASK_ID ON ATTACHMENT
+ (TASK_ID ASC, RECEIVED ASC, CLASSIFICATION_ID
+ ASC, CLASSIFICATION_KEY ASC, MODIFIED ASC, CREATED ASC, ID ASC);
+COMMIT WORK;
+
+CREATE INDEX IDX_WORKBASKET_ID ON WORKBASKET
+ (ID ASC, ORG_LEVEL_4, ORG_LEVEL_3, ORG_LEVEL_2,
+ ORG_LEVEL_1, OWNER, DESCRIPTION, TYPE, DOMAIN, NAME, KEY);
+COMMIT WORK;
+
+CREATE INDEX IDX_WORKBASKET_KEY_DOMAIN ON WORKBASKET
+ (KEY ASC, DOMAIN ASC, ORG_LEVEL_4,
+ ORG_LEVEL_3, ORG_LEVEL_2, ORG_LEVEL_1, CUSTOM_4,
+ CUSTOM_3, CUSTOM_2, CUSTOM_1, OWNER, DESCRIPTION,
+ TYPE, NAME, MODIFIED, CREATED, ID);
+COMMIT WORK;
+
+CREATE INDEX IDX_WORKBASKET_KEY_DOMAIN_ID ON WORKBASKET
+ (KEY ASC, DOMAIN ASC, ID);
+COMMIT WORK;
+
+CREATE INDEX IDX_WB_ACCESS_LIST_ACCESS_ID ON WORKBASKET_ACCESS_LIST
+ (ACCESS_ID ASC, WORKBASKET_ID ASC, PERM_READ ASC);
+COMMIT WORK;
+
+ CREATE INDEX IDX_WB_ACCESS_LIST_WB_ID ON WORKBASKET_ACCESS_LIST
+ (WORKBASKET_ID ASC, PERM_CUSTOM_12 ASC, PERM_CUSTOM_11
+ ASC, PERM_CUSTOM_10 ASC, PERM_CUSTOM_9 ASC, PERM_CUSTOM_8
+ ASC, PERM_CUSTOM_7 ASC, PERM_CUSTOM_6 ASC, PERM_CUSTOM_5
+ ASC, PERM_CUSTOM_4 ASC, PERM_CUSTOM_3 ASC, PERM_CUSTOM_2
+ ASC, PERM_CUSTOM_1 ASC, PERM_DISTRIBUTE ASC, PERM_TRANSFER
+ ASC, PERM_APPEND ASC, PERM_OPEN ASC, PERM_READ
+ ASC, ACCESS_ID ASC);
+COMMIT WORK;
+
+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 ;
+CREATE INDEX IDX_TASK_ID_HISTORY_EVENT ON TASK_HISTORY_EVENT
+ (TASK_ID ASC);
+COMMIT WORK ;
+
diff --git a/common/kadai-common/src/main/resources/sql/oracle/kadai_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
new file mode 100644
index 0000000000..4b97771501
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_5.10.0_to_6.2.0_oracle.sql
@@ -0,0 +1,20 @@
+-- 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 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));
+UPDATE WORKBASKET_ACCESS_LIST
+SET PERM_READTASKS=PERM_READ;
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ALTER PERM_READTASKS DROP DEFAULT;
+
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ADD PERM_EDITTASKS NUMBER(1) DEFAULT 0 NOT NULL CHECK (PERM_EDITTASKS IN (0,1));
+UPDATE WORKBASKET_ACCESS_LIST
+SET PERM_EDITTASKS=PERM_READ;
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ALTER PERM_EDITTASKS DROP DEFAULT
diff --git a/common/kadai-common/src/main/resources/sql/oracle/kadai_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
new file mode 100644
index 0000000000..bbda31e5f2
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_6.2.0_to_7.0.0_oracle.sql
@@ -0,0 +1,24 @@
+-- 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 KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.0.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE PERMISSION_INFO
+(
+ USER_ID VARCHAR2(32) NOT NULL,
+ PERMISSION_ID VARCHAR2(256) NOT NULL,
+ CONSTRAINT PERMISSION_INFO_PKEY PRIMARY KEY (USER_ID, PERMISSION_ID)
+);
+
+ALTER TABLE WORKBASKET
+ADD (
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL
+);
+
+CREATE INDEX IDX_TASK_ID_HISTORY_EVENT ON TASK_HISTORY_EVENT
+ (TASK_ID ASC);
+COMMIT WORK ;
\ No newline at end of file
diff --git a/common/kadai-common/src/main/resources/sql/oracle/kadai_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
new file mode 100644
index 0000000000..4db7ecaf62
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_7.0.0_to_7.1.0_oracle.sql
@@ -0,0 +1,19 @@
+-- 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 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;
+
+UPDATE TASK t
+SET NUMBER_OF_COMMENTS = subquery.COMMENT_COUNT
+FROM (
+ SELECT t.ID, COUNT(tc.ID) AS COMMENT_COUNT
+ FROM TASK t
+ RIGHT OUTER JOIN TASK_COMMENT tc
+ ON t.ID = tc.TASK_ID
+ GROUP BY t.ID
+) AS subquery
+WHERE t.ID = subquery.ID;
diff --git a/common/kadai-common/src/main/resources/sql/oracle/kadai_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
new file mode 100644
index 0000000000..25075f10db
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/oracle/kadai_schema_update_8.1.0_to_8.2.0_oracle.sql
@@ -0,0 +1,19 @@
+-- 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 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;
+
+UPDATE TASK t
+SET NUMBER_OF_COMMENTS = subquery.COMMENT_COUNT
+FROM (
+ SELECT t.ID, COUNT(tc.ID) AS COMMENT_COUNT
+ FROM TASK t
+ RIGHT OUTER JOIN TASK_COMMENT tc
+ ON t.ID = tc.TASK_ID
+ GROUP BY t.ID
+) AS subquery
+WHERE t.ID = subquery.ID;
\ No newline at end of file
diff --git a/common/kadai-common/src/main/resources/sql/oracle/schema-detection-oracle.sql b/common/kadai-common/src/main/resources/sql/oracle/schema-detection-oracle.sql
new file mode 100644
index 0000000000..91753c0de8
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/oracle/schema-detection-oracle.sql
@@ -0,0 +1,3 @@
+ALTER SESSION SET CURRENT_SCHEMA = %schemaName%;
+
+SELECT MAX(VERSION) FROM KADAI_SCHEMA_VERSION;
\ No newline at end of file
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai-schema-postgres.sql b/common/kadai-common/src/main/resources/sql/postgres/kadai-schema-postgres.sql
new file mode 100644
index 0000000000..fc97c88b16
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai-schema-postgres.sql
@@ -0,0 +1,461 @@
+CREATE SCHEMA IF NOT EXISTS %schemaName%;
+
+SET
+search_path TO %schemaName%;
+
+CREATE TABLE KADAI_SCHEMA_VERSION
+(
+ ID INT NOT NULL,
+ VERSION VARCHAR(255) NOT NULL,
+ CREATED TIMESTAMP NOT NULL,
+ PRIMARY KEY (ID)
+);
+
+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'), '7.1.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE CLASSIFICATION
+(
+ ID VARCHAR(40) NOT NULL,
+ KEY VARCHAR(32) NOT NULL,
+ PARENT_ID VARCHAR(40) NOT NULL,
+ PARENT_KEY VARCHAR(32) NOT NULL,
+ CATEGORY VARCHAR(32),
+ TYPE VARCHAR(32),
+ DOMAIN VARCHAR(32) NOT NULL,
+ VALID_IN_DOMAIN BOOLEAN NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ NAME VARCHAR(255) NULL,
+ DESCRIPTION VARCHAR(255) NULL,
+ PRIORITY INT NOT NULL,
+ SERVICE_LEVEL VARCHAR(255) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT UC_CLASS_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
+);
+
+CREATE TABLE WORKBASKET
+(
+ ID VARCHAR(40) NOT NULL,
+ KEY VARCHAR(64) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ NAME VARCHAR(255) NOT NULL,
+ DOMAIN VARCHAR(32) NOT NULL,
+ TYPE VARCHAR(16) NOT NULL,
+ DESCRIPTION VARCHAR(255) NULL,
+ OWNER VARCHAR(128) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ ORG_LEVEL_1 VARCHAR(255) NULL,
+ ORG_LEVEL_2 VARCHAR(255) NULL,
+ ORG_LEVEL_3 VARCHAR(255) NULL,
+ ORG_LEVEL_4 VARCHAR(255) NULL,
+ MARKED_FOR_DELETION BOOLEAN NOT NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT WB_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
+);
+
+CREATE TABLE TASK
+(
+ ID VARCHAR(40) NOT NULL,
+ EXTERNAL_ID VARCHAR(64) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ CLAIMED TIMESTAMP NULL,
+ COMPLETED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ RECEIVED TIMESTAMP NULL,
+ PLANNED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ NAME VARCHAR(255) NULL,
+ CREATOR VARCHAR(32) NULL,
+ DESCRIPTION VARCHAR(1024) NULL,
+ NOTE VARCHAR(4096) NULL,
+ PRIORITY INT NULL,
+ MANUAL_PRIORITY INT NULL,
+ STATE VARCHAR(20) NULL,
+ CLASSIFICATION_CATEGORY VARCHAR(32) NULL,
+ CLASSIFICATION_KEY VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ WORKBASKET_ID VARCHAR(40) NULL,
+ WORKBASKET_KEY VARCHAR(64) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ PARENT_BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ OWNER VARCHAR(32) NULL,
+ POR_COMPANY VARCHAR(32) NOT NULL,
+ POR_SYSTEM VARCHAR(32),
+ POR_INSTANCE VARCHAR(32),
+ POR_TYPE VARCHAR(32) NOT NULL,
+ POR_VALUE VARCHAR(128) NOT NULL,
+ IS_READ BOOLEAN NOT NULL,
+ IS_TRANSFERRED BOOLEAN NOT NULL,
+ CALLBACK_INFO TEXT NULL,
+ CALLBACK_STATE VARCHAR(30) NULL,
+ CUSTOM_ATTRIBUTES TEXT NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ CUSTOM_9 VARCHAR(255) NULL,
+ CUSTOM_10 VARCHAR(255) NULL,
+ CUSTOM_11 VARCHAR(255) NULL,
+ CUSTOM_12 VARCHAR(255) NULL,
+ CUSTOM_13 VARCHAR(255) NULL,
+ CUSTOM_14 VARCHAR(255) NULL,
+ CUSTOM_15 VARCHAR(255) NULL,
+ CUSTOM_16 VARCHAR(255) NULL,
+ CUSTOM_INT_1 INT NULL,
+ CUSTOM_INT_2 INT NULL,
+ CUSTOM_INT_3 INT NULL,
+ CUSTOM_INT_4 INT NULL,
+ CUSTOM_INT_5 INT NULL,
+ CUSTOM_INT_6 INT NULL,
+ CUSTOM_INT_7 INT NULL,
+ CUSTOM_INT_8 INT NULL,
+ NUMBER_OF_COMMENTS INT NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT UC_EXTERNAL_ID UNIQUE (EXTERNAL_ID),
+ CONSTRAINT TASK_WB FOREIGN KEY (WORKBASKET_ID) REFERENCES WORKBASKET ON DELETE NO ACTION,
+ CONSTRAINT TASK_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION ON DELETE NO ACTION
+);
+
+CREATE TABLE DISTRIBUTION_TARGETS
+(
+ SOURCE_ID VARCHAR(40) NOT NULL,
+ TARGET_ID VARCHAR(40) NOT NULL,
+ PRIMARY KEY (SOURCE_ID, TARGET_ID)
+);
+
+CREATE TABLE WORKBASKET_ACCESS_LIST
+(
+ ID VARCHAR(40) NOT NULL,
+ WORKBASKET_ID VARCHAR(40) NOT NULL,
+ ACCESS_ID VARCHAR(255) NOT NULL,
+ ACCESS_NAME VARCHAR(255) NULL,
+ PERM_READ BOOLEAN NOT NULL,
+ PERM_OPEN BOOLEAN NOT NULL,
+ PERM_APPEND BOOLEAN NOT NULL,
+ PERM_TRANSFER BOOLEAN NOT NULL,
+ PERM_DISTRIBUTE BOOLEAN NOT NULL,
+ PERM_CUSTOM_1 BOOLEAN NOT NULL,
+ PERM_CUSTOM_2 BOOLEAN NOT NULL,
+ PERM_CUSTOM_3 BOOLEAN NOT NULL,
+ PERM_CUSTOM_4 BOOLEAN NOT NULL,
+ PERM_CUSTOM_5 BOOLEAN NOT NULL,
+ PERM_CUSTOM_6 BOOLEAN NOT NULL,
+ PERM_CUSTOM_7 BOOLEAN NOT NULL,
+ PERM_CUSTOM_8 BOOLEAN NOT NULL,
+ PERM_CUSTOM_9 BOOLEAN NOT NULL,
+ PERM_CUSTOM_10 BOOLEAN NOT NULL,
+ PERM_CUSTOM_11 BOOLEAN NOT NULL,
+ PERM_CUSTOM_12 BOOLEAN NOT NULL,
+ PERM_READTASKS BOOLEAN NOT NULL,
+ PERM_EDITTASKS BOOLEAN NOT NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT UC_ACCESSID_WBID UNIQUE (ACCESS_ID, WORKBASKET_ID),
+ CONSTRAINT ACCESS_LIST_WB FOREIGN KEY (WORKBASKET_ID) REFERENCES WORKBASKET ON DELETE CASCADE
+);
+
+CREATE TABLE OBJECT_REFERENCE
+(
+ ID VARCHAR(40) NOT NULL,
+ TASK_ID VARCHAR(40) NOT NULL,
+ COMPANY VARCHAR(32) NOT NULL,
+ SYSTEM VARCHAR(32),
+ SYSTEM_INSTANCE VARCHAR(32),
+ TYPE VARCHAR(32) NOT NULL,
+ VALUE VARCHAR(128) NOT NULL
+);
+
+CREATE TABLE ATTACHMENT
+(
+ ID VARCHAR(40) NOT NULL,
+ TASK_ID VARCHAR(40) NOT NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ CLASSIFICATION_KEY VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ REF_COMPANY VARCHAR(32) NOT NULL,
+ REF_SYSTEM VARCHAR(32),
+ REF_INSTANCE VARCHAR(32),
+ REF_TYPE VARCHAR(32) NOT NULL,
+ REF_VALUE VARCHAR(128) NOT NULL,
+ CHANNEL VARCHAR(64) NULL,
+ RECEIVED TIMESTAMP NULL,
+ CUSTOM_ATTRIBUTES TEXT NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT ATT_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION ON DELETE NO ACTION
+);
+
+CREATE TABLE TASK_COMMENT
+(
+ ID VARCHAR(40) NOT NULL,
+ TASK_ID VARCHAR(40) NOT NULL,
+ TEXT_FIELD VARCHAR(1024) NULL,
+ CREATOR VARCHAR(32) NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT COMMENT_TASK FOREIGN KEY (TASK_ID) REFERENCES TASK ON DELETE CASCADE
+);
+
+CREATE TABLE SCHEDULED_JOB
+(
+ JOB_ID INTEGER NOT NULL,
+ PRIORITY INTEGER NULL,
+ CREATED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ STATE VARCHAR(32) NULL,
+ LOCKED_BY VARCHAR(128) NULL,
+ LOCK_EXPIRES TIMESTAMP NULL,
+ TYPE VARCHAR(255) NULL,
+ RETRY_COUNT INTEGER NOT NULL,
+ ARGUMENTS TEXT NULL,
+ PRIMARY KEY (JOB_ID)
+);
+
+CREATE TABLE TASK_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ PARENT_BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+ TASK_ID VARCHAR(40) NULL,
+ EVENT_TYPE VARCHAR(32) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ WORKBASKET_KEY VARCHAR(64) NULL,
+ WORKBASKET_NAME VARCHAR(255) NULL,
+ POR_COMPANY VARCHAR(32) NULL,
+ POR_SYSTEM VARCHAR(32) NULL,
+ POR_INSTANCE VARCHAR(32) NULL,
+ POR_TYPE VARCHAR(32) NULL,
+ POR_VALUE VARCHAR(128) NULL,
+ TASK_PRIORITY INT NULL,
+ TASK_PLANNED TIMESTAMP NULL,
+ TASK_DUE TIMESTAMP NULL,
+ TASK_OWNER VARCHAR(32) NULL,
+ TASK_CLASSIFICATION_KEY VARCHAR(32) NULL,
+ TASK_CLASSIFICATION_NAME VARCHAR(32) NULL,
+ TASK_CLASSIFICATION_CATEGORY VARCHAR(32) NULL,
+ ATTACHMENT_CLASSIFICATION_KEY VARCHAR(32) NULL,
+ ATTACHMENT_CLASSIFICATION_NAME VARCHAR(255) NULL,
+ OLD_VALUE VARCHAR(255) NULL,
+ NEW_VALUE VARCHAR(255) NULL,
+ CUSTOM_1 VARCHAR(128) NULL,
+ CUSTOM_2 VARCHAR(128) NULL,
+ CUSTOM_3 VARCHAR(128) NULL,
+ CUSTOM_4 VARCHAR(128) NULL,
+ DETAILS TEXT NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ WORKBASKET_ID VARCHAR(40) NULL,
+ KEY VARCHAR(64) NULL,
+ TYPE VARCHAR(64) NULL,
+ OWNER VARCHAR(128) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ ORGLEVEL_1 VARCHAR(255) NULL,
+ ORGLEVEL_2 VARCHAR(255) NULL,
+ ORGLEVEL_3 VARCHAR(255) NULL,
+ ORGLEVEL_4 VARCHAR(255) NULL,
+ DETAILS TEXT NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CLASSIFICATION_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
+ CATEGORY VARCHAR(64) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ KEY VARCHAR(40) NULL,
+ NAME VARCHAR(255) NULL,
+ PARENT_ID VARCHAR(40) NOT NULL,
+ PARENT_KEY VARCHAR(32) NOT NULL,
+ PRIORITY INT NOT NULL,
+ SERVICE_LEVEL VARCHAR(255) NULL,
+ TYPE VARCHAR(32),
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ DETAILS TEXT NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CONFIGURATION
+(
+ NAME VARCHAR(8) NOT NULL,
+ ENFORCE_SECURITY BOOLEAN NULL,
+ CUSTOM_ATTRIBUTES TEXT NULL,
+ PRIMARY KEY (NAME)
+);
+
+INSERT INTO CONFIGURATION (NAME)
+VALUES ('MASTER');
+
+
+CREATE TABLE USER_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ FIRST_NAME VARCHAR(32) NULL,
+ LASTNAME VARCHAR(32) NULL,
+ FULL_NAME VARCHAR(64) NULL,
+ LONG_NAME VARCHAR(64) NULL,
+ E_MAIL VARCHAR(64) NULL,
+ PHONE VARCHAR(32) NULL,
+ MOBILE_PHONE VARCHAR(32) NULL,
+ ORG_LEVEL_4 VARCHAR(32) NULL,
+ ORG_LEVEL_3 VARCHAR(32) NULL,
+ ORG_LEVEL_2 VARCHAR(32) NULL,
+ ORG_LEVEL_1 VARCHAR(32) NULL,
+ DATA TEXT NULL,
+ PRIMARY KEY (USER_ID)
+);
+
+CREATE TABLE GROUP_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ GROUP_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, GROUP_ID)
+);
+
+CREATE TABLE PERMISSION_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ PERMISSION_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, PERMISSION_ID)
+);
+
+CREATE SEQUENCE SCHEDULED_JOB_SEQ
+ MINVALUE 1
+ START WITH 1
+ INCREMENT BY 1 CACHE 10;
+
+CREATE INDEX IDX_CLASSIFICATION_ID ON CLASSIFICATION
+ (ID ASC, CUSTOM_8, CUSTOM_7, CUSTOM_6, CUSTOM_5, CUSTOM_4,
+ CUSTOM_3, CUSTOM_2, CUSTOM_1, APPLICATION_ENTRY_POINT,
+ SERVICE_LEVEL, PRIORITY, DESCRIPTION, NAME, MODIFIED,
+ CREATED, VALID_IN_DOMAIN, DOMAIN, TYPE, CATEGORY, PARENT_KEY,
+ PARENT_ID, KEY);
+COMMIT WORK;
+CREATE INDEX IDX_CLASSIFICATION_CATEGORY ON CLASSIFICATION
+ (CATEGORY ASC, DOMAIN ASC, TYPE ASC, CUSTOM_1
+ ASC, CUSTOM_8 ASC, CUSTOM_7 ASC, CUSTOM_6 ASC,
+ CUSTOM_5 ASC, CUSTOM_4 ASC, CUSTOM_3 ASC, CUSTOM_2
+ ASC, APPLICATION_ENTRY_POINT ASC, SERVICE_LEVEL
+ ASC, PRIORITY ASC, DESCRIPTION ASC, NAME ASC,
+ CREATED ASC, VALID_IN_DOMAIN ASC, PARENT_KEY ASC, PARENT_ID
+ ASC, KEY ASC, ID ASC);
+COMMIT WORK;
+CREATE INDEX IDX_CLASSIFICATION_KEY_DOMAIN ON CLASSIFICATION
+ (KEY ASC, DOMAIN ASC, CUSTOM_8, CUSTOM_7, CUSTOM_6,
+ CUSTOM_5, CUSTOM_4, CUSTOM_3, CUSTOM_2, CUSTOM_1,
+ APPLICATION_ENTRY_POINT, SERVICE_LEVEL, PRIORITY,
+ DESCRIPTION, NAME, CREATED, VALID_IN_DOMAIN,
+ TYPE, CATEGORY, PARENT_KEY, PARENT_ID, ID);
+COMMIT WORK;
+
+
+ CREATE INDEX IDX_TASK_WORKBASKET_KEY_DOMAIN ON TASK
+ (WORKBASKET_KEY ASC, DOMAIN DESC);
+ COMMIT WORK ;
+ CREATE INDEX IDX_TASK_LOWER_POR_VALUE ON TASK
+ (LOWER(POR_VALUE) ASC, WORKBASKET_ID ASC);
+ COMMIT WORK ;
+ CREATE INDEX IDX_TASK_POR_VALUE ON TASK
+ (POR_VALUE ASC, WORKBASKET_ID ASC);
+ COMMIT WORK ;
+
+CREATE INDEX IDX_ATTACHMENT_TASK_ID ON ATTACHMENT
+ (TASK_ID ASC, RECEIVED ASC, CLASSIFICATION_ID
+ ASC, CLASSIFICATION_KEY ASC, MODIFIED ASC, CREATED
+ ASC, ID ASC);
+COMMIT WORK;
+
+
+CREATE INDEX IDX_WORKBASKET_ID ON WORKBASKET
+ (ID ASC, ORG_LEVEL_4, ORG_LEVEL_3, ORG_LEVEL_2,
+ ORG_LEVEL_1, OWNER, DESCRIPTION, TYPE, DOMAIN, NAME, KEY);
+COMMIT WORK;
+CREATE INDEX IDX_WORKBASKET_KEY_DOMAIN ON WORKBASKET
+ (KEY ASC, DOMAIN ASC, ORG_LEVEL_4,
+ ORG_LEVEL_3, ORG_LEVEL_2, ORG_LEVEL_1, CUSTOM_4,
+ CUSTOM_3, CUSTOM_2, CUSTOM_1, OWNER, DESCRIPTION,
+ TYPE, NAME, MODIFIED, CREATED, ID);
+COMMIT WORK;
+CREATE INDEX IDX_WORKBASKET_KEY_DOMAIN_ID ON WORKBASKET
+ (KEY ASC, DOMAIN ASC, ID);
+COMMIT WORK;
+
+
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_ACCESS_ID ON WORKBASKET_ACCESS_LIST
+ (ACCESS_ID ASC, WORKBASKET_ID ASC, PERM_READ ASC);
+COMMIT WORK;
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_WORKBASKET_ID ON WORKBASKET_ACCESS_LIST
+ (WORKBASKET_ID ASC, PERM_CUSTOM_12 ASC, PERM_CUSTOM_11
+ ASC, PERM_CUSTOM_10 ASC, PERM_CUSTOM_9 ASC, PERM_CUSTOM_8
+ ASC, PERM_CUSTOM_7 ASC, PERM_CUSTOM_6 ASC, PERM_CUSTOM_5
+ ASC, PERM_CUSTOM_4 ASC, PERM_CUSTOM_3 ASC, PERM_CUSTOM_2
+ ASC, PERM_CUSTOM_1 ASC, PERM_DISTRIBUTE ASC, PERM_TRANSFER
+ ASC, PERM_APPEND ASC, PERM_OPEN ASC, PERM_READ
+ ASC, ACCESS_ID ASC);
+COMMIT WORK;
+
+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 ;
+CREATE INDEX IDX_TASK_ID_HISTORY_EVENT ON TASK_HISTORY_EVENT
+ (TASK_ID ASC);
+COMMIT WORK ;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..5b136b05e7
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_0.9.2_to_1.0.2_postgres.sql
@@ -0,0 +1,56 @@
+-- this script migrates the schema only.
+-- data is not migrated, as this is currently not necessary.
+
+SET SCHEMA %schemaName%;
+
+DROP TABLE KADAI_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 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;
+
+CREATE TABLE SCHEDULED_JOB(
+ JOB_ID INTEGER NOT NULL,
+ PRIORITY INTEGER NULL,
+ CREATED TIMESTAMP NULL,
+ DUE TIMESTAMP NULL,
+ STATE VARCHAR(32) NULL,
+ LOCKED_BY VARCHAR(32) NULL,
+ LOCK_EXPIRES TIMESTAMP NULL,
+ TYPE VARCHAR(32) NULL,
+ RETRY_COUNT INTEGER NOT NULL,
+ ARGUMENTS TEXT NULL,
+ PRIMARY KEY (JOB_ID)
+);
+
+DROP SEQUENCE JOB_SEQ;
+
+CREATE SEQUENCE SCHEDULED_JOB_SEQ
+ MINVALUE 1
+ START WITH 1
+ INCREMENT BY 1
+ CACHE 10;
+
+ALTER TABLE CLASSIFICATION
+ ADD COLUMN PARENT_KEY
+ VARCHAR(32) NOT NULL DEFAULT '';
+
+UPDATE CLASSIFICATION C
+ SET C.PARENT_KEY =
+ (SELECT KEY FROM CLASSIFICATION WHERE ID = C.PARENT_ID)
+ WHERE C.PARENT_ID != '';
+
+ALTER TABLE TASK
+ ADD COLUMN CALLBACK_INFO
+ TEXT NULL DEFAULT NULL;
+
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ADD COLUMN ACCESS_NAME
+ VARCHAR(255) NULL DEFAULT NULL;
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 0000000000..9a951e1060
--- /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 0000000000..9d694a250a
--- /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/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..8969a50bc6
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.1.5_to_1.2.1_postgres.sql
@@ -0,0 +1,12 @@
+-- this script adds a unique constraint to WORKBASKET_ACCESS_LIST
+-- allowing a maximum of one WORKBASKET_ACCESS_LIST per workbasket and access_id
+-- Please replace %schemaName% before executing the script
+
+SET search_path = %schemaName%;
+
+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
+
+ALTER TABLE WORKBASKET_ACCESS_LIST ADD CONSTRAINT UC_ACCESSID_WBID UNIQUE (ACCESS_ID, WORKBASKET_ID);
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..342acc56b7
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_1.2.1_to_2.0.2_postgres.sql
@@ -0,0 +1,16 @@
+-- this script adds a TASK_COMMENT table and updates the table KADAI_SCHEMA_VERSION.
+
+SET search_path = %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('2.0.2', CURRENT_TIMESTAMP);
+
+CREATE TABLE TASK_COMMENT(
+ ID CHAR(40) NOT NULL,
+ TASK_ID CHAR(40) NOT NULL,
+ TEXT_FIELD VARCHAR(1024) NULL,
+ CREATOR VARCHAR(32) NULL,
+ CREATED TIMESTAMP NULL,
+ MODIFIED TIMESTAMP NULL,
+ PRIMARY KEY (ID),
+ CONSTRAINT COMMENT_TASK FOREIGN KEY (TASK_ID) REFERENCES TASK ON DELETE CASCADE
+);
\ No newline at end of file
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..8d8c74472b
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_2.0.2_to_3.0.0_postgres.sql
@@ -0,0 +1,51 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
+
+SET search_path = %schemaName%;
+
+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;
+
+ALTER TABLE CLASSIFICATION ALTER COLUMN ID TYPE VARCHAR(40);
+
+ALTER TABLE WORKBASKET ALTER COLUMN ID TYPE VARCHAR(40);
+
+ALTER TABLE TASK ALTER COLUMN ID TYPE VARCHAR(40);
+
+ALTER TABLE TASK ALTER COLUMN WORKBASKET_ID TYPE VARCHAR(40);
+
+ALTER TABLE TASK ALTER COLUMN CLASSIFICATION_ID TYPE VARCHAR(40);
+
+ALTER TABLE DISTRIBUTION_TARGETS ALTER COLUMN SOURCE_ID TYPE VARCHAR(40);
+
+ALTER TABLE DISTRIBUTION_TARGETS ALTER COLUMN TARGET_ID TYPE VARCHAR(40);
+
+ALTER TABLE WORKBASKET_ACCESS_LIST ALTER COLUMN ID TYPE VARCHAR(40);
+
+ALTER TABLE WORKBASKET_ACCESS_LIST ALTER COLUMN WORKBASKET_ID TYPE VARCHAR(40);
+
+ALTER TABLE OBJECT_REFERENCE ALTER COLUMN ID TYPE VARCHAR(40);
+
+ALTER TABLE ATTACHMENT ALTER COLUMN ID TYPE VARCHAR(40);
+
+ALTER TABLE ATTACHMENT ALTER COLUMN TASK_ID TYPE VARCHAR(40);
+
+ALTER TABLE ATTACHMENT ALTER COLUMN CLASSIFICATION_ID TYPE VARCHAR(40);
+
+ALTER TABLE TASK_COMMENT ALTER COLUMN ID TYPE VARCHAR(40);
+
+ALTER TABLE TASK_COMMENT ALTER COLUMN TASK_ID TYPE VARCHAR(40);
+
+CREATE TABLE CONFIGURATION (
+ ENFORCE_SECURITY BOOLEAN NOT NULL
+);
+
+-- TSK-1227 allow null values in OBJECT_REFERENCE#SYSTEM and OBJECT_REFERENCE#SYSTEM_INSTANCE
+
+ALTER TABLE OBJECT_REFERENCE ALTER COLUMN SYSTEM DROP NOT NULL;
+ALTER TABLE OBJECT_REFERENCE ALTER COLUMN SYSTEM_INSTANCE DROP NOT NULL;
+
+ALTER TABLE TASK ALTER COLUMN POR_SYSTEM DROP NOT NULL;
+ALTER TABLE TASK ALTER COLUMN POR_INSTANCE DROP NOT NULL;
+
+
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..043afa95bb
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_3.0.0_to_4.0.0_postgres.sql
@@ -0,0 +1,65 @@
+-- this script updates the tables KADAI_SCHEMA_VERSION and HISTORY_EVENTS.
+
+SET search_path = %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.0.0', CURRENT_TIMESTAMP);
+
+ALTER TABLE HISTORY_EVENTS ALTER COLUMN ID DROP IDENTITY;
+
+ALTER TABLE HISTORY_EVENTS ALTER COLUMN ID TYPE VARCHAR(40);
+
+ALTER TABLE HISTORY_EVENTS RENAME TO TASK_HISTORY_EVENT;
+
+UPDATE TASK_HISTORY_EVENT SET ID = REPLACE(ID,'HEI','THI') WHERE ID LIKE '%HEI%';
+
+CREATE TABLE WORKBASKET_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ WORKBASKET_ID VARCHAR(40) NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ KEY VARCHAR(64) NULL,
+ TYPE VARCHAR(64) NULL,
+ OWNER VARCHAR(128) NULL,
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ ORGLEVEL_1 VARCHAR(255) NULL,
+ ORGLEVEL_2 VARCHAR(255) NULL,
+ ORGLEVEL_3 VARCHAR(255) NULL,
+ ORGLEVEL_4 VARCHAR(255) NULL,
+ DETAILS TEXT NULL,
+ PRIMARY KEY (ID)
+);
+
+CREATE TABLE CLASSIFICATION_HISTORY_EVENT
+(
+ ID VARCHAR(40) NOT NULL,
+ EVENT_TYPE VARCHAR(40) NULL,
+ CREATED TIMESTAMP NULL,
+ USER_ID VARCHAR(32) NULL,
+ CLASSIFICATION_ID VARCHAR(40) NULL,
+ APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
+ CATEGORY VARCHAR(64) NULL,
+ DOMAIN VARCHAR(32) NULL,
+ KEY VARCHAR(40) NULL,
+ NAME VARCHAR(255) NULL,
+ PARENT_ID VARCHAR(40) NOT NULL,
+ PARENT_KEY VARCHAR(32) NOT NULL,
+ PRIORITY INT NOT NULL,
+ SERVICE_LEVEL VARCHAR(255) NULL,
+ TYPE VARCHAR(32),
+ CUSTOM_1 VARCHAR(255) NULL,
+ CUSTOM_2 VARCHAR(255) NULL,
+ CUSTOM_3 VARCHAR(255) NULL,
+ CUSTOM_4 VARCHAR(255) NULL,
+ CUSTOM_5 VARCHAR(255) NULL,
+ CUSTOM_6 VARCHAR(255) NULL,
+ CUSTOM_7 VARCHAR(255) NULL,
+ CUSTOM_8 VARCHAR(255) NULL,
+ DETAILS TEXT NULL,
+ PRIMARY KEY (ID)
+);
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 0000000000..642168a939
--- /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/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..d488cd2f6a
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.11.0_to_5.0.0_postgres.sql
@@ -0,0 +1,89 @@
+-- this script updates the KADAI database schema from version 4.11.0 to version 5.0.0.
+
+SET search_path = %schemaName%;
+
+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';
+
+DROP INDEX IF EXISTS IDX_CLASSIFICATION_1;
+CREATE INDEX IDX_CLASSIFICATION_ID ON CLASSIFICATION
+ (ID ASC, CUSTOM_8, CUSTOM_7, CUSTOM_6, CUSTOM_5, CUSTOM_4,
+ CUSTOM_3, CUSTOM_2, CUSTOM_1, APPLICATION_ENTRY_POINT,
+ SERVICE_LEVEL, PRIORITY, DESCRIPTION, NAME, MODIFIED,
+ CREATED, VALID_IN_DOMAIN, DOMAIN, TYPE, CATEGORY, PARENT_KEY,
+ PARENT_ID, KEY);
+COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_CLASSIFICATION_2;
+CREATE INDEX IDX_CLASSIFICATION_CATEGORY ON CLASSIFICATION
+ (CATEGORY ASC, DOMAIN ASC, TYPE ASC, CUSTOM_1
+ ASC, CUSTOM_8 ASC, CUSTOM_7 ASC, CUSTOM_6 ASC,
+ CUSTOM_5 ASC, CUSTOM_4 ASC, CUSTOM_3 ASC, CUSTOM_2
+ ASC, APPLICATION_ENTRY_POINT ASC, SERVICE_LEVEL
+ ASC, PRIORITY ASC, DESCRIPTION ASC, NAME ASC,
+ CREATED ASC, VALID_IN_DOMAIN ASC, PARENT_KEY ASC, PARENT_ID
+ ASC, KEY ASC, ID ASC);
+COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_CLASSIFICATION_3;
+CREATE INDEX IDX_CLASSIFICATION_KEY_DOMAIN ON CLASSIFICATION
+ (KEY ASC, DOMAIN ASC, CUSTOM_8, CUSTOM_7, CUSTOM_6,
+ CUSTOM_5, CUSTOM_4, CUSTOM_3, CUSTOM_2, CUSTOM_1,
+ APPLICATION_ENTRY_POINT, SERVICE_LEVEL, PRIORITY,
+ DESCRIPTION, NAME, CREATED, VALID_IN_DOMAIN,
+ TYPE, CATEGORY, PARENT_KEY, PARENT_ID, ID) ;
+COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_TASK_1;
+CREATE INDEX IDX_TASK_WORKBASKET_KEY_DOMAIN ON TASK
+ (WORKBASKET_KEY ASC, DOMAIN DESC);
+COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_TASK_2;
+CREATE INDEX IDX_TASK_POR_VALUE ON TASK
+ (LOWER(POR_VALUE) ASC, WORKBASKET_ID ASC);
+COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_ATTACHMENT_1;
+DROP INDEX IF EXISTS IDX_ATTACHMENT_2;
+CREATE INDEX IDX_ATTACHMENT_TASK_ID ON ATTACHMENT
+ (TASK_ID ASC, RECEIVED ASC, CLASSIFICATION_ID
+ ASC, CLASSIFICATION_KEY ASC, MODIFIED ASC, CREATED
+ ASC, ID ASC) ;
+COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_WORKBASKET_1;
+CREATE INDEX IDX_WORKBASKET_ID ON WORKBASKET
+ (ID ASC, ORG_LEVEL_4, ORG_LEVEL_3, ORG_LEVEL_2,
+ ORG_LEVEL_1, OWNER, DESCRIPTION, TYPE, DOMAIN, NAME, KEY);
+COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_WORKBASKET_2;
+CREATE INDEX IDX_WORKBASKET_KEY_DOMAIN ON WORKBASKET
+ (KEY ASC, DOMAIN ASC, ORG_LEVEL_4,
+ ORG_LEVEL_3, ORG_LEVEL_2, ORG_LEVEL_1, CUSTOM_4,
+ CUSTOM_3, CUSTOM_2, CUSTOM_1, OWNER, DESCRIPTION,
+ TYPE, NAME, MODIFIED, CREATED, ID) ;
+COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_WORKBASKET_3;
+CREATE INDEX IDX_WORKBASKET_KEY_DOMAIN_ID ON WORKBASKET
+ (KEY ASC, DOMAIN ASC, ID) ;
+ COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_WBAL_1;
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_ACCESS_ID ON WORKBASKET_ACCESS_LIST
+ (ACCESS_ID ASC, WORKBASKET_ID ASC, PERM_READ ASC) ;
+COMMIT WORK ;
+
+DROP INDEX IF EXISTS IDX_WBAL_2;
+CREATE INDEX IDX_WORKBASKET_ACCESS_LIST_WORKBASKET_ID ON WORKBASKET_ACCESS_LIST
+ (WORKBASKET_ID ASC, PERM_CUSTOM_12 ASC, PERM_CUSTOM_11
+ ASC, PERM_CUSTOM_10 ASC, PERM_CUSTOM_9 ASC, PERM_CUSTOM_8
+ ASC, PERM_CUSTOM_7 ASC, PERM_CUSTOM_6 ASC, PERM_CUSTOM_5
+ ASC, PERM_CUSTOM_4 ASC, PERM_CUSTOM_3 ASC, PERM_CUSTOM_2
+ ASC, PERM_CUSTOM_1 ASC, PERM_DISTRIBUTE ASC, PERM_TRANSFER
+ ASC, PERM_APPEND ASC, PERM_OPEN ASC, PERM_READ
+ ASC, ACCESS_ID ASC) ;
+COMMIT WORK ;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..29c2d7ea82
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.3.0_to_4.8.0_postgres.sql
@@ -0,0 +1,47 @@
+-- this script updates the KADAI database schema from version 4.3.0 to version 4.8.0.
+
+SET search_path = %schemaName%;
+
+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;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_1 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_2 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_3 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_4 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_5 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_6 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_7 INT NULL;
+ALTER TABLE TASK ADD COLUMN CUSTOM_INT_8 INT NULL;
+
+ALTER TABLE CONFIGURATION ADD COLUMN CUSTOM_ATTRIBUTES TEXT NULL;
+
+ALTER TABLE SCHEDULED_JOB ALTER COLUMN TYPE SET DATA TYPE VARCHAR(255);
+
+ALTER TABLE CLASSIFICATION ALTER COLUMN DOMAIN SET DATA TYPE VARCHAR(32);
+
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_PRIORITY INT NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_PLANNED TIMESTAMP NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_DUE TIMESTAMP NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_OWNER VARCHAR(32) NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN TASK_CLASSIFICATION_NAME VARCHAR(255) NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN ATTACHMENT_CLASSIFICATION_NAME VARCHAR(255) NULL;
+ALTER TABLE TASK_HISTORY_EVENT ADD COLUMN WORKBASKET_NAME VARCHAR(255) NULL;
+
+CREATE TABLE USER_INFO (
+ USER_ID VARCHAR(32) NOT NULL,
+ FIRST_NAME VARCHAR(32) NULL,
+ LASTNAME VARCHAR(32) NULL,
+ FULL_NAME VARCHAR(64) NULL,
+ LONG_NAME VARCHAR(64) NULL,
+ E_MAIL VARCHAR(64) NULL,
+ PHONE VARCHAR(32) NULL,
+ MOBILE_PHONE VARCHAR(32) NULL,
+ ORG_LEVEL_4 VARCHAR(32) NULL,
+ ORG_LEVEL_3 VARCHAR(32) NULL,
+ ORG_LEVEL_2 VARCHAR(32) NULL,
+ ORG_LEVEL_1 VARCHAR(32) NULL,
+ DATA TEXT NULL,
+ PRIMARY KEY (USER_ID)
+);
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..dfcc6931a9
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_4.8.0_to_4.11.0_postgres.sql
@@ -0,0 +1,43 @@
+-- this script updates the KADAI database schema from version 4.8.0 to version 4.11.0.
+
+SET search_path = %schemaName%;
+
+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;
+ALTER TABLE CONFIGURATION ALTER COLUMN NAME DROP DEFAULT;
+ALTER TABLE CONFIGURATION ADD PRIMARY KEY (NAME);
+
+INSERT INTO CONFIGURATION (NAME) VALUES ('MASTER') ON CONFLICT DO NOTHING;
+
+UPDATE TASK SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
+UPDATE TASK SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
+UPDATE TASK SET CUSTOM_3 = '' WHERE CUSTOM_3 IS NULL;
+UPDATE TASK SET CUSTOM_4 = '' WHERE CUSTOM_4 IS NULL;
+UPDATE TASK SET CUSTOM_5 = '' WHERE CUSTOM_5 IS NULL;
+UPDATE TASK SET CUSTOM_6 = '' WHERE CUSTOM_6 IS NULL;
+UPDATE TASK SET CUSTOM_7 = '' WHERE CUSTOM_7 IS NULL;
+UPDATE TASK SET CUSTOM_8 = '' WHERE CUSTOM_8 IS NULL;
+UPDATE TASK SET CUSTOM_9 = '' WHERE CUSTOM_9 IS NULL;
+UPDATE TASK SET CUSTOM_10 = '' WHERE CUSTOM_10 IS NULL;
+UPDATE TASK SET CUSTOM_11 = '' WHERE CUSTOM_11 IS NULL;
+UPDATE TASK SET CUSTOM_12 = '' WHERE CUSTOM_12 IS NULL;
+UPDATE TASK SET CUSTOM_13 = '' WHERE CUSTOM_13 IS NULL;
+UPDATE TASK SET CUSTOM_14 = '' WHERE CUSTOM_14 IS NULL;
+UPDATE TASK SET CUSTOM_15 = '' WHERE CUSTOM_15 IS NULL;
+UPDATE TASK SET CUSTOM_16 = '' WHERE CUSTOM_16 IS NULL;
+
+UPDATE WORKBASKET SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
+UPDATE WORKBASKET SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
+UPDATE WORKBASKET SET CUSTOM_3 = '' WHERE CUSTOM_3 IS NULL;
+UPDATE WORKBASKET SET CUSTOM_4 = '' WHERE CUSTOM_4 IS NULL;
+
+UPDATE CLASSIFICATION SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_3 = '' WHERE CUSTOM_3 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_4 = '' WHERE CUSTOM_4 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_5 = '' WHERE CUSTOM_5 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_6 = '' WHERE CUSTOM_6 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_7 = '' WHERE CUSTOM_7 IS NULL;
+UPDATE CLASSIFICATION SET CUSTOM_8 = '' WHERE CUSTOM_8 IS NULL;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..dc50f43793
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.0.0_to_5.1.0_postgres.sql
@@ -0,0 +1,14 @@
+-- this script updates the KADAI database schema from version 5.0.0 to version 5.1.0.
+
+SET search_path = %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.1.0', CURRENT_TIMESTAMP);
+
+DROP INDEX IF EXISTS IDX_TASK_POR_VALUE;
+
+ CREATE INDEX IDX_TASK_LOWER_POR_VALUE ON TASK
+ (LOWER(POR_VALUE) ASC, WORKBASKET_ID ASC);
+ COMMIT WORK ;
+ CREATE INDEX IDX_TASK_POR_VALUE ON TASK
+ (POR_VALUE ASC, WORKBASKET_ID ASC);
+ COMMIT WORK ;
\ No newline at end of file
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..63c9805ada
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.1.0_to_5.2.0_postgres.sql
@@ -0,0 +1,14 @@
+-- this script updates the KADAI database schema from version 5.1.0 to version 5.2.0.
+
+SET search_path = %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (VERSION, CREATED) VALUES ('5.2.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE GROUP_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ GROUP_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, GROUP_ID)
+);
+
+ALTER TABLE SCHEDULED_JOB ALTER COLUMN LOCKED_BY SET DATA TYPE VARCHAR(128);
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..ea37182361
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_5.10.0_to_6.2.0_postgres.sql
@@ -0,0 +1,20 @@
+-- this script updates the KADAI database schema from version 5.10.0 to version 6.2.0.
+SET
+search_path = %schemaName%;
+
+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;
+UPDATE WORKBASKET_ACCESS_LIST
+SET PERM_READTASKS=PERM_READ;
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ALTER COLUMN PERM_READTASKS DROP DEFAULT;
+
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ADD COLUMN PERM_EDITTASKS BOOLEAN NOT NULL DEFAULT FALSE;
+UPDATE WORKBASKET_ACCESS_LIST
+SET PERM_EDITTASKS=PERM_READ;
+ALTER TABLE WORKBASKET_ACCESS_LIST
+ ALTER COLUMN PERM_EDITTASKS DROP DEFAULT;
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 0000000000..230ab1aa10
--- /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/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..7195f2845d
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_6.2.0_to_7.0.0_postgres.sql
@@ -0,0 +1,23 @@
+-- this script updates the KADAI database schema from version 6.2.0 to version 7.0.0.
+
+SET search_path = %schemaName%;
+
+INSERT INTO KADAI_SCHEMA_VERSION (ID, VERSION, CREATED)
+VALUES (nextval('KADAI_SCHEMA_VERSION_ID_SEQ'), '7.0.0', CURRENT_TIMESTAMP);
+
+CREATE TABLE PERMISSION_INFO
+(
+ USER_ID VARCHAR(32) NOT NULL,
+ PERMISSION_ID VARCHAR(256) NOT NULL,
+ PRIMARY KEY (USER_ID, PERMISSION_ID)
+);
+
+ALTER TABLE WORKBASKET
+ ADD COLUMN CUSTOM_5 VARCHAR(255) NULL,
+ ADD COLUMN CUSTOM_6 VARCHAR(255) NULL,
+ ADD COLUMN CUSTOM_7 VARCHAR(255) NULL,
+ ADD COLUMN CUSTOM_8 VARCHAR(255) NULL;
+
+CREATE INDEX IDX_TASK_ID_HISTORY_EVENT ON TASK_HISTORY_EVENT
+ (TASK_ID ASC);
+COMMIT WORK ;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..96016b68eb
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_7.0.0_to_7.1.0_postgres.sql
@@ -0,0 +1,20 @@
+-- this script updates the KADAI database schema from version 7.0.0 to version 7.1.0.
+
+SET search_path = %schemaName%;
+
+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;
+
+UPDATE TASK t
+SET NUMBER_OF_COMMENTS = subquery.COMMENT_COUNT
+FROM (
+ SELECT t.ID, COUNT(tc.ID) AS COMMENT_COUNT
+ FROM TASK t
+ RIGHT OUTER JOIN TASK_COMMENT tc
+ ON t.ID = tc.TASK_ID
+ GROUP BY t.ID
+) AS subquery
+WHERE t.ID = subquery.ID;
diff --git a/common/kadai-common/src/main/resources/sql/postgres/kadai_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
new file mode 100644
index 0000000000..e6ca95cfca
--- /dev/null
+++ b/common/kadai-common/src/main/resources/sql/postgres/kadai_schema_update_8.1.0_to_8.2.0_postgres.sql
@@ -0,0 +1,20 @@
+-- this script updates the KADAI database schema from version 8.1.0 to version 8.2.0.
+
+SET search_path = %schemaName%;
+
+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;
+
+UPDATE TASK t
+SET NUMBER_OF_COMMENTS = subquery.COMMENT_COUNT
+FROM (
+ SELECT t.ID, COUNT(tc.ID) AS COMMENT_COUNT
+ FROM TASK t
+ RIGHT OUTER JOIN TASK_COMMENT tc
+ ON t.ID = tc.TASK_ID
+ GROUP BY t.ID
+) AS subquery
+WHERE t.ID = subquery.ID;
\ No newline at end of file
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 0000000000..6ebccb2527
--- /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 ea86390f63..b7194c14c8 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 8d503985df..ab90d5b454 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 715884f506..f736cb8c8b 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 585230a4e4..2e3326e998 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 e56d6ded7e..09f8c36acd 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.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 cace7ddecb..fa2e0e252f 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 9c13c8abf6..4076d48253 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 9f0599ebbe..e775a5ce3b 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 8b081b1051..4706fd1608 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/kadai-common/src/test/java/io/kadai/common/internal/util/spi/ServiceProviderInterface.java b/common/kadai-common/src/test/java/io/kadai/common/internal/util/spi/ServiceProviderInterface.java
new file mode 100644
index 0000000000..ecd6855d6b
--- /dev/null
+++ b/common/kadai-common/src/test/java/io/kadai/common/internal/util/spi/ServiceProviderInterface.java
@@ -0,0 +1,5 @@
+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 9e076e3f09..b9595b5751 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 0b7f7fce8e..034eb72719 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.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 fee3f26393..2b5f22ceab 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.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 133e8c37f5..ec1baf3099 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 0000000000..e8bb2472a3
--- /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 aa4320b972..78736027ae 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 f6f064df2b..0000000000
--- 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-data/src/main/resources/sql/sample-data/attachment.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql
deleted file mode 100644
index 1d2cc63930..0000000000
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- sample-data is used for rest tests and for the example application
-
--- ATTACHMENT TABLE (ID , task_ID , CREATED , MODIFIED , classif key, classif Id , refCompany, ref sys, ref inst, ref type, ref val, channel, received, custAtts)
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000000','TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000001','TKI:000000000000000000000000000000000001', '2018-01-29 15:55:01', '2018-01-30 15:55:00', 'L10303' , 'CLI:000000000000000000000000000000000002', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000002','TKI:000000000000000000000000000000000001', '2018-01-29 15:55:02', '2018-01-30 15:55:00', 'L1050' , 'CLI:000000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000003','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:03', null , 'L11010' , 'CLI:000000000000000000000000000000000004', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000004','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:04', null , 'L110102' , 'CLI:000000000000000000000000000000000005', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000005','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:05', null , 'L110105' , 'CLI:000000000000000000000000000000000006', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000006','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:06', null , 'L110107' , 'CLI:000000000000000000000000000000000007', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000007','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:07', null , 'L12010' , 'CLI:100000000000000000000000000000000008', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000008','TKI:000000000000000000000000000000000008', '2018-01-29 15:55:08', null , 'L140101' , 'CLI:000000000000000000000000000000000009', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000009','TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000010','TKI:000000000000000000000000000000000053', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000011','TKI:000000000000000000000000000000000053', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000012','TKI:000000000000000000000000000000000054', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000013','TKI:000000000000000000000000000000000055', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null );
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/user.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/user.sql
deleted file mode 100644
index fbe388bfb8..0000000000
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/user.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- sample-data is used for rest tests and for the example application
-
--- USER_INFO TABLE (USER_ID , FIRST_NAME , LASTNAME , FULL_NAME , LONG_NAME , E_MAIL , PHONE , MOBILE_PHONE , ORG_LEVEL_4 , ORG_LEVEL_3 , ORG_LEVEL_2 , ORG_LEVEL_1 , DATA
-insert into USER_INFO values('teamlead-1' , 'Titus' , 'Toll' , 'Toll, Titus' , 'Toll, Titus - (teamlead-1)' , 'titus.toll@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , 'xy' );
-insert into USER_INFO values('user-1-1' , 'Max' , 'Mustermann' , 'Mustermann, Max' , 'Mustermann, Max - (user-1-1)' , 'max.mustermann@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-1-2' , 'Elena' , 'Eifrig' , 'Eifrig, Elena' , 'Eifrig, Elena - (user-1-2)' , 'elena.eifrig@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-1-3' , 'Elena' , 'Faul' , 'Faul, Elena' , 'Faul, Elena - (user-1-3)' , 'elena.faul@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-1' , 'Simone' , 'Müller' , 'Müller, Simone' , 'Müller, Simone - (user-2-1)' , 'simone.müller@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-2' , 'Tim' , 'Schläfrig' , 'Schläfrig, Tim' , 'Schläfrig, Tim - (user-2-2)' , 'tim.schläfrig@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-3' , 'Thomas' , 'Bach' , 'Bach, Thomas' , 'Bach, Thomas - (user-2-3)' , 'thomas.bach@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-4' , 'Rolf' , 'Wieland' , 'Wieland, Rolf' , 'Wieland, Rolf - (user-2-4)' , 'rolf.wieland@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-5' , 'Heike' , 'Schmidt' , 'Schmidt, Heike' , 'Schmidt, Heike - (user-2-5)' , 'heike.schmidt@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-6' , 'Kurt' , 'Maier' , 'Maier, Kurt' , 'Maier, Kurt - (user-2-6)' , 'kurt.maier@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-7' , 'Wiebke' , 'Meyer' , 'Meyer, Wiebke' , 'Meyer, Wiebke - (user-2-7)' , 'wiebke.meyer@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-9' , 'Nathalie' , 'Fuchs' , 'Fuchs, Nathalie' , 'Fuchs, Nathalie - (user-2-9)' , 'nathalie.fuchs@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-10' , 'Johannes' , 'Renz' , 'Renz, Johannes' , 'Renz, Johannes - (user-2-10)' , 'johannes.renz@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-insert into USER_INFO values('user-2-11' , 'Max' , 'Renz' , 'Renz, Max' , 'Renz, Max - (user-2-11)' , 'max.renz@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql
deleted file mode 100644
index 4f32521195..0000000000
--- a/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql
+++ /dev/null
@@ -1,69 +0,0 @@
--- sample-data is used for rest tests and for the example application
-
--- KSC authorizations (ID , WB_ID , ACCESS_ID , ACCESS_NAME , READ , OPEN , APPEND, TRANSFER, DISTRIBUTE, C1, .., C12)
--- PPKs
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead-1' , 'Titus Toll' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'user-1-1' , 'Max Mustermann' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'WBI:100000000000000000000000000000000007', 'user-1-2' , 'Elena Eifrig' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008', 'user-2-1' , 'Simone Müller' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009', 'user-2-2' , 'Tim Schläfrig' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016201', 'WBI:100000000000000000000000000000000016', 'user-2-1' , 'Simone Müller' , true , true , true , true , true , true , false , false , false , false , false , false , false , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016202', 'WBI:100000000000000000000000000000000016', 'user-2-2' , 'Tim Schläfrig' , true , true , true , true , true , false , true , false , false , false , false , false , false , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016203', 'WBI:100000000000000000000000000000000016', 'user-2-3' , 'Thomas Bach' , true , true , true , true , true , false , false , true , false , false , false , false , false , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016204', 'WBI:100000000000000000000000000000000016', 'user-2-4' , 'Rolf Wieland' , true , true , true , true , true , false , false , false , true , false , false , false , false , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016205', 'WBI:100000000000000000000000000000000016', 'user-2-5' , 'Heike Schmidt' , true , true , true , true , true , false , false , false , false , true , false , false , false , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016206', 'WBI:100000000000000000000000000000000016', 'user-2-6' , 'Kurt Maier' , true , true , true , true , true , false , false , false , false , false , true , false , false , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016207', 'WBI:100000000000000000000000000000000016', 'user-2-7' , 'Wiebke Meyer' , true , true , true , true , true , false , false , false , false , false , false , true , false , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016208', 'WBI:100000000000000000000000000000000016', 'user-2-8' , 'Jana Heeg' , true , true , true , true , true , false , false , false , false , false , false , false , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016209', 'WBI:100000000000000000000000000000000016', 'user-2-9' , 'Nathalie Fuchs' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000016210', 'WBI:100000000000000000000000000000000016', 'user-2-10' , 'Johannes Renz' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:B00000000000000000000000000000000014', 'WBI:100000000000000000000000000000000014', 'user-b-1' , 'Bernd Bern' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:B00000000000000000000000000000000015', 'WBI:100000000000000000000000000000000015', 'user-b-2' , 'Brundhilde Bio' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
--- group internal access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 1', true , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 2', true , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 1', true , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 1', true , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 2', true , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 2', true , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
--- teamlead substitution
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead-1' , 'Titus Toll' , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
--- cross team tranfers
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 2', true , false, true , false , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 2', true , false, true , false , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 1', true , false, false , false , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 1', true , false, true , false , false , false , false , false , false , false , false , false , false , false , false , false , false ,true , true);
-
--- Team GPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 1', true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 2', true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
--- Cross team GPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead-1' , 'Titus Toll' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
--- TPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000123', 'WBI:100000000000000000000000000000000010', 'teamlead-1' , 'Titus Toll' , true , false, false , false , false , false , false , false , false , false , false , false , false , false , false , false , false, true , true);
-
--- Access to other domains
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 1', true , false, true , true , false , false , false , false , false , false , false , false , false , false , false , false , false, true , true );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 2', true , false, true , true , false , false , false , false , false , false , false , false , false , false , false , false , false, true , true );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 2', true , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false, true , true );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'Organisationseinheit KSC 2', true , true , true , true , false , false , false , false , false , false , false , false , false , false , false , false , false, true , true );
-
--- Access to workbaskets for sorting test
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000900', 'WBI:000000000000000000000000000000000900', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000901', 'WBI:000000000000000000000000000000000901', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000902', 'WBI:000000000000000000000000000000000902', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000903', 'WBI:000000000000000000000000000000000903', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000904', 'WBI:000000000000000000000000000000000904', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000905', 'WBI:000000000000000000000000000000000905', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000906', 'WBI:000000000000000000000000000000000906', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000907', 'WBI:000000000000000000000000000000000907', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000908', 'WBI:000000000000000000000000000000000908', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000909', 'WBI:000000000000000000000000000000000909', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-
--- permissions
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'taskana:callcenter:ab:ab/a:callcenter' , 'PERM_1' , true , true , true , false , true , false, false, false, false, false, false, false, false, false, false, false, false, true , false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'taskana:callcenter:ab:AB/a:callcenter' , 'PERM_1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000005', 'WBI:100000000000000000000000000000000012', 'taskana:callcenter:ab:AB/a:callcenter' , 'PERM_1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, false , false);
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql b/common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql
deleted file mode 100644
index 41e41688e6..0000000000
--- a/common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- test-data is used for all tests except for the rest tests
-
--- ATTACHMENT TABLE (ID , task_ID , CREATED , MODIFIED , classif key, classif Id , refCompany, ref sys, ref inst, ref type, ref val, channel, received, custAtts)
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000000','TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000001','TKI:000000000000000000000000000000000001', '2018-01-29 15:55:01', '2018-01-30 15:55:00', 'L10303' , 'CLI:100000000000000000000000000000000002', 'novatec' , 'novasys', 'nvinst', 'typ2' , 'val1' , 'ch2' , '2018-01-30 12:00:00' , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000002','TKI:000000000000000000000000000000000001', '2018-01-29 15:55:02', '2018-01-30 15:55:00', 'L1050' , 'CLI:000000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ2' , 'val2' , 'ch2' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000003','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:03', null , 'L11010' , 'CLI:000000000000000000000000000000000004', 'novatec' , 'novasys', 'nvinst', 'typ2' , 'val2' , 'ch3' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000004','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:04', null , 'L110102' , 'CLI:000000000000000000000000000000000005', 'novatec' , 'novasys', 'nvinst', 'typ3' , 'val2' , 'ch4' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000005','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:05', null , 'L110105' , 'CLI:000000000000000000000000000000000006', 'novatec' , 'novasys', 'nvinst', 'typ3' , 'val2' , 'ch5' , '2018-02-01 12:00:00' , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000006','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:06', null , 'L110107' , 'CLI:000000000000000000000000000000000007', 'novatec' , 'novasys', 'nvinst', 'typ3' , 'val2' , 'ch6' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000007','TKI:000000000000000000000000000000000002', '2018-01-29 15:55:07', null , 'L12010' , 'CLI:100000000000000000000000000000000008', 'novatec' , 'novasys', 'nvinst', 'typ3' , 'val3' , 'ch6' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000008','TKI:000000000000000000000000000000000008', '2018-01-29 15:55:08', null , 'L140101' , 'CLI:000000000000000000000000000000000009', 'novatec' , 'novasys', 'nvinst', 'typ3' , 'val3' , 'ch6' , '2018-02-01 08:00:00' , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000009','TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ3' , 'val4' , 'ch7' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000010','TKI:000000000000000000000000000000000052', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ4' , 'val4' , 'ch7' , '2018-02-01 09:00:00' , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000011','TKI:000000000000000000000000000000000053', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ4' , 'val4' , 'ch7' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000012','TKI:000000000000000000000000000000000054', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ5' , 'val4' , 'ch7' , '2018-02-01 07:00:00' , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000013','TKI:000000000000000000000000000000000055', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ5' , 'val4' , 'ch7' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000014','TKI:000000000000000000000000000000000010', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L11010' , 'CLI:100000000000000000000000000000000004', 'novatec' , 'novasys', 'nvinst', 'typ5' , 'val4' , 'ch8' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000015','TKI:000000000000000000000000000000000011', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L10303' , 'CLI:100000000000000000000000000000000002', 'novatec' , 'novasys', 'nvinst', 'typ5' , 'val5' , 'ch8' , '2018-01-30 12:00:00' , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000016','TKI:000000000000000000000000000000000012', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ5' , 'val6' , 'ch8' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000017','TKI:000000000000000000000000000000000067', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000018','TKI:000000000000000000000000000000000067', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000019','TKI:000000000000000000000000000000000068', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000020','TKI:000000000000000000000000000000000068', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null);
-INSERT INTO ATTACHMENT VALUES('TAI:000000000000000000000000000000000021','TKI:000000000000000000000000000000000069', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'L1050' , 'CLI:100000000000000000000000000000000003', 'novatec' , 'novasys', 'nvinst', 'typ1' , 'val1' , 'ch1' , null , null);
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/user.sql b/common/taskana-common-data/src/main/resources/sql/test-data/user.sql
deleted file mode 100644
index ce111f6079..0000000000
--- a/common/taskana-common-data/src/main/resources/sql/test-data/user.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- test-data is used for all tests except for the rest tests
-
--- USER_INFO TABLE (USER_ID , FIRST_NAME , LASTNAME , FULL_NAME , LONG_NAME , E_MAIL , PHONE , MOBILE_PHONE , ORG_LEVEL_4 , ORG_LEVEL_3 , ORG_LEVEL_2 , ORG_LEVEL_1 , DATA
-INSERT INTO USER_INFO VALUES('teamlead-1' , 'Titus' , 'Toll' , 'Toll, Titus' , 'Toll, Titus - (teamlead-1)' , 'titus.toll@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , 'xy' );
-INSERT INTO USER_INFO VALUES('user-1-1' , 'Max' , 'Mustermann' , 'Mustermann, Max' , 'Mustermann, Max - (user-1-1)' , 'max.mustermann@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-1-2' , 'Elena' , 'Eifrig' , 'Eifrig, Elena' , 'Eifrig, Elena - (user-1-2)' , 'elena.eifrig@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-1-3' , 'Elena' , 'Faul' , 'Faul, Elena' , 'Faul, Elena - (user-1-3)' , 'elena.faul@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-1' , 'Simone' , 'Müller' , 'Müller, Simone' , 'Müller, Simone - (user-2-1)' , 'simone.müller@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-2' , 'Tim' , 'Schläfrig' , 'Schläfrig, Tim' , 'Schläfrig, Tim - (user-2-2)' , 'tim.schläfrig@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-3' , 'Thomas' , 'Bach' , 'Bach, Thomas' , 'Bach, Thomas - (user-2-3)' , 'thomas.bach@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-4' , 'Rolf' , 'Wieland' , 'Wieland, Rolf' , 'Wieland, Rolf - (user-2-4)' , 'rolf.wieland@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-5' , 'Heike' , 'Schmidt' , 'Schmidt, Heike' , 'Schmidt, Heike - (user-2-5)' , 'heike.schmidt@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-6' , 'Kurt' , 'Maier' , 'Maier, Kurt' , 'Maier, Kurt - (user-2-6)' , 'kurt.maier@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-7' , 'Wiebke' , 'Meyer' , 'Meyer, Wiebke' , 'Meyer, Wiebke - (user-2-7)' , 'wiebke.meyer@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-9' , 'Nathalie' , 'Fuchs' , 'Fuchs, Nathalie' , 'Fuchs, Nathalie - (user-2-9)' , 'nathalie.fuchs@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-10' , 'Johannes' , 'Renz' , 'Renz, Johannes' , 'Renz, Johannes - (user-2-10)' , 'johannes.renz@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
-INSERT INTO USER_INFO VALUES('user-2-11' , 'Max' , 'Renz' , 'Renz, Max' , 'Renz, Max - (user-2-11)' , 'max.renz@web.de' , '040-2951854' , '015637683197' , 'Novatec' , 'BPM' , 'Human Workflow' , 'TASKANA' , '' );
diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql
deleted file mode 100644
index 58bd1dc646..0000000000
--- a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- test-data is used for all tests except for the rest tests
-
--- KSC authorizations (ID , WB_ID , ACCESS_ID , ACCESS_NAME , READ , OPEN , APPEND, TRANSFER, DISTRIBUTE, C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10 , C11 , C12 ,READTASKS, EDITTASKS)
--- PPKs
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead-1' , 'Titus Toll' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'user-1-1' , 'Max Mustermann' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'WBI:100000000000000000000000000000000007', 'user-1-2' , 'Elena Eifrig' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008', 'user-2-1' , 'Simone Müller' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009', 'user-2-2' , 'Tim Schläfrig' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:B00000000000000000000000000000000014', 'WBI:100000000000000000000000000000000014', 'user-b-1' , 'Bernd Bern' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:B00000000000000000000000000000000015', 'WBI:100000000000000000000000000000000015', 'user-b-2' , 'Brundhilde Bio' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
--- group internal access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
--- teamlead substitution
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead-1' , 'Titus Toll' , true , true , true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
--- cross team tranfers
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , false, false , false , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
--- Team GPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
--- Cross team GPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead-1' , 'Titus Toll' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
--- TPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000123', 'WBI:100000000000000000000000000000000010', 'teamlead-1' , 'Titus Toll' , true , false, false , false , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-
--- Access to other domains
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true);
-
--- Access to workbaskets for sorting test
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000900', 'WBI:000000000000000000000000000000000900', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000901', 'WBI:000000000000000000000000000000000901', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000902', 'WBI:000000000000000000000000000000000902', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000903', 'WBI:000000000000000000000000000000000903', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000904', 'WBI:000000000000000000000000000000000904', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000905', 'WBI:000000000000000000000000000000000905', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000906', 'WBI:000000000000000000000000000000000906', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000907', 'WBI:000000000000000000000000000000000907', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000908', 'WBI:000000000000000000000000000000000908', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000909', 'WBI:000000000000000000000000000000000909', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
-
--- permissions
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'taskana:callcenter:ab:ab/a:callcenter' , 'PERM_1' , true , true , true , false , true , false, false, false, false, false, false, false, false, false, false, false, false, true , false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'taskana:callcenter:ab:ab/a:callcenter' , 'PERM_1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000005', 'WBI:100000000000000000000000000000000012', 'taskana:callcenter:ab:ab/a:callcenter' , 'PERM_1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, false , false);
diff --git a/common/taskana-common-logging/pom.xml b/common/taskana-common-logging/pom.xml
deleted file mode 100644
index 715a4c9fe3..0000000000
--- 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 458e9bf305..0000000000
--- 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 a555849af7..0000000000
--- 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/java/pro/taskana/common/internal/logging/NoLoggingTestClass.java b/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestClass.java
deleted file mode 100644
index 92a8bf7f2f..0000000000
--- a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pro.taskana.common.internal.logging;
-
-@NoLogging
-class NoLoggingTestClass {
-
- public void doNotLogInternalMethod() {}
-}
diff --git a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestSubClass.java b/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestSubClass.java
deleted file mode 100644
index 793892ecc5..0000000000
--- a/common/taskana-common-logging/src/test/java/pro/taskana/common/internal/logging/NoLoggingTestSubClass.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package pro.taskana.common.internal.logging;
-
-class NoLoggingTestSubClass extends NoLoggingTestClass {}
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 f63741e5f8..0000000000
--- 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 0c21167d2f..0000000000
--- 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 4e1a4b34c0..0000000000
--- 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-test/src/main/java/pro/taskana/common/test/DockerContainerCreator.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/DockerContainerCreator.java
deleted file mode 100644
index 6eff4c96d2..0000000000
--- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/DockerContainerCreator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package pro.taskana.common.test;
-
-import static java.time.temporal.ChronoUnit.SECONDS;
-
-import java.time.Duration;
-import java.util.Optional;
-import javax.sql.DataSource;
-import org.apache.ibatis.datasource.pooled.PooledDataSource;
-import org.testcontainers.containers.Db2Container;
-import org.testcontainers.containers.JdbcDatabaseContainer;
-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 {
-
- private DockerContainerCreator() {
- throw new IllegalStateException("Utility class");
- }
-
- public static Optional> createDockerContainer(DB db) {
- switch (db) {
- case ORACLE:
- return Optional.of(
- new OracleContainer("gvenzl/oracle-xe:18-slim-faststart")
- .withDatabaseName("taskana")
- .withUsername("TEST_USER")
- .withPassword("testPassword")
- .withEnv("TZ", "Europe/Berlin"));
- case DB2:
- return Optional.of(
- new Db2Container(
- DockerImageName.parse("taskana/db2:11.5")
- .asCompatibleSubstituteFor("ibmcom/db2"))
- .waitingFor(
- new LogMessageWaitStrategy()
- .withRegEx(".*DB2START processing was successful.*")
- .withStartupTimeout(Duration.of(60, SECONDS)))
- .withUsername("db2inst1")
- .withPassword("db2inst1-pwd")
- .withDatabaseName("TSKDB"));
- case POSTGRES:
- return Optional.of(
- new PostgreSQLContainer<>(DockerImageName.parse("postgres:14.7"))
- .withUsername("postgres")
- .withPassword("postgres")
- .withDatabaseName("postgres")
- .withCommand(
- "/bin/sh",
- "-c",
- "localedef -i de_DE -c -f UTF-8 -A /usr/share/locale/locale.alias de_DE.UTF-8 "
- + "&& export LANG=de_DE.UTF-8 "
- + "&& /usr/local/bin/docker-entrypoint.sh postgres -c fsync=off")
- .waitingFor(
- new LogMessageWaitStrategy()
- .withRegEx(".*Datenbanksystem ist bereit, um Verbindungen anzunehmen.*\\s")
- .withTimes(2)
- .withStartupTimeout(Duration.of(60, SECONDS))));
- default:
- return Optional.empty();
- }
- }
-
- public static DataSource createDataSource(JdbcDatabaseContainer container) {
- PooledDataSource ds =
- new PooledDataSource(
- Thread.currentThread().getContextClassLoader(),
- container.getDriverClassName(),
- container.getJdbcUrl(),
- container.getUsername(),
- container.getPassword());
- ds.setPoolTimeToWait(50);
- ds.forceCloseAll(); // otherwise, the MyBatis pool is not initialized correctly
- return ds;
- }
-}
diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/OracleSchemaHelper.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/OracleSchemaHelper.java
deleted file mode 100644
index 1c72cbb363..0000000000
--- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/OracleSchemaHelper.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package pro.taskana.common.test;
-
-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 {
-
- private static final String DEFAULT_PASSWORD = "testPassword";
-
- private OracleSchemaHelper() {
- // hide implicitpublic one
- }
-
- public static void initOracleSchema(DataSource dataSource, String schemaName)
- throws SystemException {
- try (Connection connection = dataSource.getConnection();
- // connect as SYSTEM user to create schemas
- Connection conn =
- DriverManager.getConnection(
- connection.getMetaData().getURL(), "SYSTEM", DEFAULT_PASSWORD);
- Statement stmt = conn.createStatement()) {
- stmt.execute("GRANT ALL PRIVILEGES TO TEST_USER");
-
- dropExistingSchema(schemaName, stmt);
-
- stmt.addBatch(
- String.format(
- "create tablespace %s datafile '%s.dat' size 5M autoextend "
- + "on NEXT 5M MAXSIZE UNLIMITED",
- schemaName, schemaName));
- stmt.addBatch(
- String.format(
- "create temporary tablespace %s_TMP tempfile '%s_tmp.dat' size 5M autoextend "
- + "on NEXT 5M MAXSIZE UNLIMITED",
- schemaName, schemaName));
- stmt.addBatch(
- String.format(
- "create user %s identified by %s default tablespace %s "
- + "temporary tablespace %s_TMP",
- schemaName, DEFAULT_PASSWORD, schemaName, schemaName));
- stmt.addBatch(String.format("ALTER USER %s quota unlimited on %s", schemaName, schemaName));
- stmt.addBatch(String.format("GRANT UNLIMITED TABLESPACE TO %s", schemaName));
- stmt.executeBatch();
- } catch (Exception e) {
- throw new SystemException("Failed to setup ORACLE Schema", e);
- }
- }
-
- private static void dropExistingSchema(String schemaName, Statement stmt) {
- try {
- stmt.addBatch(String.format("DROP USER %s CASCADE", schemaName));
- stmt.addBatch(
- String.format(
- "DROP TABLESPACE %s_TMP INCLUDING CONTENTS AND DATAFILES CASCADE CONSTRAINTS",
- schemaName));
- stmt.addBatch(
- String.format(
- "DROP TABLESPACE %s INCLUDING CONTENTS AND DATAFILES CASCADE CONSTRAINTS",
- schemaName));
- stmt.executeBatch();
- } catch (Exception e) {
- // IGNORE exceptions from dropping
- }
- }
-}
diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java
deleted file mode 100644
index 09655fefad..0000000000
--- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java
+++ /dev/null
@@ -1,331 +0,0 @@
-package pro.taskana.common.test.security;
-
-import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated;
-import static pro.taskana.common.internal.util.CheckedFunction.wrapExceptFor;
-
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.security.Principal;
-import java.security.PrivilegedAction;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-import javax.security.auth.Subject;
-import org.junit.jupiter.api.DynamicContainer;
-import org.junit.jupiter.api.DynamicNode;
-import org.junit.jupiter.api.extension.DynamicTestInvocationContext;
-import org.junit.jupiter.api.extension.Extension;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
-import org.junit.jupiter.api.extension.ExtensionContext.Store;
-import org.junit.jupiter.api.extension.InvocationInterceptor;
-import org.junit.jupiter.api.extension.ParameterContext;
-import org.junit.jupiter.api.extension.ParameterResolver;
-import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
-import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
-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 {
-
- private static final String ACCESS_IDS_STORE_KEY = "accessIds";
-
- // region InvocationInterceptor
-
- @Override
- public T interceptTestClassConstructor(
- Invocation invocation,
- ReflectiveInvocationContext> invocationContext,
- ExtensionContext extensionContext) {
- return extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
- }
-
- @Override
- public void interceptBeforeAllMethod(
- Invocation invocation,
- ReflectiveInvocationContext invocationContext,
- ExtensionContext extensionContext) {
- extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
- }
-
- @Override
- public void interceptBeforeEachMethod(
- Invocation invocation,
- ReflectiveInvocationContext invocationContext,
- ExtensionContext extensionContext) {
- extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
- }
-
- @Override
- public void interceptTestMethod(
- Invocation invocation,
- ReflectiveInvocationContext invocationContext,
- ExtensionContext extensionContext) {
- if (isAnnotated(invocationContext.getExecutable(), WithAccessIds.class)) {
- throw new JUnitException("Please use @TestTemplate instead of @Test for multiple accessIds");
- }
- extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public T interceptTestFactoryMethod(
- Invocation invocation,
- ReflectiveInvocationContext invocationContext,
- ExtensionContext extensionContext) {
- WithAccessIds annotation = invocationContext.getExecutable().getAnnotation(WithAccessIds.class);
- if (annotation != null) {
- // our goal is to run each test returned from the test factory X times. X is the amount of
- // WithAccessId annotations. In order to achieve this we are wrapping the result from the
- // factory (the returning tests) in a dynamicContainer for each accessId. Since we don't know
- // what the factory will return we have to check for every possible return type. All possible
- // return types can be found here:
- // https://junit.org/junit5/docs/current/user-guide/#writing-tests-dynamic-tests
- // After checking each return type we abuse the return type of T and hardly change it to
- // Stream no matter what the factory returns. This return type is allowed
- // per definition (See link above), but is not the type T. Hence we have an unchecked cast at
- // the end to keep the compiler happy...
-
- // we are using the first annotation to run the factory method with.
- T factoryResult = performInvocationWithAccessId(invocation, annotation.value()[0]);
-
- Iterable newChildrenForDynamicContainer;
- // TestFactory must have one of the following return types. See link above for further details
- if (factoryResult instanceof DynamicNode) {
- newChildrenForDynamicContainer = Collections.singleton((DynamicNode) factoryResult);
- } else if (factoryResult instanceof Stream) {
- Stream nodes = (Stream) factoryResult;
- newChildrenForDynamicContainer = nodes.toList();
- } else if (factoryResult instanceof Iterable) {
- newChildrenForDynamicContainer = (Iterable) factoryResult;
- } else if (factoryResult instanceof Iterator) {
- newChildrenForDynamicContainer = () -> (Iterator) factoryResult;
- } else if (factoryResult instanceof DynamicNode[]) {
- newChildrenForDynamicContainer = Arrays.asList((DynamicNode[]) factoryResult);
- } else {
- throw new SystemException(
- String.format(
- "Testfactory '%s' did not return a proper type",
- invocationContext.getExecutable().getName()));
- }
-
- // Currently, a DynamicContainer has children from this type: Stream
- // Because of this the children can only be extracted once (Streams can only be operated
- // once). This is obviously not ok since we want to execute each node X times. So we have to
- // manually insert all children recursively to extract them X times...
- Map> childrenMap = new HashMap<>();
- persistDynamicContainerChildren(newChildrenForDynamicContainer, childrenMap);
-
- Function wrapTestsInDynamicContainer =
- accessId ->
- DynamicContainer.dynamicContainer(
- getDisplayNameForAccessId(accessId),
- StreamSupport.stream(newChildrenForDynamicContainer.spliterator(), false)
- .map(x -> duplicateDynamicNode(x, childrenMap)));
-
- Store store = getMethodLevelStore(extensionContext);
- return (T)
- Stream.of(annotation.value())
- .map(
- a -> {
- store.put(ACCESS_IDS_STORE_KEY, a);
- return wrapTestsInDynamicContainer.apply(a);
- });
- }
-
- return extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
- }
-
- @Override
- public void interceptTestTemplateMethod(
- Invocation invocation,
- ReflectiveInvocationContext invocationContext,
- ExtensionContext extensionContext) {
- WithAccessId accessId =
- getMethodLevelStore(extensionContext).get(ACCESS_IDS_STORE_KEY, WithAccessId.class);
- performInvocationWithAccessId(invocation, accessId);
- }
-
- @Override
- public void interceptDynamicTest(
- Invocation invocation,
- DynamicTestInvocationContext invocationContext,
- ExtensionContext extensionContext) {
- ExtensionContext testContext = getParentMethodExtensionContent(extensionContext);
- // Check if the test factory provided an access Id for this dynamic test.
- WithAccessId o = getMethodLevelStore(testContext).get(ACCESS_IDS_STORE_KEY, WithAccessId.class);
- if (o != null) {
- performInvocationWithAccessId(invocation, o);
- } else {
- extractAccessIdAndPerformInvocation(invocation, testContext.getRequiredTestMethod());
- }
- }
-
- @Override
- public void interceptAfterEachMethod(
- Invocation invocation,
- ReflectiveInvocationContext invocationContext,
- ExtensionContext extensionContext) {
- extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
- }
-
- @Override
- public void interceptAfterAllMethod(
- Invocation invocation,
- ReflectiveInvocationContext invocationContext,
- ExtensionContext extensionContext) {
- extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable());
- }
-
- // endregion
-
- // region TestTemplateInvocationContextProvider
-
- @Override
- public boolean supportsTestTemplate(ExtensionContext context) {
- return isAnnotated(context.getElement(), WithAccessIds.class)
- || isAnnotated(context.getElement(), WithAccessId.class);
- }
-
- @Override
- public Stream provideTestTemplateInvocationContexts(
- ExtensionContext context) {
- List accessIds =
- AnnotationSupport.findRepeatableAnnotations(context.getElement(), WithAccessId.class);
- Store store = getMethodLevelStore(context);
- return accessIds.stream()
- .map(
- a -> {
- store.put(ACCESS_IDS_STORE_KEY, a);
- return new JaasExtensionInvocationContext(a);
- });
- }
-
- // endregion
-
- private static void persistDynamicContainerChildren(
- Iterable nodes, Map> childrenMap) {
- nodes.forEach(
- node -> {
- if (node instanceof DynamicContainer) {
- DynamicContainer container = (DynamicContainer) node;
- List children = container.getChildren().collect(Collectors.toList());
- childrenMap.put(container.hashCode() + container.getDisplayName(), children);
- persistDynamicContainerChildren(children, childrenMap);
- }
- });
- }
-
- private static DynamicNode duplicateDynamicNode(
- DynamicNode node, Map> lookupMap) {
- if (node instanceof DynamicContainer) {
- DynamicContainer container = (DynamicContainer) node;
- Stream children =
- lookupMap.get(node.hashCode() + node.getDisplayName()).stream()
- .map(x -> duplicateDynamicNode(x, lookupMap));
- return DynamicContainer.dynamicContainer(container.getDisplayName(), children);
- }
- return node;
- }
-
- private static T extractAccessIdAndPerformInvocation(
- Invocation invocation, AnnotatedElement executable) {
- return performInvocationWithAccessId(invocation, executable.getAnnotation(WithAccessId.class));
- }
-
- private static T performInvocationWithAccessId(
- Invocation invocation, WithAccessId withAccessId) {
- Subject subject = new Subject();
- subject.getPrincipals().addAll(getPrincipals(withAccessId));
-
- Function, T> proceedInvocation =
- wrapExceptFor(Invocation::proceed, TestAbortedException.class);
- PrivilegedAction performInvocation = () -> proceedInvocation.apply(invocation);
- return Subject.doAs(subject, performInvocation);
- }
-
- private static List getPrincipals(WithAccessId withAccessId) {
- if (withAccessId != null) {
- return Stream.concat(
- Stream.of(withAccessId.user()).map(UserPrincipal::new),
- Arrays.stream(withAccessId.groups()).map(GroupPrincipal::new))
- .toList();
- }
- return Collections.emptyList();
- }
-
- private ExtensionContext getParentMethodExtensionContent(ExtensionContext extensionContext) {
- Optional parent = extensionContext.getParent();
- // the class MethodExtensionContext is part of junit-jupiter-engine and has only a
- // package-private visibility thus this workaround is needed.
- while (!parent
- .map(Object::getClass)
- .map(Class::getName)
- .filter(s -> s.endsWith("MethodExtensionContext"))
- .isPresent()) {
- parent = parent.flatMap(ExtensionContext::getParent);
- }
- return parent.orElseThrow(
- () ->
- new JUnitException(
- String.format(
- "Test '%s' does not have a parent method", extensionContext.getUniqueId())));
- }
-
- private static Store getMethodLevelStore(ExtensionContext context) {
- return context.getStore(
- Namespace.create(context.getRequiredTestClass(), context.getRequiredTestMethod()));
- }
-
- private static String getDisplayNameForAccessId(WithAccessId withAccessId) {
- return String.format("for user '%s'", withAccessId.user());
- }
-
- private static class JaasExtensionInvocationContext implements TestTemplateInvocationContext {
- private final WithAccessId withAccessId;
-
- private JaasExtensionInvocationContext(WithAccessId withAccessId) {
- this.withAccessId = withAccessId;
- }
-
- @Override
- public String getDisplayName(int invocationIndex) {
- return getDisplayNameForAccessId(withAccessId);
- }
-
- @Override
- public List getAdditionalExtensions() {
- return Collections.singletonList(new WithAccessIdParameterResolver());
- }
-
- private class WithAccessIdParameterResolver implements ParameterResolver {
- @Override
- public boolean supportsParameter(
- ParameterContext parameterContext, ExtensionContext extensionContext) {
- return parameterContext.getParameter().getType().equals(WithAccessId.class);
- }
-
- @Override
- public Object resolveParameter(
- ParameterContext parameterContext, ExtensionContext extensionContext) {
- return withAccessId;
- }
- }
- }
-}
diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessId.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessId.java
deleted file mode 100644
index f496360876..0000000000
--- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessId.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package pro.taskana.common.test.security;
-
-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})
-@Repeatable(WithAccessIds.class)
-public @interface WithAccessId {
-
- String user();
-
- String[] groups() default {};
-
- String[] permissions() default {};
-
- @Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.METHOD)
- @interface WithAccessIds {
- WithAccessId[] value();
- }
-}
diff --git a/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java b/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java
deleted file mode 100644
index 011bdc534a..0000000000
--- a/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java
+++ /dev/null
@@ -1,735 +0,0 @@
-package pro.taskana.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 java.util.Iterator;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DynamicContainer;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestFactory;
-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 {
-
- private static final String INSIDE_DYNAMIC_TEST_USER = "inside_dynamic_test";
- private static final CurrentUserContext CURRENT_USER_CONTEXT = new CurrentUserContextImpl(true);
- private static final DynamicTest NOT_NULL_DYNAMIC_TEST =
- dynamicTest("dynamic test", () -> assertThat(CURRENT_USER_CONTEXT.getUserid()).isNotNull());
- private static final DynamicTest NULL_DYNAMIC_TEST =
- dynamicTest("dynamic test", () -> assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull());
- private static final DynamicTest DYNAMIC_TEST_USER_DYNAMIC_TEST =
- dynamicTest(
- "dynamic test",
- () -> assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo(INSIDE_DYNAMIC_TEST_USER));
-
- // region JaasExtension#interceptBeforeAllMethod
-
- @BeforeAll
- static void should_NotSetJaasSubject_When_AnnotationIsMissing_On_BeforeAll() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- }
-
- @WithAccessId(user = "beforeall")
- @BeforeAll
- static void should_SetJaasSubject_When_AnnotationExists_On_BeforeAll() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("beforeall");
- }
-
- @WithAccessId(user = "beforeall")
- @WithAccessId(user = "beforeall2")
- @BeforeAll
- static void should_NotSetJaasSubject_When_MultipleAnnotationsExist_On_BeforeAll() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- }
-
- // endregion
-
- // region JaasExtension#interceptBeforeEachMethod
-
- @BeforeEach
- void should_NotSetJaasSubject_When_AnnotationIsMissing_On_BeforeEach() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- }
-
- @WithAccessId(user = "beforeeach")
- @BeforeEach
- void should_SetJaasSubject_When_AnnotationExists_On_BeforeEach() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("beforeeach");
- }
-
- @WithAccessId(user = "beforeeach")
- @WithAccessId(user = "beforeeach2")
- @BeforeEach
- void should_NotSetJaasSubject_When_MultipleAnnotationsExist_On_BeforeEach() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- }
-
- // endregion
-
- // region JaasExtension#interceptAfterEachMethod
-
- @AfterEach
- void should_NotSetJaasSubject_When_AnnotationIsMissing_On_AfterEach() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- }
-
- @WithAccessId(user = "aftereach")
- @AfterEach
- void should_SetJaasSubject_When_AnnotationExists_On_AfterEach() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("aftereach");
- }
-
- @WithAccessId(user = "aftereach")
- @WithAccessId(user = "afterach2")
- @AfterEach
- void should_NotSetJaasSubject_When_MultipleAnnotationsExist_On_AfterEach() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- }
-
- // endregion
-
- // region JaasExtension#interceptAfterAllMethod
-
- @AfterAll
- static void should_NotSetJaasSubject_When_AnnotationIsMissing_On_AfterAll() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- }
-
- @WithAccessId(user = "afterall")
- @AfterAll
- static void should_SetJaasSubject_When_AnnotationExists_On_AfterAll() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("afterall");
- }
-
- @WithAccessId(user = "afterall")
- @WithAccessId(user = "afterall2")
- @AfterAll
- static void should_NotSetJaasSubject_When_MultipleAnnotationsExist_On_AfterAll() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- }
-
- // endregion
-
- // region JaasExtension#interceptTestMethod
-
- @Test
- void should_NotSetJaasSubject_When_AnnotationIsMissing_On_Test() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- }
-
- @WithAccessId(user = "user")
- @Test
- void should_SetJaasSubject_When_AnnotationExists_On_Test() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("user");
- assertThat(CURRENT_USER_CONTEXT.getGroupIds()).isEmpty();
- }
-
- @WithAccessId(
- user = "user",
- groups = {"group1", "group2"})
- @Test
- void should_SetJaasSubjectWithGroups_When_AnnotationExistsWithGroups_On_Test() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("user");
- assertThat(CURRENT_USER_CONTEXT.getGroupIds()).containsExactlyInAnyOrder("group1", "group2");
- }
-
- @WithAccessId(user = "user")
- @Test
- @ExtendWith(ShouldThrowParameterResolutionException.class)
- void should_NotInjectParameter_When_TestTemplateIsNotUsed(
- @SuppressWarnings("unused") WithAccessId accessId) {
- // THIS IS NOT RELEVANT
- assertThat(true).isTrue();
- }
-
- @WithAccessId(user = "user")
- @WithAccessId(user = "user2")
- @Test
- @ExtendWith(ShouldThrowJunitException.class)
- void should_ThrowJunitException_When_MultipleAnnotationsExist_On_Test() {
- // THIS IS NOT RELEVANT
- assertThat(true).isTrue();
- }
-
- // endregion
-
- // region JaasExtension#interceptTestFactory
-
- @TestFactory
- List should_NotSetJaasSubject_When_AnnotationIsMissing_On_TestFactory() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
- return List.of();
- }
-
- @WithAccessId(user = "testfactory")
- @TestFactory
- List should_SetJaasSubject_When_AnnotationExists_On_TestFactory() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("testfactory");
- return List.of();
- }
-
- @WithAccessId(user = "testfactory1")
- @WithAccessId(user = "testfactory2")
- @TestFactory
- List
- should_SetJaasSubjectFromFirstAnnotation_When_MultipleAnnotationsExists_On_TestFactory() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("testfactory1");
- return List.of();
- }
-
- // endregion
-
- // region JaasExtension#interceptTestTemplateMethod
-
- @WithAccessId(user = "testtemplate")
- @TestTemplate
- void should_SetJaasSubject_When_AnnotationExists_On_TestTemplate() {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("testtemplate");
- }
-
- @WithAccessId(user = "testtemplate1")
- @WithAccessId(user = "testtemplate2")
- @WithAccessId(user = "testtemplate3")
- @TestTemplate
- void should_SetMultipleJaasSubjects_When_MultipleAnnotationsExist_On_TestTemplate(
- WithAccessId accessId) {
- assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo(accessId.user());
- }
-
- @WithAccessId(user = "testtemplate1", groups = "abc", permissions = "perm")
- @TestTemplate
- void should_InjectCorrectAccessId_When_AnnotationExists_On_TestTemplate(WithAccessId accessId) {
- assertThat(accessId.user()).isEqualTo("testtemplate1");
- assertThat(accessId.groups()).containsExactly("abc");
- assertThat(accessId.permissions()).containsExactly("perm");
- }
-
- // endregion
-
- // region JaasExtension#interceptDynamicTest
-
- // region RETURNING DynamicNode
-
- // WITH DynamicTest
-
- @TestFactory
- DynamicTest should_NotSetAccessIdForDynamicTest_When_AnnotationIsMissing() {
- return NULL_DYNAMIC_TEST;
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicTest should_SetAccessIdForDynamicTest_When_AnnotationExists() {
- return DYNAMIC_TEST_USER_DYNAMIC_TEST;
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicTest should_SetMultipleAccessIdForDynamicTest_When_AnnotationsExist() {
- return NOT_NULL_DYNAMIC_TEST;
- }
-
- // WITH DynamicContainer
-
- @TestFactory
- DynamicContainer should_NotSetAccessIdForDynamicContainer_When_AnnotationIsMissing() {
- return dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicContainer should_SetAccessIdForDynamicContainer_When_AnnotationExists() {
- return dynamicContainer(
- "dynamic container",
- Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicContainer should_SetMultipleAccessIdForDynamicContainer_When_AnnotationsExist() {
- return dynamicContainer(
- "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
- }
-
- // WITH nested DynamicContainer
-
- @TestFactory
- DynamicContainer should_NotSetAccessIdForNestedDynamicContainer_When_AnnotationIsMissing() {
- DynamicContainer container =
- dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- return dynamicContainer("outside container", Stream.of(container, NULL_DYNAMIC_TEST));
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicContainer should_SetAccessIdForNestedDynamicContainer_When_AnnotationExists() {
- DynamicContainer container =
- dynamicContainer(
- "nested container",
- Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- return dynamicContainer(
- "outside container", Stream.of(container, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicContainer should_SetMultipleAccessIdForNestedDynamicContainer_When_AnnotationsExist() {
- DynamicContainer container =
- dynamicContainer(
- "inside container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
- return dynamicContainer("outside container", Stream.of(container, NOT_NULL_DYNAMIC_TEST));
- }
-
- // endregion
-
- // region RETURNING Stream
-
- @TestFactory
- Stream should_NotSetAccessIdForDynamicTestInStream_When_AnnotationIsMissing() {
- return Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Stream should_SetAccessIdForDynamicTestInStream_When_AnnotationExists() {
- return Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Stream should_SetMultipleAccessIdForDynamicTestInStream_When_AnnotationsExist() {
- return Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST);
- }
-
- // WITH DynamicContainer
-
- @TestFactory
- Stream
- should_NotSetAccessIdForDynamicContainerInStream_When_AnnotationIsMissing() {
- Supplier supplier =
- () ->
- dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Stream should_SetAccessIdForDynamicContainerInStream_When_AnnotationExists() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "dynamic container",
- Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Stream
- should_SetMultipleAccessIdForDynamicContainerInStream_When_AnnotationsExist() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2);
- }
-
- // WITH nested DynamicContainer
-
- @TestFactory
- Stream
- should_NotSetAccessIdForNestedDynamicContainerInStream_When_AnnotationIsMissing() {
- Supplier supplier =
- () -> dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- Supplier outsideSupplier =
- () -> dynamicContainer("outside container", Stream.of(supplier.get(), NULL_DYNAMIC_TEST));
- return Stream.generate(outsideSupplier).limit(2);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Stream
- should_SetAccessIdForNestedDynamicContainerInStream_When_AnnotationExists() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "inside container",
- Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- Supplier outsideSupplier =
- () ->
- dynamicContainer(
- "outside container", Stream.of(supplier.get(), DYNAMIC_TEST_USER_DYNAMIC_TEST));
- return Stream.generate(outsideSupplier).limit(2);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Stream
- should_SetMultipleAccessIdForNestedDynamicContainerInStream_When_AnnotationsExist() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "inside container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
- Supplier outsideSupplier =
- () ->
- dynamicContainer("outside container", Stream.of(supplier.get(), NOT_NULL_DYNAMIC_TEST));
- return Stream.generate(outsideSupplier).limit(2);
- }
-
- // endregion
-
- // region RETURNING Iterable
-
- @TestFactory
- Iterable should_NotSetAccessIdForDynamicTestInIterable_When_AnnotationIsMissing() {
- return Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST).toList();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterable should_SetAccessIdForDynamicTestInIterable_When_AnnotationExists() {
- return Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST)
- .toList();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterable should_SetMultipleAccessIdForDynamicTestInIterable_When_AnnotationsExist() {
- return Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST).toList();
- }
-
- // WITH DynamicContainer
-
- @TestFactory
- Iterable
- should_NotSetAccessIdForDynamicContainerInIterable_When_AnnotationIsMissing() {
- Supplier supplier =
- () ->
- dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2).toList();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterable
- should_SetAccessIdForDynamicContainerInIterable_When_AnnotationExists() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "dynamic container",
- Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2).toList();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterable
- should_SetMultipleAccessIdForDynamicContainerInIterable_When_AnnotationsExist() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2).toList();
- }
-
- // WITH nested DynamicContainer
-
- @TestFactory
- Iterable
- should_NotSetAccessIdForNestedDynamicContainerInIterable_When_AnnotationIsMissing() {
- Supplier supplier =
- () -> dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- Supplier outsideSupplier =
- () -> dynamicContainer("outside container", Stream.of(supplier.get(), NULL_DYNAMIC_TEST));
- return Stream.generate(outsideSupplier).limit(2).toList();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterable
- should_SetAccessIdForNestedDynamicContainerInIterable_When_AnnotationExists() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "inside container",
- Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- Supplier outsideSupplier =
- () ->
- dynamicContainer(
- "outside container", Stream.of(supplier.get(), DYNAMIC_TEST_USER_DYNAMIC_TEST));
- return Stream.generate(outsideSupplier).limit(2).toList();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterable
- should_SetMultipleAccessIdForNestedDynamicContainerInIterable_When_AnnotationsExist() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "inside container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
- Supplier outsideSupplier =
- () ->
- dynamicContainer("outside container", Stream.of(supplier.get(), NOT_NULL_DYNAMIC_TEST));
- return Stream.generate(outsideSupplier).limit(2).toList();
- }
-
- // endregion
-
- // region RETURNING Iterator
-
- @TestFactory
- Iterator should_NotSetAccessIdForDynamicTestInIterator_When_AnnotationIsMissing() {
- return Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST).iterator();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterator should_SetAccessIdForDynamicTestInIterator_When_AnnotationExists() {
- return Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST).iterator();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterator should_SetMultipleAccessIdForDynamicTestInIterator_When_AnnotationsExist() {
- return Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST).iterator();
- }
-
- // WITH DynamicContainer
-
- @TestFactory
- Iterator
- should_NotSetAccessIdForDynamicContainerInIterator_When_AnnotationIsMissing() {
- Supplier supplier =
- () ->
- dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2).iterator();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterator
- should_SetAccessIdForDynamicContainerInIterator_When_AnnotationExists() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "dynamic container",
- Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2).iterator();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterator
- should_SetMultipleAccessIdForDynamicContainerInIterator_When_AnnotationsExist() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2).iterator();
- }
-
- // WITH nested DynamicContainer
-
- @TestFactory
- Iterator
- should_NotSetAccessIdForNestedDynamicContainerInIterator_When_AnnotationIsMissing() {
- Supplier supplier =
- () -> dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- Supplier outsideSupplier =
- () -> dynamicContainer("outside container", Stream.of(supplier.get(), NULL_DYNAMIC_TEST));
- return Stream.generate(outsideSupplier).limit(2).iterator();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterator
- should_SetAccessIdForNestedDynamicContainerInIterator_When_AnnotationExists() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "inside container",
- Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- Supplier outsideSupplier =
- () ->
- dynamicContainer(
- "outside container", Stream.of(supplier.get(), DYNAMIC_TEST_USER_DYNAMIC_TEST));
- return Stream.generate(outsideSupplier).limit(2).iterator();
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- Iterator
- should_SetMultipleAccessIdForNestedDynamicContainerInIterator_When_AnnotationsExist() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "inside container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
- Supplier outsideSupplier =
- () ->
- dynamicContainer("outside container", Stream.of(supplier.get(), NOT_NULL_DYNAMIC_TEST));
- return Stream.generate(outsideSupplier).limit(2).iterator();
- }
-
- // endregion
-
- // region RETURNING DynamicNode[]
-
- @TestFactory
- DynamicTest[] should_NotSetAccessIdForDynamicTestInArray_When_AnnotationIsMissing() {
- return Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST).toArray(DynamicTest[]::new);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicTest[] should_SetAccessIdForDynamicTestInArray_When_AnnotationExists() {
- return Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST)
- .toArray(DynamicTest[]::new);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicTest[] should_SetMultipleAccessIdForDynamicTestInArray_When_AnnotationsExist() {
- return Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST).toArray(DynamicTest[]::new);
- }
-
- // WITH DynamicContainer
-
- @TestFactory
- DynamicContainer[] should_NotSetAccessIdForDynamicContainerInArray_When_AnnotationIsMissing() {
- Supplier supplier =
- () ->
- dynamicContainer("dynamic container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2).toArray(DynamicContainer[]::new);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicContainer[] should_SetAccessIdForDynamicContainerInArray_When_AnnotationExists() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "dynamic container",
- Stream.of(DYNAMIC_TEST_USER_DYNAMIC_TEST, DYNAMIC_TEST_USER_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2).toArray(DynamicContainer[]::new);
- }
-
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @WithAccessId(user = INSIDE_DYNAMIC_TEST_USER)
- @TestFactory
- DynamicContainer[] should_SetMultipleAccessIdForDynamicContainerInArray_When_AnnotationsExist() {
- Supplier supplier =
- () ->
- dynamicContainer(
- "dynamic container", Stream.of(NOT_NULL_DYNAMIC_TEST, NOT_NULL_DYNAMIC_TEST));
- return Stream.generate(supplier).limit(2).toArray(DynamicContainer[]::new);
- }
-
- // WITH nested DynamicContainer
-
- @TestFactory
- DynamicContainer[]
- should_NotSetAccessIdForNestedDynamicContainerInArray_When_AnnotationIsMissing() {
- Supplier supplier =
- () -> dynamicContainer("inside container", Stream.of(NULL_DYNAMIC_TEST, NULL_DYNAMIC_TEST));
- Supplier