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

TSK-775 adapt code formatting to checkstyle template

This commit is contained in:
BerndBreier 2019-01-28 11:34:39 +01:00 committed by Jose Ignacio Recuerda Cambil
parent e513f4256d
commit 8789dd5bf5
56 changed files with 288 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/taskana-core/src/main/java/pro/taskana/KeyDomain.java
View File

@ -33,10 +33,10 @@ public class KeyDomain {
@Override
public String toString() {
return "KeyDomain [" +
"key=" + this.key +
", domain=" + this.domain +
"]";
return "KeyDomain ["
+ "key=" + this.key
+ ", domain=" + this.domain
+ "]";
}
@Override

13
lib/taskana-core/src/main/java/pro/taskana/ObjectReference.java
View File

@ -62,14 +62,11 @@ public class ObjectReference {
@Override
public String toString() {
return "ObjectReference [" +
"id=" + this.id +
", company=" + this.company +
", system=" + this.system +
", systemInstance=" + this.systemInstance +
", type=" + this.type +
", value=" + this.value +
"]";
return "ObjectReference ["
+ "id=" + this.id + ", company="
+ this.company + ", system=" + this.system
+ ", systemInstance=" + this.systemInstance
+ ", type=" + this.type + ", value=" + this.value + "]";
}
@Override

5
lib/taskana-core/src/main/java/pro/taskana/TimeInterval.java
View File

@ -53,10 +53,7 @@ public class TimeInterval {
@Override
public String toString() {
return "TimeInterval [" +
"begin=" + this.begin +
", end=" + this.end +
"]";
return "TimeInterval [" + "begin=" + this.begin + ", end=" + this.end + "]";
}
@Override

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

@ -311,7 +311,7 @@ public class TaskanaEngineConfiguration {
}
ensureRoleMapIsFullyInitialized();
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
roleMap.forEach(
(k, v) -> LOGGER.debug("Found Taskana RoleConfig {} : {} ", k, LoggerUtils.setToString(v)));
}

23
lib/taskana-core/src/main/java/pro/taskana/history/api/TaskanaHistoryEvent.java
View File

@ -246,22 +246,11 @@ public class TaskanaHistoryEvent {
@Override
public String toString() {
return "TaskanaHistoryEvent [" +
"id=" + this.id +
", businessProcessId=" + this.businessProcessId +
", parentBusinessProcessId=" + this.parentBusinessProcessId +
", taskId=" + this.taskId +
", eventType=" + this.eventType +
", created=" + this.created +
", userId=" + this.userId +
", domain=" + this.domain +
", workbasketKey=" + this.workbasketKey +
", taskClassificationKey=" + this.taskClassificationKey +
", attachmentClassificationKey=" + this.attachmentClassificationKey +
", oldValue=" + this.oldValue +
", newValue=" + this.newValue +
", oldData=" + this.oldData +
", newData=" + this.newData +
"]";
return "TaskanaHistoryEvent [" + "id=" + this.id + ", businessProcessId=" + this.businessProcessId
+ ", parentBusinessProcessId=" + this.parentBusinessProcessId + ", taskId=" + this.taskId + ", eventType="
+ this.eventType + ", created=" + this.created + ", userId=" + this.userId + ", domain=" + this.domain
+ ", workbasketKey=" + this.workbasketKey + ", taskClassificationKey=" + this.taskClassificationKey
+ ", attachmentClassificationKey=" + this.attachmentClassificationKey + ", oldValue=" + this.oldValue
+ ", newValue=" + this.newValue + ", oldData=" + this.oldData + ", newData=" + this.newData + "]";
}
}

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

@ -177,11 +177,9 @@ 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 + "]";
return "TaskEvent [taskId= " + this.taskId + ", businessProcessId= " + this.businessProcessId
+ ", parentBusinessProcessId= " + this.parentBusinessProcessId + ", domain= " + this.domain
+ ", workbasketKey= " + this.workbasketKey + "]";
}
}

9
lib/taskana-core/src/main/java/pro/taskana/impl/AbstractWorkbasketAccessItemQueryImpl.java
View File

@ -212,12 +212,9 @@ abstract class AbstractWorkbasketAccessItemQueryImpl<Q extends AbstractWorkbaske
@Override
public String toString() {
return "AbstractWorkbasketAccessItemQueryImpl [" +
"idIn=" + Arrays.toString(this.idIn) +
", accessIdIn=" + Arrays.toString(this.accessIdIn) +
", workbasketIdIn=" + Arrays.toString(this.workbasketIdIn) +
", orderBy=" + this.orderBy +
"]";
return "AbstractWorkbasketAccessItemQueryImpl [" + "idIn=" + Arrays.toString(this.idIn) + ", accessIdIn="
+ Arrays.toString(this.accessIdIn) + ", workbasketIdIn=" + Arrays.toString(this.workbasketIdIn)
+ ", orderBy=" + this.orderBy + "]";
}
}

15
lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentImpl.java
View File

@ -238,16 +238,9 @@ public class AttachmentImpl implements Attachment {
@Override
public String toString() {
return "AttachmentImpl [" +
"id= " + this.id +
", taskId= " + this.taskId +
", created= " + this.created +
", modified= " + this.modified +
", classificationSummary= " + this.classificationSummary +
", objectReference= " + this.objectReference +
", channel= " + this.channel +
", received= " + this.received +
", customAttributes= " + this.customAttributes +
"]";
return "AttachmentImpl [id=" + id + ", taskId=" + taskId + ", created=" + created + ", modified=" + modified
+ ", classificationSummary=" + classificationSummary + ", objectReference=" + objectReference + ", channel="
+ channel + ", received=" + received + ", customAttributes=" + customAttributes + "]";
}
}

13
lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentSummaryImpl.java
View File

@ -226,16 +226,9 @@ public class AttachmentSummaryImpl implements AttachmentSummary {
@Override
public String toString() {
return "AttachmentSummaryImpl [" +
"id=" + this.id +
", taskId=" + this.taskId +
", created=" + this.created +
", modified=" + this.modified +
", classificationSummary=" + this.classificationSummary +
", objectReference=" + this.objectReference +
", channel=" + this.channel +
", received=" + this.received +
"]";
return "AttachmentSummaryImpl [id=" + id + ", taskId=" + taskId + ", created=" + created + ", modified="
+ modified + ", classificationSummary=" + classificationSummary + ", objectReference=" + objectReference
+ ", channel=" + channel + ", received=" + received + "]";
}
}

32
lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationImpl.java
View File

@ -313,31 +313,13 @@ public class ClassificationImpl implements Classification {
@Override
public String toString() {
return "Classification [" +
"id= " + this.id +
", key= " + this.key +
", parentId= " + this.parentId +
", parentKey= " + this.parentKey +
", category= " + this.category +
", type= " + this.type +
", domain= " + this.domain +
", isValidInDomain= " + this.isValidInDomain +
", created= " + this.created +
", modified= " + this.modified +
", name= " + this.name +
", description= " + this.description +
", priority= " + this.priority +
", serviceLevel= " + this.serviceLevel +
", applicationEntryPoint= " + this.applicationEntryPoint +
", custom1= " + this.custom1 +
", custom2= " + this.custom2 +
", custom3= " + this.custom3 +
", custom4= " + this.custom4 +
", custom5= " + this.custom5 +
", custom6= " + this.custom6 +
", custom7= " + this.custom7 +
", custom8= " + this.custom8 +
"]";
return "ClassificationImpl [id=" + id + ", key=" + key + ", parentId=" + parentId + ", parentKey=" + parentKey
+ ", category=" + category + ", type=" + type + ", domain=" + domain + ", isValidInDomain="
+ isValidInDomain + ", created=" + created + ", modified=" + modified + ", name=" + name + ", description="
+ description + ", priority=" + priority + ", serviceLevel=" + serviceLevel + ", applicationEntryPoint="
+ applicationEntryPoint + ", custom1=" + custom1 + ", custom2=" + custom2 + ", custom3=" + custom3
+ ", custom4=" + custom4 + ", custom5=" + custom5 + ", custom6=" + custom6 + ", custom7=" + custom7
+ ", custom8=" + custom8 + "]";
}
@Override

58
lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
View File

@ -617,44 +617,26 @@ public class ClassificationQueryImpl implements ClassificationQuery {
@Override
public String toString() {
return "ClassificationQueryImpl [" +
"columnName= " + this.columnName +
", key= " + Arrays.toString(this.key) +
", idIn= " + Arrays.toString(this.idIn) +
", parentId= " + Arrays.toString(this.parentId) +
", parentKey= " + Arrays.toString(this.parentKey) +
", category= " + Arrays.toString(this.category) +
", type= " + Arrays.toString(this.type) +
", domain= " + Arrays.toString(this.domain) +
", validInDomain= " + this.validInDomain +
", createdIn= " + Arrays.toString(this.createdIn) +
", modifiedIn= " + Arrays.toString(this.modifiedIn) +
", nameIn= " + Arrays.toString(this.nameIn) +
", nameLike= " + Arrays.toString(this.nameLike) +
", descriptionLike= " + this.descriptionLike +
", priority= " + Arrays.toString(this.priority) +
", serviceLevelIn= " + Arrays.toString(this.serviceLevelIn) +
", serviceLevelLike= " + Arrays.toString(this.serviceLevelLike) +
", applicationEntryPointIn= " + Arrays.toString(this.applicationEntryPointIn) +
", applicationEntryPointLike= " + Arrays.toString(this.applicationEntryPointLike) +
", custom1In= " + Arrays.toString(this.custom1In) +
", custom1Like= " + Arrays.toString(this.custom1Like) +
", custom2In= " + Arrays.toString(this.custom2In) +
", custom2Like= " + Arrays.toString(this.custom2Like) +
", custom3In= " + Arrays.toString(this.custom3In) +
", custom3Like= " + Arrays.toString(this.custom3Like) +
", custom4In= " + Arrays.toString(this.custom4In) +
", custom4Like= " + Arrays.toString(this.custom4Like) +
", custom5In= " + Arrays.toString(this.custom5In) +
", custom5Like= " + Arrays.toString(this.custom5Like) +
", custom6In= " + Arrays.toString(this.custom6In) +
", custom6Like= " + Arrays.toString(this.custom6Like) +
", custom7In= " + Arrays.toString(this.custom7In) +
", custom7Like= " + Arrays.toString(this.custom7Like) +
", custom8In= " + Arrays.toString(this.custom8In) +
", custom8Like= " + Arrays.toString(this.custom8Like) +
", orderBy= " + this.orderBy +
"]";
return "ClassificationQueryImpl [" + "columnName= " + this.columnName + ", key= " + Arrays.toString(this.key)
+ ", idIn= " + Arrays.toString(this.idIn) + ", parentId= " + Arrays.toString(this.parentId)
+ ", parentKey= " + Arrays.toString(this.parentKey) + ", category= " + Arrays.toString(this.category)
+ ", type= " + Arrays.toString(this.type) + ", domain= " + Arrays.toString(this.domain)
+ ", validInDomain= " + this.validInDomain + ", createdIn= " + Arrays.toString(this.createdIn)
+ ", modifiedIn= " + Arrays.toString(this.modifiedIn) + ", nameIn= " + Arrays.toString(this.nameIn)
+ ", nameLike= " + Arrays.toString(this.nameLike) + ", descriptionLike= " + this.descriptionLike
+ ", priority= " + Arrays.toString(this.priority) + ", serviceLevelIn= "
+ Arrays.toString(this.serviceLevelIn) + ", serviceLevelLike= " + Arrays.toString(this.serviceLevelLike)
+ ", applicationEntryPointIn= " + Arrays.toString(this.applicationEntryPointIn)
+ ", applicationEntryPointLike= " + Arrays.toString(this.applicationEntryPointLike) + ", custom1In= "
+ Arrays.toString(this.custom1In) + ", custom1Like= " + Arrays.toString(this.custom1Like) + ", custom2In= "
+ Arrays.toString(this.custom2In) + ", custom2Like= " + Arrays.toString(this.custom2Like) + ", custom3In= "
+ Arrays.toString(this.custom3In) + ", custom3Like= " + Arrays.toString(this.custom3Like) + ", custom4In= "
+ Arrays.toString(this.custom4In) + ", custom4Like= " + Arrays.toString(this.custom4Like) + ", custom5In= "
+ Arrays.toString(this.custom5In) + ", custom5Like= " + Arrays.toString(this.custom5Like) + ", custom6In= "
+ Arrays.toString(this.custom6In) + ", custom6Like= " + Arrays.toString(this.custom6Like) + ", custom7In= "
+ Arrays.toString(this.custom7In) + ", custom7Like= " + Arrays.toString(this.custom7Like) + ", custom8In= "
+ Arrays.toString(this.custom8In) + ", custom8Like= " + Arrays.toString(this.custom8Like) + ", orderBy= "
+ this.orderBy + "]";
}
}

25
lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationSummaryImpl.java
View File

@ -351,26 +351,11 @@ public class ClassificationSummaryImpl implements ClassificationSummary {
@Override
public String toString() {
return "ClassificationSummaryImpl [" +
"id= " + this.id +
", key= " + this.key +
", category= " + this.category +
", type= " + this.type +
", domain= " + this.domain +
", name= " + this.name +
", parentId= " + this.parentId +
", parentKey= " + parentKey +
", priority= " + this.priority +
", serviceLevel= " + this.serviceLevel +
", custom1= " + this.custom1 +
", custom2= " + this.custom2 +
", custom3= " + this.custom3 +
", custom4= " + this.custom4 +
", custom5= " + this.custom5 +
", custom6= " + this.custom6 +
", custom7= " + this.custom7 +
", custom8= " + this.custom8 +
"]";
return "ClassificationSummaryImpl [id=" + id + ", key=" + key + ", category=" + category + ", type=" + type
+ ", domain=" + domain + ", name=" + name + ", parentId=" + parentId + ", parentKey=" + parentKey
+ ", priority=" + priority + ", serviceLevel=" + serviceLevel + ", custom1=" + custom1 + ", custom2="
+ custom2 + ", custom3=" + custom3 + ", custom4=" + custom4 + ", custom5=" + custom5 + ", custom6="
+ custom6 + ", custom7=" + custom7 + ", custom8=" + custom8 + "]";
}
}

13
lib/taskana-core/src/main/java/pro/taskana/impl/DaysToWorkingDaysConverter.java
View File

@ -328,12 +328,11 @@ public final class DaysToWorkingDaysConverter {
@Override
public String toString() {
return "DaysToWorkingDaysConverter [instance= " + instance +
", positiveDaysToWorkingDays= " + positiveDaysToWorkingDays +
", negativeDaysToWorkingDays= " + negativeDaysToWorkingDays +
", dateCreated= " + dateCreated +
", easterSunday= " + easterSunday +
", germanHolidaysEnabled= " + germanHolidaysEnabled +
", customHolidays= " + LoggerUtils.listToString(customHolidays) + "]";
return "DaysToWorkingDaysConverter [instance= " + instance
+ ", positiveDaysToWorkingDays= " + positiveDaysToWorkingDays
+ ", negativeDaysToWorkingDays= " + negativeDaysToWorkingDays
+ ", dateCreated= " + dateCreated + ", easterSunday= " + easterSunday
+ ", germanHolidaysEnabled= " + germanHolidaysEnabled
+ ", customHolidays= " + LoggerUtils.listToString(customHolidays) + "]";
}
}

7
lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java
View File

@ -41,11 +41,8 @@ public class MinimalTaskSummary {
@Override
public String toString() {
return "MinimalTaskSummary [" +
"taskId= " + this.taskId +
", workbasketId= " + this.workbasketId +
", taskState= " + this.taskState +
"]";
return "MinimalTaskSummary [taskId=" + taskId + ", workbasketId=" + workbasketId + ", taskState=" + taskState
+ "]";
}
}

13
lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java
View File

@ -216,13 +216,10 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery {
@Override
public String toString() {
return "ObjectReferenceQueryImpl [" +
"taskanaEngineImpl= " + this.taskanaEngine +
", company= " + Arrays.toString(this.company) +
", system= " + Arrays.toString(this.system) +
", systemInstance= " + Arrays.toString(this.systemInstance) +
", type= " + Arrays.toString(this.type) +
", value= " + Arrays.toString(this.value) +
"]";
return "ObjectReferenceQueryImpl [taskanaEngine=" + taskanaEngine + ", columnName=" + columnName + ", company="
+ Arrays.toString(company) + ", system=" + Arrays.toString(system) + ", systemInstance="
+ Arrays.toString(systemInstance) + ", type=" + Arrays.toString(type) + ", value=" + Arrays.toString(value)
+ ", orderBy=" + orderBy + "]";
}
}

55
lib/taskana-core/src/main/java/pro/taskana/impl/TaskImpl.java
View File

@ -721,49 +721,18 @@ public class TaskImpl implements Task {
@Override
public String toString() {
return "TaskImpl [" +
"id= " + this.id +
", externalId= " + this.externalId +
", created= " + this.created +
", claimed= " + this.claimed +
", completed= " + this.completed +
", modified= " + this.modified +
", planned= " + this.planned +
", due= " + this.due +
", name= " + this.name +
", creator= " + this.creator +
", description= " + this.description +
", note= " + this.note +
", priority= " + this.priority +
", state= " + this.state +
", classificationSummary= " + this.classificationSummary +
", workbasketSummary= " + this.workbasketSummary +
", businessProcessId= " + this.businessProcessId +
", parentBusinessProcessId= " + this.parentBusinessProcessId +
", owner= " + this.owner +
", primaryObjRef= " + this.primaryObjRef +
", isRead= " + this.isRead +
", isTransferred= " + this.isTransferred +
", customAttributes= " + this.customAttributes +
", callbackInfo= " + this.callbackInfo +
", attachments= " + this.attachments +
", custom1= " + this.custom1 +
", custom2= " + this.custom2 +
", custom3= " + this.custom3 +
", custom4= " + this.custom4 +
", custom5= " + this.custom5 +
", custom6= " + this.custom6 +
", custom7= " + this.custom7 +
", custom8= " + this.custom8 +
", custom9= " + this.custom9 +
", custom10= " + this.custom10 +
", custom11= " + this.custom11 +
", custom12= " + this.custom12 +
", custom13= " + this.custom13 +
", custom14= " + this.custom14 +
", custom15= " + this.custom15 +
", custom16= " + this.custom16 +
"]";
return "TaskImpl [id=" + id + ", externalId=" + externalId + ", created=" + created + ", claimed=" + claimed
+ ", completed=" + completed + ", modified=" + modified + ", planned=" + planned + ", due=" + due
+ ", name=" + name + ", creator=" + creator + ", description=" + description + ", note=" + note
+ ", priority=" + priority + ", state=" + state + ", classificationSummary=" + classificationSummary
+ ", workbasketSummary=" + workbasketSummary + ", businessProcessId=" + businessProcessId
+ ", parentBusinessProcessId=" + parentBusinessProcessId + ", owner=" + owner + ", primaryObjRef="
+ primaryObjRef + ", isRead=" + isRead + ", isTransferred=" + isTransferred + ", customAttributes="
+ customAttributes + ", callbackInfo=" + callbackInfo + ", attachments=" + attachments + ", custom1="
+ custom1 + ", custom2=" + custom2 + ", custom3=" + custom3 + ", custom4=" + custom4 + ", custom5="
+ custom5 + ", custom6=" + custom6 + ", custom7=" + custom7 + ", custom8=" + custom8 + ", custom9="
+ custom9 + ", custom10=" + custom10 + ", custom11=" + custom11 + ", custom12=" + custom12 + ", custom13="
+ custom13 + ", custom14=" + custom14 + ", custom15=" + custom15 + ", custom16=" + custom16 + "]";
}
@Override

58
lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
View File

@ -412,7 +412,7 @@ public class TaskServiceImpl implements TaskService {
List<String> taskIds) throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException {
try {
taskanaEngine.openConnection();
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to transferTasks(targetWbId = {}, taskIds = {})", destinationWorkbasketId, LoggerUtils.listToString(taskIds));
}
@ -425,7 +425,7 @@ public class TaskServiceImpl implements TaskService {
return transferTasks(taskIds, destinationWorkbasket);
} finally {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("exit from transferTasks(targetWbKey = {}, taskIds = {})", destinationWorkbasketId, LoggerUtils.listToString(taskIds));
}
@ -439,7 +439,7 @@ public class TaskServiceImpl implements TaskService {
throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException {
try {
taskanaEngine.openConnection();
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to transferTasks(targetWbKey = {}, domain = {}, taskIds = {})", destinationWorkbasketKey,
destinationWorkbasketDomain, LoggerUtils.listToString(taskIds));
}
@ -454,7 +454,7 @@ public class TaskServiceImpl implements TaskService {
return transferTasks(taskIds, destinationWorkbasket);
} finally {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("exit from transferTasks(targetWbKey = {}, targetWbDomain = {}, destination taskIds = {})", destinationWorkbasketKey,
destinationWorkbasketDomain, LoggerUtils.listToString(taskIds));
}
@ -608,7 +608,7 @@ public class TaskServiceImpl implements TaskService {
if (!taskSummaries.isEmpty()) {
changedTasks = taskSummaries.stream().map(TaskSummary::getTaskId).collect(Collectors.toList());
taskMapper.updateTasks(changedTasks, updated, fieldSelector);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("updateTasks() updated the following tasks: {} ", LoggerUtils.listToString(changedTasks));
}
@ -644,7 +644,7 @@ public class TaskServiceImpl implements TaskService {
if (!taskSummaries.isEmpty()) {
changedTasks = taskSummaries.stream().map(TaskSummary::getTaskId).collect(Collectors.toList());
taskMapper.updateTasks(changedTasks, updatedTask, fieldSelector);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("updateTasks() updated the following tasks: {} ", LoggerUtils.listToString(changedTasks));
}
@ -760,7 +760,7 @@ public class TaskServiceImpl implements TaskService {
private BulkOperationResults<String, TaskanaException> transferTasks(List<String> taskIdsToBeTransferred,
Workbasket destinationWorkbasket)
throws InvalidArgumentException, WorkbasketNotFoundException, NotAuthorizedException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to transferTasks(taskIdsToBeTransferred = {}, destinationWorkbasket = {})", LoggerUtils.listToString(taskIdsToBeTransferred), destinationWorkbasket);
}
@ -785,7 +785,7 @@ public class TaskServiceImpl implements TaskService {
}
checkIfTransferConditionsAreFulfilled(taskIds, taskSummaries, bulkLog);
updateTasksToBeTransferred(taskIds, taskSummaries, destinationWorkbasket);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("exit from transferTasks(), returning {}", bulkLog);
}
@ -794,7 +794,7 @@ public class TaskServiceImpl implements TaskService {
private void removeNonExistingTasksFromTaskIdList(List<String> taskIds,
BulkOperationResults<String, TaskanaException> bulkLog) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to removeNonExistingTasksFromTaskIdList(targetWbId = {}, taskIds = {})", taskIds, bulkLog);
}
@ -812,7 +812,7 @@ public class TaskServiceImpl implements TaskService {
private void checkIfTransferConditionsAreFulfilled(List<String> taskIds, List<MinimalTaskSummary> taskSummaries,
BulkOperationResults<String, TaskanaException> bulkLog) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to checkIfTransferConditionsAreFulfilled(taskIds = {}, taskSummaries = {}, bulkLog = {})",
LoggerUtils.listToString(taskIds), LoggerUtils.listToString(taskSummaries), bulkLog);
}
@ -836,7 +836,7 @@ public class TaskServiceImpl implements TaskService {
private void checkIfTasksMatchTransferCriteria(List<String> taskIds, List<MinimalTaskSummary> taskSummaries,
List<WorkbasketSummary> sourceWorkbaskets, BulkOperationResults<String, TaskanaException> bulkLog) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to checkIfTasksMatchTransferCriteria(taskIds = {}, taskSummaries = {}, sourceWorkbaskets = {}, bulkLog = {})",
LoggerUtils.listToString(taskIds), LoggerUtils.listToString(taskSummaries), LoggerUtils.listToString(sourceWorkbaskets), bulkLog);
}
@ -869,7 +869,7 @@ public class TaskServiceImpl implements TaskService {
private void checkIfTasksMatchCompleteCriteria(List<String> taskIds, List<TaskSummary> taskSummaries,
BulkOperationResults<String, TaskanaException> bulkLog) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to checkIfTasksMatchCompleteCriteria(taskIds = {}, taskSummaries = {}, bulkLog = {})",
LoggerUtils.listToString(taskIds), LoggerUtils.listToString(taskSummaries), bulkLog);
}
@ -905,7 +905,7 @@ public class TaskServiceImpl implements TaskService {
private void updateTasksToBeTransferred(List<String> taskIds,
List<MinimalTaskSummary> taskSummaries, Workbasket destinationWorkbasket) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to updateTasksToBeTransferred(taskIds = {}, taskSummaries = {})",
LoggerUtils.listToString(taskIds), LoggerUtils.listToString(taskSummaries), destinationWorkbasket);
}
@ -934,7 +934,7 @@ public class TaskServiceImpl implements TaskService {
private void updateTasksToBeCompleted(List<String> taskIds,
List<TaskSummary> taskSummaries) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to updateTasksToBeCompleted(taskIds = {}, taskSummaries = {})", LoggerUtils.listToString(taskIds), LoggerUtils.listToString(taskSummaries));
}
@ -984,7 +984,7 @@ public class TaskServiceImpl implements TaskService {
private void addClassificationSummariesToTaskSummaries(List<TaskSummaryImpl> tasks,
List<ClassificationSummary> classifications) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to addClassificationSummariesToTaskSummaries(tasks = {}, classifications = {})", LoggerUtils.listToString(tasks), LoggerUtils.listToString(classifications));
}
@ -1095,7 +1095,7 @@ public class TaskServiceImpl implements TaskService {
private void addAttachmentSummariesToTaskSummaries(List<TaskSummaryImpl> taskSummaries,
List<AttachmentSummaryImpl> attachmentSummaries, List<ClassificationSummary> classifications) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to addAttachmentSummariesToTaskSummaries(taskSummaries = {}, attachmentSummaries = {}, classifications = {})",
LoggerUtils.listToString(taskSummaries), LoggerUtils.listToString(attachmentSummaries), LoggerUtils.listToString(classifications));
}
@ -1147,7 +1147,7 @@ public class TaskServiceImpl implements TaskService {
private List<Attachment> addClassificationSummariesToAttachments(List<AttachmentImpl> attachmentImpls,
List<ClassificationSummary> classifications) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to addClassificationSummariesToAttachments(targetWbId = {}, taskIds = {})",
LoggerUtils.listToString(attachmentImpls), LoggerUtils.listToString(classifications));
}
@ -1171,7 +1171,7 @@ public class TaskServiceImpl implements TaskService {
att.setClassificationSummary(aClassification);
result.add(att);
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("exit from addClassificationSummariesToAttachments(), returning {}", result);
}
@ -1180,7 +1180,7 @@ public class TaskServiceImpl implements TaskService {
private TaskImpl initUpdatedTask(Map<String, String> customFieldsToUpdate, CustomPropertySelector fieldSelector)
throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to initUpdatedTask(customFieldsToUpdate = {}, fieldSelector = {})", LoggerUtils.mapToString(customFieldsToUpdate), fieldSelector);
}
@ -1192,7 +1192,7 @@ public class TaskServiceImpl implements TaskService {
fieldSelector.setCustomProperty(key, true);
newTask.setCustomAttribute(key, entry.getValue());
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("exit from initUpdatedTask(), returning {}", newTask);
}
@ -1200,7 +1200,7 @@ public class TaskServiceImpl implements TaskService {
}
private void validateCustomFields(Map<String, String> customFieldsToUpdate) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to validateCustomFields(customFieldsToUpdate = {}, taskIds = {})", LoggerUtils.mapToString(customFieldsToUpdate));
}
@ -1258,7 +1258,7 @@ public class TaskServiceImpl implements TaskService {
}
private PrioDurationHolder handleAttachments(TaskImpl task) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to handleAttachments(task = {})", task);
}
@ -1404,7 +1404,7 @@ public class TaskServiceImpl implements TaskService {
private PrioDurationHolder handleAttachmentsOnTaskUpdate(TaskImpl oldTaskImpl, TaskImpl newTaskImpl)
throws AttachmentPersistenceException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to handleAttachmentsOnTaskUpdate(oldTaskImpl = {}, newTaskImpl = {})", oldTaskImpl, newTaskImpl);
}
@ -1432,7 +1432,7 @@ public class TaskServiceImpl implements TaskService {
}
private void deleteAttachmentOnTaskUpdate(TaskImpl oldTaskImpl, TaskImpl newTaskImpl) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to deleteAttachmentOnTaskUpdate(oldTaskImpl = {}, newTaskImpl = {})", oldTaskImpl, newTaskImpl);
}
@ -1531,7 +1531,7 @@ public class TaskServiceImpl implements TaskService {
}
private PrioDurationHolder handleAttachmentsOnClassificationUpdate(Task task) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to handleAttachmentsOnClassificationUpdate(task = {})", task);
}
@ -1876,7 +1876,7 @@ public class TaskServiceImpl implements TaskService {
}
List<TaskSummary> augmentTaskSummariesByContainedSummaries(List<TaskSummaryImpl> taskSummaries) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to augmentTaskSummariesByContainedSummaries(taskSummaries= {})", LoggerUtils.listToString(taskSummaries));
}
@ -1937,11 +1937,7 @@ public class TaskServiceImpl implements TaskService {
@Override
public String toString() {
return "PrioDurationHolder [" +
"duration=" + this.duration +
", prio=" + this.prio +
"]";
return "PrioDurationHolder [duration=" + duration + ", prio=" + prio + "]";
}
}
}

51
lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java
View File

@ -590,46 +590,17 @@ public class TaskSummaryImpl implements TaskSummary {
@Override
public String toString() {
return "TaskSummaryImpl [" +
"taskId=" + this.taskId +
", externalId=" + this.externalId +
", created=" + this.created +
", claimed=" + this.claimed +
", completed=" + this.completed +
", modified=" + this.modified +
", planned=" + this.planned +
", due=" + this.due +
", name=" + this.name +
", creator=" + this.creator +
", note=" + this.note +
", priority=" + this.priority +
", state=" + this.state +
", classificationSummary=" + this.classificationSummary +
", workbasketSummary=" + this.workbasketSummary +
", businessProcessId=" + this.businessProcessId +
", parentBusinessProcessId=" + this.parentBusinessProcessId +
", owner=" + this.owner +
", primaryObjRef=" + this.primaryObjRef +
", isRead=" + this.isRead +
", isTransferred=" + this.isTransferred +
", attachmentSummaries=" + this.attachmentSummaries +
", custom1=" + this.custom1 +
", custom2=" + this.custom2 +
", custom3=" + this.custom3 +
", custom4=" + this.custom4 +
", custom5=" + this.custom5 +
", custom6=" + this.custom6 +
", custom7=" + this.custom7 +
", custom8=" + this.custom8 +
", custom9=" + this.custom9 +
", custom10=" + this.custom10 +
", custom11=" + this.custom11 +
", custom12=" + this.custom12 +
", custom13=" + this.custom13 +
", custom14=" + this.custom14 +
", custom15=" + this.custom15 +
", custom16=" + this.custom16 +
"]";
return "TaskSummaryImpl [taskId=" + taskId + ", externalId=" + externalId + ", created=" + created
+ ", claimed=" + claimed + ", completed=" + completed + ", modified=" + modified + ", planned=" + planned
+ ", due=" + due + ", name=" + name + ", creator=" + creator + ", note=" + note + ", priority=" + priority
+ ", state=" + state + ", classificationSummary=" + classificationSummary + ", workbasketSummary="
+ workbasketSummary + ", businessProcessId=" + businessProcessId + ", parentBusinessProcessId="
+ parentBusinessProcessId + ", owner=" + owner + ", primaryObjRef=" + primaryObjRef + ", isRead=" + isRead
+ ", isTransferred=" + isTransferred + ", attachmentSummaries=" + attachmentSummaries + ", custom1="
+ custom1 + ", custom2=" + custom2 + ", custom3=" + custom3 + ", custom4=" + custom4 + ", custom5="
+ custom5 + ", custom6=" + custom6 + ", custom7=" + custom7 + ", custom8=" + custom8 + ", custom9="
+ custom9 + ", custom10=" + custom10 + ", custom11=" + custom11 + ", custom12=" + custom12 + ", custom13="
+ custom13 + ", custom14=" + custom14 + ", custom15=" + custom15 + ", custom16=" + custom16 + "]";
}
}

2
lib/taskana-core/src/main/java/pro/taskana/impl/TimeIntervalReportBuilderImpl.java
View File

@ -124,7 +124,7 @@ abstract class TimeIntervalReportBuilderImpl<B extends TimeIntervalReportBuilder
@Override
public List<String> listTaskIdsForSelectedItems(List<SelectedItem> selectedItems)
throws NotAuthorizedException, InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to listTaskIdsForSelectedItems(selectedItems = {}), this = {}",
LoggerUtils.listToString(selectedItems), this);
}

4
lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java
View File

@ -433,8 +433,8 @@ public class WorkbasketAccessItemImpl implements WorkbasketAccessItem {
+ ", permCustom9=" + this.permCustom9
+ ", permCustom10=" + this.permCustom10
+ ", permCustom11=" + this.permCustom11
+ ", permCustom12=" + this.permCustom12 +
"]";
+ ", permCustom12=" + this.permCustom12
+ "]";
}
@Override

9
lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java
View File

@ -241,12 +241,9 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery
@Override
public String toString() {
return "WorkbasketAccessItemQueryImpl [" +
"idIn=" + Arrays.toString(this.idIn) +
", accessIdIn=" + Arrays.toString(this.accessIdIn) +
", workbasketIdIn=" + Arrays.toString(this.workbasketIdIn) +
", orderBy=" + this.orderBy +
"]";
return "WorkbasketAccessItemQueryImpl [" + "idIn=" + Arrays.toString(this.idIn) + ", accessIdIn="
+ Arrays.toString(this.accessIdIn) + ", workbasketIdIn=" + Arrays.toString(this.workbasketIdIn)
+ ", orderBy=" + this.orderBy + "]";
}
}

25
lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketImpl.java
View File

@ -381,24 +381,11 @@ public class WorkbasketImpl implements Workbasket {
@Override
public String toString() {
return "Workbasket [" +
"id=" + this.id +
", key=" + this.key +
", created=" + this.created +
", modified=" + this.modified +
", name=" + this.name +
", description=" + this.description +
", owner=" + this.owner +
", domain=" + this.domain +
", type=" + this.type +
", custom1=" + this.custom1 +
", custom2=" + this.custom2 +
", custom3=" + this.custom3 +
", custom4=" + this.custom4 +
", orgLevel1=" + this.orgLevel1 +
", orgLevel2=" + this.orgLevel2 +
", orgLevel3=" + this.orgLevel3 +
", orgLevel4=" + this.orgLevel4 +
"]";
return "WorkbasketImpl [id=" + id + ", key=" + key + ", created=" + created + ", modified=" + modified
+ ", name=" + name + ", description=" + description + ", owner=" + owner + ", domain=" + domain + ", type="
+ type + ", custom1=" + custom1 + ", custom2=" + custom2 + ", custom3=" + custom3 + ", custom4=" + custom4
+ ", orgLevel1=" + orgLevel1 + ", orgLevel2=" + orgLevel2 + ", orgLevel3=" + orgLevel3 + ", orgLevel4="
+ orgLevel4 + ", markedForDeletion=" + markedForDeletion + "]";
}
}

61
lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java
View File

@ -630,46 +630,27 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
@Override
public String toString() {
return "WorkbasketQueryImpl [" +
"columnName=" + this.columnName +
", accessId=" + Arrays.toString(this.accessId) +
", idIn=" + Arrays.toString(this.idIn) +
", permission=" + this.permission +
", nameIn=" + Arrays.toString(this.nameIn) +
", nameLike=" + Arrays.toString(this.nameLike) +
", keyIn=" + Arrays.toString(this.keyIn) +
", keyLike=" + Arrays.toString(this.keyLike) +
", keyOrNameLike=" + Arrays.toString(this.keyOrNameLike) +
", domainIn=" + Arrays.toString(this.domainIn) +
", domainLike=" + Arrays.toString(this.domainLike) +
", type=" + Arrays.toString(this.type) +
", createdIn=" + Arrays.toString(this.createdIn) +
", modifiedIn=" + Arrays.toString(this.modifiedIn) +
", descriptionLike=" + Arrays.toString(this.descriptionLike) +
", ownerIn=" + Arrays.toString(this.ownerIn) +
", ownerLike=" + Arrays.toString(this.ownerLike) +
", custom1In=" + Arrays.toString(this.custom1In) +
", custom1Like=" + Arrays.toString(this.custom1Like) +
", custom2In=" + Arrays.toString(this.custom2In) +
", custom2Like=" + Arrays.toString(this.custom2Like) +
", custom3In=" + Arrays.toString(this.custom3In) +
", custom3Like=" + Arrays.toString(this.custom3Like) +
", custom4In=" + Arrays.toString(this.custom4In) +
", custom4Like=" + Arrays.toString(this.custom4Like) +
", orgLevel1In=" + Arrays.toString(this.orgLevel1In) +
", orgLevel1Like=" + Arrays.toString(this.orgLevel1Like) +
", orgLevel2In=" + Arrays.toString(this.orgLevel2In) +
", orgLevel2Like=" + Arrays.toString(this.orgLevel2Like) +
", orgLevel3In=" + Arrays.toString(this.orgLevel3In) +
", orgLevel3Like=" + Arrays.toString(this.orgLevel3Like) +
", orgLevel4In=" + Arrays.toString(this.orgLevel4In) +
", orgLevel4Like=" + Arrays.toString(this.orgLevel4Like) +
", markedForDeletion=" + this.markedForDeletion +
", orderBy=" + this.orderBy +
", joinWithAccessList=" + this.joinWithAccessList +
", checkReadPermission=" + this.checkReadPermission +
", usedToAugmentTasks=" + this.usedToAugmentTasks +
"]";
return "WorkbasketQueryImpl [" + "columnName=" + this.columnName + ", accessId="
+ Arrays.toString(this.accessId) + ", idIn=" + Arrays.toString(this.idIn) + ", permission="
+ this.permission + ", nameIn=" + Arrays.toString(this.nameIn) + ", nameLike="
+ Arrays.toString(this.nameLike) + ", keyIn=" + Arrays.toString(this.keyIn) + ", keyLike="
+ Arrays.toString(this.keyLike) + ", keyOrNameLike=" + Arrays.toString(this.keyOrNameLike) + ", domainIn="
+ Arrays.toString(this.domainIn) + ", domainLike=" + Arrays.toString(this.domainLike) + ", type="
+ Arrays.toString(this.type) + ", createdIn=" + Arrays.toString(this.createdIn) + ", modifiedIn="
+ Arrays.toString(this.modifiedIn) + ", descriptionLike=" + Arrays.toString(this.descriptionLike)
+ ", ownerIn=" + Arrays.toString(this.ownerIn) + ", ownerLike=" + Arrays.toString(this.ownerLike)
+ ", custom1In=" + Arrays.toString(this.custom1In) + ", custom1Like=" + Arrays.toString(this.custom1Like)
+ ", custom2In=" + Arrays.toString(this.custom2In) + ", custom2Like=" + Arrays.toString(this.custom2Like)
+ ", custom3In=" + Arrays.toString(this.custom3In) + ", custom3Like=" + Arrays.toString(this.custom3Like)
+ ", custom4In=" + Arrays.toString(this.custom4In) + ", custom4Like=" + Arrays.toString(this.custom4Like)
+ ", orgLevel1In=" + Arrays.toString(this.orgLevel1In) + ", orgLevel1Like="
+ Arrays.toString(this.orgLevel1Like) + ", orgLevel2In=" + Arrays.toString(this.orgLevel2In)
+ ", orgLevel2Like=" + Arrays.toString(this.orgLevel2Like) + ", orgLevel3In="
+ Arrays.toString(this.orgLevel3In) + ", orgLevel3Like=" + Arrays.toString(this.orgLevel3Like)
+ ", orgLevel4In=" + Arrays.toString(this.orgLevel4In) + ", orgLevel4Like="
+ Arrays.toString(this.orgLevel4Like) + ", markedForDeletion=" + this.markedForDeletion + ", orderBy="
+ this.orderBy + ", joinWithAccessList=" + this.joinWithAccessList + ", checkReadPermission="
+ this.checkReadPermission + ", usedToAugmentTasks=" + this.usedToAugmentTasks + "]";
}
private void handleCallerRolesAndAccessIds() {

2
lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
View File

@ -789,7 +789,7 @@ public class WorkbasketServiceImpl implements WorkbasketService {
public BulkOperationResults<String, TaskanaException> deleteWorkbaskets(List<String> workbasketsIds)
throws NotAuthorizedException, InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to deleteWorkbaskets(workbasketId = {})", LoggerUtils.listToString(workbasketsIds));
}

18
lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java
View File

@ -340,19 +340,11 @@ public class WorkbasketSummaryImpl implements WorkbasketSummary {
@Override
public String toString() {
return "WorkbasketSummaryImpl [" +
"id=" + this.id +
", key=" + this.key +
", name=" + this.name +
", description=" + this.description +
", owner=" + this.owner +
", domain=" + this.domain +
", type=" + this.type +
", orgLevel1=" + this.orgLevel1 +
", orgLevel2=" + this.orgLevel2 +
", orgLevel3=" + this.orgLevel3 +
", orgLevel4=" + this.orgLevel4 +
"]";
return "WorkbasketSummaryImpl [id=" + id + ", key=" + key + ", name=" + name + ", description=" + description
+ ", owner=" + owner + ", domain=" + domain + ", type=" + type + ", custom1=" + custom1 + ", custom2="
+ custom2 + ", custom3=" + custom3 + ", custom4=" + custom4 + ", orgLevel1=" + orgLevel1 + ", orgLevel2="
+ orgLevel2 + ", orgLevel3=" + orgLevel3 + ", orgLevel4=" + orgLevel4 + ", markedForDeletion="
+ markedForDeletion + "]";
}
}

6
lib/taskana-core/src/main/java/pro/taskana/impl/report/CombinedClassificationFilter.java
View File

@ -37,10 +37,8 @@ public class CombinedClassificationFilter {
@Override
public String toString() {
return "CombinedClassificationFilter [" +
"taskClassificationId= " + this.taskClassificationId +
", attachmentClassificationId= " + this.attachmentClassificationId +
"]";
return "CombinedClassificationFilter [taskClassificationId=" + taskClassificationId
+ ", attachmentClassificationId=" + attachmentClassificationId + "]";
}
}

4
lib/taskana-core/src/main/java/pro/taskana/impl/report/DetailedMonitorQueryItem.java
View File

@ -18,9 +18,7 @@ public class DetailedMonitorQueryItem extends MonitorQueryItem {
@Override
public String toString() {
return "DetailedMonitorQueryItem [" +
"attachmentKey= " + this.attachmentKey +
"]";
return "DetailedMonitorQueryItem [" + "attachmentKey= " + this.attachmentKey + "]";
}
}

6
lib/taskana-core/src/main/java/pro/taskana/impl/report/DetailedReportRow.java
View File

@ -53,9 +53,7 @@ public class DetailedReportRow extends ReportRow<DetailedMonitorQueryItem> {
@Override
public String toString() {
return "DetailedReportRow [" +
"detailRows= " + LoggerUtils.mapToString(this.detailRows) +
", columnCount= " + this.columnCount +
"]";
return "DetailedReportRow [" + "detailRows= " + LoggerUtils.mapToString(this.detailRows)
+ ", columnCount= " + this.columnCount + "]";
}
}

7
lib/taskana-core/src/main/java/pro/taskana/impl/report/MonitorQueryItem.java
View File

@ -37,11 +37,8 @@ public class MonitorQueryItem implements QueryItem {
@Override
public String toString() {
return "MonitorQueryItem [" +
"key= " + this.key +
", ageInDays= " + this.ageInDays +
", numberOfTasks= " + this.numberOfTasks +
"]";
return "MonitorQueryItem [" + "key= " + this.key + ", ageInDays= " + this.ageInDays
+ ", numberOfTasks= " + this.numberOfTasks + "]";
}
}

7
lib/taskana-core/src/main/java/pro/taskana/impl/report/TaskQueryItem.java
View File

@ -40,10 +40,7 @@ public class TaskQueryItem implements QueryItem {
@Override
public String toString() {
return "TaskQueryItem [" +
"domain= " + this.domain +
", state= " + this.state.name() +
", count= " + this.count +
"]";
return "TaskQueryItem [" + "domain= " + this.domain + ", state= " + this.state.name()
+ ", count= " + this.count + "]";
}
}

15
lib/taskana-core/src/main/java/pro/taskana/jobs/ScheduledJob.java
View File

@ -109,18 +109,9 @@ public class ScheduledJob {
@Override
public String toString() {
return "ScheduledJob [" +
"jobId=" + this.jobId +
", priority=" + this.priority +
", created=" + this.created +
", due=" + this.due +
", state=" + this.state +
", lockedBy=" + this.lockedBy +
", lockExpires=" + this.lockExpires +
", type=" + this.type +
", retryCount=" + this.retryCount +
", arguments=" + this.arguments +
"]";
return "ScheduledJob [jobId=" + jobId + ", priority=" + priority + ", created=" + created + ", due=" + due
+ ", state=" + state + ", lockedBy=" + lockedBy + ", lockExpires=" + lockExpires + ", type=" + type
+ ", retryCount=" + retryCount + ", arguments=" + arguments + "]";
}
/**

6
lib/taskana-core/src/main/java/pro/taskana/jobs/TaskCleanupJob.java
View File

@ -110,7 +110,7 @@ public class TaskCleanupJob extends AbstractTaskanaJob {
.list();
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("exit from getTasksCompletedBefore(), returning {}", LoggerUtils.listToString(taskList));
}
@ -118,7 +118,7 @@ public class TaskCleanupJob extends AbstractTaskanaJob {
}
private int deleteTasksTransactionally(List<TaskSummary> tasksToBeDeleted) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to deleteTasksTransactionally(tasksToBeDeleted = {})", LoggerUtils.listToString(tasksToBeDeleted));
}
@ -146,7 +146,7 @@ public class TaskCleanupJob extends AbstractTaskanaJob {
}
private int deleteTasks(List<TaskSummary> tasksToBeDeleted) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("entry to deleteTasks(tasksToBeDeleted = {})", tasksToBeDeleted);
}

2
lib/taskana-core/src/main/java/pro/taskana/jobs/TaskRefreshJob.java
View File

@ -53,7 +53,7 @@ public class TaskRefreshJob extends AbstractTaskanaJob {
}
@Override
public String toString(){
public String toString() {
return "TaskRefreshJob [affectedTaskIds= " + LoggerUtils.listToString(affectedTaskIds) + "]";
}

24
lib/taskana-core/src/main/java/pro/taskana/mappings/CustomPropertySelector.java
View File

@ -221,23 +221,11 @@ public class CustomPropertySelector {
@Override
public String toString() {
return "CustomPropertySelector [" +
"custom1= " + this.custom1 +
", custom2= " + this.custom2 +
", custom3= " + this.custom3 +
", custom4= " + this.custom4 +
", custom5= " + this.custom5 +
", custom6= " + this.custom6 +
", custom7= " + this.custom7 +
", custom8= " + this.custom8 +
", custom9= " + this.custom9 +
", custom10= " + this.custom10 +
", custom11= " + this.custom11 +
", custom12= " + this.custom12 +
", custom13= " + this.custom13 +
", custom14= " + this.custom14 +
", custom15= " + this.custom15 +
", custom16= " + this.custom16 +
"]";
return "CustomPropertySelector [custom1=" + custom1 + ", custom2=" + custom2 + ", custom3=" + custom3
+ ", custom4=" + custom4 + ", custom5=" + custom5 + ", custom6=" + custom6 + ", custom7=" + custom7
+ ", custom8=" + custom8 + ", custom9=" + custom9 + ", custom10=" + custom10 + ", custom11=" + custom11
+ ", custom12=" + custom12 + ", custom13=" + custom13 + ", custom14=" + custom14 + ", custom15=" + custom15
+ ", custom16=" + custom16 + "]";
}
}

6
lib/taskana-core/src/main/java/pro/taskana/security/GroupPrincipal.java
View File

@ -49,9 +49,7 @@ public class GroupPrincipal implements Group {
@Override
public String toString() {
return "GroupPrincipal [" +
"name= " + this.name +
", members= " + LoggerUtils.setToString(this.members) +
"]";
return "GroupPrincipal [name=" + name + ", members=" + LoggerUtils.setToString(this.members) + "]";
}
}

2
qa/eclipseFormatter/taskana_formatter.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="13">
<profile kind="CodeFormatterProfile" name="Daimler Truck" version="13">
<profile kind="CodeFormatterProfile" name="taskana formatter" version="13">
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>

4
rest/taskana-rest-spring-example/.classpath
View File

@ -15,14 +15,16 @@
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>

2
rest/taskana-rest-spring-example/.settings/org.eclipse.jdt.core.prefs
View File

@ -1,5 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8

8
rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java
View File

@ -170,7 +170,7 @@ public class ClassificationDefinitionControllerIntTest {
}
@Test
public void testImportMultipleClassifications() throws IOException, InterruptedException {
public void testImportMultipleClassifications() throws IOException {
ClassificationResource classification1 = this.createClassification("id1", "ImportKey1", "DOMAIN_A", null, null);
String c1 = objMapper.writeValueAsString(classification1);
@ -196,7 +196,7 @@ public class ClassificationDefinitionControllerIntTest {
}
@Test
public void testImportDuplicateClassification() throws IOException, InterruptedException {
public void testImportDuplicateClassification() throws IOException {
ClassificationResource classification1 = new ClassificationResource();
classification1.setClassificationId("id1");
classification1.setKey("ImportKey3");
@ -262,7 +262,7 @@ public class ClassificationDefinitionControllerIntTest {
}
@Test
public void testImportParentAndChildClassification() throws IOException, InterruptedException {
public void testImportParentAndChildClassification() throws IOException {
ClassificationResource classification1 = this.createClassification("parentId", "ImportKey6", "DOMAIN_A", null, null);
String c1 = objMapper.writeValueAsString(classification1);
@ -299,7 +299,7 @@ public class ClassificationDefinitionControllerIntTest {
}
@Test
public void testImportParentAndChildClassificationWithKey() throws IOException, InterruptedException {
public void testImportParentAndChildClassificationWithKey() throws IOException {
ClassificationResource classification1 = createClassification("parent", "ImportKey11", "DOMAIN_A", null, null);
classification1.setCustom1("parent is correct");
String parent = objMapper.writeValueAsString(classification1);

5
rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/AccessId.java
View File

@ -28,10 +28,7 @@ public class AccessId {
@Override
public String toString() {
return "AccessId [" +
"accessId=" + this.accessId +
", name=" + this.name +
"]";
return "AccessId [" + "accessId=" + this.accessId + ", name=" + this.name + "]";
}
}

8
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AccessIdController.java
View File

@ -48,13 +48,13 @@ public class AccessIdController {
}
if (ldapClient.useLdap()) {
List<AccessIdResource> accessIdUsers = ldapClient.searchUsersAndGroups(searchFor);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from validateAccessIds(), returning {}", new ResponseEntity<>(accessIdUsers, HttpStatus.OK));
}
return new ResponseEntity<>(accessIdUsers, HttpStatus.OK);
} else if (ldapCache != null) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from validateAccessIds(), returning {}", new ResponseEntity<>(
ldapCache.findMatchingAccessId(searchFor, ldapClient.getMaxNumberOfReturnedAccessIds()),
HttpStatus.OK));
@ -82,14 +82,14 @@ public class AccessIdController {
if (ldapClient.useLdap()) {
accessIdUsers = ldapClient.searchUsersAndGroups(accessId);
accessIdUsers.addAll(ldapClient.searchGroupsofUsersIsMember(accessId));
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getGroupsByAccessId(), returning {}", new ResponseEntity<>(accessIdUsers, HttpStatus.OK));
}
return new ResponseEntity<>(accessIdUsers, HttpStatus.OK);
} else if (ldapCache != null) {
accessIdUsers = ldapCache.findGroupsOfUser(accessId, ldapClient.getMaxNumberOfReturnedAccessIds());
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getGroupsByAccessId(), returning {}", new ResponseEntity<>(accessIdUsers, HttpStatus.OK));
}

22
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java
View File

@ -82,7 +82,7 @@ public class ClassificationController extends AbstractPagingController {
@Transactional(readOnly = true, rollbackFor = Exception.class)
public ResponseEntity<PagedResources<ClassificationSummaryResource>> getClassifications(
@RequestParam MultiValueMap<String, String> params) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to getClassifications(params= {})", params);
}
@ -114,7 +114,7 @@ public class ClassificationController extends AbstractPagingController {
PagedResources<ClassificationSummaryResource> pagedResources = assembler.toResources(classificationSummaries,
pageMetadata);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getClassifications(), returning {}", new ResponseEntity<>(pagedResources, HttpStatus.OK));
}
@ -128,7 +128,7 @@ public class ClassificationController extends AbstractPagingController {
ConcurrencyException, DomainNotFoundException, InvalidArgumentException {
LOGGER.debug("Entry to getClassification(classificationId= {})", classificationId);
Classification classification = classificationService.getClassification(classificationId);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getClassification(), returning {}", ResponseEntity.status(HttpStatus.OK).body(classificationResourceAssembler.toResource(classification)));
}
@ -141,13 +141,13 @@ public class ClassificationController extends AbstractPagingController {
@RequestBody ClassificationResource resource)
throws NotAuthorizedException, ClassificationNotFoundException, ClassificationAlreadyExistException,
ConcurrencyException, DomainNotFoundException, InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to createClassification(resource= {})", resource);
}
Classification classification = classificationResourceAssembler.toModel(resource);
classification = classificationService.createClassification(classification);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from createClassification(), returning {}", ResponseEntity.status(HttpStatus.CREATED)
.body(classificationResourceAssembler.toResource(classification)));
}
@ -162,7 +162,7 @@ public class ClassificationController extends AbstractPagingController {
@PathVariable(value = "classificationId") String classificationId, @RequestBody ClassificationResource resource)
throws NotAuthorizedException, ClassificationNotFoundException, ConcurrencyException,
ClassificationAlreadyExistException, DomainNotFoundException, InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to updateClassification(classificationId= {}, resource= {})", classificationId, resource);
}
@ -177,7 +177,7 @@ public class ClassificationController extends AbstractPagingController {
+ "') of the URI is not identical with the classificationId ('"
+ resource.getClassificationId() + "') of the object in the payload.");
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from updateClassification(), returning {}", result);
}
@ -196,7 +196,7 @@ public class ClassificationController extends AbstractPagingController {
private ClassificationQuery applySortingParams(ClassificationQuery query, MultiValueMap<String, String> params)
throws IllegalArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to applySortingParams(query= {}, params= {})", query, params);
}
@ -228,7 +228,7 @@ public class ClassificationController extends AbstractPagingController {
}
params.remove(SORT_BY);
params.remove(SORT_DIRECTION);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from applySortingParams(), returning {}", query);
}
@ -237,7 +237,7 @@ public class ClassificationController extends AbstractPagingController {
private ClassificationQuery applyFilterParams(ClassificationQuery query,
MultiValueMap<String, String> params) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to applyFilterParams(query= {}, params= {})", query, params);
}
@ -303,7 +303,7 @@ public class ClassificationController extends AbstractPagingController {
params.remove(CUSTOM_8_LIKE);
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from applyFilterParams(), returning {}", query);
}

19
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java
View File

@ -68,7 +68,7 @@ public class ClassificationDefinitionController {
List<ClassificationSummary> summaries = domain != null ? query.domainIn(domain).list() : query.list();
List<ClassificationResource> export = new ArrayList<>();
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from exportClassifications(), returning {}", new ResponseEntity<>(summaries, HttpStatus.OK));
}
@ -81,14 +81,14 @@ public class ClassificationDefinitionController {
@RequestParam("file") MultipartFile file)
throws InvalidArgumentException, NotAuthorizedException, ConcurrencyException, ClassificationNotFoundException,
ClassificationAlreadyExistException, DomainNotFoundException, IOException {
LOGGER.debug("Entry to importClassifications()");
LOGGER.debug("Entry to importClassifications()");
Map<String, String> systemIds = getSystemIds();
List<ClassificationResource> classificationsResources = extractClassificationResourcesFromFile(file);
Map<Classification, String> childsInFile = mapChildsToParentKeys(classificationsResources, systemIds);
insertOrUpdateClassificationsWithoutParent(classificationsResources, systemIds);
updateParentChildRelations(childsInFile);
LOGGER.debug("Exit from importClassifications(), returning {}", new ResponseEntity<>(HttpStatus.OK));
LOGGER.debug("Exit from importClassifications(), returning {}", new ResponseEntity<>(HttpStatus.OK));
return new ResponseEntity<>(HttpStatus.OK);
}
@ -112,7 +112,7 @@ public class ClassificationDefinitionController {
}
private Map<Classification, String> mapChildsToParentKeys(List<ClassificationResource> classificationResources, Map<String, String> systemIds) {
LOGGER.debug("Entry to mapChildsToParentKeys()");
LOGGER.debug("Entry to mapChildsToParentKeys()");
Map<Classification, String> childsInFile = new HashMap<>();
Set<String> newKeysWithDomain = new HashSet<>();
classificationResources.forEach(cl -> newKeysWithDomain.add(cl.getKey() + "|" + cl.getDomain()));
@ -135,8 +135,8 @@ public class ClassificationDefinitionController {
childsInFile.put(classificationResourceAssembler.toModel(cl), cl.getParentKey());
}
}
}
if(LOGGER.isDebugEnabled()) {
}
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from mapChildsToParentKeys(), returning {}", LoggerUtils.mapToString(childsInFile));
}
@ -147,7 +147,8 @@ public class ClassificationDefinitionController {
Map<String, String> systemIds)
throws ClassificationNotFoundException, NotAuthorizedException, InvalidArgumentException,
ClassificationAlreadyExistException, DomainNotFoundException, ConcurrencyException {
LOGGER.debug("Entry to insertOrUpdateClassificationsWithoutParent()");
LOGGER.debug("Entry to insertOrUpdateClassificationsWithoutParent()");
for (ClassificationResource classificationResource : classificationResources) {
classificationResource.setParentKey(null);
classificationResource.setParentId(null);
@ -160,8 +161,8 @@ public class ClassificationDefinitionController {
classificationService.createClassification(
classificationResourceAssembler.toModel(classificationResource));
}
}
LOGGER.debug("Exit from insertOrUpdateClassificationsWithoutParent()");
}
LOGGER.debug("Exit from insertOrUpdateClassificationsWithoutParent()");
}
private void updateParentChildRelations(Map<Classification, String> childsInFile)

8
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java
View File

@ -46,7 +46,7 @@ public class MonitorController {
@RequestParam(required = false) List<TaskState> states) throws NotAuthorizedException,
InvalidArgumentException {
LOGGER.debug("Entry to getTasksStatusReport()");
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getTasksStatusReport(), returning {}", reportAssembler.toResource(
taskMonitorService.createTaskStatusReportBuilder().stateIn(states).domainIn(domains).buildReport(),
domains, states));
@ -65,7 +65,7 @@ public class MonitorController {
@RequestParam(value = "states") List<TaskState> states)
throws NotAuthorizedException, InvalidArgumentException {
LOGGER.debug("Entry to getTasksWorkbasketReport()");
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getTasksWorkbasketReport(), returning {}", reportAssembler.toResource(
taskMonitorService.createWorkbasketReportBuilder()
.stateIn(states)
@ -85,8 +85,8 @@ public class MonitorController {
public ResponseEntity<ReportResource> getTasksClassificationReport()
throws NotAuthorizedException, InvalidArgumentException {
LOGGER.debug("Entry to getTasksClassificationReport()");
if(LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getTasksClassificationReport(), returning {}",reportAssembler.toResource(
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getTasksClassificationReport(), returning {}", reportAssembler.toResource(
taskMonitorService.createClassificationReportBuilder()
.withColumnHeaders(getTaskClassificationTimeInterval())
.buildReport()));

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

@ -94,7 +94,7 @@ public class TaskController extends AbstractPagingController {
@Transactional(readOnly = true, rollbackFor = Exception.class)
public ResponseEntity<PagedResources<TaskSummaryResource>> getTasks(
@RequestParam MultiValueMap<String, String> params) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to getTasks(params= {})", params);
}
@ -126,7 +126,7 @@ public class TaskController extends AbstractPagingController {
TaskSummaryResourcesAssembler taskSummaryResourcesAssembler = new TaskSummaryResourcesAssembler();
PagedResources<TaskSummaryResource> pagedResources = taskSummaryResourcesAssembler.toResources(taskSummaries,
pageMetadata);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getTasks(), returning {}", new ResponseEntity<>(pagedResources, HttpStatus.OK));
}
@ -141,7 +141,7 @@ public class TaskController extends AbstractPagingController {
Task task = taskService.getTask(taskId);
ResponseEntity<TaskResource> result = new ResponseEntity<>(taskResourceAssembler.toResource(task),
HttpStatus.OK);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getTask(), returning {}", result);
}
@ -158,7 +158,7 @@ public class TaskController extends AbstractPagingController {
Task updatedTask = taskService.getTask(taskId);
ResponseEntity<TaskResource> result = new ResponseEntity<>(taskResourceAssembler.toResource(updatedTask),
HttpStatus.OK);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from claimTask(), returning {}", result);
}
@ -174,7 +174,7 @@ public class TaskController extends AbstractPagingController {
Task updatedTask = taskService.getTask(taskId);
ResponseEntity<TaskResource> result = new ResponseEntity<>(taskResourceAssembler.toResource(updatedTask),
HttpStatus.OK);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from completeTask(), returning {}", result);
}
@ -197,14 +197,14 @@ public class TaskController extends AbstractPagingController {
public ResponseEntity<TaskResource> createTask(@RequestBody TaskResource taskResource)
throws WorkbasketNotFoundException, ClassificationNotFoundException, NotAuthorizedException,
TaskAlreadyExistException, InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to createTask(params= {})", taskResource);
}
Task createdTask = taskService.createTask(taskResourceAssembler.toModel(taskResource));
ResponseEntity<TaskResource> result = new ResponseEntity<>(taskResourceAssembler.toResource(createdTask),
HttpStatus.CREATED);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from createTask(), returning {}", result);
}
@ -219,7 +219,7 @@ public class TaskController extends AbstractPagingController {
Task updatedTask = taskService.transfer(taskId, workbasketId);
ResponseEntity<TaskResource> result = new ResponseEntity<>(taskResourceAssembler.toResource(updatedTask),
HttpStatus.OK);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from transferTask(), returning {}", result);
}
@ -246,7 +246,7 @@ public class TaskController extends AbstractPagingController {
+ taskResource.getTaskId() + "')");
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from updateTask(), returning {}", result);
}
@ -255,7 +255,7 @@ public class TaskController extends AbstractPagingController {
private TaskQuery applyFilterParams(TaskQuery taskQuery, MultiValueMap<String, String> params)
throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to applyFilterParams(taskQuery= {}, params= {})", taskQuery, params);
}
@ -340,7 +340,7 @@ public class TaskController extends AbstractPagingController {
params.remove(POR_VALUE);
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from applyFilterParams(), returning {}", taskQuery);
}
@ -349,7 +349,7 @@ public class TaskController extends AbstractPagingController {
private TaskQuery applySortingParams(TaskQuery taskQuery, MultiValueMap<String, String> params)
throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to applySortingParams(taskQuery= {}, params= {})", taskQuery, params);
}
@ -393,7 +393,7 @@ public class TaskController extends AbstractPagingController {
}
params.remove(SORT_BY);
params.remove(SORT_DIRECTION);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from applySortingParams(), returning {}", taskQuery);
}
@ -401,7 +401,7 @@ public class TaskController extends AbstractPagingController {
}
private int[] extractPriorities(String[] prioritiesInString) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to extractPriorities(prioritiesInString= {})", prioritiesInString);
}
@ -409,7 +409,7 @@ public class TaskController extends AbstractPagingController {
for (int i = 0; i < prioritiesInString.length; i++) {
priorities[i] = Integer.valueOf(prioritiesInString[i]);
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from extractPriorities(), returning {}", priorities);
}
@ -417,7 +417,7 @@ public class TaskController extends AbstractPagingController {
}
private TaskState[] extractStates(MultiValueMap<String, String> params) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to extractStates(params= {})", params);
}

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

@ -64,7 +64,7 @@ public class TaskanaEngineController {
resource.getRoles().add(role);
}
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getCurrentUserInfo(), returning {}", new ResponseEntity<>(resource, HttpStatus.OK));
}

9
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaErrorData.java
View File

@ -57,13 +57,8 @@ public class TaskanaErrorData {
@Override
public String toString() {
return "TaskanaErrorData [" +
"timestamp=" + this.timestamp +
", status=" + this.status +
", error=" + this.error +
", exception=" + this.exception +
", message=" + this.message +
", path=" + this.path + "]";
return "TaskanaErrorData [timestamp=" + timestamp + ", status=" + status + ", error=" + error + ", exception="
+ exception + ", message=" + message + ", path=" + path + "]";
}
}

16
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java
View File

@ -69,7 +69,7 @@ public class WorkbasketAccessItemController extends AbstractPagingController {
public ResponseEntity<PagedResources<WorkbasketAccessItemResource>> getWorkbasketAccessItems(
@RequestParam MultiValueMap<String, String> params)
throws NotAuthorizedException, InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to getWorkbasketAccessItems(params= {})", params);
}
@ -103,7 +103,7 @@ public class WorkbasketAccessItemController extends AbstractPagingController {
workbasketAccessItems,
pageMetadata);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getWorkbasketAccessItems(), returning {}", new ResponseEntity<>(pagedResources, HttpStatus.OK));
}
@ -142,7 +142,7 @@ public class WorkbasketAccessItemController extends AbstractPagingController {
private WorkbasketAccessItemQuery getAccessIds(WorkbasketAccessItemQuery query,
MultiValueMap<String, String> params) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to getAccessIds(query= {}, params= {})", params);
}
@ -152,7 +152,7 @@ public class WorkbasketAccessItemController extends AbstractPagingController {
params.remove(ACCESS_IDS);
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getAccessIds(), returning {}", query);
}
@ -161,7 +161,7 @@ public class WorkbasketAccessItemController extends AbstractPagingController {
private WorkbasketAccessItemQuery applyFilterParams(WorkbasketAccessItemQuery query,
MultiValueMap<String, String> params) {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to applyFilterParams(query= {}, params= {})", params);
}
@ -183,7 +183,7 @@ public class WorkbasketAccessItemController extends AbstractPagingController {
query.accessIdLike(LIKE + params.get(ACCESS_ID_LIKE).get(0) + LIKE);
params.remove(ACCESS_ID_LIKE);
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from applyFilterParams(), returning {}", query);
}
@ -193,7 +193,7 @@ public class WorkbasketAccessItemController extends AbstractPagingController {
private WorkbasketAccessItemQuery applySortingParams(WorkbasketAccessItemQuery query,
MultiValueMap<String, String> params)
throws IllegalArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to applySortingParams(query= {}, params= {})", params);
}
@ -219,7 +219,7 @@ public class WorkbasketAccessItemController extends AbstractPagingController {
}
params.remove(SORT_BY);
params.remove(SORT_DIRECTION);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from applySortingParams(), returning {}", query);
}

30
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java
View File

@ -103,7 +103,7 @@ public class WorkbasketController extends AbstractPagingController {
@Transactional(readOnly = true, rollbackFor = Exception.class)
public ResponseEntity<PagedResources<WorkbasketSummaryResource>> getWorkbaskets(
@RequestParam MultiValueMap<String, String> params) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to getWorkbaskets(params= {})", params);
}
@ -135,7 +135,7 @@ public class WorkbasketController extends AbstractPagingController {
PagedResources<WorkbasketSummaryResource> pagedResources = assembler.toResources(workbasketSummaries,
pageMetadata);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getWorkbaskets(), returning {}", new ResponseEntity<>(pagedResources, HttpStatus.OK));
}
@ -150,7 +150,7 @@ public class WorkbasketController extends AbstractPagingController {
ResponseEntity<WorkbasketResource> result;
Workbasket workbasket = workbasketService.getWorkbasket(workbasketId);
result = new ResponseEntity<>(workbasketResourceAssembler.toResource(workbasket), HttpStatus.OK);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getWorkbasket(), returning {}", result);
}
@ -172,13 +172,13 @@ public class WorkbasketController extends AbstractPagingController {
public ResponseEntity<WorkbasketResource> createWorkbasket(@RequestBody WorkbasketResource workbasketResource)
throws InvalidWorkbasketException, NotAuthorizedException, WorkbasketAlreadyExistException,
WorkbasketNotFoundException, DomainNotFoundException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to createWorkbasket(workbasketResource= {})", workbasketResource);
}
Workbasket workbasket = workbasketResourceAssembler.toModel(workbasketResource);
workbasket = workbasketService.createWorkbasket(workbasket);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from createWorkbasket(), returning {}", new ResponseEntity<>(workbasketResourceAssembler.toResource(workbasket), HttpStatus.CREATED));
}
@ -204,7 +204,7 @@ public class WorkbasketController extends AbstractPagingController {
+ workbasketResource.getId() + "')");
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from updateWorkbasket(), returning {}", result);
}
@ -223,7 +223,7 @@ public class WorkbasketController extends AbstractPagingController {
Resources<WorkbasketAccessItemResource> accessItemListResource = accessItemListAssembler
.toResource(workbasketId, accessItems);
result = new ResponseEntity<>(accessItemListResource, HttpStatus.OK);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getWorkbasketAccessItems(), returning {}", result);
}
@ -249,7 +249,7 @@ public class WorkbasketController extends AbstractPagingController {
Resources<WorkbasketAccessItemResource> accessItemListResource = accessItemListAssembler
.toResource(workbasketId, updatedWbAccessItems);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from setWorkbasketAccessItems(), returning {}", new ResponseEntity<>(accessItemListResource, HttpStatus.OK));
}
@ -267,7 +267,7 @@ public class WorkbasketController extends AbstractPagingController {
Resources<DistributionTargetResource> distributionTargetListResource = distributionTargetListAssembler
.toResource(workbasketId, distributionTargets);
result = new ResponseEntity<>(distributionTargetListResource, HttpStatus.OK);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getDistributionTargets(), returning {}", result);
}
@ -279,7 +279,7 @@ public class WorkbasketController extends AbstractPagingController {
public ResponseEntity<Resources<DistributionTargetResource>> setDistributionTargetsForWorkbasketId(
@PathVariable(value = "workbasketId") String sourceWorkbasketId,
@RequestBody List<String> targetWorkbasketIds) throws WorkbasketNotFoundException, NotAuthorizedException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to getTasksStatusReport(workbasketId= {}, targetWorkbasketIds´= {})", sourceWorkbasketId,
LoggerUtils.listToString(targetWorkbasketIds));
}
@ -290,7 +290,7 @@ public class WorkbasketController extends AbstractPagingController {
Resources<DistributionTargetResource> distributionTargetListResource = distributionTargetListAssembler
.toResource(sourceWorkbasketId, distributionTargets);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getTasksStatusReport(), returning {}", new ResponseEntity<>(distributionTargetListResource, HttpStatus.OK));
}
@ -314,7 +314,7 @@ public class WorkbasketController extends AbstractPagingController {
private WorkbasketQuery applySortingParams(WorkbasketQuery query, MultiValueMap<String, String> params)
throws IllegalArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to applySortingParams(query= {}, params={})", query, params);
}
@ -349,7 +349,7 @@ public class WorkbasketController extends AbstractPagingController {
}
params.remove(SORT_BY);
params.remove(SORT_DIRECTION);
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from applySortingParams(), returning {}", query);
}
@ -358,7 +358,7 @@ public class WorkbasketController extends AbstractPagingController {
private WorkbasketQuery applyFilterParams(WorkbasketQuery query,
MultiValueMap<String, String> params) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to applyFilterParams(query= {}, params= {})", query, params);
}
@ -476,7 +476,7 @@ public class WorkbasketController extends AbstractPagingController {
}
params.remove(REQUIRED_PERMISSION);
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from applyFilterParams(), returning {}", query);
}

8
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java
View File

@ -62,7 +62,7 @@ public class WorkbasketDefinitionController {
List<WorkbasketSummary> workbasketSummaryList = domain != null
? workbasketQuery.domainIn(domain).list()
: workbasketQuery.list();
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from exportWorkbaskets(), returning {}", new ResponseEntity<>(workbasketSummaryList, HttpStatus.OK));
}
@ -83,7 +83,7 @@ public class WorkbasketDefinitionController {
public ResponseEntity<String> importWorkbaskets(@RequestParam("file") MultipartFile file)
throws IOException, NotAuthorizedException, DomainNotFoundException, InvalidWorkbasketException,
WorkbasketAlreadyExistException, WorkbasketNotFoundException, InvalidArgumentException {
LOGGER.debug("Entry to importWorkbaskets()");
LOGGER.debug("Entry to importWorkbaskets()");
ObjectMapper mapper = new ObjectMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
List<WorkbasketDefinition> definitions = mapper.readValue(file.getInputStream(),
@ -141,8 +141,8 @@ public class WorkbasketDefinitionController {
workbasketService.setDistributionTargets(
// no verification necessary since the workbasket was already imported in step 1.
idConversion.get(definition.workbasket.getWorkbasketId()), distributionTargets);
}
LOGGER.debug("Exit from importWorkbaskets(), returning {}", new ResponseEntity<>(HttpStatus.OK));
}
LOGGER.debug("Exit from importWorkbaskets(), returning {}", new ResponseEntity<>(HttpStatus.OK));
return new ResponseEntity<>(HttpStatus.OK);
}

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

@ -60,7 +60,7 @@ public class TaskFilter {
public List<TaskSummary> inspectParams(MultiValueMap<String, String> params)
throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to inspectParams(params= {})", params);
}
@ -125,7 +125,7 @@ public class TaskFilter {
taskQuery.transferredEquals(Boolean.getBoolean(params.get(IS_TRANSFERRED).get(0)));
}
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from inspectParams(), returning {}", LoggerUtils.listToString(taskQuery.list()));
}
@ -147,7 +147,7 @@ public class TaskFilter {
}
private TaskState[] extractStates(MultiValueMap<String, String> params) throws InvalidArgumentException {
if(LOGGER.isDebugEnabled()) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Entry to extractStates(params= {})", params);
}

5
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AccessIdResource.java
View File

@ -37,10 +37,7 @@ public class AccessIdResource {
@Override
public String toString() {
return "AccessIdResource [" +
"name=" + this.name +
", accessId=" + this.accessId +
"]";
return "AccessIdResource [" + "name=" + this.name + ", accessId=" + this.accessId + "]";
}
}

33
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResource.java
View File

@ -217,30 +217,13 @@ public class ClassificationResource extends ResourceSupport {
@Override
public String toString() {
return "ClassificationResource [" +
"classificationId=" + this.classificationId +
", key=" + this.key +
", parentId=" + this.parentId +
", parentKey=" + this.parentKey +
", category=" + this.category +
", type=" + this.type +
", domain=" + this.domain +
", isValidInDomain=" + this.isValidInDomain +
", created=" + this.created +
", modified=" + this.modified +
", name=" + this.name +
", description=" + this.description +
", priority=" + this.priority +
", serviceLevel=" + this.serviceLevel +
", applicationEntryPoint=" + this.applicationEntryPoint +
", custom1=" + this.custom1 +
", custom2=" + this.custom2 +
", custom3=" + this.custom3 +
", custom4=" + this.custom4 +
", custom5=" + this.custom5 +
", custom6=" + this.custom6 +
", custom7=" + this.custom7 +
", custom8=" + this.custom8 +
"]";
return "ClassificationResource [classificationId=" + classificationId + ", key=" + key + ", parentId="
+ parentId + ", parentKey=" + parentKey + ", category=" + category + ", type=" + type + ", domain=" + domain
+ ", isValidInDomain=" + isValidInDomain + ", created=" + created + ", modified=" + modified + ", name="
+ name + ", description=" + description + ", priority=" + priority + ", serviceLevel=" + serviceLevel
+ ", applicationEntryPoint=" + applicationEntryPoint + ", custom1=" + custom1 + ", custom2=" + custom2
+ ", custom3=" + custom3 + ", custom4=" + custom4 + ", custom5=" + custom5 + ", custom6=" + custom6
+ ", custom7=" + custom7 + ", custom8=" + custom8 + "]";
}
}

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

@ -65,10 +65,10 @@ public class ClassificationResourceAssembler {
BeanUtils.copyProperties(classification, resource);
// need to be set by hand, because they are named different, or have different types
resource.setClassificationId(classification.getId());
if(classification.getCreated() != null){
if (classification.getCreated() != null) {
resource.setCreated(classification.getCreated().toString());
}
if(classification.getModified() != null){
if (classification.getModified() != null) {
resource.setModified(classification.getModified().toString());
}
return addLinks(resource, classification);

1
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinition.java
View File

@ -3,7 +3,6 @@ package pro.taskana.rest.resource;
import java.util.List;
import java.util.Set;
import pro.taskana.Workbasket;
import pro.taskana.WorkbasketAccessItem;
import pro.taskana.impl.util.LoggerUtils;

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

@ -1,6 +1,5 @@
package pro.taskana.rest.resource;
import java.io.IOException;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
@ -10,17 +9,12 @@ import java.util.stream.Collectors;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import pro.taskana.Workbasket;
import pro.taskana.WorkbasketAccessItem;
import pro.taskana.WorkbasketService;
import pro.taskana.WorkbasketSummary;
import pro.taskana.exceptions.DomainNotFoundException;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.InvalidWorkbasketException;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.exceptions.WorkbasketAlreadyExistException;
import pro.taskana.exceptions.WorkbasketNotFoundException;
import pro.taskana.impl.WorkbasketImpl;