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

automatically formatted code

This commit is contained in:
Mustapha Zorgati 2020-04-23 20:18:49 +02:00
parent 314fa14b91
commit 35705ddb02
44 changed files with 164 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/HistoryEventImpl.java
View File

@ -5,8 +5,7 @@ import pro.taskana.spi.history.api.events.TaskanaHistoryEvent;
/** This entity contains the most important information about a history event. */
public class HistoryEventImpl extends TaskanaHistoryEvent {
public HistoryEventImpl() {
}
public HistoryEventImpl() {}
public HistoryEventImpl(String userId, String details) {
super(userId, details);

49
history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/mappings/HistoryEventMapper.java
View File

@ -27,7 +27,6 @@ public interface HistoryEventMapper {
+ "</script>")
void insert(@Param("historyEvent") TaskanaHistoryEvent historyEvent);
@Select(
"<script>"
+ "SELECT ID, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, TASK_ID, EVENT_TYPE, CREATED, USER_ID, DOMAIN, WORKBASKET_KEY, "
@ -38,30 +37,30 @@ public interface HistoryEventMapper {
+ "</script>")
@Results(
value = {
@Result(property = "id", column = "ID"),
@Result(property = "businessProcessId", column = "BUSINESS_PROCESS_ID"),
@Result(property = "parentBusinessProcessId", column = "PARENT_BUSINESS_PROCESS_ID"),
@Result(property = "taskId", column = "TASK_ID"),
@Result(property = "eventType", column = "EVENT_TYPE"),
@Result(property = "created", column = "CREATED"),
@Result(property = "userId", column = "USER_ID"),
@Result(property = "domain", column = "DOMAIN"),
@Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
@Result(property = "porCompany", column = "POR_COMPANY"),
@Result(property = "porSystem", column = "POR_SYSTEM"),
@Result(property = "porInstance", column = "POR_INSTANCE"),
@Result(property = "porType", column = "POR_TYPE"),
@Result(property = "porValue", column = "POR_VALUE"),
@Result(property = "taskClassificationKey", column = "TASK_CLASSIFICATION_KEY"),
@Result(property = "taskClassificationCategory", column = "TASK_CLASSIFICATION_CATEGORY"),
@Result(property = "attachmentClassificationKey", column = "ATTACHMENT_CLASSIFICATION_KEY"),
@Result(property = "oldValue", column = "OLD_VALUE"),
@Result(property = "newValue", column = "NEW_VALUE"),
@Result(property = "custom1", column = "CUSTOM_1"),
@Result(property = "custom2", column = "CUSTOM_2"),
@Result(property = "custom3", column = "CUSTOM_3"),
@Result(property = "custom4", column = "CUSTOM_4"),
@Result(property = "details", column = "DETAILS")
@Result(property = "id", column = "ID"),
@Result(property = "businessProcessId", column = "BUSINESS_PROCESS_ID"),
@Result(property = "parentBusinessProcessId", column = "PARENT_BUSINESS_PROCESS_ID"),
@Result(property = "taskId", column = "TASK_ID"),
@Result(property = "eventType", column = "EVENT_TYPE"),
@Result(property = "created", column = "CREATED"),
@Result(property = "userId", column = "USER_ID"),
@Result(property = "domain", column = "DOMAIN"),
@Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
@Result(property = "porCompany", column = "POR_COMPANY"),
@Result(property = "porSystem", column = "POR_SYSTEM"),
@Result(property = "porInstance", column = "POR_INSTANCE"),
@Result(property = "porType", column = "POR_TYPE"),
@Result(property = "porValue", column = "POR_VALUE"),
@Result(property = "taskClassificationKey", column = "TASK_CLASSIFICATION_KEY"),
@Result(property = "taskClassificationCategory", column = "TASK_CLASSIFICATION_CATEGORY"),
@Result(property = "attachmentClassificationKey", column = "ATTACHMENT_CLASSIFICATION_KEY"),
@Result(property = "oldValue", column = "OLD_VALUE"),
@Result(property = "newValue", column = "NEW_VALUE"),
@Result(property = "custom1", column = "CUSTOM_1"),
@Result(property = "custom2", column = "CUSTOM_2"),
@Result(property = "custom3", column = "CUSTOM_3"),
@Result(property = "custom4", column = "CUSTOM_4"),
@Result(property = "details", column = "DETAILS")
})
TaskanaHistoryEvent findById(@Param("id") String id);
}

1
history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryHistoryAccTest.java
View File

@ -329,6 +329,5 @@ public class QueryHistoryAccTest extends AbstractAccTest {
returnedList =
getHistoryService().createHistoryQuery().listValues(HistoryQueryColumnName.CUSTOM_4, null);
assertThat(returnedList).hasSize(2);
}
}

2
history/taskana-simplehistory-provider/src/test/java/configuration/TaskanaEngineConfigurationTest.java
View File

@ -36,7 +36,7 @@ public class TaskanaEngineConfigurationTest extends AbstractAccTest {
getHistoryService()
.create(
AbstractAccTest.createHistoryEvent(
"wbKey1", "taskId1", "type1", "Some comment", "wbKey2","someUserId"));
"wbKey1", "taskId1", "type1", "Some comment", "wbKey2", "someUserId"));
count = getHistoryService().createHistoryQuery().workbasketKeyIn("wbKey1").count();
assertThat(count).isOne();
}

6
history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/resource/TaskHistoryEventListResourceAssembler.java
View File

@ -35,14 +35,14 @@ public class TaskHistoryEventListResourceAssembler extends AbstractRessourcesAss
this.getOriginal()
.replaceQueryParam("page", pageMetadata.getTotalPages())
.toUriString())
.withRel(IanaLinkRelations.LAST));
.withRel(IanaLinkRelations.LAST));
if (pageMetadata.getNumber() > 1) {
pagedResources.add(
new Link(
this.getOriginal()
.replaceQueryParam("page", pageMetadata.getNumber() - 1)
.toUriString())
.withRel(IanaLinkRelations.PREV));
.withRel(IanaLinkRelations.PREV));
}
if (pageMetadata.getNumber() < pageMetadata.getTotalPages()) {
pagedResources.add(
@ -50,7 +50,7 @@ public class TaskHistoryEventListResourceAssembler extends AbstractRessourcesAss
this.getOriginal()
.replaceQueryParam("page", pageMetadata.getNumber() + 1)
.toUriString())
.withRel(IanaLinkRelations.NEXT));
.withRel(IanaLinkRelations.NEXT));
}
}

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

@ -16,8 +16,6 @@ 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 {

20
lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java
View File

@ -172,16 +172,6 @@ public class TaskanaEngineConfiguration {
initGermanHolidaysEnabled(props);
}
private void initGermanHolidaysEnabled(Properties props) {
String enabled = props.getProperty(TASKANA_GERMAN_HOLIDAYS_ENABLED);
if (enabled != null && !enabled.isEmpty()) {
germanPublicHolidaysEnabled = Boolean.parseBoolean(enabled);
} else {
germanPublicHolidaysEnabled = false;
}
LOGGER.debug("GermanPublicHolidaysEnabled = {}", germanPublicHolidaysEnabled);
}
public static DataSource createDefaultDataSource() {
LOGGER.info(
"No datasource is provided. A inmemory db is used: "
@ -352,6 +342,16 @@ public class TaskanaEngineConfiguration {
return true;
}
private void initGermanHolidaysEnabled(Properties props) {
String enabled = props.getProperty(TASKANA_GERMAN_HOLIDAYS_ENABLED);
if (enabled != null && !enabled.isEmpty()) {
germanPublicHolidaysEnabled = Boolean.parseBoolean(enabled);
} else {
germanPublicHolidaysEnabled = false;
}
LOGGER.debug("GermanPublicHolidaysEnabled = {}", germanPublicHolidaysEnabled);
}
private void initJobParameters(Properties props) {
String jobBatchSizeProperty = props.getProperty(TASKANA_JOB_BATCHSIZE);
if (jobBatchSizeProperty != null && !jobBatchSizeProperty.isEmpty()) {

3
lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java
View File

@ -341,8 +341,7 @@ public class ClassificationServiceImpl implements ClassificationService {
masterClassification.setDomain("");
masterClassification.setIsValidInDomain(false);
try {
if (classification.getParentKey() != null
&& !"".equals(classification.getParentKey())) {
if (classification.getParentKey() != null && !"".equals(classification.getParentKey())) {
masterClassification.setParentId(
getClassification(classification.getParentKey(), "").getId());
}

13
lib/taskana-core/src/main/java/pro/taskana/common/internal/util/Pair.java
View File

@ -35,6 +35,11 @@ public final class Pair<L, R> {
return new Pair<>(left, right);
}
@Override
public int hashCode() {
return Objects.hash(left, right);
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
@ -47,13 +52,7 @@ public final class Pair<L, R> {
return false;
}
Pair<?, ?> other = (Pair<?, ?>) obj;
return Objects.equals(left, other.left)
&& Objects.equals(right, other.right);
}
@Override
public int hashCode() {
return Objects.hash(left, right);
return Objects.equals(left, other.left) && Objects.equals(right, other.right);
}
@Override

3
lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/TaskanaHistoryEvent.java
View File

@ -30,8 +30,7 @@ public class TaskanaHistoryEvent {
protected String custom4;
protected String details;
public TaskanaHistoryEvent() {
}
public TaskanaHistoryEvent() {}
public TaskanaHistoryEvent(String userId, String details) {
this.userId = userId;

2
lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimCancelledEvent.java
View File

@ -6,7 +6,7 @@ import pro.taskana.task.api.models.Task;
public class ClaimCancelledEvent extends TaskEvent {
public ClaimCancelledEvent(Task task, String userId) {
super(task, userId,null);
super(task, userId, null);
eventType = "TASK_CLAIM_CANCELLED";
created = task.getModified();
}

2
lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimedEvent.java
View File

@ -6,7 +6,7 @@ import pro.taskana.task.api.models.Task;
public class ClaimedEvent extends TaskEvent {
public ClaimedEvent(Task task, String userId) {
super(task, userId,null);
super(task, userId, null);
setEventType("TASK_CLAIMED");
created = task.getClaimed();
}

4
lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/CompletedEvent.java
View File

@ -7,13 +7,13 @@ import pro.taskana.task.api.models.TaskSummary;
public class CompletedEvent extends TaskEvent {
public CompletedEvent(Task completedTask, String userId) {
super(completedTask, userId,null);
super(completedTask, userId, null);
eventType = "TASK_COMPLETED";
created = completedTask.getCompleted();
}
public CompletedEvent(TaskSummary completedTask, String userId) {
super(completedTask, userId,null);
super(completedTask, userId, null);
eventType = "TASK_COMPLETED";
created = completedTask.getCompleted();
}

24
lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskEvent.java
View File

@ -164,17 +164,17 @@ public class TaskEvent extends TaskanaHistoryEvent {
@Override
public String toString() {
return "TaskEvent [taskId= "
+ this.taskId
+ ", businessProcessId= "
+ this.businessProcessId
+ ", parentBusinessProcessId= "
+ this.parentBusinessProcessId
+ ", domain= "
+ this.domain
+ ", workbasketKey= "
+ this.workbasketKey
+ ", details= "
+ this.details
+ "]";
+ this.taskId
+ ", businessProcessId= "
+ this.businessProcessId
+ ", parentBusinessProcessId= "
+ this.parentBusinessProcessId
+ ", domain= "
+ this.domain
+ ", workbasketKey= "
+ this.workbasketKey
+ ", details= "
+ this.details
+ "]";
}
}

2
lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TransferredEvent.java
View File

@ -13,7 +13,7 @@ public class TransferredEvent extends TaskEvent {
public TransferredEvent(
Task task, WorkbasketSummary oldWorkbasket, WorkbasketSummary newWorkbasket, String userId) {
super(task, userId,null);
super(task, userId, null);
eventType = "TASK_TRANSFERRED";
created = task.getModified();
this.oldValue = oldWorkbasket.getId();

1
lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/UpdatedEvent.java
View File

@ -9,5 +9,4 @@ public class UpdatedEvent extends TaskEvent {
eventType = "TASK_UPDATED";
created = updatedTask.getModified();
}
}

8
lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQuery.java
View File

@ -613,8 +613,8 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
/**
* Add your wildcard search value for pattern matching to your query. It will be compared in SQL
* with the LIKE operator. You may use a wildcard like % to specify the pattern.
* Must be used in combination with the wilcardSearchFieldIn parameter
* with the LIKE operator. You may use a wildcard like % to specify the pattern. Must be used in
* combination with the wilcardSearchFieldIn parameter
*
* @param wildcardSearchValue the wildcard search value
* @return the query
@ -622,8 +622,8 @@ public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {
TaskQuery wildcardSearchValueLike(String wildcardSearchValue);
/**
* Add the values of the wildcard search fields for exact matching to your query.
* Must be used in combination with the wildcardSearchValueLike parameter
* Add the values of the wildcard search fields for exact matching to your query. Must be used in
* combination with the wildcardSearchValueLike parameter
*
* @param wildcardSearchFields the values of your wildcard search fields
* @return the query

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

@ -3,8 +3,7 @@ package pro.taskana.task.api;
import pro.taskana.common.api.QueryColumnName;
/**
* Enum containing the column names for
* TaskQueryMapper.queryTaskColumnValues
* Enum containing the column names for TaskQueryMapper.queryTaskColumnValues
*
* @author jsa
*/

7
lib/taskana-core/src/main/java/pro/taskana/task/api/WildcardSearchField.java
View File

@ -25,10 +25,6 @@ public enum WildcardSearchField {
CUSTOM_15("CUSTOM_15"),
CUSTOM_16("CUSTOM_16");
WildcardSearchField(String name) {
this.name = name;
}
private static final Map<String, WildcardSearchField> STRING_TO_ENUM =
Arrays.stream(values())
.collect(
@ -38,6 +34,9 @@ public enum WildcardSearchField {
(first, second) -> first,
() -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER)));
private String name;
WildcardSearchField(String name) {
this.name = name;
}
public static WildcardSearchField fromString(String name) {

1
lib/taskana-core/src/main/java/pro/taskana/task/api/exceptions/TaskCommentNotFoundException.java
View File

@ -10,5 +10,4 @@ public class TaskCommentNotFoundException extends NotFoundException {
public TaskCommentNotFoundException(String id, String msg) {
super(id, msg);
}
}

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

@ -189,8 +189,8 @@ public interface Task extends TaskSummary {
String getClassificationCategory();
/**
* Duplicates this Task without the internal and external id.
* All referenced {@link Attachment}s are copied as well.
* Duplicates this Task without the internal and external id. All referenced {@link Attachment}s
* are copied as well.
*
* @return a copy of this Task
*/

3
lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentMapper.java
View File

@ -60,6 +60,5 @@ public interface TaskCommentMapper {
@Result(property = "created", column = "CREATED"),
@Result(property = "modified", column = "MODIFIED"),
})
TaskCommentImpl findById(
@Param("taskCommentId") String taskCommentId);
TaskCommentImpl findById(@Param("taskCommentId") String taskCommentId);
}

10
lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentServiceImpl.java
View File

@ -72,8 +72,7 @@ class TaskCommentServiceImpl {
if (taskCommentToUpdate.getCreator().equals(userId)
|| taskanaEngine.getEngine().isUserInRole(TaskanaRole.ADMIN)) {
TaskComment oldTaskComment =
getTaskComment(taskCommentImplToUpdate.getId());
TaskComment oldTaskComment = getTaskComment(taskCommentImplToUpdate.getId());
checkModifiedHasNotChanged(oldTaskComment, taskCommentImplToUpdate);
@ -132,8 +131,7 @@ class TaskCommentServiceImpl {
throws NotAuthorizedException, TaskCommentNotFoundException, TaskNotFoundException,
InvalidArgumentException {
LOGGER.debug(
"entry to deleteTaskComment (taskComment = {}", taskCommentId);
LOGGER.debug("entry to deleteTaskComment (taskComment = {}", taskCommentId);
String userId = CurrentUserContext.getUserid();
@ -208,9 +206,7 @@ class TaskCommentServiceImpl {
if (result == null) {
throw new TaskCommentNotFoundException(
taskCommentId,
String.format(
"TaskComment for taskCommentId '%s' was not found",
taskCommentId));
String.format("TaskComment for taskCommentId '%s' was not found", taskCommentId));
}
taskService.getTask(result.getTaskId());

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

@ -37,8 +37,8 @@ import pro.taskana.workbasket.internal.WorkbasketQueryImpl;
public class TaskTransferrer {
private static final String WAS_NOT_FOUND2 = " was not found.";
private static final String TASK_IN_END_STATE_WITH_ID_CANNOT_BE_TRANSFERRED
= "Task in end state with id %s cannot be transferred.";
private static final String TASK_IN_END_STATE_WITH_ID_CANNOT_BE_TRANSFERRED =
"Task in end state with id %s cannot be transferred.";
private static final String TASK_WITH_ID = "Task with id ";
private static final String WAS_MARKED_FOR_DELETION = " was marked for deletion";
private static final String THE_WORKBASKET = "The workbasket ";

47
lib/taskana-core/src/main/java/pro/taskana/task/internal/models/MinimalTaskSummary.java
View File

@ -17,6 +17,9 @@ public class MinimalTaskSummary {
private Instant planned;
private Instant due;
private Instant modified;
private CallbackState callbackState;
MinimalTaskSummary() {}
public Instant getPlanned() {
return planned;
@ -42,10 +45,6 @@ public class MinimalTaskSummary {
this.modified = modified;
}
private CallbackState callbackState;
MinimalTaskSummary() {}
public String getTaskId() {
return taskId;
}
@ -105,25 +104,25 @@ public class MinimalTaskSummary {
@Override
public String toString() {
return "MinimalTaskSummary [taskId="
+ taskId
+ ", externalId="
+ externalId
+ ", workbasketId="
+ workbasketId
+ ", classificationId="
+ classificationId
+ ", owner="
+ owner
+ ", taskState="
+ taskState
+ ", planned="
+ planned
+ ", due="
+ due
+ ", modified="
+ modified
+ ", callbackState="
+ callbackState
+ "]";
+ taskId
+ ", externalId="
+ externalId
+ ", workbasketId="
+ workbasketId
+ ", classificationId="
+ classificationId
+ ", owner="
+ owner
+ ", taskState="
+ taskState
+ ", planned="
+ planned
+ ", due="
+ due
+ ", modified="
+ modified
+ ", callbackState="
+ callbackState
+ "]";
}
}

8
lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskImpl.java
View File

@ -268,10 +268,6 @@ public class TaskImpl extends TaskSummaryImpl implements Task {
return new TaskImpl(this);
}
public String getClassificationId() {
return classificationSummary == null ? null : classificationSummary.getId();
}
protected boolean canEqual(Object other) {
return (other instanceof TaskImpl);
}
@ -392,4 +388,8 @@ public class TaskImpl extends TaskSummaryImpl implements Task {
+ custom16
+ "]";
}
public String getClassificationId() {
return classificationSummary == null ? null : classificationSummary.getId();
}
}

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

@ -3,8 +3,8 @@ package pro.taskana.workbasket.api;
import pro.taskana.common.api.QueryColumnName;
/**
* Enum containing the column names
* for pro.taskana.workbasket.internal.WorkbasketQueryMapper.queryWorkbasketColumnValues
* Enum containing the column names for
* pro.taskana.workbasket.internal.WorkbasketQueryMapper.queryWorkbasketColumnValues
*
* @author jsa
*/

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

@ -292,8 +292,8 @@ public interface WorkbasketService {
* Deletes the workbasket by the given ID of it.
*
* @param workbasketId Id of the workbasket which should be deleted.
* @return true if the workbasket was deleted successfully.
* false if the workbasket is marked for deletion.
* @return true if the workbasket was deleted successfully. false if the workbasket is marked for
* deletion.
* @throws NotAuthorizedException if the current user got no permissions for this interaction.
* @throws WorkbasketNotFoundException if the workbasket does not exist.
* @throws WorkbasketInUseException if the workbasket does contain task-content.

10
lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java
View File

@ -39,8 +39,7 @@ public class DeleteTaskCommentAccTest extends AbstractAccTest {
taskService.getTaskComments("TKI:000000000000000000000000000000000001");
assertThat(taskComments).hasSize(2);
taskService.deleteTaskComment(
"TCI:000000000000000000000000000000000004");
taskService.deleteTaskComment("TCI:000000000000000000000000000000000004");
// make sure the task comment was deleted
List<TaskComment> taskCommentsAfterDeletion =
@ -62,10 +61,8 @@ public class DeleteTaskCommentAccTest extends AbstractAccTest {
assertThat(taskComments).hasSize(2);
ThrowingCallable lambda =
() ->
taskService.deleteTaskComment(
() -> taskService.deleteTaskComment("TCI:000000000000000000000000000000000005");
"TCI:000000000000000000000000000000000005");
assertThatThrownBy(lambda).isInstanceOf(NotAuthorizedException.class);
// make sure the task comment was not deleted
@ -112,8 +109,7 @@ public class DeleteTaskCommentAccTest extends AbstractAccTest {
taskService.getTaskComments("TKI:000000000000000000000000000000000002");
assertThat(taskComments).hasSize(2);
ThrowingCallable lambda =
() -> taskService.deleteTaskComment("non existing task comment id");
ThrowingCallable lambda = () -> taskService.deleteTaskComment("non existing task comment id");
assertThatThrownBy(lambda).isInstanceOf(TaskCommentNotFoundException.class);
// make sure the task comment was not deleted

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

@ -161,7 +161,7 @@ class QueryTaskByClassificationNameAccTest extends AbstractAccTest {
taskQuery.classificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikänderung").list();
long numberOfTasks =
taskQuery.classificationNameIn("Widerruf", "Beratungsprotokoll", "Dynamikänderung").count();
assertThat(tasks).hasSize((int)numberOfTasks);
assertThat(tasks).hasSize((int) numberOfTasks);
}
@WithAccessId(

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

@ -27,7 +27,7 @@ public class QueryTasksByWildcardSearchAccTest extends AbstractAccTest {
TaskService taskService = taskanaEngine.getTaskService();
WildcardSearchField[] wildcards = {
WildcardSearchField.CUSTOM_3, WildcardSearchField.CUSTOM_4, WildcardSearchField.NAME
WildcardSearchField.CUSTOM_3, WildcardSearchField.CUSTOM_4, WildcardSearchField.NAME
};
List<TaskSummary> foundTasks =

10
lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java
View File

@ -25,16 +25,16 @@ import pro.taskana.task.api.models.TaskSummary;
class TerminateTaskAccTest extends AbstractAccTest {
private static TaskService taskService;
@BeforeAll
static void setup() {
taskService = taskanaEngine.getTaskService();
}
@BeforeEach
public void setupIndividualTest() throws Exception {
resetDb(false);
}
@BeforeAll
static void setup() {
taskService = taskanaEngine.getTaskService();
}
@WithAccessId(
userName = "user_1_1",
groupNames = {"group_1"})

12
lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java
View File

@ -41,8 +41,7 @@ public class UpdateTaskCommentAccTest extends AbstractAccTest {
assertThat(taskComments.get(0).getTextField()).isEqualTo("some text in textfield");
TaskComment taskComment =
taskService.getTaskComment(
"TCI:000000000000000000000000000000000003");
taskService.getTaskComment("TCI:000000000000000000000000000000000003");
taskComment.setTextField("updated textfield");
taskService.updateTaskComment(taskComment);
@ -68,8 +67,7 @@ public class UpdateTaskCommentAccTest extends AbstractAccTest {
assertThat(taskComments.get(1).getTextField()).isEqualTo("some other text in textfield");
TaskComment taskComment =
taskService.getTaskComment(
"TCI:000000000000000000000000000000000001");
taskService.getTaskComment("TCI:000000000000000000000000000000000001");
taskComment.setTextField("updated textfield");
assertThatThrownBy(() -> taskService.updateTaskComment(taskComment))
@ -98,13 +96,11 @@ public class UpdateTaskCommentAccTest extends AbstractAccTest {
assertThat(taskComments.get(2).getTextField()).isEqualTo("some other text in textfield");
TaskComment taskCommentToUpdate =
taskService.getTaskComment(
"TCI:000000000000000000000000000000000002");
taskService.getTaskComment("TCI:000000000000000000000000000000000002");
taskCommentToUpdate.setTextField("updated textfield");
TaskComment concurrentTaskCommentToUpdate =
taskService.getTaskComment(
"TCI:000000000000000000000000000000000002");
taskService.getTaskComment("TCI:000000000000000000000000000000000002");
concurrentTaskCommentToUpdate.setTextField("concurrently updated textfield");
taskService.updateTaskComment(taskCommentToUpdate);

24
lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java
View File

@ -541,7 +541,8 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
List<WorkbasketSummary> results =
workbasketService.createWorkbasketQuery().orderByOrgLevel1(DESCENDING).list();
assertThat(results).hasSizeGreaterThan(2)
assertThat(results)
.hasSizeGreaterThan(2)
.extracting(WorkbasketSummary::getOrgLevel1)
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER.reversed());
}
@ -552,7 +553,8 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
List<WorkbasketSummary> results =
workbasketService.createWorkbasketQuery().orderByOrgLevel2(ASCENDING).list();
assertThat(results).hasSizeGreaterThan(2)
assertThat(results)
.hasSizeGreaterThan(2)
.extracting(WorkbasketSummary::getOrgLevel2)
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER);
}
@ -563,7 +565,8 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
List<WorkbasketSummary> results =
workbasketService.createWorkbasketQuery().orderByOrgLevel3(DESCENDING).list();
assertThat(results).hasSizeGreaterThan(2)
assertThat(results)
.hasSizeGreaterThan(2)
.extracting(WorkbasketSummary::getOrgLevel3)
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER.reversed());
}
@ -574,7 +577,8 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
List<WorkbasketSummary> results =
workbasketService.createWorkbasketQuery().orderByOrgLevel4(ASCENDING).list();
assertThat(results).hasSizeGreaterThan(2)
assertThat(results)
.hasSizeGreaterThan(2)
.extracting(WorkbasketSummary::getOrgLevel4)
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER);
}
@ -585,7 +589,8 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
List<WorkbasketSummary> results =
workbasketService.createWorkbasketQuery().orderByCustom1(ASCENDING).list();
assertThat(results).hasSizeGreaterThan(2)
assertThat(results)
.hasSizeGreaterThan(2)
.extracting(WorkbasketSummary::getCustom1)
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER);
}
@ -596,7 +601,8 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
List<WorkbasketSummary> results =
workbasketService.createWorkbasketQuery().orderByCustom2(DESCENDING).list();
assertThat(results).hasSizeGreaterThan(2)
assertThat(results)
.hasSizeGreaterThan(2)
.extracting(WorkbasketSummary::getCustom2)
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER.reversed());
}
@ -607,7 +613,8 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
List<WorkbasketSummary> results =
workbasketService.createWorkbasketQuery().orderByCustom3(ASCENDING).list();
assertThat(results).hasSizeGreaterThan(2)
assertThat(results)
.hasSizeGreaterThan(2)
.extracting(WorkbasketSummary::getCustom3)
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER);
}
@ -618,7 +625,8 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
List<WorkbasketSummary> results =
workbasketService.createWorkbasketQuery().orderByCustom4(DESCENDING).list();
assertThat(results).hasSizeGreaterThan(2)
assertThat(results)
.hasSizeGreaterThan(2)
.extracting(WorkbasketSummary::getCustom4)
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER.reversed());
}

3
lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java
View File

@ -202,7 +202,8 @@ class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest {
.orderById(SortDirection.ASCENDING)
.list();
assertThat(results).hasSizeGreaterThan(2)
assertThat(results)
.hasSizeGreaterThan(2)
.extracting(WorkbasketAccessItem::getId)
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER);
}

1
lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java
View File

@ -38,6 +38,5 @@ public class UpdateWorkbasketAuthorizations2AccTest extends AbstractAccTest {
workbasketService.getWorkbasketAccessItems(wbId);
int countAfter = updatedAccessItems.size();
assertThat(countAfter).isEqualTo(0);
}
}

2
lib/taskana-core/src/test/java/pro/taskana/classification/internal/models/ClassificationModelsCloneTest.java
View File

@ -5,8 +5,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.Test;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.classification.internal.models.ClassificationImpl;
import pro.taskana.classification.internal.models.ClassificationSummaryImpl;
class ClassificationModelsCloneTest {

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

@ -61,21 +61,14 @@ import pro.taskana.workbasket.internal.models.WorkbasketImpl;
@ExtendWith(JaasExtension.class)
class TaskServiceImplIntAutocommitTest {
private DataSource dataSource;
private TaskServiceImpl taskServiceImpl;
private TaskanaEngine taskanaEngine;
private TaskanaEngineImpl taskanaEngineImpl;
private ClassificationService classificationService;
private WorkbasketService workbasketService;
private static SampleDataGenerator sampleDataGenerator;
private static TaskanaEngineConfiguration taskanaEngineConfiguration;
private DataSource dataSource;
private TaskServiceImpl taskServiceImpl;
private TaskanaEngine taskanaEngine;
private TaskanaEngineImpl taskanaEngineImpl;
private ClassificationService classificationService;
private WorkbasketService workbasketService;
@BeforeAll
static void beforeAll() throws SQLException {

3
lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/models/WorkbasketModelsCloneTest.java
View File

@ -5,9 +5,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.Test;
import pro.taskana.workbasket.api.models.Workbasket;
import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl;
import pro.taskana.workbasket.internal.models.WorkbasketImpl;
import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl;
class WorkbasketModelsCloneTest {

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

@ -3,9 +3,6 @@ package pro.taskana.common.internal.transaction;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import pro.taskana.common.internal.transaction.TaskanaCallable;
import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
/** TODO. */
@Component
public class SpringTransactionProvider implements TaskanaTransactionProvider<Object> {

10
rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapClient.java
View File

@ -90,10 +90,6 @@ public class LdapClient {
return result;
}
boolean nameIsDn(String name) {
return name.toLowerCase().endsWith(getBaseDn().toLowerCase());
}
public List<AccessIdResource> searchUsersByName(final String name)
throws InvalidArgumentException {
LOGGER.debug("entry to searchUsersByName(name = {}).", name);
@ -278,6 +274,10 @@ public class LdapClient {
return accessId.contains(getGroupSearchBase());
}
boolean nameIsDn(String name) {
return name.toLowerCase().endsWith(getBaseDn().toLowerCase());
}
List<AccessIdResource> getFirstPageOfaResultList(List<AccessIdResource> accessIds) {
return accessIds.subList(0, Math.min(accessIds.size(), maxNumberOfReturnedAccessIds));
}
@ -367,8 +367,6 @@ public class LdapClient {
accessId.setName(context.getStringAttribute(getGroupNameAttribute()));
return accessId;
}
}
/** Context Mapper for user entries. */

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

@ -18,12 +18,12 @@ public abstract class AbstractRessourcesAssembler {
UriComponentsBuilder original = getBuilderForOriginalUri();
public AbstractRessourcesAssembler() {}
public UriComponentsBuilder getOriginal() {
return original;
}
public AbstractRessourcesAssembler() {}
protected static UriComponentsBuilder getBuilderForOriginalUri() {
HttpServletRequest request =
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();

13
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java
View File

@ -212,13 +212,14 @@ class WorkbasketControllerIntTest {
void statusCode423ShouldBeReturnedIfWorkbasketContainsNonCompletedTasks() {
String workbasketWithNonCompletedTasks = "WBI:100000000000000000000000000000000004";
assertThatThrownBy(
ThrowingCallable call =
() ->
template.exchange(
restHelper.toUrl(Mapping.URL_WORKBASKET_ID, workbasketWithNonCompletedTasks),
HttpMethod.DELETE,
new HttpEntity<>(restHelper.getHeadersBusinessAdmin()),
Void.class))
template.exchange(
restHelper.toUrl(Mapping.URL_WORKBASKET_ID, workbasketWithNonCompletedTasks),
HttpMethod.DELETE,
new HttpEntity<>(restHelper.getHeadersBusinessAdmin()),
Void.class);
assertThatThrownBy(call)
.isInstanceOf(HttpClientErrorException.class)
.extracting(ex -> ((HttpClientErrorException) ex).getStatusCode())
.isEqualTo(HttpStatus.LOCKED);