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

TSK-1160 - terminate/cancel task more comments from Holger

This commit is contained in:
BerndBreier 2020-03-27 15:36:46 +01:00
parent d6505284f7
commit 7fdea5bef2
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java
View File

@ -46,7 +46,6 @@ import pro.taskana.common.internal.persistence.InstantTypeHandler;
import pro.taskana.common.internal.persistence.MapTypeHandler;
import pro.taskana.common.internal.security.CurrentUserContext;
import pro.taskana.common.internal.security.GroupPrincipal;
import pro.taskana.common.internal.util.WorkingDaysToDaysConverter;
import pro.taskana.monitor.api.MonitorService;
import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.monitor.internal.MonitorServiceImpl;
@ -88,8 +87,6 @@ public class TaskanaEngineImpl implements TaskanaEngine {
historyEventProducer = HistoryEventProducer.getInstance(taskanaEngineConfiguration);
taskRoutingManager = TaskRoutingManager.getInstance(this);
this.internalTaskanaEngineImpl = new InternalTaskanaEngineImpl();
WorkingDaysToDaysConverter.setGermanPublicHolidaysEnabled(
taskanaEngineConfiguration.isGermanPublicHolidaysEnabled());
}
public static TaskanaEngine createTaskanaEngine(

2
lib/taskana-core/src/main/java/pro/taskana/task/api/TaskState.java
View File

@ -8,7 +8,7 @@ public enum TaskState {
CANCELLED,
TERMINATED;
public boolean isInStates(TaskState... states) {
public boolean in(TaskState... states) {
for (TaskState currState : states) {
if (this.equals(currState)) {
return true;

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

@ -46,6 +46,8 @@ class ServiceLevelHandler {
this.taskanaEngine = taskanaEngine;
this.taskMapper = taskMapper;
this.attachmentMapper = attachmentMapper;
WorkingDaysToDaysConverter.setGermanPublicHolidaysEnabled(
taskanaEngine.getEngine().getConfiguration().isGermanPublicHolidaysEnabled());
this.converter = WorkingDaysToDaysConverter.initialize();
}

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

@ -991,7 +991,6 @@ public class TaskServiceImpl implements TaskService {
}
Instant now = Instant.now();
task.setOwner(null);
task.setModified(now);
task.setCompleted(now);
task.setState(targetState);
@ -1036,7 +1035,7 @@ public class TaskServiceImpl implements TaskService {
taskanaEngine.openConnection();
task = (TaskImpl) getTask(taskId);
TaskState state = task.getState();
if (!state.isInStates(TaskState.READY, TaskState.CLAIMED)) {
if (!state.in(TaskState.READY, TaskState.CLAIMED)) {
throw new InvalidStateException(
String.format(TASK_WITH_ID_IS_ALREADY_IN_END_STATE, taskId));
}
@ -1118,7 +1117,7 @@ public class TaskServiceImpl implements TaskService {
return task;
}
if (task.getState().isInStates(TaskState.CANCELLED, TaskState.TERMINATED)) {
if (task.getState().in(TaskState.CANCELLED, TaskState.TERMINATED)) {
throw new InvalidStateException(
String.format(
"Cannot complete task %s because it is in state %s.", taskId, task.getState()));
@ -1171,7 +1170,7 @@ public class TaskServiceImpl implements TaskService {
throw new InvalidStateException(
"Cannot delete Task " + taskId + " because it is not in an end state.");
}
if ((!task.getState().isInStates(TaskState.TERMINATED, TaskState.CANCELLED))
if ((!task.getState().in(TaskState.TERMINATED, TaskState.CANCELLED))
&& CallbackState.CALLBACK_PROCESSING_REQUIRED.equals(task.getCallbackState())) {
throw new InvalidStateException(String.format(TASK_WITH_ID_CALLBACK_NOT_PROCESSED, taskId));
}
@ -1210,7 +1209,7 @@ public class TaskServiceImpl implements TaskService {
bulkLog.addError(currentTaskId, new InvalidStateException(currentTaskId));
taskIdIterator.remove();
} else {
if ((!foundSummary.getTaskState().isInStates(TaskState.CANCELLED, TaskState.TERMINATED))
if ((!foundSummary.getTaskState().in(TaskState.CANCELLED, TaskState.TERMINATED))
&& CallbackState.CALLBACK_PROCESSING_REQUIRED.equals(foundSummary.getCallbackState())) {
bulkLog.addError(
currentTaskId,