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

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. */ /** This entity contains the most important information about a history event. */
public class HistoryEventImpl extends TaskanaHistoryEvent { public class HistoryEventImpl extends TaskanaHistoryEvent {
public HistoryEventImpl() { public HistoryEventImpl() {}
}
public HistoryEventImpl(String userId, String details) { public HistoryEventImpl(String userId, String details) {
super(userId, details); super(userId, details);

View File

@ -453,7 +453,7 @@ public class HistoryQueryImpl implements HistoryQuery {
"Custom number has to be between 1 and 4, but this is: " + num); "Custom number has to be between 1 and 4, but this is: " + num);
} }
} }
@Override @Override
public List<HistoryEventImpl> list() { public List<HistoryEventImpl> list() {
LOGGER.debug("entry to list(), this = {}", this); LOGGER.debug("entry to list(), this = {}", this);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -172,16 +172,6 @@ public class TaskanaEngineConfiguration {
initGermanHolidaysEnabled(props); 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() { public static DataSource createDefaultDataSource() {
LOGGER.info( LOGGER.info(
"No datasource is provided. A inmemory db is used: " "No datasource is provided. A inmemory db is used: "
@ -352,6 +342,16 @@ public class TaskanaEngineConfiguration {
return true; 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) { private void initJobParameters(Properties props) {
String jobBatchSizeProperty = props.getProperty(TASKANA_JOB_BATCHSIZE); String jobBatchSizeProperty = props.getProperty(TASKANA_JOB_BATCHSIZE);
if (jobBatchSizeProperty != null && !jobBatchSizeProperty.isEmpty()) { if (jobBatchSizeProperty != null && !jobBatchSizeProperty.isEmpty()) {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -5,9 +5,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import pro.taskana.workbasket.api.models.Workbasket; 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 { class WorkbasketModelsCloneTest {

View File

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

View File

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

View File

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

View File

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