nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1095 

-Removed internal imports from api classes
-moved 3 exceptions from common.api.exceptions to task.api.exceptions
-Adjusted package structure of taskana-cdi and taskana-spring to match taskana-core
This commit is contained in:
Jörg Heffner 2020-02-13 16:38:18 +01:00 committed by Holger Hagen
parent f64053ec4e
commit ddb12a6ad1
43 changed files with 80 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java
View File

@ -8,9 +8,9 @@ import javax.enterprise.event.Observes;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.ObjectReference;

3
lib/taskana-cdi/src/main/java/pro/taskana/TaskanaProducers.java → lib/taskana-cdi/src/main/java/pro/taskana/common/internal/TaskanaProducers.java
View File

@ -1,4 +1,4 @@
package pro.taskana;
package pro.taskana.common.internal;
import java.io.IOException;
import java.io.InputStream;
@ -17,6 +17,7 @@ import javax.sql.DataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.TaskanaEngineConfiguration;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.task.api.TaskService;

4
lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java
View File

@ -17,9 +17,9 @@ import pro.taskana.classification.api.exceptions.ClassificationNotFoundException
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.ObjectReference;

4
lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java → lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java
View File

@ -1,4 +1,4 @@
package pro.taskana;
package pro.taskana.common.internal;
import java.sql.Connection;
import java.sql.DriverManager;
@ -16,6 +16,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.wildfly.swarm.undertow.WARArchive;
import pro.taskana.common.internal.TaskanaProducers;
/** TODO. */
@RunWith(Arquillian.class)
public class TaskanaProducersTest {

3
lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQueryColumnName.java
View File

@ -1,11 +1,10 @@
package pro.taskana.classification.api;
import pro.taskana.classification.internal.ClassificationQueryMapper;
import pro.taskana.common.api.QueryColumnName;
/**
* Enum containing the column names for {@link
* ClassificationQueryMapper#queryClassificationColumnValues}.
* pro.taskana.classification.internal.ClassificationQueryMapper#queryClassificationColumnValues}.
*
* @author jsa
*/

4
lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReferenceQueryColumnName.java
View File

@ -1,10 +1,10 @@
package pro.taskana.task.api;
import pro.taskana.common.api.QueryColumnName;
import pro.taskana.task.internal.TaskQueryMapper;
/**
* Enum containing the column names for {@link TaskQueryMapper#queryObjectReferenceColumnValues}.
* Enum containing the column names for {@link
* pro.taskana.task.internal.TaskQueryMapper#queryObjectReferenceColumnValues}.
*
* @author jsa
*/

6
lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQueryColumnName.java
View File

@ -1,12 +1,10 @@
package pro.taskana.task.api;
import pro.taskana.common.api.QueryColumnName;
import pro.taskana.task.internal.TaskQueryImpl;
import pro.taskana.task.internal.TaskQueryMapper;
/**
* Enum containing the column names for {@link
* TaskQueryMapper#queryTaskColumnValues(TaskQueryImpl)}.
* Enum containing the column names for
* TaskQueryMapper.queryTaskColumnValues
*
* @author jsa
*/

6
lib/taskana-core/src/main/java/pro/taskana/task/api/TaskService.java
View File

@ -6,13 +6,13 @@ import java.util.Map;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Attachment;

4
lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/AttachmentPersistenceException.java → lib/taskana-core/src/main/java/pro/taskana/task/api/exceptions/AttachmentPersistenceException.java
View File

@ -1,4 +1,6 @@
package pro.taskana.common.api.exceptions;
package pro.taskana.task.api.exceptions;
import pro.taskana.common.api.exceptions.TaskanaException;
/**
* Thrown, when an attachment should be inserted to the DB, but it does already exist.<br>

4
lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/InvalidOwnerException.java → lib/taskana-core/src/main/java/pro/taskana/task/api/exceptions/InvalidOwnerException.java
View File

@ -1,4 +1,6 @@
package pro.taskana.common.api.exceptions;
package pro.taskana.task.api.exceptions;
import pro.taskana.common.api.exceptions.TaskanaException;
/**
* This exception is thrown when the task state doesn't allow the requested operation.

4
lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/InvalidStateException.java → lib/taskana-core/src/main/java/pro/taskana/task/api/exceptions/InvalidStateException.java
View File

@ -1,4 +1,6 @@
package pro.taskana.common.api.exceptions;
package pro.taskana.task.api.exceptions;
import pro.taskana.common.api.exceptions.TaskanaException;
/**
* This exception is thrown when the task state doesn't allow the requested operation.

6
lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java
View File

@ -23,11 +23,8 @@ import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.SystemException;
import pro.taskana.common.api.exceptions.TaskanaException;
@ -46,6 +43,9 @@ import pro.taskana.task.api.CallbackState;
import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Attachment;

2
lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskTransferrer.java
View File

@ -13,7 +13,6 @@ import org.slf4j.LoggerFactory;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.common.internal.InternalTaskanaEngine;
@ -21,6 +20,7 @@ import pro.taskana.common.internal.security.CurrentUserContext;
import pro.taskana.spi.history.api.events.task.TransferredEvent;
import pro.taskana.spi.history.internal.HistoryEventProducer;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.internal.models.MinimalTaskSummary;

3
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AccessItemQueryColumnName.java
View File

@ -1,11 +1,10 @@
package pro.taskana.workbasket.api;
import pro.taskana.common.api.QueryColumnName;
import pro.taskana.workbasket.internal.WorkbasketQueryMapper;
/**
* Enum containing the column names for {@link
* WorkbasketQueryMapper#queryWorkbasketAccessItemColumnValues}.
* pro.taskana.workbasket.internal.WorkbasketQueryMapper#queryWorkbasketAccessItemColumnValues}.
*
* @author jsa
*/

4
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQueryColumnName.java
View File

@ -1,10 +1,10 @@
package pro.taskana.workbasket.api;
import pro.taskana.common.api.QueryColumnName;
import pro.taskana.workbasket.internal.WorkbasketQueryMapper;
/**
* Enum containing the column names for {@link WorkbasketQueryMapper#queryWorkbasketColumnValues}.
* Enum containing the column names
* for pro.taskana.workbasket.internal.WorkbasketQueryMapper.queryWorkbasketColumnValues
*
* @author jsa
*/

4
lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
View File

@ -13,13 +13,13 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.jobs.TaskCleanupJob;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;

4
lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java
View File

@ -20,16 +20,16 @@ import pro.taskana.classification.api.exceptions.ClassificationNotFoundException
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.JobService;
import pro.taskana.common.api.ScheduledJob;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.JobServiceImpl;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;

6
lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java
View File

@ -18,8 +18,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.security.JaasExtension;
@ -27,6 +25,8 @@ import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.CallbackState;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;
@ -146,7 +146,7 @@ class CallbackStateAccTest extends AbstractAccTest {
for (String taskId : failedTaskIds) {
TaskanaException excpt = bulkResult1.getErrorForId(taskId);
assertEquals(
"pro.taskana.common.api.exceptions.InvalidStateException", excpt.getClass().getName());
"pro.taskana.task.api.exceptions.InvalidStateException", excpt.getClass().getName());
}
List<String> externalIds =
new ArrayList<>(

4
lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java
View File

@ -14,14 +14,14 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.CurrentUserContext;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;

2
lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java
View File

@ -15,12 +15,12 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;

4
lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java
View File

@ -29,10 +29,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.TaskanaEngineProxyForTest;
import pro.taskana.security.JaasExtension;
@ -40,6 +38,8 @@ import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskQueryColumnName;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Attachment;

4
lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java
View File

@ -20,14 +20,14 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;

6
lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java
View File

@ -14,16 +14,16 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.ObjectReference;

4
lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java
View File

@ -20,16 +20,16 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.security.CurrentUserContext;
import pro.taskana.common.internal.util.DaysToWorkingDaysConverter;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Attachment;

4
lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java
View File

@ -20,14 +20,14 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;

4
lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java
View File

@ -14,12 +14,12 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.internal.models.TaskImpl;
import pro.taskana.workbasket.api.WorkbasketService;

2
lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntAutocommitTest.java
View File

@ -26,7 +26,6 @@ import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.SystemException;
import pro.taskana.common.internal.JunitHelper;
@ -38,6 +37,7 @@ import pro.taskana.sampledata.SampleDataGenerator;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.ObjectReference;

2
lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntExplicitTest.java
View File

@ -30,7 +30,6 @@ import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.SystemException;
import pro.taskana.common.internal.JunitHelper;
@ -43,6 +42,7 @@ import pro.taskana.sampledata.SampleDataGenerator;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;

2
lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskTransferrerTest.java
View File

@ -21,10 +21,10 @@ import pro.taskana.classification.api.models.Classification;
import pro.taskana.classification.internal.ClassificationQueryImpl;
import pro.taskana.classification.internal.ClassificationServiceImpl;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.InternalTaskanaEngine;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.internal.models.TaskImpl;

4
lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java
View File

@ -11,10 +11,10 @@ import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.ObjectReference;

1
lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfig.java
View File

@ -15,7 +15,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.configuration.SpringTaskanaEngineConfiguration;
import pro.taskana.task.api.TaskService;
import pro.taskana.workbasket.api.WorkbasketService;

3
lib/taskana-spring-example/src/test/java/pro/taskana/TransactionalJobsConfiguration.java
View File

@ -3,6 +3,7 @@ package pro.taskana;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import pro.taskana.common.internal.transaction.SpringTransactionProvider;
import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
/** Configuration class for Spring sample application. */
@ -11,6 +12,6 @@ public class TransactionalJobsConfiguration {
@Bean
public TaskanaTransactionProvider<Object> springTransactionProvider() {
return new pro.taskana.transaction.SpringTransactionProvider();
return new SpringTransactionProvider();
}
}

5
lib/taskana-spring/src/main/java/pro/taskana/configuration/SpringTaskanaEngineConfiguration.java → lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineConfiguration.java
View File

@ -1,11 +1,10 @@
package pro.taskana.configuration;
package pro.taskana;
import java.sql.SQLException;
import javax.sql.DataSource;
import pro.taskana.SpringTaskanaEngineImpl;
import pro.taskana.TaskanaEngineConfiguration;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.common.internal.SpringTaskanaEngineImpl;
/** This class configures the TaskanaEngineConfiguration for spring. */
public class SpringTaskanaEngineConfiguration extends TaskanaEngineConfiguration {

5
lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineImpl.java → lib/taskana-spring/src/main/java/pro/taskana/common/internal/SpringTaskanaEngineImpl.java
View File

@ -1,10 +1,9 @@
package pro.taskana;
package pro.taskana.common.internal;
import javax.annotation.PostConstruct;
import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
import pro.taskana.common.internal.TaskanaEngineImpl;
import pro.taskana.configuration.SpringTaskanaEngineConfiguration;
import pro.taskana.SpringTaskanaEngineConfiguration;
/** This class configures the TaskanaEngine for spring. */
public class SpringTaskanaEngineImpl extends TaskanaEngineImpl {

2
lib/taskana-spring/src/main/java/pro/taskana/transaction/SpringTransactionProvider.java → lib/taskana-spring/src/main/java/pro/taskana/common/internal/transaction/SpringTransactionProvider.java
View File

@ -1,4 +1,4 @@
package pro.taskana.transaction;
package pro.taskana.common.internal.transaction;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

2
lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java → lib/taskana-spring/src/test/java/pro/taskana/common/internal/transaction/TaskanaComponent.java
View File

@ -1,4 +1,4 @@
package pro.taskana;
package pro.taskana.common.internal.transaction;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

2
lib/taskana-spring/src/test/java/pro/taskana/TransactionTest.java → lib/taskana-spring/src/test/java/pro/taskana/common/internal/transaction/TransactionTest.java
View File

@ -1,4 +1,4 @@
package pro.taskana;
package pro.taskana.common.internal.transaction;
import java.sql.Connection;
import java.sql.DriverManager;

2
lib/taskana-spring/src/test/resources/test-applicationContext.xml
View File

@ -31,5 +31,5 @@
<bean id="taskEngine" factory-bean="taskEngineConfiguration" factory-method="createTaskEngineConfiguration" />
<bean id="taskService" factory-bean="taskEngine" factory-method="getTaskService" />
<bean class="pro.taskana.TaskanaComponent" />
<bean class="pro.taskana.common.internal.transaction.TaskanaComponent" />
</beans>

3
rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/TransactionalJobsConfiguration.java
View File

@ -3,6 +3,7 @@ package pro.taskana.jobs;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import pro.taskana.common.internal.transaction.SpringTransactionProvider;
import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
/** Configuration class for Spring sample application. */
@ -11,6 +12,6 @@ public class TransactionalJobsConfiguration {
@Bean
public TaskanaTransactionProvider<Object> springTransactionProvider() {
return new pro.taskana.transaction.SpringTransactionProvider();
return new SpringTransactionProvider();
}
}

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java
View File

@ -13,10 +13,10 @@ import org.springframework.context.annotation.Scope;
import org.springframework.http.converter.json.SpringHandlerInstantiator;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import pro.taskana.SpringTaskanaEngineConfiguration;
import pro.taskana.TaskanaEngineConfiguration;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.configuration.SpringTaskanaEngineConfiguration;
import pro.taskana.ldap.LdapClient;
import pro.taskana.monitor.api.MonitorService;
import pro.taskana.task.api.TaskService;

6
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java
View File

@ -25,11 +25,8 @@ import pro.taskana.classification.api.exceptions.ClassificationNotFoundException
import pro.taskana.common.api.BaseQuery.SortDirection;
import pro.taskana.common.api.KeyDomain;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.rest.resource.PagedResources.PageMetadata;
import pro.taskana.rest.resource.TaskResource;
@ -39,6 +36,9 @@ import pro.taskana.rest.resource.TaskSummaryResourceAssembler;
import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaRestExceptionHandler.java
View File

@ -18,9 +18,9 @@ import pro.taskana.classification.api.exceptions.ClassificationNotFoundException
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.task.api.exceptions.InvalidOwnerException;
import pro.taskana.task.api.exceptions.InvalidStateException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException;

2
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TestSchemaNameCustomizable.java
View File

@ -11,9 +11,9 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import pro.taskana.SpringTaskanaEngineConfiguration;
import pro.taskana.TaskanaSpringBootTest;
import pro.taskana.common.internal.configuration.DB;
import pro.taskana.configuration.SpringTaskanaEngineConfiguration;
import pro.taskana.sampledata.SampleDataGenerator;
/** Test that the schema name can be customized. */