From e308578ced577706e1f6994473e0e6252f647b9e Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Thu, 6 Feb 2020 12:20:58 +0100 Subject: [PATCH] TSK-991: refactored report structure to meet api -> internal agreement --- .../rest/simplehistory/TaskHistoryEventController.java | 2 +- .../main/java/pro/taskana/TaskanaEngineConfiguration.java | 2 +- .../classification/internal/ClassificationQueryImpl.java | 2 +- .../java/pro/taskana/common/api/BulkOperationResults.java | 2 -- .../common/{internal/util => api}/LoggerUtils.java | 2 +- .../pro/taskana/common/internal/TaskanaEngineImpl.java | 2 +- .../pro/taskana/common/internal/jobs/TaskCleanupJob.java | 2 +- .../pro/taskana/common/internal/jobs/TaskRefreshJob.java | 2 +- .../taskana/common/internal/security/GroupPrincipal.java | 2 +- .../main/java/pro/taskana/report/api/CategoryReport.java | 4 ++-- .../java/pro/taskana/report/api/ClassificationReport.java | 6 +++--- .../pro/taskana/report/api/CustomFieldValueReport.java | 4 ++-- .../java/pro/taskana/report/api/TaskStatusReport.java | 4 ++-- .../pro/taskana/report/api/TimeIntervalReportBuilder.java | 4 ++-- .../main/java/pro/taskana/report/api/TimestampReport.java | 4 ++-- .../java/pro/taskana/report/api/WorkbasketReport.java | 4 ++-- .../{internal => api}/header/TaskStatusColumnHeader.java | 4 ++-- .../header/TimeIntervalColumnHeader.java | 4 ++-- .../report/{internal => api}/item/AgeQueryItem.java | 2 +- .../{internal => api}/item/DetailedMonitorQueryItem.java | 2 +- .../report/{internal => api}/item/MonitorQueryItem.java | 2 +- .../report/{internal => api}/item/TaskQueryItem.java | 2 +- .../report/{internal => api}/item/TimestampQueryItem.java | 2 +- .../taskana/report/api/row/DetailedClassificationRow.java | 2 +- .../main/java/pro/taskana/report/api/row/FoldableRow.java | 2 +- .../java/pro/taskana/report/api/row/TimestampRow.java | 2 +- .../report/internal/CategoryReportBuilderImpl.java | 4 ++-- .../report/internal/ClassificationReportBuilderImpl.java | 6 +++--- .../internal/CustomFieldValueReportBuilderImpl.java | 4 ++-- .../report/internal/DaysToWorkingDaysReportConverter.java | 4 ++-- .../pro/taskana/report/internal/TaskMonitorMapper.java | 8 ++++---- .../report/internal/TaskStatusReportBuilderImpl.java | 2 +- .../report/internal/TimeIntervalReportBuilderImpl.java | 6 +++--- .../report/internal/TimestampReportBuilderImpl.java | 4 ++-- .../report/internal/WorkbasketReportBuilderImpl.java | 4 ++-- .../preprocessor/DaysToWorkingDaysPreProcessor.java | 4 ++-- .../taskana/task/internal/ObjectReferenceQueryImpl.java | 2 +- .../java/pro/taskana/task/internal/TaskQueryImpl.java | 2 +- .../java/pro/taskana/task/internal/TaskServiceImpl.java | 2 +- .../java/pro/taskana/task/internal/TaskTransferrer.java | 2 +- .../internal/AbstractWorkbasketAccessItemQueryImpl.java | 2 +- .../internal/WorkbasketAccessItemQueryImpl.java | 2 +- .../taskana/workbasket/internal/WorkbasketQueryImpl.java | 2 +- .../workbasket/internal/WorkbasketServiceImpl.java | 2 +- .../report/GetTaskIdsOfCategoryReportAccTest.java | 2 +- .../report/GetTaskIdsOfClassificationReportAccTest.java | 2 +- .../report/GetTaskIdsOfCustomFieldValueReportAccTest.java | 2 +- .../report/GetTaskIdsOfWorkbasketReportAccTest.java | 2 +- .../acceptance/report/ProvideCategoryReportAccTest.java | 2 +- .../report/ProvideClassificationReportAccTest.java | 2 +- .../report/ProvideCustomFieldValueReportAccTest.java | 2 +- .../ProvideDetailedClassificationReportAccTest.java | 4 ++-- .../acceptance/report/ProvideTaskStatusReportAccTest.java | 4 ++-- .../acceptance/report/ProvideTimestampReportAccTest.java | 4 ++-- .../acceptance/report/ProvideWorkbasketReportAccTest.java | 2 +- .../src/test/java/pro/taskana/ArchitectureTest.java | 3 --- .../internal/util/DaysToWorkingDaysConverterTest.java | 3 +-- .../report/internal/CategoryReportBuilderImplTest.java | 4 ++-- .../internal/ClassificationReportBuilderImplTest.java | 6 +++--- .../internal/CustomFieldValueReportBuilderImplTest.java | 4 ++-- .../internal/DaysToWorkingDaysReportConverterTest.java | 2 +- .../test/java/pro/taskana/report/internal/ReportTest.java | 4 ++-- .../task/internal/TaskStatusReportBuilderImplTest.java | 2 +- .../internal/WorkbasketReportBuilderImplTest.java | 4 ++-- .../src/test/java/pro/taskana/ldap/LdapTest.java | 2 +- .../src/main/java/pro/taskana/ldap/LdapClient.java | 2 +- .../taskana/rest/ClassificationDefinitionController.java | 2 +- .../src/main/java/pro/taskana/rest/MonitorController.java | 2 +- .../main/java/pro/taskana/rest/WorkbasketController.java | 2 +- .../taskana/rest/resource/TaskanaUserInfoResource.java | 2 +- .../rest/resource/WorkbasketDefinitionResource.java | 2 +- .../pro/taskana/rest/resource/ReportResourceTest.java | 6 +++--- 72 files changed, 104 insertions(+), 110 deletions(-) rename lib/taskana-core/src/main/java/pro/taskana/common/{internal/util => api}/LoggerUtils.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/report/{internal => api}/header/TaskStatusColumnHeader.java (86%) rename lib/taskana-core/src/main/java/pro/taskana/report/{internal => api}/header/TimeIntervalColumnHeader.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/report/{internal => api}/item/AgeQueryItem.java (87%) rename lib/taskana-core/src/main/java/pro/taskana/report/{internal => api}/item/DetailedMonitorQueryItem.java (93%) rename lib/taskana-core/src/main/java/pro/taskana/report/{internal => api}/item/MonitorQueryItem.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/report/{internal => api}/item/TaskQueryItem.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/report/{internal => api}/item/TimestampQueryItem.java (96%) diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/simplehistory/TaskHistoryEventController.java b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/simplehistory/TaskHistoryEventController.java index 210a97640..ef4117333 100644 --- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/simplehistory/TaskHistoryEventController.java +++ b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/simplehistory/TaskHistoryEventController.java @@ -18,9 +18,9 @@ import org.springframework.web.bind.annotation.RestController; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.common.api.BaseQuery; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.rest.AbstractPagingController; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.TaskHistoryEventListAssembler; diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java index d2ad252f8..261f5237a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java +++ b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java @@ -27,12 +27,12 @@ import org.apache.ibatis.datasource.pooled.PooledDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.TaskanaEngine; 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.common.internal.util.LoggerUtils; import pro.taskana.task.api.TaskanaRole; /** diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java index 7bfd46115..d0f7c2102 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java @@ -11,11 +11,11 @@ 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.common.api.LoggerUtils; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.TaskanaRuntimeException; import pro.taskana.common.internal.InternalTaskanaEngine; -import pro.taskana.common.internal.util.LoggerUtils; /** * Implementation of ClassificationQuery interface. diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/BulkOperationResults.java b/lib/taskana-core/src/main/java/pro/taskana/common/api/BulkOperationResults.java index 52e0ebb41..ed66d865d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/api/BulkOperationResults.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/api/BulkOperationResults.java @@ -7,8 +7,6 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.common.internal.util.LoggerUtils; - /** * Returning type for a bulk db interaction with errors. This wrapper is storing them with a * matching object ID. diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/LoggerUtils.java b/lib/taskana-core/src/main/java/pro/taskana/common/api/LoggerUtils.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/util/LoggerUtils.java rename to lib/taskana-core/src/main/java/pro/taskana/common/api/LoggerUtils.java index f63cc5b38..89915c2d8 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/LoggerUtils.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/api/LoggerUtils.java @@ -1,4 +1,4 @@ -package pro.taskana.common.internal.util; +package pro.taskana.common.api; import java.util.List; import java.util.Map; diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java index 78b1cd891..c987ae4aa 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java @@ -32,6 +32,7 @@ import pro.taskana.classification.internal.ClassificationMapper; import pro.taskana.classification.internal.ClassificationQueryMapper; 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.exceptions.AutocommitFailedException; import pro.taskana.common.api.exceptions.ConnectionNotSetException; @@ -43,7 +44,6 @@ import pro.taskana.common.internal.persistence.InstantTypeHandler; import pro.taskana.common.internal.persistence.MapTypeHandler; import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.security.GroupPrincipal; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.history.internal.HistoryEventProducer; import pro.taskana.report.api.TaskMonitorService; import pro.taskana.report.internal.TaskMonitorMapper; diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java index 56514a9ad..3d5646b17 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java @@ -12,13 +12,13 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.BaseQuery; import pro.taskana.common.api.BulkOperationResults; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.ScheduledJob; import pro.taskana.common.api.TaskanaEngine; 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.common.internal.util.LoggerUtils; import pro.taskana.task.api.TaskSummary; /** Job to cleanup completed tasks after a period of time. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskRefreshJob.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskRefreshJob.java index e1d7a4631..c0f241953 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskRefreshJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskRefreshJob.java @@ -6,11 +6,11 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.ScheduledJob; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.task.internal.TaskServiceImpl; /** diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/security/GroupPrincipal.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/security/GroupPrincipal.java index 3353dbb60..d1a5bc9ca 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/security/GroupPrincipal.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/security/GroupPrincipal.java @@ -7,7 +7,7 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import pro.taskana.common.internal.util.LoggerUtils; +import pro.taskana.common.api.LoggerUtils; /** Represents a group with a name and a set of members. */ public class GroupPrincipal implements Group { diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/CategoryReport.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/CategoryReport.java index 87d41a13b..8c96fa273 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/CategoryReport.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/CategoryReport.java @@ -4,9 +4,9 @@ import java.util.List; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.api.structure.Report; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; /** * A CategoryReport contains the total numbers of tasks of the respective category as well as the diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/ClassificationReport.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/ClassificationReport.java index 9b324d47e..9297a58b6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/ClassificationReport.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/ClassificationReport.java @@ -4,13 +4,13 @@ import java.util.List; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.DetailedMonitorQueryItem; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.api.row.DetailedClassificationRow; import pro.taskana.report.api.row.FoldableRow; import pro.taskana.report.api.structure.Report; import pro.taskana.report.api.structure.Row; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.DetailedMonitorQueryItem; -import pro.taskana.report.internal.item.MonitorQueryItem; /** * The ClassificationReport extends the Report. The {@link Row}s of the ClassificationReport are diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/CustomFieldValueReport.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/CustomFieldValueReport.java index e10084d99..fc4fb494e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/CustomFieldValueReport.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/CustomFieldValueReport.java @@ -4,9 +4,9 @@ import java.util.List; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.api.structure.Report; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; /** * A CustomFieldValueReport contains the total numbers of tasks of the respective custom field as diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/TaskStatusReport.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/TaskStatusReport.java index a9f311957..b6929504e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/TaskStatusReport.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/TaskStatusReport.java @@ -6,9 +6,9 @@ import java.util.stream.Stream; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.report.api.header.TaskStatusColumnHeader; +import pro.taskana.report.api.item.TaskQueryItem; import pro.taskana.report.api.structure.Report; -import pro.taskana.report.internal.header.TaskStatusColumnHeader; -import pro.taskana.report.internal.item.TaskQueryItem; import pro.taskana.task.api.TaskState; /** diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/TimeIntervalReportBuilder.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/TimeIntervalReportBuilder.java index de5bafa67..364d7cb05 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/TimeIntervalReportBuilder.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/TimeIntervalReportBuilder.java @@ -5,10 +5,10 @@ import java.util.Map; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.AgeQueryItem; import pro.taskana.report.api.structure.Report; import pro.taskana.report.internal.SelectedItem; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.AgeQueryItem; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/TimestampReport.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/TimestampReport.java index dd2ddd52c..bdf4d719e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/TimestampReport.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/TimestampReport.java @@ -4,10 +4,10 @@ import java.util.List; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.TimestampQueryItem; import pro.taskana.report.api.row.TimestampRow; import pro.taskana.report.api.structure.Report; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.TimestampQueryItem; /** A {@link TimestampReport} displays created and competed tasks for a specific dates. */ public class TimestampReport extends Report { diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/WorkbasketReport.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/WorkbasketReport.java index e7e646e56..8b186357c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/WorkbasketReport.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/WorkbasketReport.java @@ -4,10 +4,10 @@ import java.util.List; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.api.structure.Report; import pro.taskana.report.internal.CombinedClassificationFilter; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; /** * A WorkbasketReport contains the total numbers of tasks of the respective workbasket as well as diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/header/TaskStatusColumnHeader.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/header/TaskStatusColumnHeader.java similarity index 86% rename from lib/taskana-core/src/main/java/pro/taskana/report/internal/header/TaskStatusColumnHeader.java rename to lib/taskana-core/src/main/java/pro/taskana/report/api/header/TaskStatusColumnHeader.java index 927db8f83..742b91247 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/header/TaskStatusColumnHeader.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/header/TaskStatusColumnHeader.java @@ -1,7 +1,7 @@ -package pro.taskana.report.internal.header; +package pro.taskana.report.api.header; +import pro.taskana.report.api.item.TaskQueryItem; import pro.taskana.report.api.structure.ColumnHeader; -import pro.taskana.report.internal.item.TaskQueryItem; import pro.taskana.task.api.TaskState; /** The TaskStatusColumnHeader represents a column for each {@link TaskState}. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/header/TimeIntervalColumnHeader.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/header/TimeIntervalColumnHeader.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/report/internal/header/TimeIntervalColumnHeader.java rename to lib/taskana-core/src/main/java/pro/taskana/report/api/header/TimeIntervalColumnHeader.java index 24fb55704..22949309d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/header/TimeIntervalColumnHeader.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/header/TimeIntervalColumnHeader.java @@ -1,12 +1,12 @@ -package pro.taskana.report.internal.header; +package pro.taskana.report.api.header; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Locale; +import pro.taskana.report.api.item.AgeQueryItem; import pro.taskana.report.api.structure.ColumnHeader; -import pro.taskana.report.internal.item.AgeQueryItem; /** * A TimeIntervalColumnHeader has a lower and an upper age limit which subdivide the count of tasks diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/AgeQueryItem.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/AgeQueryItem.java similarity index 87% rename from lib/taskana-core/src/main/java/pro/taskana/report/internal/item/AgeQueryItem.java rename to lib/taskana-core/src/main/java/pro/taskana/report/api/item/AgeQueryItem.java index b31c1ac76..bc578f211 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/AgeQueryItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/AgeQueryItem.java @@ -1,4 +1,4 @@ -package pro.taskana.report.internal.item; +package pro.taskana.report.api.item; import pro.taskana.report.api.structure.QueryItem; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/DetailedMonitorQueryItem.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/DetailedMonitorQueryItem.java similarity index 93% rename from lib/taskana-core/src/main/java/pro/taskana/report/internal/item/DetailedMonitorQueryItem.java rename to lib/taskana-core/src/main/java/pro/taskana/report/api/item/DetailedMonitorQueryItem.java index ccbba4f36..44487734f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/DetailedMonitorQueryItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/DetailedMonitorQueryItem.java @@ -1,4 +1,4 @@ -package pro.taskana.report.internal.item; +package pro.taskana.report.api.item; /** * The DetailedMonitorQueryItem extends the {@link MonitorQueryItem}. The additional attachment key diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/MonitorQueryItem.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/MonitorQueryItem.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/report/internal/item/MonitorQueryItem.java rename to lib/taskana-core/src/main/java/pro/taskana/report/api/item/MonitorQueryItem.java index b28c105bb..413021eeb 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/MonitorQueryItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/MonitorQueryItem.java @@ -1,4 +1,4 @@ -package pro.taskana.report.internal.item; +package pro.taskana.report.api.item; /** * The MonitorQueryItem entity contains the number of tasks for a key (e.g. workbasketKey) and age diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/TaskQueryItem.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/TaskQueryItem.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/report/internal/item/TaskQueryItem.java rename to lib/taskana-core/src/main/java/pro/taskana/report/api/item/TaskQueryItem.java index 6ad4d655a..dd641ff8f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/TaskQueryItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/TaskQueryItem.java @@ -1,4 +1,4 @@ -package pro.taskana.report.internal.item; +package pro.taskana.report.api.item; import pro.taskana.report.api.structure.QueryItem; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/TimestampQueryItem.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/TimestampQueryItem.java similarity index 96% rename from lib/taskana-core/src/main/java/pro/taskana/report/internal/item/TimestampQueryItem.java rename to lib/taskana-core/src/main/java/pro/taskana/report/api/item/TimestampQueryItem.java index 0147db725..7a25cb50e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/item/TimestampQueryItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/item/TimestampQueryItem.java @@ -1,4 +1,4 @@ -package pro.taskana.report.internal.item; +package pro.taskana.report.api.item; import pro.taskana.report.api.Timestamp; import pro.taskana.report.api.TimestampReport; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/row/DetailedClassificationRow.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/row/DetailedClassificationRow.java index 2b2da042a..edfe7746d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/row/DetailedClassificationRow.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/row/DetailedClassificationRow.java @@ -1,8 +1,8 @@ package pro.taskana.report.api.row; import pro.taskana.report.api.ClassificationReport; +import pro.taskana.report.api.item.DetailedMonitorQueryItem; import pro.taskana.report.api.structure.Row; -import pro.taskana.report.internal.item.DetailedMonitorQueryItem; /** * Represents a single Row inside {@link ClassificationReport.DetailedClassificationReport}. The diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/row/FoldableRow.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/row/FoldableRow.java index a5d24514d..15aa288fa 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/row/FoldableRow.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/row/FoldableRow.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import pro.taskana.common.internal.util.LoggerUtils; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.report.api.structure.QueryItem; import pro.taskana.report.api.structure.Report; import pro.taskana.report.api.structure.Row; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/row/TimestampRow.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/row/TimestampRow.java index 8aa10aaf1..b1e83a941 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/row/TimestampRow.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/row/TimestampRow.java @@ -1,8 +1,8 @@ package pro.taskana.report.api.row; import pro.taskana.report.api.TimestampReport; +import pro.taskana.report.api.item.TimestampQueryItem; import pro.taskana.report.api.structure.Row; -import pro.taskana.report.internal.item.TimestampQueryItem; /** * A single Row inside the {@link TimestampReport}. It contains 4 sub-rows for each org level diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/CategoryReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/CategoryReportBuilderImpl.java index 75de667f5..587daba4a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/CategoryReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/CategoryReportBuilderImpl.java @@ -8,8 +8,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.CategoryReport; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.internal.preprocessor.DaysToWorkingDaysPreProcessor; import pro.taskana.task.api.TaskanaRole; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/ClassificationReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/ClassificationReportBuilderImpl.java index dd5fcd1e5..be1590433 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/ClassificationReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/ClassificationReportBuilderImpl.java @@ -9,9 +9,9 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.ClassificationReport; import pro.taskana.report.api.ClassificationReport.DetailedClassificationReport; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.DetailedMonitorQueryItem; -import pro.taskana.report.internal.item.MonitorQueryItem; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.DetailedMonitorQueryItem; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.internal.preprocessor.DaysToWorkingDaysPreProcessor; import pro.taskana.task.api.TaskanaRole; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/CustomFieldValueReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/CustomFieldValueReportBuilderImpl.java index 06c67920d..36414d267 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/CustomFieldValueReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/CustomFieldValueReportBuilderImpl.java @@ -8,8 +8,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.CustomFieldValueReport; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.internal.preprocessor.DaysToWorkingDaysPreProcessor; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskanaRole; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/DaysToWorkingDaysReportConverter.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/DaysToWorkingDaysReportConverter.java index 2940faafe..0bd192b9f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/DaysToWorkingDaysReportConverter.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/DaysToWorkingDaysReportConverter.java @@ -6,10 +6,10 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.internal.util.DaysToWorkingDaysConverter; -import pro.taskana.common.internal.util.LoggerUtils; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; /** * The DaysToWorkingDaysReportConverter provides a method to convert an age in days into an age in diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskMonitorMapper.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskMonitorMapper.java index aefea85fd..9e81fbee0 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskMonitorMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskMonitorMapper.java @@ -8,10 +8,10 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import pro.taskana.report.api.Timestamp; -import pro.taskana.report.internal.item.DetailedMonitorQueryItem; -import pro.taskana.report.internal.item.MonitorQueryItem; -import pro.taskana.report.internal.item.TaskQueryItem; -import pro.taskana.report.internal.item.TimestampQueryItem; +import pro.taskana.report.api.item.DetailedMonitorQueryItem; +import pro.taskana.report.api.item.MonitorQueryItem; +import pro.taskana.report.api.item.TaskQueryItem; +import pro.taskana.report.api.item.TimestampQueryItem; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskStatusReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskStatusReportBuilderImpl.java index fbb5cc29d..82b7ab683 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskStatusReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskStatusReportBuilderImpl.java @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.TaskStatusReport; -import pro.taskana.report.internal.item.TaskQueryItem; +import pro.taskana.report.api.item.TaskQueryItem; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskanaRole; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TimeIntervalReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TimeIntervalReportBuilderImpl.java index 230485cec..160f6b4c7 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TimeIntervalReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TimeIntervalReportBuilderImpl.java @@ -8,15 +8,15 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.util.DaysToWorkingDaysConverter; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.report.api.ClassificationReport; import pro.taskana.report.api.TimeIntervalReportBuilder; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.AgeQueryItem; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.AgeQueryItem; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskanaRole; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TimestampReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TimestampReportBuilderImpl.java index 7a7910fc2..ecd7662dc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TimestampReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TimestampReportBuilderImpl.java @@ -13,8 +13,8 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.Timestamp; import pro.taskana.report.api.TimestampReport; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.TimestampQueryItem; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.TimestampQueryItem; import pro.taskana.report.internal.preprocessor.DaysToWorkingDaysPreProcessor; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskanaRole; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/WorkbasketReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/WorkbasketReportBuilderImpl.java index 9172f8ada..2c956b966 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/WorkbasketReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/WorkbasketReportBuilderImpl.java @@ -8,8 +8,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.WorkbasketReport; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.internal.preprocessor.DaysToWorkingDaysPreProcessor; import pro.taskana.task.api.TaskanaRole; diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/preprocessor/DaysToWorkingDaysPreProcessor.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/preprocessor/DaysToWorkingDaysPreProcessor.java index 090a3ae63..d88f777fe 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/preprocessor/DaysToWorkingDaysPreProcessor.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/preprocessor/DaysToWorkingDaysPreProcessor.java @@ -4,10 +4,10 @@ import java.util.List; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.internal.util.DaysToWorkingDaysConverter; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.AgeQueryItem; import pro.taskana.report.api.structure.QueryItemPreprocessor; import pro.taskana.report.internal.DaysToWorkingDaysReportConverter; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.AgeQueryItem; /** * Uses {@link DaysToWorkingDaysConverter} to convert an <I>s age to working days. diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceQueryImpl.java index 26a4121af..6f638ad64 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceQueryImpl.java @@ -8,9 +8,9 @@ import org.apache.ibatis.session.RowBounds; import org.slf4j.Logger; 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.common.internal.util.LoggerUtils; import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.ObjectReferenceQuery; import pro.taskana.task.api.ObjectReferenceQueryColumnName; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java index 94252fd6b..b34cd9a37 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java @@ -10,6 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pro.taskana.common.api.KeyDomain; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; @@ -17,7 +18,6 @@ import pro.taskana.common.api.exceptions.TaskanaRuntimeException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.configuration.DB; import pro.taskana.common.internal.security.CurrentUserContext; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.task.api.CallbackState; import pro.taskana.task.api.ObjectReferenceQuery; import pro.taskana.task.api.TaskQuery; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java index 662d7188e..6f20c9006 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java @@ -21,6 +21,7 @@ import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; import pro.taskana.common.api.BulkOperationResults; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.AttachmentPersistenceException; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.InvalidArgumentException; @@ -34,7 +35,6 @@ import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.util.DaysToWorkingDaysConverter; import pro.taskana.common.internal.util.IdGenerator; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.history.api.events.task.ClaimCancelledEvent; import pro.taskana.history.api.events.task.ClaimedEvent; import pro.taskana.history.api.events.task.CompletedEvent; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskTransferrer.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskTransferrer.java index dc32142f6..edce6c7aa 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskTransferrer.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskTransferrer.java @@ -11,13 +11,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pro.taskana.common.api.BulkOperationResults; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidStateException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.security.CurrentUserContext; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.history.api.events.task.TransferredEvent; import pro.taskana.history.internal.HistoryEventProducer; import pro.taskana.task.api.Task; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/AbstractWorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/AbstractWorkbasketAccessItemQueryImpl.java index 7b83aa434..e45e3c77a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/AbstractWorkbasketAccessItemQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/AbstractWorkbasketAccessItemQueryImpl.java @@ -8,9 +8,9 @@ import org.apache.ibatis.session.RowBounds; import org.slf4j.Logger; 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.common.internal.util.LoggerUtils; import pro.taskana.workbasket.api.AbstractWorkbasketAccessItemQuery; import pro.taskana.workbasket.api.AccessItemQueryColumnName; import pro.taskana.workbasket.api.WorkbasketAccessItem; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java index 35f32f3fb..ee76f60d6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java @@ -8,9 +8,9 @@ import org.apache.ibatis.session.RowBounds; import org.slf4j.Logger; 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.common.internal.util.LoggerUtils; import pro.taskana.workbasket.api.AccessItemQueryColumnName; import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketAccessItemQuery; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java index 836633463..d1574049a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java @@ -9,13 +9,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pro.taskana.TaskanaEngineConfiguration; +import pro.taskana.common.api.LoggerUtils; 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.common.internal.util.LoggerUtils; import pro.taskana.task.api.TaskanaRole; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketQuery; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java index 7ccb0646c..9dc6e0cdd 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java @@ -14,6 +14,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.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; @@ -21,7 +22,6 @@ import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.util.IdGenerator; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskanaRole; import pro.taskana.workbasket.api.Workbasket; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java index 538c8d027..8f163563f 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.report.internal.SelectedItem; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java index af7ae6934..43f0a9ea6 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.report.internal.SelectedItem; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java index a54e82cdb..900134350 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.report.internal.SelectedItem; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java index ca3509e5c..8b73443b5 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java @@ -13,8 +13,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.report.internal.SelectedItem; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java index dc8c84d73..9dccc5131 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java @@ -21,7 +21,7 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.CategoryReport; import pro.taskana.report.api.TaskMonitorService; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java index f34a1d513..9e44f0ac0 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java @@ -21,7 +21,7 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.ClassificationReport; import pro.taskana.report.api.TaskMonitorService; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java index fdd5e3dd4..8f365cf97 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java @@ -20,7 +20,7 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.CustomFieldValueReport; import pro.taskana.report.api.TaskMonitorService; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java index 83b10105a..f4bfe3190 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java @@ -20,10 +20,10 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.ClassificationReport.DetailedClassificationReport; import pro.taskana.report.api.TaskMonitorService; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.DetailedMonitorQueryItem; import pro.taskana.report.api.row.FoldableRow; import pro.taskana.report.api.structure.Row; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.DetailedMonitorQueryItem; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java index 6475cedff..a57f9ee38 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java @@ -17,9 +17,9 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; import pro.taskana.report.api.TaskStatusReport; +import pro.taskana.report.api.header.TaskStatusColumnHeader; +import pro.taskana.report.api.item.TaskQueryItem; import pro.taskana.report.api.structure.Row; -import pro.taskana.report.internal.header.TaskStatusColumnHeader; -import pro.taskana.report.internal.item.TaskQueryItem; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java index a9310fec5..af43d57b0 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java @@ -14,10 +14,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.report.api.TaskMonitorService; import pro.taskana.report.api.TimestampReport; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.TimestampQueryItem; import pro.taskana.report.api.row.SingleRow; import pro.taskana.report.api.row.TimestampRow; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.TimestampQueryItem; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java index 4ffe6330f..057b987a4 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java @@ -21,8 +21,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; import pro.taskana.report.api.WorkbasketReport; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.report.internal.CombinedClassificationFilter; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; diff --git a/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java b/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java index db4f3a203..4e0c1fc2d 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java @@ -35,7 +35,6 @@ class ArchitectureTest { .importPackages("pro.taskana"); } - @Disabled @Test void apiClassesShouldNotDependOnInternalClasses() { ArchRule myRule = @@ -43,8 +42,6 @@ class ArchitectureTest { .that() .haveSimpleNameNotEndingWith("TaskanaHistoryEvent") .and() - .haveSimpleNameNotEndingWith("BulkOperationResults") - .and() .resideInAPackage("..api..") .should() .onlyDependOnClassesThat() diff --git a/lib/taskana-core/src/test/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverterTest.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverterTest.java index a1449c269..86e3991e8 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverterTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverterTest.java @@ -14,9 +14,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.common.internal.util.DaysToWorkingDaysConverter; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.report.internal.DaysToWorkingDaysReportConverter; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; /** Test for the DaysToWorkingDaysConverter. */ class DaysToWorkingDaysConverterTest { diff --git a/lib/taskana-core/src/test/java/pro/taskana/report/internal/CategoryReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/report/internal/CategoryReportBuilderImplTest.java index 23ef4c5f8..12a2e1bb7 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/report/internal/CategoryReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/report/internal/CategoryReportBuilderImplTest.java @@ -28,8 +28,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.CategoryReport; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/pro/taskana/report/internal/ClassificationReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/report/internal/ClassificationReportBuilderImplTest.java index f6f7ca88f..f7c6f2a45 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/report/internal/ClassificationReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/report/internal/ClassificationReportBuilderImplTest.java @@ -29,10 +29,10 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.ClassificationReport; import pro.taskana.report.api.ClassificationReport.DetailedClassificationReport; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.DetailedMonitorQueryItem; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.api.row.FoldableRow; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.DetailedMonitorQueryItem; -import pro.taskana.report.internal.item.MonitorQueryItem; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/pro/taskana/report/internal/CustomFieldValueReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/report/internal/CustomFieldValueReportBuilderImplTest.java index 3b0d026ab..7340cd553 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/report/internal/CustomFieldValueReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/report/internal/CustomFieldValueReportBuilderImplTest.java @@ -27,8 +27,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.CustomFieldValueReport; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/pro/taskana/report/internal/DaysToWorkingDaysReportConverterTest.java b/lib/taskana-core/src/test/java/pro/taskana/report/internal/DaysToWorkingDaysReportConverterTest.java index eae99d88e..591693e69 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/report/internal/DaysToWorkingDaysReportConverterTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/report/internal/DaysToWorkingDaysReportConverterTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.internal.util.DaysToWorkingDaysConverter; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; /** Test for the DaysToWorkingDaysReportConverter. */ class DaysToWorkingDaysReportConverterTest { diff --git a/lib/taskana-core/src/test/java/pro/taskana/report/internal/ReportTest.java b/lib/taskana-core/src/test/java/pro/taskana/report/internal/ReportTest.java index 7259a3416..33b06d360 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/report/internal/ReportTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/report/internal/ReportTest.java @@ -12,11 +12,11 @@ import java.util.stream.IntStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.api.structure.QueryItemPreprocessor; import pro.taskana.report.api.structure.Report; import pro.taskana.report.api.structure.Row; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; /** Tests for {@link Report}. */ class ReportTest { diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java index 24cd95558..f4d9b254f 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java @@ -24,9 +24,9 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.TaskStatusReport; +import pro.taskana.report.api.item.TaskQueryItem; import pro.taskana.report.internal.TaskMonitorMapper; import pro.taskana.report.internal.TaskMonitorServiceImpl; -import pro.taskana.report.internal.item.TaskQueryItem; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskanaRole; diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java index 0d9e9be28..d574125da 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java @@ -29,12 +29,12 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.WorkbasketReport; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.MonitorQueryItem; import pro.taskana.report.internal.CombinedClassificationFilter; import pro.taskana.report.internal.SelectedItem; import pro.taskana.report.internal.TaskMonitorMapper; import pro.taskana.report.internal.TaskMonitorServiceImpl; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.MonitorQueryItem; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskanaRole; diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/ldap/LdapTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/ldap/LdapTest.java index 9e87ee583..721ca2056 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/ldap/LdapTest.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/ldap/LdapTest.java @@ -10,8 +10,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.rest.RestConfiguration; import pro.taskana.rest.resource.AccessIdResource; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapClient.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapClient.java index aca941eb1..2bb43df7b 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapClient.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapClient.java @@ -21,9 +21,9 @@ import org.springframework.ldap.filter.OrFilter; import org.springframework.ldap.filter.WhitespaceWildcardsFilter; import org.springframework.stereotype.Component; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.SystemException; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.rest.resource.AccessIdResource; /** diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java index 6477a6f13..ffb154c24 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java @@ -29,11 +29,11 @@ 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.ClassificationNotFoundException; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.rest.resource.ClassificationResource; import pro.taskana.rest.resource.ClassificationResourceAssembler; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java index 1ac9a24bd..38881eea4 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/MonitorController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; import pro.taskana.rest.resource.ReportResource; import pro.taskana.rest.resource.ReportResourceAssembler; import pro.taskana.task.api.TaskState; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java index 4fa48b5dd..6604e5489 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java @@ -21,10 +21,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import pro.taskana.common.api.BaseQuery.SortDirection; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.rest.resource.DistributionTargetListResource; import pro.taskana.rest.resource.DistributionTargetResource; import pro.taskana.rest.resource.DistributionTargetResourceAssembler; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskanaUserInfoResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskanaUserInfoResource.java index be0ef432d..cf9f8d4b9 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskanaUserInfoResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskanaUserInfoResource.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.hateoas.ResourceSupport; -import pro.taskana.common.internal.util.LoggerUtils; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.task.api.TaskanaRole; /** Resource class for user information. */ diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResource.java index 8f75facc6..0b97ce4a2 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResource.java @@ -3,7 +3,7 @@ package pro.taskana.rest.resource; import java.util.List; import java.util.Set; -import pro.taskana.common.internal.util.LoggerUtils; +import pro.taskana.common.api.LoggerUtils; import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; /** this class represents a workbasket including its distro targets and authorisations. */ diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java index f203d8954..a689192c5 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ReportResourceTest.java @@ -19,9 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.TaskanaSpringBootTest; import pro.taskana.report.api.ClassificationReport; import pro.taskana.report.api.WorkbasketReport; -import pro.taskana.report.internal.header.TimeIntervalColumnHeader; -import pro.taskana.report.internal.item.DetailedMonitorQueryItem; -import pro.taskana.report.internal.item.MonitorQueryItem; +import pro.taskana.report.api.header.TimeIntervalColumnHeader; +import pro.taskana.report.api.item.DetailedMonitorQueryItem; +import pro.taskana.report.api.item.MonitorQueryItem; /** Test for {@link ReportResourceAssembler}. */ @TaskanaSpringBootTest