TSK-1277: moved JaasExtension and all its necessary classes to common modules

This commit is contained in:
Mustapha Zorgati 2020-10-06 17:18:06 +02:00
parent 7df5587676
commit 47aa60033f
133 changed files with 302 additions and 608 deletions

View File

@ -15,5 +15,23 @@
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>pro.taskana</groupId>
<artifactId>taskana-common</artifactId>
<version>${project.version}</version>
</dependency>
<!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project> </project>

View File

@ -1,4 +1,4 @@
package acceptance.security; package pro.taskana.common.test.security;
import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated; import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated;
import static pro.taskana.common.internal.util.CheckedFunction.wrap; import static pro.taskana.common.internal.util.CheckedFunction.wrap;

View File

@ -1,4 +1,4 @@
package acceptance.security; package pro.taskana.common.test.security;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Repeatable; import java.lang.annotation.Repeatable;

View File

@ -1,4 +1,4 @@
package acceptance.security; package pro.taskana.common.test.security;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

View File

@ -1,4 +1,4 @@
package pro.taskana.common.internal.security; package pro.taskana.common.test.security;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.DynamicContainer.dynamicContainer; import static org.junit.jupiter.api.DynamicContainer.dynamicContainer;
@ -23,6 +23,8 @@ import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.internal.security.CurrentUserContext;
@ExtendWith(JaasExtension.class) @ExtendWith(JaasExtension.class)
class JaasExtensionTest { class JaasExtensionTest {

View File

@ -14,5 +14,16 @@
<version>4.1.1-SNAPSHOT</version> <version>4.1.1-SNAPSHOT</version>
</parent> </parent>
<dependencies>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>${version.json}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project> </project>

View File

@ -1,6 +1,5 @@
package pro.taskana.common.internal.security; package pro.taskana.common.internal.security;
import static pro.taskana.TaskanaEngineConfiguration.shouldUseLowerCaseForAccessIds;
import static pro.taskana.common.internal.util.CheckedFunction.wrap; import static pro.taskana.common.internal.util.CheckedFunction.wrap;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -148,9 +147,10 @@ public final class CurrentUserContext {
private static String convertAccessId(String accessId) { private static String convertAccessId(String accessId) {
String toReturn = accessId; String toReturn = accessId;
if (shouldUseLowerCaseForAccessIds()) { // TODO: DAS IST DOOF
toReturn = accessId.toLowerCase(); // if (shouldUseLowerCaseForAccessIds()) {
} // toReturn = accessId.toLowerCase();
// }
LOGGER.trace("Found AccessId '{}'. Returning AccessId '{}' ", accessId, toReturn); LOGGER.trace("Found AccessId '{}'. Returning AccessId '{}' ", accessId, toReturn);
return toReturn; return toReturn;
} }

View File

@ -38,6 +38,12 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>pro.taskana</groupId>
<artifactId>taskana-common-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>

View File

@ -3,13 +3,13 @@ package acceptance.events.classification;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.ClassificationService;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper; import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper;
import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent; import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;

View File

@ -3,14 +3,14 @@ package acceptance.events.classification;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper; import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper;
import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent; import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;

View File

@ -3,8 +3,6 @@ package acceptance.events.classification;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
@ -12,6 +10,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.ClassificationCustomField; import pro.taskana.classification.api.ClassificationCustomField;
import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper; import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper;
import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent; import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent;

View File

@ -3,12 +3,12 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;

View File

@ -3,12 +3,12 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
import pro.taskana.spi.history.api.events.task.TaskHistoryEventType; import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;

View File

@ -3,12 +3,12 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;

View File

@ -3,12 +3,12 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;

View File

@ -3,12 +3,12 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;

View File

@ -3,12 +3,12 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
import pro.taskana.spi.history.api.events.task.TaskHistoryEventType; import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;

View File

@ -3,12 +3,12 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;

View File

@ -3,12 +3,12 @@ package acceptance.events.task;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;

View File

@ -4,14 +4,14 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatThrownBy;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl;
import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper;

View File

@ -3,12 +3,12 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,12 +3,12 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,12 +3,12 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,13 +3,13 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,12 +3,12 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,12 +3,12 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,12 +3,12 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,12 +3,12 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,13 +3,13 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,12 +3,12 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,12 +3,12 @@ package acceptance.events.workbasket;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.util.List; import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl;
import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper;
import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent;

View File

@ -3,14 +3,14 @@ package acceptance.jobs;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import acceptance.AbstractAccTest; import acceptance.AbstractAccTest;
import acceptance.security.JaasExtension;
import acceptance.security.WithAccessId;
import java.time.Instant; import java.time.Instant;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.simplehistory.impl.jobs.HistoryCleanupJob; import pro.taskana.simplehistory.impl.jobs.HistoryCleanupJob;
import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent;
import pro.taskana.spi.history.api.events.task.TaskHistoryEventType; import pro.taskana.spi.history.api.events.task.TaskHistoryEventType;

View File

@ -14,6 +14,11 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency>
<groupId>pro.taskana</groupId>
<artifactId>taskana-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
@ -31,7 +36,13 @@
<!-- test dependencies --> <!-- test dependencies -->
<dependency> <dependency>
<groupId>pro.taskana</groupId> <groupId>pro.taskana</groupId>
<artifactId>taskana-data</artifactId> <artifactId>taskana-common-data</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>pro.taskana</groupId>
<artifactId>taskana-common-test</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

View File

@ -16,8 +16,8 @@ import pro.taskana.classification.internal.models.ClassificationImpl;
import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
/** Acceptance test for all "create classification" scenarios. */ /** Acceptance test for all "create classification" scenarios. */
@ExtendWith(JaasExtension.class) @ExtendWith(JaasExtension.class)
@ -25,26 +25,22 @@ class CreateClassificationAccTest extends AbstractAccTest {
private static final String ID_PREFIX_CLASSIFICATION = "CLI"; private static final String ID_PREFIX_CLASSIFICATION = "CLI";
private ClassificationService classificationService; private static final ClassificationService CLASSIFICATION_SERVICE =
taskanaEngine.getClassificationService();
CreateClassificationAccTest() {
super();
classificationService = taskanaEngine.getClassificationService();
}
@WithAccessId(user = "businessadmin") @WithAccessId(user = "businessadmin")
@Test @Test
void testCreateMasterClassification() throws Exception { void testCreateMasterClassification() throws Exception {
long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count();
Classification classification = classificationService.newClassification("Key0", "", "TASK"); Classification classification = CLASSIFICATION_SERVICE.newClassification("Key0", "", "TASK");
classification.setIsValidInDomain(true); classification.setIsValidInDomain(true);
classification = classificationService.createClassification(classification); classification = CLASSIFICATION_SERVICE.createClassification(classification);
// check only 1 created // check only 1 created
long amountOfClassificationsAfter = classificationService.createClassificationQuery().count(); long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count();
assertThat(amountOfClassificationsAfter).isEqualTo(amountOfClassificationsBefore + 1); assertThat(amountOfClassificationsAfter).isEqualTo(amountOfClassificationsBefore + 1);
classification = classificationService.getClassification(classification.getId()); classification = CLASSIFICATION_SERVICE.getClassification(classification.getId());
assertThat(classification).isNotNull(); assertThat(classification).isNotNull();
assertThat(classification.getCreated()).isNotNull(); assertThat(classification.getCreated()).isNotNull();
@ -58,15 +54,15 @@ class CreateClassificationAccTest extends AbstractAccTest {
@Test @Test
void testCreateClassificationWithMasterCopy() throws Exception { void testCreateClassificationWithMasterCopy() throws Exception {
final long countClassificationsBefore = final long countClassificationsBefore =
classificationService.createClassificationQuery().count(); CLASSIFICATION_SERVICE.createClassificationQuery().count();
Classification classification = Classification classification =
classificationService.newClassification("Key1", "DOMAIN_A", "TASK"); CLASSIFICATION_SERVICE.newClassification("Key1", "DOMAIN_A", "TASK");
classification.setIsValidInDomain(true); classification.setIsValidInDomain(true);
classification = classificationService.createClassification(classification); classification = CLASSIFICATION_SERVICE.createClassification(classification);
// Check returning one is the "original" // Check returning one is the "original"
Classification createdClassification = Classification createdClassification =
classificationService.getClassification(classification.getId()); CLASSIFICATION_SERVICE.getClassification(classification.getId());
assertThat(classification).isNotNull(); assertThat(classification).isNotNull();
assertThat(classification.getCreated()).isNotNull(); assertThat(classification.getCreated()).isNotNull();
assertThat(classification.getModified()).isNotNull(); assertThat(classification.getModified()).isNotNull();
@ -77,11 +73,11 @@ class CreateClassificationAccTest extends AbstractAccTest {
assertThat(createdClassification.getKey()).isEqualTo("Key1"); assertThat(createdClassification.getKey()).isEqualTo("Key1");
// Check 2 new created // Check 2 new created
long amountOfClassificationsAfter = classificationService.createClassificationQuery().count(); long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count();
assertThat(amountOfClassificationsAfter).isEqualTo(countClassificationsBefore + 2); assertThat(amountOfClassificationsAfter).isEqualTo(countClassificationsBefore + 2);
// Check main // Check main
classification = classificationService.getClassification(classification.getId()); classification = CLASSIFICATION_SERVICE.getClassification(classification.getId());
assertThat(classification).isNotNull(); assertThat(classification).isNotNull();
assertThat(classification.getCreated()).isNotNull(); assertThat(classification.getCreated()).isNotNull();
assertThat(classification.getModified()).isNotNull(); assertThat(classification.getModified()).isNotNull();
@ -90,7 +86,7 @@ class CreateClassificationAccTest extends AbstractAccTest {
assertThat(classification.getId()).startsWith(ID_PREFIX_CLASSIFICATION); assertThat(classification.getId()).startsWith(ID_PREFIX_CLASSIFICATION);
// Check master-copy // Check master-copy
classification = classificationService.getClassification(classification.getKey(), ""); classification = CLASSIFICATION_SERVICE.getClassification(classification.getKey(), "");
assertThat(classification).isNotNull(); assertThat(classification).isNotNull();
assertThat(classification.getCreated()).isNotNull(); assertThat(classification.getCreated()).isNotNull();
assertThat(classification.getModified()).isNotNull(); assertThat(classification.getModified()).isNotNull();
@ -103,14 +99,14 @@ class CreateClassificationAccTest extends AbstractAccTest {
@Test @Test
void testCreateClassificationWithExistingMaster() throws Exception { void testCreateClassificationWithExistingMaster() throws Exception {
classificationService.createClassification( CLASSIFICATION_SERVICE.createClassification(
classificationService.newClassification("Key0815", "", "TASK")); CLASSIFICATION_SERVICE.newClassification("Key0815", "", "TASK"));
long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count();
Classification expected = Classification expected =
classificationService.newClassification("Key0815", "DOMAIN_B", "TASK"); CLASSIFICATION_SERVICE.newClassification("Key0815", "DOMAIN_B", "TASK");
Classification actual = classificationService.createClassification(expected); Classification actual = CLASSIFICATION_SERVICE.createClassification(expected);
long amountOfClassificationsAfter = classificationService.createClassificationQuery().count(); long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count();
assertThat(amountOfClassificationsAfter).isEqualTo(amountOfClassificationsBefore + 1); assertThat(amountOfClassificationsAfter).isEqualTo(amountOfClassificationsBefore + 1);
assertThat(actual).isNotNull(); assertThat(actual).isNotNull();
@ -121,16 +117,16 @@ class CreateClassificationAccTest extends AbstractAccTest {
@WithAccessId(user = "businessadmin") @WithAccessId(user = "businessadmin")
@Test @Test
void testCreateChildInDomainAndCopyInMaster() throws Exception { void testCreateChildInDomainAndCopyInMaster() throws Exception {
Classification parent = classificationService.newClassification("Key0816", "DOMAIN_A", "TASK"); Classification parent = CLASSIFICATION_SERVICE.newClassification("Key0816", "DOMAIN_A", "TASK");
Classification actualParent = classificationService.createClassification(parent); Classification actualParent = CLASSIFICATION_SERVICE.createClassification(parent);
assertThat(actualParent).isNotNull(); assertThat(actualParent).isNotNull();
long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count();
Classification child = classificationService.newClassification("Key0817", "DOMAIN_A", "TASK"); Classification child = CLASSIFICATION_SERVICE.newClassification("Key0817", "DOMAIN_A", "TASK");
child.setParentId(actualParent.getId()); child.setParentId(actualParent.getId());
child.setParentKey(actualParent.getKey()); child.setParentKey(actualParent.getKey());
Classification actualChild = classificationService.createClassification(child); Classification actualChild = CLASSIFICATION_SERVICE.createClassification(child);
long amountOfClassificationsAfter = classificationService.createClassificationQuery().count(); long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count();
assertThat(amountOfClassificationsAfter).isEqualTo(amountOfClassificationsBefore + 2); assertThat(amountOfClassificationsAfter).isEqualTo(amountOfClassificationsBefore + 2);
assertThat(actualChild).isNotNull(); assertThat(actualChild).isNotNull();
@ -139,30 +135,30 @@ class CreateClassificationAccTest extends AbstractAccTest {
@WithAccessId(user = "businessadmin") @WithAccessId(user = "businessadmin")
@Test @Test
void testCreateClassificationWithInvalidValues() { void testCreateClassificationWithInvalidValues() {
classificationService.createClassificationQuery().count(); CLASSIFICATION_SERVICE.createClassificationQuery().count();
// Check key NULL // Check key NULL
Classification classification = Classification classification =
classificationService.newClassification(null, "DOMAIN_A", "TASK"); CLASSIFICATION_SERVICE.newClassification(null, "DOMAIN_A", "TASK");
assertThatThrownBy(() -> classificationService.createClassification(classification)) assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification))
.isInstanceOf(InvalidArgumentException.class); .isInstanceOf(InvalidArgumentException.class);
// Check invalid ServiceLevel // Check invalid ServiceLevel
Classification classification2 = Classification classification2 =
classificationService.newClassification("Key2", "DOMAIN_B", "TASK"); CLASSIFICATION_SERVICE.newClassification("Key2", "DOMAIN_B", "TASK");
classification2.setServiceLevel("abc"); classification2.setServiceLevel("abc");
assertThatThrownBy(() -> classificationService.createClassification(classification2)) assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification2))
.isInstanceOf(InvalidArgumentException.class); .isInstanceOf(InvalidArgumentException.class);
} }
@WithAccessId(user = "businessadmin") @WithAccessId(user = "businessadmin")
@Test @Test
void testCreateClassificationAlreadyExisting() throws Exception { void testCreateClassificationAlreadyExisting() throws Exception {
Classification classification = classificationService.newClassification("Key3", "", "TASK"); Classification classification = CLASSIFICATION_SERVICE.newClassification("Key3", "", "TASK");
Classification classificationCreated = Classification classificationCreated =
classificationService.createClassification(classification); CLASSIFICATION_SERVICE.createClassification(classification);
assertThatThrownBy(() -> classificationService.createClassification(classificationCreated)) assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classificationCreated))
.isInstanceOf(ClassificationAlreadyExistException.class); .isInstanceOf(ClassificationAlreadyExistException.class);
} }
@ -170,8 +166,8 @@ class CreateClassificationAccTest extends AbstractAccTest {
@Test @Test
void testCreateClassificationInUnknownDomain() { void testCreateClassificationInUnknownDomain() {
Classification classification = Classification classification =
classificationService.newClassification("Key3", "UNKNOWN_DOMAIN", "TASK"); CLASSIFICATION_SERVICE.newClassification("Key3", "UNKNOWN_DOMAIN", "TASK");
assertThatThrownBy(() -> classificationService.createClassification(classification)) assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification))
.isInstanceOf(DomainNotFoundException.class); .isInstanceOf(DomainNotFoundException.class);
} }
@ -179,8 +175,8 @@ class CreateClassificationAccTest extends AbstractAccTest {
@Test @Test
void testCreateClassificationOfUnknownType() { void testCreateClassificationOfUnknownType() {
Classification classification = Classification classification =
classificationService.newClassification("Key3", "DOMAIN_A", "UNKNOWN_TYPE"); CLASSIFICATION_SERVICE.newClassification("Key3", "DOMAIN_A", "UNKNOWN_TYPE");
assertThatThrownBy(() -> classificationService.createClassification(classification)) assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification))
.isInstanceOf(InvalidArgumentException.class); .isInstanceOf(InvalidArgumentException.class);
} }
@ -188,27 +184,27 @@ class CreateClassificationAccTest extends AbstractAccTest {
@Test @Test
void testCreateClassificationOfUnknownCategory() { void testCreateClassificationOfUnknownCategory() {
Classification classification = Classification classification =
classificationService.newClassification("Key4", "DOMAIN_A", "TASK"); CLASSIFICATION_SERVICE.newClassification("Key4", "DOMAIN_A", "TASK");
classification.setCategory("UNKNOWN_CATEGORY"); classification.setCategory("UNKNOWN_CATEGORY");
assertThatThrownBy(() -> classificationService.createClassification(classification)) assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification))
.isInstanceOf(InvalidArgumentException.class); .isInstanceOf(InvalidArgumentException.class);
} }
@WithAccessId(user = "businessadmin") @WithAccessId(user = "businessadmin")
@Test @Test
void testCreateClassificationWithInvalidParentId() { void testCreateClassificationWithInvalidParentId() {
Classification classification = classificationService.newClassification("Key5", "", "TASK"); Classification classification = CLASSIFICATION_SERVICE.newClassification("Key5", "", "TASK");
classification.setParentId("ID WHICH CANT BE FOUND"); classification.setParentId("ID WHICH CANT BE FOUND");
assertThatThrownBy(() -> classificationService.createClassification(classification)) assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification))
.isInstanceOf(InvalidArgumentException.class); .isInstanceOf(InvalidArgumentException.class);
} }
@WithAccessId(user = "businessadmin") @WithAccessId(user = "businessadmin")
@Test @Test
void testCreateClassificationWithInvalidParentKey() { void testCreateClassificationWithInvalidParentKey() {
Classification classification = classificationService.newClassification("Key5", "", "TASK"); Classification classification = CLASSIFICATION_SERVICE.newClassification("Key5", "", "TASK");
classification.setParentKey("KEY WHICH CANT BE FOUND"); classification.setParentKey("KEY WHICH CANT BE FOUND");
assertThatThrownBy(() -> classificationService.createClassification(classification)) assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification))
.isInstanceOf(InvalidArgumentException.class); .isInstanceOf(InvalidArgumentException.class);
} }
@ -216,9 +212,9 @@ class CreateClassificationAccTest extends AbstractAccTest {
@Test @Test
void testCreateClassificationWithExplicitId() { void testCreateClassificationWithExplicitId() {
ClassificationImpl classification = ClassificationImpl classification =
(ClassificationImpl) classificationService.newClassification("Key0818", "", "TASK"); (ClassificationImpl) CLASSIFICATION_SERVICE.newClassification("Key0818", "", "TASK");
classification.setId("EXPLICIT ID"); classification.setId("EXPLICIT ID");
assertThatThrownBy(() -> classificationService.createClassification(classification)) assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification))
.isInstanceOf(InvalidArgumentException.class); .isInstanceOf(InvalidArgumentException.class);
} }
@ -226,10 +222,10 @@ class CreateClassificationAccTest extends AbstractAccTest {
@Test @Test
void should_BeAbleToCreateNewClassification_When_ClassificationCopy() throws Exception { void should_BeAbleToCreateNewClassification_When_ClassificationCopy() throws Exception {
ClassificationImpl oldClassification = ClassificationImpl oldClassification =
(ClassificationImpl) classificationService.getClassification("T2100", "DOMAIN_B"); (ClassificationImpl) CLASSIFICATION_SERVICE.getClassification("T2100", "DOMAIN_B");
Classification newClassification = oldClassification.copy("T9949"); Classification newClassification = oldClassification.copy("T9949");
newClassification = classificationService.createClassification(newClassification); newClassification = CLASSIFICATION_SERVICE.createClassification(newClassification);
assertThat(newClassification.getId()).isNotNull(); assertThat(newClassification.getId()).isNotNull();
assertThat(newClassification.getId()).isNotEqualTo(oldClassification.getId()); assertThat(newClassification.getId()).isNotEqualTo(oldClassification.getId());
@ -240,11 +236,11 @@ class CreateClassificationAccTest extends AbstractAccTest {
@TestTemplate @TestTemplate
void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() { void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() {
ClassificationImpl classification = ClassificationImpl classification =
(ClassificationImpl) classificationService.newClassification("newKey718", "", "TASK"); (ClassificationImpl) CLASSIFICATION_SERVICE.newClassification("newKey718", "", "TASK");
ThrowingCallable createClassificationCall = ThrowingCallable createClassificationCall =
() -> { () -> {
classificationService.createClassification(classification); CLASSIFICATION_SERVICE.createClassification(classification);
}; };
assertThatThrownBy(createClassificationCall).isInstanceOf(NotAuthorizedException.class); assertThatThrownBy(createClassificationCall).isInstanceOf(NotAuthorizedException.class);

View File

@ -14,8 +14,8 @@ import pro.taskana.classification.api.exceptions.ClassificationInUseException;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
/** Acceptance test for all "delete classification" scenarios. */ /** Acceptance test for all "delete classification" scenarios. */
@ExtendWith(JaasExtension.class) @ExtendWith(JaasExtension.class)

View File

@ -38,8 +38,8 @@ import pro.taskana.classification.api.ClassificationCustomField;
import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
/** Acceptance test for all "get classification" scenarios. */ /** Acceptance test for all "get classification" scenarios. */
@ExtendWith(JaasExtension.class) @ExtendWith(JaasExtension.class)

View File

@ -9,7 +9,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
/** Acceptance test for all "query classifications with pagination" scenarios. */ /** Acceptance test for all "query classifications with pagination" scenarios. */
@ExtendWith(JaasExtension.class) @ExtendWith(JaasExtension.class)

View File

@ -25,8 +25,8 @@ import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.jobs.JobRunner; import pro.taskana.common.internal.jobs.JobRunner;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.Task;
import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.task.internal.models.TaskImpl;

View File

@ -9,8 +9,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.Task;
import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.api.models.TaskSummary;

View File

@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BaseQuery; import pro.taskana.common.api.BaseQuery;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskState;
import pro.taskana.task.internal.jobs.TaskCleanupJob; import pro.taskana.task.internal.jobs.TaskCleanupJob;

View File

@ -8,7 +8,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.task.api.ObjectReferenceQuery; import pro.taskana.task.api.ObjectReferenceQuery;
import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;

View File

@ -16,8 +16,8 @@ import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.JobService; import pro.taskana.common.api.JobService;
import pro.taskana.common.api.ScheduledJob; import pro.taskana.common.api.ScheduledJob;
import pro.taskana.common.internal.JobServiceImpl; import pro.taskana.common.internal.JobServiceImpl;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskCustomField;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.Task;

View File

@ -13,8 +13,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskCustomField;

View File

@ -21,8 +21,8 @@ import org.junit.jupiter.api.function.ThrowingConsumer;
import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.SelectedItem;
import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.TaskTimestamp;

View File

@ -18,8 +18,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer; import org.junit.jupiter.api.function.ThrowingConsumer;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.SelectedItem;
import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.TaskTimestamp;

View File

@ -21,8 +21,8 @@ import org.junit.jupiter.api.function.ThrowingConsumer;
import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.SelectedItem;
import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.TaskTimestamp;

View File

@ -18,8 +18,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer; import org.junit.jupiter.api.function.ThrowingConsumer;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.CombinedClassificationFilter; import pro.taskana.monitor.api.CombinedClassificationFilter;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.SelectedItem;

View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer; import org.junit.jupiter.api.function.ThrowingConsumer;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.TaskTimestamp;
import pro.taskana.monitor.api.reports.ClassificationCategoryReport; import pro.taskana.monitor.api.reports.ClassificationCategoryReport;

View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer; import org.junit.jupiter.api.function.ThrowingConsumer;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.TaskTimestamp;
import pro.taskana.monitor.api.reports.ClassificationReport; import pro.taskana.monitor.api.reports.ClassificationReport;

View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer; import org.junit.jupiter.api.function.ThrowingConsumer;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.TaskTimestamp;
import pro.taskana.monitor.api.reports.ClassificationReport.Builder; import pro.taskana.monitor.api.reports.ClassificationReport.Builder;

View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer; import org.junit.jupiter.api.function.ThrowingConsumer;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.TaskTimestamp;
import pro.taskana.monitor.api.reports.TaskCustomFieldValueReport; import pro.taskana.monitor.api.reports.TaskCustomFieldValueReport;

View File

@ -14,8 +14,8 @@ import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.reports.TaskStatusReport; import pro.taskana.monitor.api.reports.TaskStatusReport;
import pro.taskana.monitor.api.reports.item.TaskQueryItem; import pro.taskana.monitor.api.reports.item.TaskQueryItem;

View File

@ -13,8 +13,8 @@ import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.reports.TimestampReport; import pro.taskana.monitor.api.reports.TimestampReport;
import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;

View File

@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer; import org.junit.jupiter.api.function.ThrowingConsumer;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.monitor.api.CombinedClassificationFilter; import pro.taskana.monitor.api.CombinedClassificationFilter;
import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.TaskTimestamp;

View File

@ -9,8 +9,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
/** /**
* Acceptance test for classification queries and authorization. * Acceptance test for classification queries and authorization.

View File

@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.TaskanaEngineProxy; import pro.taskana.common.internal.TaskanaEngineProxy;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
/** Acceptance test for task queries and authorization. */ /** Acceptance test for task queries and authorization. */
@ExtendWith(JaasExtension.class) @ExtendWith(JaasExtension.class)

View File

@ -7,8 +7,8 @@ import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.api.models.TaskSummary;

View File

@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketPermission;
import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketService;
import pro.taskana.workbasket.api.models.WorkbasketSummary; import pro.taskana.workbasket.api.models.WorkbasketSummary;

View File

@ -16,8 +16,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.CallbackState; import pro.taskana.task.api.CallbackState;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskState;

View File

@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidStateException; import pro.taskana.task.api.exceptions.InvalidStateException;

View File

@ -18,8 +18,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.security.CurrentUserContext;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidOwnerException; import pro.taskana.task.api.exceptions.InvalidOwnerException;

View File

@ -19,8 +19,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.TaskanaEngineProxy; import pro.taskana.common.internal.TaskanaEngineProxy;
import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.security.CurrentUserContext;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskCustomField;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskState;

View File

@ -8,8 +8,8 @@ import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.TaskNotFoundException; import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.TaskComment; import pro.taskana.task.api.models.TaskComment;

View File

@ -16,8 +16,8 @@ import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.common.internal.TaskanaEngineProxy; import pro.taskana.common.internal.TaskanaEngineProxy;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.InvalidStateException; import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskNotFoundException; import pro.taskana.task.api.exceptions.TaskNotFoundException;

View File

@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.TaskCommentNotFoundException; import pro.taskana.task.api.exceptions.TaskCommentNotFoundException;
import pro.taskana.task.api.models.TaskComment; import pro.taskana.task.api.models.TaskComment;

View File

@ -11,8 +11,8 @@ import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskCustomField;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskState;

View File

@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.TaskCommentNotFoundException; import pro.taskana.task.api.exceptions.TaskCommentNotFoundException;
import pro.taskana.task.api.models.TaskComment; import pro.taskana.task.api.models.TaskComment;

View File

@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.BaseQuery.SortDirection;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskQueryColumnName; import pro.taskana.task.api.TaskQueryColumnName;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;

View File

@ -9,8 +9,8 @@ import java.util.stream.Collectors;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskCustomField;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.Attachment; import pro.taskana.task.api.models.Attachment;

View File

@ -36,9 +36,9 @@ import pro.taskana.common.api.BaseQuery.SortDirection;
import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.internal.TaskanaEngineProxy; import pro.taskana.common.internal.TaskanaEngineProxy;
import pro.taskana.common.internal.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId;
import pro.taskana.common.internal.util.Triplet; import pro.taskana.common.internal.util.Triplet;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskCustomField;
import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskQueryColumnName; import pro.taskana.task.api.TaskQueryColumnName;

View File

@ -7,8 +7,8 @@ import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.ObjectReference; import pro.taskana.task.api.models.ObjectReference;
import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.api.models.TaskSummary;

View File

@ -10,8 +10,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.BaseQuery.SortDirection;
import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.api.models.TaskSummary;

View File

@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.BaseQuery.SortDirection;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.WildcardSearchField; import pro.taskana.task.api.WildcardSearchField;
import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.api.models.TaskSummary;

View File

@ -12,8 +12,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.KeyDomain; import pro.taskana.common.api.KeyDomain;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.api.models.TaskSummary;
import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException; import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException;

View File

@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.KeyDomain; import pro.taskana.common.api.KeyDomain;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.api.models.TaskSummary;

View File

@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.BaseQuery.SortDirection;
import pro.taskana.common.api.KeyDomain; import pro.taskana.common.api.KeyDomain;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.api.models.TaskSummary;

View File

@ -18,10 +18,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.BaseQuery.SortDirection;
import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.common.api.exceptions.SystemException;
import pro.taskana.common.internal.security.JaasExtension;
import pro.taskana.common.internal.security.UserPrincipal; import pro.taskana.common.internal.security.UserPrincipal;
import pro.taskana.common.internal.security.WithAccessId;
import pro.taskana.common.internal.util.CheckedConsumer; import pro.taskana.common.internal.util.CheckedConsumer;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.Task;

View File

@ -13,8 +13,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.Task;
import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.api.models.TaskSummary;

Some files were not shown because too many files have changed in this diff Show More