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

TSK-1094 introduce models package for */api and */internal

This commit is contained in:
Jörg Heffner 2020-02-13 12:54:46 +01:00
parent 4c884819d5
commit 5c7d38451c
208 changed files with 609 additions and 572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,10 +11,10 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.ObjectReference;
import pro.taskana.task.api.models.Task;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
/** Example Bootstrap Application. */

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

@ -7,10 +7,10 @@ import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.models.ObjectReference;
import pro.taskana.task.api.models.Task;
import pro.taskana.workbasket.api.WorkbasketService;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;

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

@ -11,24 +11,24 @@ import javax.ws.rs.core.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.InvalidOwnerException;
import pro.taskana.common.api.exceptions.InvalidStateException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.workbasket.api.Workbasket;
import pro.taskana.task.api.models.ObjectReference;
import pro.taskana.task.api.models.Task;
import pro.taskana.workbasket.api.WorkbasketType;
import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException;
import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
import pro.taskana.workbasket.api.models.Workbasket;
/** TODO. */
@Path("/test")

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

@ -29,11 +29,11 @@ import org.slf4j.LoggerFactory;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.SystemException;
import pro.taskana.common.internal.TaskanaEngineImpl;
import pro.taskana.common.internal.configuration.DB;
import pro.taskana.common.internal.configuration.DbSchemaCreator;
import pro.taskana.task.api.TaskanaRole;
/**
* This central class creates the TaskanaEngine and holds all the information about DB and Security.

1
lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java
View File

@ -1,5 +1,6 @@
package pro.taskana.classification.api;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.api.BaseQuery;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.InvalidArgumentException;

1
lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationService.java
View File

@ -3,6 +3,7 @@ package pro.taskana.classification.api;
import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
import pro.taskana.classification.api.exceptions.ClassificationInUseException;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;

2
lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationAlreadyExistException.java
View File

@ -1,6 +1,6 @@
package pro.taskana.classification.api.exceptions;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.exceptions.TaskanaException;
/** Thrown, when a classification does already exits, but wanted to create with same ID+domain. */

2
lib/taskana-core/src/main/java/pro/taskana/classification/api/Classification.java → lib/taskana-core/src/main/java/pro/taskana/classification/api/models/Classification.java
View File

@ -1,4 +1,4 @@
package pro.taskana.classification.api;
package pro.taskana.classification.api.models;
import java.time.Instant;

2
lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationSummary.java → lib/taskana-core/src/main/java/pro/taskana/classification/api/models/ClassificationSummary.java
View File

@ -1,4 +1,4 @@
package pro.taskana.classification.api;
package pro.taskana.classification.api.models;
/**
* Interface for ClassificationSummaries. This is a specific short model-object which only requieres

2
lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java
View File

@ -8,6 +8,8 @@ import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import pro.taskana.classification.internal.models.ClassificationImpl;
/** This class is the mybatis mapping of classifications. */
@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"})
public interface ClassificationMapper {

2
lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java
View File

@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory;
import pro.taskana.classification.api.ClassificationQuery;
import pro.taskana.classification.api.ClassificationQueryColumnName;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.InvalidArgumentException;

2
lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryMapper.java
View File

@ -5,6 +5,8 @@ import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import pro.taskana.classification.internal.models.ClassificationSummaryImpl;
/** This class provides a mapper for all classification queries. */
@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"})
public interface ClassificationQueryMapper {

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

@ -13,14 +13,16 @@ import org.apache.ibatis.exceptions.PersistenceException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.ClassificationQuery;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
import pro.taskana.classification.api.exceptions.ClassificationInUseException;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.classification.internal.models.ClassificationImpl;
import pro.taskana.common.api.ScheduledJob;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
@ -28,8 +30,7 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.InternalTaskanaEngine;
import pro.taskana.common.internal.jobs.ClassificationChangedJob;
import pro.taskana.common.internal.util.IdGenerator;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.task.api.TaskanaRole;
import pro.taskana.task.api.models.TaskSummary;
import pro.taskana.task.internal.TaskMapper;
/** This is the implementation of ClassificationService. */

8
lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationImpl.java → lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java
View File

@ -1,10 +1,10 @@
package pro.taskana.classification.internal;
package pro.taskana.classification.internal.models;
import java.time.Instant;
import java.util.Objects;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.classification.api.models.ClassificationSummary;
/** Classification entity. */
public class ClassificationImpl extends ClassificationSummaryImpl implements Classification {
@ -17,7 +17,7 @@ public class ClassificationImpl extends ClassificationSummaryImpl implements Cla
public ClassificationImpl() {}
ClassificationImpl(ClassificationImpl classification) {
public ClassificationImpl(ClassificationImpl classification) {
this.id = classification.getId();
this.key = classification.getKey();
this.parentId = classification.getParentId();

4
lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationSummaryImpl.java → lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationSummaryImpl.java
View File

@ -1,8 +1,8 @@
package pro.taskana.classification.internal;
package pro.taskana.classification.internal.models;
import java.util.Objects;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.models.ClassificationSummary;
/** Implementation for the short summaries of a classification entity. */
public class ClassificationSummaryImpl implements ClassificationSummary {

1
lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java
View File

@ -7,7 +7,6 @@ import pro.taskana.classification.api.ClassificationService;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.monitor.api.MonitorService;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskanaRole;
import pro.taskana.workbasket.api.WorkbasketService;
/** The TaskanaEngine represents an overall set of all needed services. */

2
lib/taskana-core/src/main/java/pro/taskana/task/api/TaskanaRole.java → lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaRole.java
View File

@ -1,4 +1,4 @@
package pro.taskana.task.api;
package pro.taskana.common.api;
import java.util.Arrays;
import java.util.List;

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

@ -34,6 +34,7 @@ import pro.taskana.classification.internal.ClassificationServiceImpl;
import pro.taskana.common.api.JobService;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.AutocommitFailedException;
import pro.taskana.common.api.exceptions.ConnectionNotSetException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
@ -49,7 +50,6 @@ import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.monitor.internal.MonitorServiceImpl;
import pro.taskana.spi.history.internal.HistoryEventProducer;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskanaRole;
import pro.taskana.task.internal.AttachmentMapper;
import pro.taskana.task.internal.ObjectReferenceMapper;
import pro.taskana.task.internal.TaskMapper;

2
lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java
View File

@ -19,7 +19,7 @@ import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.task.api.models.TaskSummary;
/** Job to cleanup completed tasks after a period of time. */
public class TaskCleanupJob extends AbstractTaskanaJob {

58
lib/taskana-core/src/main/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverter.java
View File

@ -82,35 +82,6 @@ public final class DaysToWorkingDaysConverter {
.orElse(0);
}
/**
* Computes the date of Easter Sunday for a given year.
*
* @param year for which the date of Easter Sunday should be calculated
* @return the date of Easter Sunday for the given year
*/
static LocalDate getEasterSunday(int year) {
// Formula to compute Easter Sunday by Gauss.
int a = year % 19;
int b = year % 4;
int c = year % 7;
int k = year / 100;
int p = (13 + 8 * k) / 25;
int q = k / 4;
int m = (15 - p + k - q) % 30;
int n = (4 + k - q) % 7;
int d = (19 * a + m) % 30;
int e = (2 * b + 4 * c + 6 * d + n) % 7;
if (d == 29 && e == 6) {
return LocalDate.of(year, 3, 15).plusDays(d + e);
}
if (d == 28 && e == 6 && (11 * m + 11) % 30 < 19) {
return LocalDate.of(year, 3, 15).plusDays(d + e);
}
return LocalDate.of(year, 3, 22).plusDays(d + e);
}
public boolean isWorkingDay(long day, Instant referenceDate) {
LocalDateTime dateToCheck =
LocalDateTime.ofInstant(referenceDate, ZoneId.systemDefault()).plusDays(day);
@ -150,6 +121,35 @@ public final class DaysToWorkingDaysConverter {
.anyMatch(diff -> diff == diffFromEasterSunday);
}
/**
* Computes the date of Easter Sunday for a given year.
*
* @param year for which the date of Easter Sunday should be calculated
* @return the date of Easter Sunday for the given year
*/
static LocalDate getEasterSunday(int year) {
// Formula to compute Easter Sunday by Gauss.
int a = year % 19;
int b = year % 4;
int c = year % 7;
int k = year / 100;
int p = (13 + 8 * k) / 25;
int q = k / 4;
int m = (15 - p + k - q) % 30;
int n = (4 + k - q) % 7;
int d = (19 * a + m) % 30;
int e = (2 * b + 4 * c + 6 * d + n) % 7;
if (d == 29 && e == 6) {
return LocalDate.of(year, 3, 15).plusDays(d + e);
}
if (d == 28 && e == 6 && (11 * m + 11) % 30 < 19) {
return LocalDate.of(year, 3, 15).plusDays(d + e);
}
return LocalDate.of(year, 3, 22).plusDays(d + e);
}
@Override
public String toString() {
return "DaysToWorkingDaysConverter{"

4
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java
View File

@ -8,7 +8,6 @@ import pro.taskana.monitor.api.reports.CustomFieldValueReport;
import pro.taskana.monitor.api.reports.TaskStatusReport;
import pro.taskana.monitor.api.reports.TimestampReport;
import pro.taskana.monitor.api.reports.WorkbasketReport;
import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.monitor.internal.reports.CategoryReportBuilderImpl;
import pro.taskana.monitor.internal.reports.ClassificationReportBuilderImpl;
import pro.taskana.monitor.internal.reports.CustomFieldValueReportBuilderImpl;
@ -23,8 +22,7 @@ public class MonitorServiceImpl implements MonitorService {
private InternalTaskanaEngine taskanaEngine;
private MonitorMapper monitorMapper;
public MonitorServiceImpl(
InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper) {
public MonitorServiceImpl(InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper) {
super();
this.taskanaEngine = taskanaEngine;
this.monitorMapper = monitorMapper;

60
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/preprocessor/DaysToWorkingDaysReportConverter.java
View File

@ -77,36 +77,6 @@ public class DaysToWorkingDaysReportConverter {
return new DaysToWorkingDaysReportConverter(columnHeaders, daysToWorkingDaysConverter);
}
protected List<Integer> generateNegativeDaysToWorkingDays(
List<? extends TimeIntervalColumnHeader> columnHeaders, Instant referenceDate) {
int minUpperLimit = TimeIntervalColumnHeader.getSmallestUpperLimit(columnHeaders);
List<Integer> daysToWorkingDays = new ArrayList<>();
daysToWorkingDays.add(0);
int day = -1;
int workingDay = 0;
while (workingDay > minUpperLimit) {
workingDay -= (daysToWorkingDaysConverter.isWorkingDay(day--, referenceDate)) ? 1 : 0;
daysToWorkingDays.add(workingDay);
}
return daysToWorkingDays;
}
protected List<Integer> generatePositiveDaysToWorkingDays(
List<? extends TimeIntervalColumnHeader> columnHeaders, Instant referenceDate) {
int maxLowerLimit = TimeIntervalColumnHeader.getLargestLowerLimit(columnHeaders);
ArrayList<Integer> daysToWorkingDays = new ArrayList<>();
daysToWorkingDays.add(0);
int day = 1;
int workingDay = 0;
while (workingDay < maxLowerLimit) {
workingDay += (daysToWorkingDaysConverter.isWorkingDay(day++, referenceDate)) ? 1 : 0;
daysToWorkingDays.add(workingDay);
}
return daysToWorkingDays;
}
/**
* Converts an integer, that represents the age in days, to the age in working days by using the
* table that was created by initialization. If the age in days is beyond the limits of the table,
@ -184,6 +154,36 @@ public class DaysToWorkingDaysReportConverter {
return list;
}
protected List<Integer> generateNegativeDaysToWorkingDays(
List<? extends TimeIntervalColumnHeader> columnHeaders, Instant referenceDate) {
int minUpperLimit = TimeIntervalColumnHeader.getSmallestUpperLimit(columnHeaders);
List<Integer> daysToWorkingDays = new ArrayList<>();
daysToWorkingDays.add(0);
int day = -1;
int workingDay = 0;
while (workingDay > minUpperLimit) {
workingDay -= (daysToWorkingDaysConverter.isWorkingDay(day--, referenceDate)) ? 1 : 0;
daysToWorkingDays.add(workingDay);
}
return daysToWorkingDays;
}
protected List<Integer> generatePositiveDaysToWorkingDays(
List<? extends TimeIntervalColumnHeader> columnHeaders, Instant referenceDate) {
int maxLowerLimit = TimeIntervalColumnHeader.getLargestLowerLimit(columnHeaders);
ArrayList<Integer> daysToWorkingDays = new ArrayList<>();
daysToWorkingDays.add(0);
int day = 1;
int workingDay = 0;
while (workingDay < maxLowerLimit) {
workingDay += (daysToWorkingDaysConverter.isWorkingDay(day++, referenceDate)) ? 1 : 0;
daysToWorkingDays.add(workingDay);
}
return daysToWorkingDays;
}
@Override
public String toString() {
return "DaysToWorkingDaysReportConverter [positiveDaysToWorkingDays="

2
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CategoryReportBuilderImpl.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.InternalTaskanaEngine;
@ -13,7 +14,6 @@ import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
import pro.taskana.monitor.api.reports.item.MonitorQueryItem;
import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor;
import pro.taskana.task.api.TaskanaRole;
/** The implementation of CategoryReportBuilder. */
public class CategoryReportBuilderImpl

5
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/ClassificationReportBuilderImpl.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.InternalTaskanaEngine;
@ -15,12 +16,10 @@ import pro.taskana.monitor.api.reports.item.DetailedMonitorQueryItem;
import pro.taskana.monitor.api.reports.item.MonitorQueryItem;
import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor;
import pro.taskana.task.api.TaskanaRole;
/** The implementation of ClassificationReportBuilder. */
public class ClassificationReportBuilderImpl
extends TimeIntervalReportBuilderImpl<
Builder, MonitorQueryItem, TimeIntervalColumnHeader>
extends TimeIntervalReportBuilderImpl<Builder, MonitorQueryItem, TimeIntervalColumnHeader>
implements ClassificationReport.Builder {
private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationReport.Builder.class);

9
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CustomFieldValueReportBuilderImpl.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.InternalTaskanaEngine;
@ -14,12 +15,10 @@ import pro.taskana.monitor.api.reports.item.MonitorQueryItem;
import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor;
import pro.taskana.task.api.CustomField;
import pro.taskana.task.api.TaskanaRole;
/** The implementation of CustomFieldValueReportBuilder. */
public class CustomFieldValueReportBuilderImpl
extends TimeIntervalReportBuilderImpl<
Builder, MonitorQueryItem, TimeIntervalColumnHeader>
extends TimeIntervalReportBuilderImpl<Builder, MonitorQueryItem, TimeIntervalColumnHeader>
implements CustomFieldValueReport.Builder {
private static final Logger LOGGER =
@ -28,9 +27,7 @@ public class CustomFieldValueReportBuilderImpl
private CustomField customField;
public CustomFieldValueReportBuilderImpl(
InternalTaskanaEngine taskanaEngine,
MonitorMapper monitorMapper,
CustomField customField) {
InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper, CustomField customField) {
super(taskanaEngine, monitorMapper);
this.customField = customField;
}

2
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TaskStatusReportBuilderImpl.java
View File

@ -4,13 +4,13 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.InternalTaskanaEngine;
import pro.taskana.monitor.api.reports.TaskStatusReport;
import pro.taskana.monitor.api.reports.item.TaskQueryItem;
import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.TaskanaRole;
/** The implementation of TaskStatusReportBuilder. */
public class TaskStatusReportBuilderImpl implements TaskStatusReport.Builder {

5
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java
View File

@ -9,6 +9,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.InternalTaskanaEngine;
@ -22,7 +23,6 @@ import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportConverter;
import pro.taskana.task.api.CustomField;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.TaskanaRole;
/**
* Implementation of {@link TimeIntervalReportBuilder}.
@ -51,8 +51,7 @@ abstract class TimeIntervalReportBuilderImpl<
protected List<String> excludedClassificationIds;
protected Map<CustomField, String> customAttributeFilter;
TimeIntervalReportBuilderImpl(
InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper) {
TimeIntervalReportBuilderImpl(InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper) {
this.taskanaEngine = taskanaEngine;
this.monitorMapper = monitorMapper;
this.columnHeaders = Collections.emptyList();

5
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java
View File

@ -8,6 +8,7 @@ import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.InternalTaskanaEngine;
@ -19,13 +20,11 @@ import pro.taskana.monitor.api.reports.item.TimestampQueryItem;
import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.TaskanaRole;
import pro.taskana.task.api.Timestamp;
/** The implementation of {@link TimestampReport.Builder}. */
public class TimestampReportBuilderImpl
extends TimeIntervalReportBuilderImpl<
Builder, TimestampQueryItem, TimeIntervalColumnHeader>
extends TimeIntervalReportBuilderImpl<Builder, TimestampQueryItem, TimeIntervalColumnHeader>
implements TimestampReport.Builder {
private static final Logger LOGGER = LoggerFactory.getLogger(TimestampReport.Builder.class);

5
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/WorkbasketReportBuilderImpl.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.InternalTaskanaEngine;
@ -14,12 +15,10 @@ import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
import pro.taskana.monitor.api.reports.item.MonitorQueryItem;
import pro.taskana.monitor.internal.MonitorMapper;
import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor;
import pro.taskana.task.api.TaskanaRole;
/** The implementation of WorkbasketReportBuilder. */
public class WorkbasketReportBuilderImpl
extends TimeIntervalReportBuilderImpl<
Builder, MonitorQueryItem, TimeIntervalColumnHeader>
extends TimeIntervalReportBuilderImpl<Builder, MonitorQueryItem, TimeIntervalColumnHeader>
implements WorkbasketReport.Builder {
private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketReportBuilderImpl.class);

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

@ -1,6 +1,6 @@
package pro.taskana.spi.history.api.events.task;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.models.Task;
/** Event fired if a task is cancelled to be claimed. */
public class ClaimCancelledEvent extends TaskEvent {

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

@ -1,6 +1,6 @@
package pro.taskana.spi.history.api.events.task;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.models.Task;
/** Event fired if a task is claimed. */
public class ClaimedEvent extends TaskEvent {

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

@ -1,7 +1,7 @@
package pro.taskana.spi.history.api.events.task;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.api.models.TaskSummary;
/** Event fired if a task is completed. */
public class CompletedEvent extends TaskEvent {

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

@ -1,6 +1,6 @@
package pro.taskana.spi.history.api.events.task;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.models.Task;
/** Event fired if a task is created. */
public class CreatedEvent extends TaskEvent {

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

@ -1,8 +1,8 @@
package pro.taskana.spi.history.api.events.task;
import pro.taskana.spi.history.api.events.TaskanaHistoryEvent;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.api.models.TaskSummary;
/** Super class for all task related events. */
public class TaskEvent extends TaskanaHistoryEvent {

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

@ -3,8 +3,8 @@ package pro.taskana.spi.history.api.events.task;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.task.api.Task;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.task.api.models.Task;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** Event fired if a task is transferred. */
public class TransferredEvent extends TaskEvent {

2
lib/taskana-core/src/main/java/pro/taskana/spi/routing/api/TaskRoutingProvider.java
View File

@ -1,7 +1,7 @@
package pro.taskana.spi.routing.api;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.models.Task;
/** Interface for TASKANA TaskRoutingProvider SPI. */
public interface TaskRoutingProvider {

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

@ -1,6 +1,7 @@
package pro.taskana.task.api;
import pro.taskana.common.api.BaseQuery;
import pro.taskana.task.api.models.ObjectReference;
/** ObjectReferenceQuery for generating dynamic sql. */
public interface ObjectReferenceQuery

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

@ -4,6 +4,7 @@ import pro.taskana.common.api.BaseQuery;
import pro.taskana.common.api.KeyDomain;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.task.api.models.TaskSummary;
/** TaskQuery for generating dynamic sql. */
public interface TaskQuery extends BaseQuery<TaskSummary, TaskQueryColumnName> {

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

@ -3,8 +3,8 @@ package pro.taskana.task.api;
import java.util.List;
import java.util.Map;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
import pro.taskana.common.api.exceptions.ConcurrencyException;
@ -15,6 +15,9 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Attachment;
import pro.taskana.task.api.models.ObjectReference;
import pro.taskana.task.api.models.Task;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
/** The Task Service manages all operations on tasks. */

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

@ -1,5 +1,7 @@
package pro.taskana.task.api;
import pro.taskana.task.api.models.Task;
/** This enum contains all timestamps saved in the database table for a {@link Task}. */
public enum Timestamp {
CREATED,

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

@ -1,9 +1,9 @@
package pro.taskana.task.api;
package pro.taskana.task.api.models;
import java.time.Instant;
import java.util.Map;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.models.ClassificationSummary;
/** Attachment-Interface to specify Attachment Attributes. */
public interface Attachment extends AttachmentSummary {

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

@ -1,8 +1,8 @@
package pro.taskana.task.api;
package pro.taskana.task.api.models;
import java.time.Instant;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.models.ClassificationSummary;
/**
* Interface for AttachmentSummaries. This is a specific short model-object which only contains the

2
lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReference.java → lib/taskana-core/src/main/java/pro/taskana/task/api/models/ObjectReference.java
View File

@ -1,4 +1,4 @@
package pro.taskana.task.api;
package pro.taskana.task.api.models;
import java.util.Objects;

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

@ -1,11 +1,12 @@
package pro.taskana.task.api;
package pro.taskana.task.api.models;
import java.time.Instant;
import java.util.List;
import java.util.Map;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.task.api.TaskService;
/** task-Interface to specify attribute interactions. */
public interface Task extends TaskSummary {

7
lib/taskana-core/src/main/java/pro/taskana/task/api/TaskSummary.java → lib/taskana-core/src/main/java/pro/taskana/task/api/models/TaskSummary.java
View File

@ -1,11 +1,12 @@
package pro.taskana.task.api;
package pro.taskana.task.api.models;
import java.time.Instant;
import java.util.List;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.task.api.TaskState;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
/**
* Interface for TaskSummary. This is a specific short model-object which only contains the most

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

@ -12,6 +12,8 @@ import org.apache.ibatis.annotations.Update;
import org.apache.ibatis.type.ClobTypeHandler;
import pro.taskana.common.internal.persistence.MapTypeHandler;
import pro.taskana.task.internal.models.AttachmentImpl;
import pro.taskana.task.internal.models.AttachmentSummaryImpl;
/** This class is the mybatis mapping of Attachment. */
@SuppressWarnings("checkstyle:LineLength")

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

@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.models.ObjectReference;
/** This class is the mybatis mapping of ObjectReference. */
@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"})

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

@ -11,9 +11,9 @@ import org.slf4j.LoggerFactory;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.exceptions.TaskanaRuntimeException;
import pro.taskana.common.internal.InternalTaskanaEngine;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.ObjectReferenceQuery;
import pro.taskana.task.api.ObjectReferenceQueryColumnName;
import pro.taskana.task.api.models.ObjectReference;
/**
* Implementation of ObjectReferenceQuery interface.

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

@ -14,6 +14,9 @@ import org.apache.ibatis.annotations.Update;
import pro.taskana.common.internal.CustomPropertySelector;
import pro.taskana.common.internal.persistence.MapTypeHandler;
import pro.taskana.task.api.CallbackState;
import pro.taskana.task.internal.models.MinimalTaskSummary;
import pro.taskana.task.internal.models.TaskImpl;
import pro.taskana.task.internal.models.TaskSummaryImpl;
/** This class is the mybatis mapping of task. */
@SuppressWarnings("checkstyle:LineLength")

5
lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java
View File

@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
import pro.taskana.common.api.KeyDomain;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
@ -23,8 +24,8 @@ import pro.taskana.task.api.ObjectReferenceQuery;
import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskQueryColumnName;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.task.api.TaskanaRole;
import pro.taskana.task.api.models.TaskSummary;
import pro.taskana.task.internal.models.TaskSummaryImpl;
import pro.taskana.workbasket.api.WorkbasketPermission;
import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;

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

@ -5,7 +5,8 @@ import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.models.ObjectReference;
import pro.taskana.task.internal.models.TaskSummaryImpl;
/** This class provides a mapper for all task queries. */
@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"})

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

@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
import pro.taskana.common.api.TaskanaEngine;
import pro.taskana.spi.routing.api.TaskRoutingProvider;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.models.Task;
/**
* Loads TaskRoutingProvider SPI implementation(s) and passes requests to determine workbasketids to

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

@ -16,12 +16,13 @@ import org.apache.ibatis.exceptions.PersistenceException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
@ -41,24 +42,28 @@ import pro.taskana.spi.history.api.events.task.ClaimedEvent;
import pro.taskana.spi.history.api.events.task.CompletedEvent;
import pro.taskana.spi.history.api.events.task.CreatedEvent;
import pro.taskana.spi.history.internal.HistoryEventProducer;
import pro.taskana.task.api.Attachment;
import pro.taskana.task.api.CallbackState;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.task.api.TaskanaRole;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.workbasket.api.Workbasket;
import pro.taskana.task.api.models.Attachment;
import pro.taskana.task.api.models.ObjectReference;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.api.models.TaskSummary;
import pro.taskana.task.internal.models.AttachmentImpl;
import pro.taskana.task.internal.models.AttachmentSummaryImpl;
import pro.taskana.task.internal.models.MinimalTaskSummary;
import pro.taskana.task.internal.models.TaskImpl;
import pro.taskana.task.internal.models.TaskSummaryImpl;
import pro.taskana.workbasket.api.WorkbasketPermission;
import pro.taskana.workbasket.api.WorkbasketService;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
import pro.taskana.workbasket.api.models.Workbasket;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
import pro.taskana.workbasket.internal.WorkbasketQueryImpl;
import pro.taskana.workbasket.internal.WorkbasketSummaryImpl;
import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl;
/** This is the implementation of TaskService. */
@SuppressWarnings("checkstyle:OverloadMethodsDeclarationOrder")

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

@ -20,14 +20,17 @@ import pro.taskana.common.internal.InternalTaskanaEngine;
import pro.taskana.common.internal.security.CurrentUserContext;
import pro.taskana.spi.history.api.events.task.TransferredEvent;
import pro.taskana.spi.history.internal.HistoryEventProducer;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.workbasket.api.Workbasket;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.internal.models.MinimalTaskSummary;
import pro.taskana.task.internal.models.TaskImpl;
import pro.taskana.task.internal.models.TaskSummaryImpl;
import pro.taskana.workbasket.api.WorkbasketPermission;
import pro.taskana.workbasket.api.WorkbasketService;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
import pro.taskana.workbasket.api.models.Workbasket;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
import pro.taskana.workbasket.internal.WorkbasketQueryImpl;
/** This class is responsible for the transfer of tasks. */

6
lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentImpl.java → lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentImpl.java
View File

@ -1,11 +1,11 @@
package pro.taskana.task.internal;
package pro.taskana.task.internal.models;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import pro.taskana.task.api.Attachment;
import pro.taskana.task.api.AttachmentSummary;
import pro.taskana.task.api.models.Attachment;
import pro.taskana.task.api.models.AttachmentSummary;
/**
* Attachment entity.

10
lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentSummaryImpl.java → lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentSummaryImpl.java
View File

@ -1,12 +1,12 @@
package pro.taskana.task.internal;
package pro.taskana.task.internal.models;
import java.time.Instant;
import java.util.Objects;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.internal.ClassificationSummaryImpl;
import pro.taskana.task.api.AttachmentSummary;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.classification.internal.models.ClassificationSummaryImpl;
import pro.taskana.task.api.models.AttachmentSummary;
import pro.taskana.task.api.models.ObjectReference;
/** The most important fields of the Attachment entity. */
public class AttachmentSummaryImpl implements AttachmentSummary {

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

@ -1,4 +1,4 @@
package pro.taskana.task.internal;
package pro.taskana.task.internal.models;
import pro.taskana.task.api.CallbackState;
import pro.taskana.task.api.TaskState;

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

@ -1,4 +1,4 @@
package pro.taskana.task.internal;
package pro.taskana.task.internal.models;
import java.util.ArrayList;
import java.util.Collections;
@ -7,14 +7,14 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import pro.taskana.classification.internal.ClassificationSummaryImpl;
import pro.taskana.classification.internal.models.ClassificationSummaryImpl;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.task.api.Attachment;
import pro.taskana.task.api.AttachmentSummary;
import pro.taskana.task.api.CallbackState;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.workbasket.internal.WorkbasketSummaryImpl;
import pro.taskana.task.api.models.Attachment;
import pro.taskana.task.api.models.AttachmentSummary;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.api.models.TaskSummary;
import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl;
/** Task entity. */
public class TaskImpl extends TaskSummaryImpl implements Task {
@ -27,7 +27,7 @@ public class TaskImpl extends TaskSummaryImpl implements Task {
private CallbackState callbackState;
private List<Attachment> attachments = new ArrayList<>();
TaskImpl() {}
public TaskImpl() {}
public CallbackState getCallbackState() {
return callbackState;

18
lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskSummaryImpl.java → lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java
View File

@ -1,19 +1,19 @@
package pro.taskana.task.internal;
package pro.taskana.task.internal.models;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.internal.ClassificationSummaryImpl;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.classification.internal.models.ClassificationSummaryImpl;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.task.api.AttachmentSummary;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.workbasket.internal.WorkbasketSummaryImpl;
import pro.taskana.task.api.models.AttachmentSummary;
import pro.taskana.task.api.models.ObjectReference;
import pro.taskana.task.api.models.TaskSummary;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl;
/** Entity which contains the most important informations about a Task. */
public class TaskSummaryImpl implements TaskSummary {
@ -62,7 +62,7 @@ public class TaskSummaryImpl implements TaskSummary {
protected String custom15;
protected String custom16;
TaskSummaryImpl() {}
public TaskSummaryImpl() {}
/*
* (non-Javadoc)

1
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AbstractWorkbasketAccessItemQuery.java
View File

@ -1,6 +1,7 @@
package pro.taskana.workbasket.api;
import pro.taskana.common.api.BaseQuery;
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
/**
* AbstractWorkbasketAccessItemQuery for generating dynamic sql.

1
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItemQuery.java
View File

@ -1,6 +1,7 @@
package pro.taskana.workbasket.api;
import pro.taskana.common.api.BaseQuery;
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
/** WorkbasketAccessItemQuery for generating dynamic SQL. */
public interface WorkbasketAccessItemQuery

1
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQuery.java
View File

@ -4,6 +4,7 @@ import pro.taskana.common.api.BaseQuery;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** WorkitemQuery for generating dynamic sql. */
public interface WorkbasketQuery extends BaseQuery<WorkbasketSummary, WorkbasketQueryColumnName> {

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

@ -13,6 +13,9 @@ import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistExc
import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException;
import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
import pro.taskana.workbasket.api.models.Workbasket;
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** This service manages Workbaskets. */
public interface WorkbasketService {

2
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAccessItemAlreadyExistException.java
View File

@ -1,7 +1,7 @@
package pro.taskana.workbasket.api.exceptions;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.workbasket.api.WorkbasketAccessItem;
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
public class WorkbasketAccessItemAlreadyExistException extends TaskanaException {
private static final long serialVersionUID = 4716611657569005013L;

2
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAlreadyExistException.java
View File

@ -1,7 +1,7 @@
package pro.taskana.workbasket.api.exceptions;
import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.workbasket.api.Workbasket;
import pro.taskana.workbasket.api.models.Workbasket;
/** Thrown, when a workbasket does already exits, but wanted to create with same ID. */
public class WorkbasketAlreadyExistException extends TaskanaException {

4
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/Workbasket.java → lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/Workbasket.java
View File

@ -1,7 +1,9 @@
package pro.taskana.workbasket.api;
package pro.taskana.workbasket.api.models;
import java.time.Instant;
import pro.taskana.workbasket.api.WorkbasketType;
/** Workbasket entity interface. */
// @JsonDeserialize(as = WorkbasketImpl.class)
public interface Workbasket extends WorkbasketSummary {

2
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItem.java → lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/WorkbasketAccessItem.java
View File

@ -1,4 +1,4 @@
package pro.taskana.workbasket.api;
package pro.taskana.workbasket.api.models;
/**
* Interface for WorkbasketAccessItem. This interface is used to control access of users to

4
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketSummary.java → lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/WorkbasketSummary.java
View File

@ -1,4 +1,6 @@
package pro.taskana.workbasket.api;
package pro.taskana.workbasket.api.models;
import pro.taskana.workbasket.api.WorkbasketType;
/**
* Interface for WorkbasketSummary. This is a specific short model-object which only contains the

2
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/AbstractWorkbasketAccessItemQueryImpl.java
View File

@ -13,7 +13,7 @@ import pro.taskana.common.api.exceptions.TaskanaRuntimeException;
import pro.taskana.common.internal.InternalTaskanaEngine;
import pro.taskana.workbasket.api.AbstractWorkbasketAccessItemQuery;
import pro.taskana.workbasket.api.AccessItemQueryColumnName;
import pro.taskana.workbasket.api.WorkbasketAccessItem;
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
/**
* AbstractWorkbasketAccessItemQueryImpl for generating dynamic SQL.

3
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java
View File

@ -12,8 +12,9 @@ import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.exceptions.TaskanaRuntimeException;
import pro.taskana.common.internal.InternalTaskanaEngine;
import pro.taskana.workbasket.api.AccessItemQueryColumnName;
import pro.taskana.workbasket.api.WorkbasketAccessItem;
import pro.taskana.workbasket.api.WorkbasketAccessItemQuery;
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl;
/** WorkbasketAccessItemQueryImpl for generating dynamic SQL. */
public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery {

2
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessMapper.java
View File

@ -10,6 +10,8 @@ import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl;
/** This class is the mybatis mapping of workbasket access items. */
@SuppressWarnings("checkstyle:LineLength")
public interface WorkbasketAccessMapper {

3
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java
View File

@ -10,6 +10,9 @@ import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import pro.taskana.workbasket.internal.models.WorkbasketImpl;
import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl;
/** This class is the mybatis mapping of workbaskets. */
@SuppressWarnings("checkstyle:LineLength")
public interface WorkbasketMapper {

4
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java
View File

@ -10,18 +10,18 @@ import org.slf4j.LoggerFactory;
import pro.taskana.TaskanaEngineConfiguration;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaRuntimeException;
import pro.taskana.common.internal.InternalTaskanaEngine;
import pro.taskana.common.internal.security.CurrentUserContext;
import pro.taskana.task.api.TaskanaRole;
import pro.taskana.workbasket.api.WorkbasketPermission;
import pro.taskana.workbasket.api.WorkbasketQuery;
import pro.taskana.workbasket.api.WorkbasketQueryColumnName;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.workbasket.api.WorkbasketType;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
/**
* WorkbasketQuery for generating dynamic SQL.

2
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java
View File

@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import pro.taskana.workbasket.api.WorkbasketAccessItemQuery;
import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl;
import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl;
/** This class provides a mapper for all queries. */
@SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"})

11
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java
View File

@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory;
import pro.taskana.TaskanaEngineConfiguration;
import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.LoggerUtils;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
@ -24,19 +25,21 @@ import pro.taskana.common.internal.InternalTaskanaEngine;
import pro.taskana.common.internal.security.CurrentUserContext;
import pro.taskana.common.internal.util.IdGenerator;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.TaskanaRole;
import pro.taskana.workbasket.api.Workbasket;
import pro.taskana.workbasket.api.WorkbasketAccessItem;
import pro.taskana.workbasket.api.WorkbasketAccessItemQuery;
import pro.taskana.workbasket.api.WorkbasketPermission;
import pro.taskana.workbasket.api.WorkbasketQuery;
import pro.taskana.workbasket.api.WorkbasketService;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException;
import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException;
import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException;
import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
import pro.taskana.workbasket.api.models.Workbasket;
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl;
import pro.taskana.workbasket.internal.models.WorkbasketImpl;
import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl;
/** This is the implementation of WorkbasketService. */
public class WorkbasketServiceImpl implements WorkbasketService {

6
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemImpl.java → lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketAccessItemImpl.java
View File

@ -1,8 +1,8 @@
package pro.taskana.workbasket.internal;
package pro.taskana.workbasket.internal.models;
import java.util.Objects;
import pro.taskana.workbasket.api.WorkbasketAccessItem;
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
/** WorkbasketAccessItemImpl Entity. */
public class WorkbasketAccessItemImpl implements WorkbasketAccessItem {
@ -30,7 +30,7 @@ public class WorkbasketAccessItemImpl implements WorkbasketAccessItem {
private boolean permCustom11;
private boolean permCustom12;
WorkbasketAccessItemImpl() {
public WorkbasketAccessItemImpl() {
super();
}

6
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketImpl.java → lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketImpl.java
View File

@ -1,10 +1,10 @@
package pro.taskana.workbasket.internal;
package pro.taskana.workbasket.internal.models;
import java.time.Instant;
import java.util.Objects;
import pro.taskana.workbasket.api.Workbasket;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.workbasket.api.models.Workbasket;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** Workbasket entity. */
public class WorkbasketImpl extends WorkbasketSummaryImpl implements Workbasket {

4
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketSummaryImpl.java → lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketSummaryImpl.java
View File

@ -1,9 +1,9 @@
package pro.taskana.workbasket.internal;
package pro.taskana.workbasket.internal.models;
import java.util.Objects;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.workbasket.api.WorkbasketType;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** This entity contains the most important information about a workbasket. */
public class WorkbasketSummaryImpl implements WorkbasketSummary {

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

@ -20,8 +20,8 @@ import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.internal.TaskanaEngineTestConfiguration;
import pro.taskana.sampledata.SampleDataGenerator;
import pro.taskana.task.api.Attachment;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.models.Attachment;
import pro.taskana.task.api.models.ObjectReference;
/** Base class for all acceptance tests. */
public abstract class AbstractAccTest {

4
lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java
View File

@ -7,11 +7,11 @@ import acceptance.AbstractAccTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.internal.ClassificationImpl;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.classification.internal.models.ClassificationImpl;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;

2
lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java
View File

@ -9,10 +9,10 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.exceptions.ClassificationInUseException;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;

4
lib/taskana-core/src/test/java/acceptance/classification/GetClassificationAccTest.java
View File

@ -8,10 +8,10 @@ import java.util.List;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.classification.api.models.ClassificationSummary;
/** Acceptance test for all "get classification" scenarios. */
class GetClassificationAccTest extends AbstractAccTest {

2
lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java
View File

@ -15,8 +15,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.common.api.BaseQuery.SortDirection;
import pro.taskana.common.api.TimeInterval;
import pro.taskana.common.api.exceptions.ConcurrencyException;

2
lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java
View File

@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.security.JaasExtension;
/** Acceptance test for all "query classifications with pagination" scenarios. */

6
lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java
View File

@ -18,10 +18,10 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.DomainNotFoundException;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
@ -30,10 +30,10 @@ import pro.taskana.common.internal.jobs.JobRunner;
import pro.taskana.common.internal.util.DaysToWorkingDaysConverter;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.internal.TaskImpl;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.internal.models.TaskImpl;
/** Acceptance test for all "update classification" scenarios. */
@ExtendWith(JaasExtension.class)

2
lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java
View File

@ -11,9 +11,9 @@ import org.h2.store.fs.FileUtils;
import org.junit.jupiter.api.Test;
import pro.taskana.TaskanaEngineConfiguration;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.internal.TaskanaEngineImpl;
import pro.taskana.common.internal.TaskanaEngineTestConfiguration;
import pro.taskana.task.api.TaskanaRole;
/**
* Test taskana's role configuration.

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

@ -19,11 +19,11 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.jobs.TaskCleanupJob;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.api.models.TaskSummary;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
/** Acceptance test for all "jobs tasks runner" scenarios. */

2
lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java
View File

@ -19,7 +19,7 @@ import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.workbasket.api.WorkbasketService;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** Acceptance test for all "jobs workbasket runner" scenarios. */
@ExtendWith(JaasExtension.class)

2
lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectReferenceAccTest.java
View File

@ -9,8 +9,8 @@ import acceptance.AbstractAccTest;
import java.util.List;
import org.junit.jupiter.api.Test;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.models.ObjectReference;
/** Acceptance test for all "get classification" scenarios. */
class QueryObjectReferenceAccTest extends AbstractAccTest {

2
lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java
View File

@ -10,10 +10,10 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.security.JaasExtension;
import pro.taskana.task.api.ObjectReference;
import pro.taskana.task.api.ObjectReferenceQuery;
import pro.taskana.task.api.TaskQuery;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.models.ObjectReference;
/** Acceptance test for all "query classifications with pagination" scenarios. */
@ExtendWith(JaasExtension.class)

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

@ -14,10 +14,10 @@ import java.util.TimeZone;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.Classification;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.classification.api.models.Classification;
import pro.taskana.common.api.JobService;
import pro.taskana.common.api.ScheduledJob;
import pro.taskana.common.api.exceptions.AttachmentPersistenceException;
@ -29,19 +29,19 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.JobServiceImpl;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.internal.TaskImpl;
import pro.taskana.workbasket.api.Workbasket;
import pro.taskana.workbasket.api.WorkbasketAccessItem;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.internal.models.TaskImpl;
import pro.taskana.workbasket.api.WorkbasketService;
import pro.taskana.workbasket.api.WorkbasketType;
import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException;
import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException;
import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
import pro.taskana.workbasket.api.models.Workbasket;
import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
/** Acceptance test for access to timestamps from different timezones. */
@ExtendWith(JaasExtension.class)

5
lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java
View File

@ -140,10 +140,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest {
List<TimeIntervalColumnHeader> columnHeaders = getShortListOfColumnHeaders();
CategoryReport report =
monitorService
.createCategoryReportBuilder()
.withColumnHeaders(columnHeaders)
.buildReport();
monitorService.createCategoryReportBuilder().withColumnHeaders(columnHeaders).buildReport();
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(reportToString(report, columnHeaders));

3
lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java
View File

@ -49,8 +49,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest {
throws InvalidArgumentException, NotAuthorizedException {
MonitorService monitorService = taskanaEngine.getMonitorService();
ClassificationReport report =
monitorService.createClassificationReportBuilder().buildReport();
ClassificationReport report = monitorService.createClassificationReportBuilder().buildReport();
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(reportToString(report));

12
lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java
View File

@ -40,9 +40,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
Assertions.assertThrows(
NotAuthorizedException.class,
() ->
monitorService
.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1)
.buildReport());
monitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1).buildReport());
}
@WithAccessId(userName = "monitor")
@ -52,9 +50,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
MonitorService monitorService = taskanaEngine.getMonitorService();
CustomFieldValueReport report =
monitorService
.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1)
.buildReport();
monitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1).buildReport();
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(reportToString(report));
@ -80,9 +76,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest {
MonitorService monitorService = taskanaEngine.getMonitorService();
CustomFieldValueReport report =
monitorService
.createCustomFieldValueReportBuilder(CustomField.CUSTOM_2)
.buildReport();
monitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_2).buildReport();
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(reportToString(report));

5
lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java
View File

@ -44,10 +44,7 @@ class ProvideTimestampReportAccTest extends AbstractReportAccTest {
.mapToObj(TimeIntervalColumnHeader.Date::new)
.collect(Collectors.toList());
TimestampReport timestampReport =
monitorService
.createTimestampReportBuilder()
.withColumnHeaders(headers)
.buildReport();
monitorService.createTimestampReportBuilder().withColumnHeaders(headers).buildReport();
final HashSet<String> org1Set = new HashSet<>(Arrays.asList("N/A", "org1"));
final HashSet<String> allOtherOrgLevelSet = new HashSet<>(Collections.singletonList("N/A"));

2
lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java
View File

@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.ClassificationSummary;
import pro.taskana.classification.api.models.ClassificationSummary;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;

2
lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java
View File

@ -8,11 +8,11 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.common.api.TaskanaRole;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.internal.TaskanaEngineProxyForTest;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskanaRole;
/** Acceptance test for task queries and authorization. */
@ExtendWith(JaasExtension.class)

2
lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java
View File

@ -11,7 +11,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.task.api.models.TaskSummary;
/** Acceptance test for task queries and authorization. */
@ExtendWith(JaasExtension.class)

2
lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java
View File

@ -14,7 +14,7 @@ import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.workbasket.api.WorkbasketPermission;
import pro.taskana.workbasket.api.WorkbasketService;
import pro.taskana.workbasket.api.WorkbasketSummary;
import pro.taskana.workbasket.api.models.WorkbasketSummary;
/** Acceptance test for workbasket queries and authorization. */
@ExtendWith(JaasExtension.class)

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

@ -25,13 +25,13 @@ import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.CallbackState;
import pro.taskana.task.api.Task;
import pro.taskana.task.api.TaskService;
import pro.taskana.task.api.TaskState;
import pro.taskana.task.api.TaskSummary;
import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
import pro.taskana.task.api.exceptions.TaskNotFoundException;
import pro.taskana.task.internal.TaskImpl;
import pro.taskana.task.api.models.Task;
import pro.taskana.task.api.models.TaskSummary;
import pro.taskana.task.internal.models.TaskImpl;
import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
/** Acceptance test for all "create task" scenarios. */

Some files were not shown because too many files have changed in this diff Show More