diff --git a/history/taskana-simplehistory-provider/src/test/java/configuration/TaskanaEngineConfigurationTest.java b/history/taskana-simplehistory-provider/src/test/java/configuration/TaskanaEngineConfigurationTest.java index eda7e1324..f3be245ad 100644 --- a/history/taskana-simplehistory-provider/src/test/java/configuration/TaskanaEngineConfigurationTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/configuration/TaskanaEngineConfigurationTest.java @@ -8,8 +8,8 @@ import javax.sql.DataSource; import org.junit.Assert; import org.junit.Test; -import pro.taskana.common.api.TaskanaEngine; import pro.taskana.TaskanaEngineConfiguration; +import pro.taskana.common.api.TaskanaEngine; /** * Unit Test for TaskanaEngineConfigurationTest. 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 fa14fff89..210a97640 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 @@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.common.api.BaseQuery; import pro.taskana.common.api.TimeInterval; -import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.internal.util.LoggerUtils; import pro.taskana.rest.AbstractPagingController; diff --git a/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java b/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java index 77fe352d4..7ae406f31 100644 --- a/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java +++ b/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java @@ -11,11 +11,11 @@ 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.exceptions.WorkbasketNotFoundException; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; /** Example Bootstrap Application. */ @ApplicationScoped diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java index d010d3604..5fb31fb81 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java @@ -7,12 +7,12 @@ 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.exceptions.TaskAlreadyExistException; -import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; 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.workbasket.api.WorkbasketService; +import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** TODO. */ @Stateless diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java index 4f212b8bc..a2645a104 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java @@ -19,16 +19,16 @@ 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.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.task.api.exceptions.TaskAlreadyExistException; -import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; -import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; 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.workbasket.api.WorkbasketType; +import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; +import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; +import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** TODO. */ @Path("/test") diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/api/TaskMonitorService.java b/lib/taskana-core/src/main/java/pro/taskana/report/api/TaskMonitorService.java index ad7d8ae4c..c7144bb3c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/api/TaskMonitorService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/api/TaskMonitorService.java @@ -1,6 +1,6 @@ package pro.taskana.report.api; -import pro.taskana.common.api.CustomField; +import pro.taskana.task.api.CustomField; /** The Task Monitor Service manages operations on tasks regarding the monitoring. */ public interface TaskMonitorService { 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 3691c4995..71836db13 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 @@ -3,13 +3,13 @@ package pro.taskana.report.api; import java.util.List; import java.util.Map; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.internal.SelectedItem; import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.report.internal.item.AgeQueryItem; import pro.taskana.report.internal.structure.Report; +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/CustomFieldValueReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/CustomFieldValueReportBuilderImpl.java index 5fa800ea0..06c67920d 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 @@ -4,7 +4,6 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -12,6 +11,7 @@ import pro.taskana.report.api.CustomFieldValueReport; import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.report.internal.item.MonitorQueryItem; import pro.taskana.report.internal.preprocessor.DaysToWorkingDaysPreProcessor; +import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskanaRole; /** The implementation of CustomFieldValueReportBuilder. */ 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 d2807e3d5..aefea85fd 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 @@ -7,12 +7,12 @@ import org.apache.ibatis.annotations.Result; import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; -import pro.taskana.common.api.CustomField; 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.task.api.CustomField; import pro.taskana.task.api.TaskState; /** This class is the mybatis mapping of task monitoring. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskMonitorServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskMonitorServiceImpl.java index 33ec94454..7a38dff1e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskMonitorServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/internal/TaskMonitorServiceImpl.java @@ -1,6 +1,5 @@ package pro.taskana.report.internal; -import pro.taskana.common.api.CustomField; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.report.api.CategoryReport; import pro.taskana.report.api.ClassificationReport; @@ -9,6 +8,7 @@ import pro.taskana.report.api.TaskMonitorService; import pro.taskana.report.api.TaskStatusReport; import pro.taskana.report.api.TimestampReport; import pro.taskana.report.api.WorkbasketReport; +import pro.taskana.task.api.CustomField; /** This is the implementation of TaskMonitorService. */ public class TaskMonitorServiceImpl implements TaskMonitorService { 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 183c30ac5..c8c566190 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,7 +8,6 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -17,6 +16,7 @@ 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.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/common/api/CustomField.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/CustomField.java similarity index 90% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/CustomField.java rename to lib/taskana-core/src/main/java/pro/taskana/task/api/CustomField.java index 3977323f3..f8eea2adc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/api/CustomField.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/CustomField.java @@ -1,4 +1,4 @@ -package pro.taskana.common.api; +package pro.taskana.task.api; /** This enum contains the fields CUSTOM_1 - CUSTOM_10 for the task entity. */ public enum CustomField { diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java index e5cffd82a..e11df1d24 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java @@ -13,11 +13,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.CustomField; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; +import pro.taskana.task.api.CustomField; /** Acceptance test for all "classification report" scenarios. */ @ExtendWith(JaasExtension.class) 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 8e65070cd..538c8d027 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java @@ -13,7 +13,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; @@ -21,6 +20,7 @@ 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; import pro.taskana.task.api.TaskState; /** Acceptance test for all "get task ids of category report" scenarios. */ 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 a444d1b57..a54e82cdb 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java @@ -13,7 +13,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; @@ -21,6 +20,7 @@ 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; import pro.taskana.task.api.TaskState; /** Acceptance test for all "get task ids of category report" scenarios. */ 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 bfc9b3646..dc8c84d73 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.CategoryReport; @@ -25,6 +24,7 @@ import pro.taskana.report.api.TaskMonitorService; import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; +import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; /** Acceptance test for all "category report" scenarios. */ 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 498121d62..f34a1d513 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.ClassificationReport; @@ -25,6 +24,7 @@ import pro.taskana.report.api.TaskMonitorService; import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; +import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; /** Acceptance test for all "classification report" scenarios. */ 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 1728e3afe..fdd5e3dd4 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.CustomFieldValueReport; @@ -24,6 +23,7 @@ import pro.taskana.report.api.TaskMonitorService; import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; +import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; /** Acceptance test for all "classification report" scenarios. */ 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 429739b88..13f4c5d4b 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.ClassificationReport.DetailedClassificationReport; @@ -27,6 +26,7 @@ import pro.taskana.report.internal.row.FoldableRow; import pro.taskana.report.internal.structure.Row; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; +import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; /** Acceptance test for all "detailed classification report" scenarios. */ 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 195a7c9ff..4ffe6330f 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.report.api.TaskMonitorService; @@ -26,6 +25,7 @@ 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; import pro.taskana.task.api.TaskState; /** Acceptance test for all "workbasket level report" scenarios. */ 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 7fb423d10..23ef4c5f8 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 @@ -23,7 +23,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; @@ -31,6 +30,7 @@ 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.task.api.CustomField; import pro.taskana.task.api.TaskState; /** Unit Test for CategoryBuilderImpl. */ 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 f0562dc52..4cff85778 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 @@ -23,7 +23,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; @@ -34,6 +33,7 @@ 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.internal.row.FoldableRow; +import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; /** Unit Test for ClassificationReportBuilderImpl. */ 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 712993f0f..3b0d026ab 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 @@ -22,7 +22,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; @@ -30,6 +29,7 @@ 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.task.api.CustomField; import pro.taskana.task.api.TaskState; /** Unit Test for CustomFieldValueReportBuilderImpl. */ 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 1a319eb32..0d9e9be28 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 @@ -24,7 +24,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.common.api.CustomField; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; @@ -36,6 +35,7 @@ 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/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java b/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java index 5223311a5..abc472d84 100644 --- a/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java +++ b/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java @@ -13,17 +13,17 @@ 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.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.task.api.exceptions.TaskAlreadyExistException; -import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; -import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; 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.exceptions.TaskNotFoundException; import pro.taskana.workbasket.api.Workbasket; 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; /** TODO. */ @Component diff --git a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java index 4002fbd11..958820c74 100644 --- a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java +++ b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java @@ -10,13 +10,13 @@ import org.springframework.web.bind.annotation.RestController; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.DomainNotFoundException; -import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; -import pro.taskana.workbasket.internal.WorkbasketImpl; import pro.taskana.common.internal.util.IdGenerator; import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketType; +import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; +import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; +import pro.taskana.workbasket.internal.WorkbasketImpl; /** Rest Controller. */ @RestController diff --git a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java index b98efc941..4ca0448cc 100644 --- a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java +++ b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java @@ -28,25 +28,25 @@ import pro.taskana.classification.api.ClassificationService; import pro.taskana.common.api.KeyDomain; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.DomainNotFoundException; -import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; -import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; -import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.task.internal.TaskImpl; import pro.taskana.common.internal.TaskanaEngineImpl; -import pro.taskana.workbasket.internal.WorkbasketImpl; -import pro.taskana.common.internal.util.IdGenerator; import pro.taskana.common.internal.jobs.TaskCleanupJob; import pro.taskana.common.internal.jobs.WorkbasketCleanupJob; +import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; +import pro.taskana.common.internal.util.IdGenerator; import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskSummary; -import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; +import pro.taskana.task.internal.TaskImpl; import pro.taskana.workbasket.api.Workbasket; 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.WorkbasketAlreadyExistException; +import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.internal.WorkbasketImpl; /** Test for internal transaction management. */ @ExtendWith(SpringExtension.class) diff --git a/lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineImpl.java b/lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineImpl.java index 6eea2dccf..9afb89482 100644 --- a/lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineImpl.java +++ b/lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineImpl.java @@ -3,8 +3,8 @@ package pro.taskana; import javax.annotation.PostConstruct; import org.mybatis.spring.transaction.SpringManagedTransactionFactory; -import pro.taskana.configuration.SpringTaskanaEngineConfiguration; import pro.taskana.common.internal.TaskanaEngineImpl; +import pro.taskana.configuration.SpringTaskanaEngineConfiguration; /** This class configures the TaskanaEngine for spring. */ public class SpringTaskanaEngineImpl extends TaskanaEngineImpl { diff --git a/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java b/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java index d592912a5..ccdfc05bc 100644 --- a/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java +++ b/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java @@ -7,19 +7,18 @@ import org.springframework.transaction.annotation.Transactional; 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.exceptions.TaskAlreadyExistException; -import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; 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.workbasket.api.exceptions.WorkbasketNotFoundException; /** TODO. */ @Component @Transactional public class TaskanaComponent { - @Autowired - TaskService taskService; + @Autowired TaskService taskService; public TaskService getTaskService() { return taskService; diff --git a/lib/taskana-spring/src/test/java/pro/taskana/TransactionTest.java b/lib/taskana-spring/src/test/java/pro/taskana/TransactionTest.java index ac9936b63..7875b1d3f 100644 --- a/lib/taskana-spring/src/test/java/pro/taskana/TransactionTest.java +++ b/lib/taskana-spring/src/test/java/pro/taskana/TransactionTest.java @@ -32,8 +32,7 @@ import pro.taskana.task.api.TaskService; @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) public class TransactionTest { - @Autowired - TaskService taskService; + @Autowired TaskService taskService; @LocalServerPort int port; @Autowired private TestRestTemplate restTemplate; diff --git a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java index 2960465f9..186ca2fea 100644 --- a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java +++ b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java @@ -17,9 +17,9 @@ import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.internal.jobs.JobRunner; import pro.taskana.common.internal.jobs.TaskCleanupJob; import pro.taskana.common.internal.jobs.WorkbasketCleanupJob; -import pro.taskana.task.api.TaskanaRole; import pro.taskana.common.internal.security.UserPrincipal; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; +import pro.taskana.task.api.TaskanaRole; /** This class invokes the JobRunner periodically to schedule long running jobs. */ @Component diff --git a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/SampleLoginModule.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/SampleLoginModule.java index 39c1b4bf2..c5f7bec3d 100644 --- a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/SampleLoginModule.java +++ b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/security/SampleLoginModule.java @@ -10,10 +10,10 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.spi.LoginModule; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import pro.taskana.ldap.LdapCacheTestImpl; -import pro.taskana.rest.resource.AccessIdResource; import pro.taskana.common.internal.security.GroupPrincipal; import pro.taskana.common.internal.security.UserPrincipal; +import pro.taskana.ldap.LdapCacheTestImpl; +import pro.taskana.rest.resource.AccessIdResource; /** TODO. */ public class SampleLoginModule extends UsernamePasswordAuthenticationFilter implements LoginModule { diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java index 8281123b5..3a243ed7a 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java @@ -22,9 +22,8 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.client.RestTemplate; -import pro.taskana.classification.api.Classification; import pro.taskana.RestHelper; -import pro.taskana.task.api.Task; +import pro.taskana.classification.api.Classification; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.rest.Mapping; import pro.taskana.rest.RestConfiguration; @@ -32,6 +31,7 @@ import pro.taskana.rest.resource.ClassificationResource; import pro.taskana.rest.resource.ClassificationResourceAssembler; import pro.taskana.rest.resource.TaskResource; import pro.taskana.rest.resource.TaskResourceAssembler; +import pro.taskana.task.api.Task; /** Test async updates. */ @ActiveProfiles({"test"}) 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 aa6c21120..aca941eb1 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 @@ -43,8 +43,7 @@ public class LdapClient { private boolean active = false; - @Autowired - private Environment env; + @Autowired private Environment env; @Autowired(required = false) private LdapTemplate ldapTemplate; @@ -169,10 +168,6 @@ public class LdapClient { return accessId; } - List getFirstPageOfaResultList(List accessIds) { - return accessIds.subList(0, Math.min(accessIds.size(), maxNumberOfReturnedAccessIds)); - } - public List searchGroupsofUsersIsMember(final String name) throws InvalidArgumentException { LOGGER.debug("entry to searchGroupsofUsersIsMember(name = {}).", name); @@ -198,31 +193,6 @@ public class LdapClient { return accessIds; } - void isInitOrFail() { - if (!active) { - throw new SystemException(String.format(MISSING_CONFIGURATION_S, message)); - } - } - - void sortListOfAccessIdResources(List accessIds) { - accessIds.sort( - (AccessIdResource a, AccessIdResource b) -> - a.getAccessId().compareToIgnoreCase(b.getAccessId())); - } - - String getNameWithoutBaseDn(String name) { - // (?i) --> case insensitive replacement - return name.replaceAll("(?i)" + Pattern.quote("," + getBaseDn()), ""); - } - - String[] getLookUpGoupAttributesToReturn() { - if (CN.equals(getGroupNameAttribute())) { - return new String[]{CN}; - } else { - return new String[]{getGroupNameAttribute(), CN}; - } - } - public boolean useLdap() { String useLdap = LdapSettings.TASKANA_LDAP_USE_LDAP.getValueFromEnv(env); return Boolean.parseBoolean(useLdap); @@ -305,6 +275,35 @@ public class LdapClient { return accessId.contains(getGroupSearchBase()); } + List getFirstPageOfaResultList(List accessIds) { + return accessIds.subList(0, Math.min(accessIds.size(), maxNumberOfReturnedAccessIds)); + } + + void isInitOrFail() { + if (!active) { + throw new SystemException(String.format(MISSING_CONFIGURATION_S, message)); + } + } + + void sortListOfAccessIdResources(List accessIds) { + accessIds.sort( + (AccessIdResource a, AccessIdResource b) -> + a.getAccessId().compareToIgnoreCase(b.getAccessId())); + } + + String getNameWithoutBaseDn(String name) { + // (?i) --> case insensitive replacement + return name.replaceAll("(?i)" + Pattern.quote("," + getBaseDn()), ""); + } + + String[] getLookUpGoupAttributesToReturn() { + if (CN.equals(getGroupNameAttribute())) { + return new String[] {CN}; + } else { + return new String[] {getGroupNameAttribute(), CN}; + } + } + @PostConstruct void init() { LOGGER.debug("Entry to init()"); @@ -330,11 +329,11 @@ public class LdapClient { List checkForMissingConfigurations() { return Arrays.stream(LdapSettings.values()) - // optional settings - .filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_MAX_NUMBER_OF_RETURNED_ACCESS_IDS)) - .filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_MIN_SEARCH_FOR_LENGTH)) - .filter(p -> Objects.isNull(p.getValueFromEnv(env))) - .collect(Collectors.toList()); + // optional settings + .filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_MAX_NUMBER_OF_RETURNED_ACCESS_IDS)) + .filter(p -> !p.equals(LdapSettings.TASKANA_LDAP_MIN_SEARCH_FOR_LENGTH)) + .filter(p -> Objects.isNull(p.getValueFromEnv(env))) + .collect(Collectors.toList()); } void testMinSearchForLength(final String name) throws InvalidArgumentException { @@ -346,9 +345,7 @@ public class LdapClient { } } - /** - * Context Mapper for user entries. - */ + /** Context Mapper for user entries. */ class GroupContextMapper extends AbstractContextMapper { @Override @@ -360,9 +357,7 @@ public class LdapClient { } } - /** - * Context Mapper for user entries. - */ + /** Context Mapper for user entries. */ class UserContextMapper extends AbstractContextMapper { @Override diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapSettings.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapSettings.java index f8934892e..ff5e87214 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapSettings.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapSettings.java @@ -2,9 +2,7 @@ package pro.taskana.ldap; import org.springframework.core.env.Environment; -/** - * Required settings to run ldap. - */ +/** Required settings to run ldap. */ enum LdapSettings { TASKANA_LDAP_USE_LDAP("taskana.ldap.useLdap"), TASKANA_LDAP_USER_SEARCH_BASE("taskana.ldap.userSearchBase"), diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java index 8908ffcda..c5e580370 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java @@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationQuery; import pro.taskana.classification.api.ClassificationService; @@ -26,6 +25,7 @@ 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.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; 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 edcfbb58a..1ac9a24bd 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 @@ -15,13 +15,13 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import pro.taskana.report.api.TaskMonitorService; -import pro.taskana.task.api.TaskState; 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.rest.resource.ReportResource; import pro.taskana.rest.resource.ReportResourceAssembler; +import pro.taskana.task.api.TaskState; /** Controller for all monitoring endpoints. */ @RestController diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java index 010b08b12..a1c23e819 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java @@ -13,14 +13,14 @@ import org.springframework.context.annotation.Scope; import org.springframework.http.converter.json.SpringHandlerInstantiator; import org.springframework.transaction.annotation.EnableTransactionManagement; +import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.classification.api.ClassificationService; +import pro.taskana.common.api.TaskanaEngine; +import pro.taskana.configuration.SpringTaskanaEngineConfiguration; +import pro.taskana.ldap.LdapClient; import pro.taskana.report.api.TaskMonitorService; import pro.taskana.task.api.TaskService; -import pro.taskana.common.api.TaskanaEngine; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.configuration.SpringTaskanaEngineConfiguration; -import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.ldap.LdapClient; /** Configuration for REST service. */ @Configuration diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java index a02a1328d..dd4c5b17e 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java @@ -21,29 +21,29 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.KeyDomain; -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.common.api.TimeInterval; import pro.taskana.common.api.exceptions.AttachmentPersistenceException; -import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; import pro.taskana.common.api.exceptions.ConcurrencyException; 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.exceptions.TaskAlreadyExistException; -import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.TaskResource; import pro.taskana.rest.resource.TaskResourceAssembler; import pro.taskana.rest.resource.TaskSummaryListResource; import pro.taskana.rest.resource.TaskSummaryResourceAssembler; +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.exceptions.TaskAlreadyExistException; +import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Controller for all {@link Task} related endpoints. */ @RestController @@ -290,7 +290,7 @@ public class TaskController extends AbstractPagingController { params.remove(WORKBASKET_ID); } if (params.containsKey(WORKBASKET_KEY)) { - updateTaskQueryWithWorkbasketKey(taskQuery,params); + updateTaskQueryWithWorkbasketKey(taskQuery, params); } if (params.containsKey(OWNER)) { String[] owners = extractCommaSeparatedFields(params.get(OWNER)); @@ -369,9 +369,8 @@ public class TaskController extends AbstractPagingController { return taskQuery; } - private void updateTaskQueryWithWorkbasketKey(TaskQuery taskQuery, - MultiValueMap params) - throws InvalidArgumentException { + private void updateTaskQueryWithWorkbasketKey( + TaskQuery taskQuery, MultiValueMap params) throws InvalidArgumentException { String[] domains = null; if (params.get(DOMAIN) != null) { @@ -389,13 +388,12 @@ public class TaskController extends AbstractPagingController { taskQuery.workbasketKeyDomainIn(keyDomains); params.remove(WORKBASKET_KEY); params.remove(DOMAIN); - } private void checkForIllegalParamCombinations(MultiValueMap params) { if (params.containsKey(PLANNED) - && (params.containsKey(PLANNED_FROM) || params.containsKey(PLANNED_TO))) { + && (params.containsKey(PLANNED_FROM) || params.containsKey(PLANNED_TO))) { throw new IllegalArgumentException( "It is prohibited to use the param \"" diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java index 489a10b94..63187f796 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java @@ -9,12 +9,12 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import pro.taskana.common.api.TaskanaEngine; -import pro.taskana.task.api.TaskanaRole; import pro.taskana.TaskanaEngineConfiguration; +import pro.taskana.common.api.TaskanaEngine; +import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.rest.resource.TaskanaUserInfoResource; import pro.taskana.rest.resource.VersionResource; -import pro.taskana.common.internal.security.CurrentUserContext; +import pro.taskana.task.api.TaskanaRole; /** Controller for TaskanaEngine related tasks. */ @RestController diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaRestExceptionHandler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaRestExceptionHandler.java index b4cc905cc..a1e2f3a67 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaRestExceptionHandler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaRestExceptionHandler.java @@ -20,11 +20,11 @@ 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.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; +import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java index bacce5372..d1dbf8410 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java @@ -15,15 +15,15 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import pro.taskana.common.api.BaseQuery; -import pro.taskana.workbasket.api.WorkbasketAccessItem; -import pro.taskana.workbasket.api.WorkbasketAccessItemQuery; -import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.ldap.LdapClient; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.WorkbasketAccessItemListResource; import pro.taskana.rest.resource.WorkbasketAccessItemResourceAssembler; +import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.workbasket.api.WorkbasketAccessItemQuery; +import pro.taskana.workbasket.api.WorkbasketService; /** Controller for Workbasket access. */ @RestController 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 c8be8b7a9..4fa48b5dd 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,21 +21,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import pro.taskana.common.api.BaseQuery.SortDirection; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; -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.WorkbasketType; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -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.common.internal.util.LoggerUtils; import pro.taskana.rest.resource.DistributionTargetListResource; import pro.taskana.rest.resource.DistributionTargetResource; @@ -48,6 +36,18 @@ import pro.taskana.rest.resource.WorkbasketResource; import pro.taskana.rest.resource.WorkbasketResourceAssembler; import pro.taskana.rest.resource.WorkbasketSummaryListResource; import pro.taskana.rest.resource.WorkbasketSummaryResourceAssembler; +import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.workbasket.api.WorkbasketAccessItem; +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.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.WorkbasketInUseException; +import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Controller for all {@link Workbasket} related endpoints. */ @RestController diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java index 2aa1f99d6..36752d3d7 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java @@ -24,22 +24,22 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import pro.taskana.common.api.exceptions.DomainNotFoundException; +import pro.taskana.common.api.exceptions.InvalidArgumentException; +import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.rest.resource.WorkbasketDefinitionResource; +import pro.taskana.rest.resource.WorkbasketDefinitionResourceAssembler; +import pro.taskana.rest.resource.WorkbasketResource; import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketQuery; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketSummary; -import pro.taskana.common.api.exceptions.DomainNotFoundException; -import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; -import pro.taskana.common.api.exceptions.NotAuthorizedException; 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.internal.WorkbasketAccessItemImpl; -import pro.taskana.rest.resource.WorkbasketDefinitionResource; -import pro.taskana.rest.resource.WorkbasketDefinitionResourceAssembler; -import pro.taskana.rest.resource.WorkbasketResource; /** Controller for all {@link WorkbasketDefinitionResource} related endpoints. */ @RestController @@ -145,18 +145,21 @@ public class WorkbasketDefinitionController { // Since we would have a n² runtime when doing a lookup and updating the access items we // decided to // simply delete all existing accessItems and create new ones. - boolean noWrongAuth = definition.getAuthorizations().stream().noneMatch(access -> { - return (!access.getWorkbasketId().equals(importedWb.getId())) - || (!access.getWorkbasketKey().equals(importedWb.getKey())); - }); + boolean noWrongAuth = + definition.getAuthorizations().stream() + .noneMatch( + access -> { + return (!access.getWorkbasketId().equals(importedWb.getId())) + || (!access.getWorkbasketKey().equals(importedWb.getKey())); + }); if (!noWrongAuth) { throw new InvalidWorkbasketException( - "The given Authentications for Workbasket " + importedWb.getId() + "The given Authentications for Workbasket " + + importedWb.getId() + " doesn't match in WorkbasketId and/or WorkbasketKey. " + "Please provide consistent WorkbasketDefinitions"); } - for (WorkbasketAccessItem accessItem : - workbasketService.getWorkbasketAccessItems(newId)) { + for (WorkbasketAccessItem accessItem : workbasketService.getWorkbasketAccessItems(newId)) { workbasketService.deleteWorkbasketAccessItem(accessItem.getId()); } for (WorkbasketAccessItemImpl authorization : definition.getAuthorizations()) { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResourceAssembler.java index 2c1c2e6b7..f25ef41ea 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResourceAssembler.java @@ -9,10 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; +import pro.taskana.rest.AttachmentController; import pro.taskana.task.api.Attachment; import pro.taskana.task.api.TaskService; import pro.taskana.task.internal.AttachmentImpl; -import pro.taskana.rest.AttachmentController; /** Resource assembler for {@link AttachmentResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResourceAssembler.java index 8b2fb9eaa..bbe930940 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResourceAssembler.java @@ -4,8 +4,8 @@ import java.util.List; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; -import pro.taskana.task.api.AttachmentSummary; import pro.taskana.rest.AttachmentController; +import pro.taskana.task.api.AttachmentSummary; /** Resource assembler for {@link AttachmentSummaryResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResourceAssembler.java index 06d1b0fa6..142a6b0de 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResourceAssembler.java @@ -12,8 +12,8 @@ import org.springframework.stereotype.Component; import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; -import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.classification.internal.ClassificationImpl; +import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.rest.ClassificationController; /** diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResourceAssembler.java index f51048b62..24895a1b8 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResourceAssembler.java @@ -7,10 +7,10 @@ import java.util.List; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; import pro.taskana.rest.WorkbasketController; +import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** * Transforms WorkbasketSummary to its resource counterpart DistributionTargerResource and vice diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportResourceAssembler.java index eba7cae55..4b89e9b33 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportResourceAssembler.java @@ -12,20 +12,20 @@ import java.util.List; import java.util.stream.Collectors; import org.springframework.stereotype.Component; -import pro.taskana.task.api.TaskState; 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.TaskStatusReport; +import pro.taskana.report.api.TimestampReport; +import pro.taskana.report.api.WorkbasketReport; import pro.taskana.report.internal.row.FoldableRow; import pro.taskana.report.internal.row.SingleRow; import pro.taskana.report.internal.structure.ColumnHeader; import pro.taskana.report.internal.structure.QueryItem; import pro.taskana.report.internal.structure.Report; import pro.taskana.report.internal.structure.Row; -import pro.taskana.report.api.ClassificationReport; -import pro.taskana.report.api.TaskStatusReport; -import pro.taskana.report.api.TimestampReport; -import pro.taskana.report.api.WorkbasketReport; import pro.taskana.rest.MonitorController; +import pro.taskana.task.api.TaskState; /** Transforms any {@link Report} into its {@link ReportResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResource.java index 933c6c59d..3e07d24a7 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResource.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.stream.Collectors; import org.springframework.hateoas.ResourceSupport; +import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskState; -import pro.taskana.common.api.exceptions.InvalidArgumentException; /** Resource class for {@link Task}. */ public class TaskResource extends ResourceSupport { @@ -476,8 +476,7 @@ public class TaskResource extends ResourceSupport { /** * A CustomAttribute is a user customized attribute which is saved as a Map and can be retreived - * from either {@link Task#getCustomAttributes()} or {@link - * Task#getCallbackInfo()}. + * from either {@link Task#getCustomAttributes()} or {@link Task#getCallbackInfo()}. */ public static class CustomAttribute { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResourceAssembler.java index 8f70c7f8b..2fa2be999 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResourceAssembler.java @@ -11,14 +11,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; -import pro.taskana.task.api.Task; -import pro.taskana.task.api.TaskService; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.SystemException; +import pro.taskana.rest.TaskController; +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.rest.TaskController; /** Resource assembler for {@link TaskResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java index ca7911471..1812d7afc 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java @@ -6,10 +6,10 @@ import java.util.stream.Collectors; import org.springframework.hateoas.ResourceSupport; import org.springframework.hateoas.core.Relation; +import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.TaskSummary; -import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.workbasket.api.WorkbasketSummary; /** Resource class for {@link WorkbasketSummary}. */ diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java index fa5b23a85..758e29d88 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java @@ -4,13 +4,13 @@ import java.util.List; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; -import pro.taskana.task.api.TaskSummary; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.rest.Mapping; import pro.taskana.rest.TaskController; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.links.PageLinks; +import pro.taskana.task.api.TaskSummary; /** Resource assembler for {@link TaskSummaryResource}. */ @Component 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 c74b91b23..be0ef432d 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,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import org.springframework.hateoas.ResourceSupport; -import pro.taskana.task.api.TaskanaRole; import pro.taskana.common.internal.util.LoggerUtils; +import pro.taskana.task.api.TaskanaRole; /** Resource class for user information. */ public class TaskanaUserInfoResource extends ResourceSupport { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java index b80874220..3574e1447 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java @@ -9,15 +9,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; -import pro.taskana.workbasket.api.WorkbasketAccessItem; -import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; import pro.taskana.rest.Mapping; import pro.taskana.rest.WorkbasketController; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.links.PageLinks; +import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.workbasket.api.WorkbasketService; +import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; /** * Transforms {@link WorkbasketAccessItem} to its resource counterpart {@link 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 2234712d3..8f75facc6 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,8 +3,8 @@ package pro.taskana.rest.resource; import java.util.List; import java.util.Set; -import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; import pro.taskana.common.internal.util.LoggerUtils; +import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; /** this class represents a workbasket including its distro targets and authorisations. */ public class WorkbasketDefinitionResource { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResourceAssembler.java index 1eeaaa439..e995183bf 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResourceAssembler.java @@ -9,11 +9,11 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketSummary; -import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; import pro.taskana.workbasket.internal.WorkbasketImpl; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceAssembler.java index ad540e03d..310aaea4d 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceAssembler.java @@ -10,14 +10,14 @@ import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; import org.springframework.util.LinkedMultiValueMap; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.SystemException; +import pro.taskana.rest.WorkbasketController; +import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; import pro.taskana.workbasket.internal.WorkbasketImpl; -import pro.taskana.rest.WorkbasketController; /** * Transforms {@link Workbasket} to its resource counterpart {@link WorkbasketResource} and vice diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResourceAssembler.java index 0efd58c01..ad546f882 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResourceAssembler.java @@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; -import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; -import pro.taskana.workbasket.internal.WorkbasketImpl; import pro.taskana.rest.Mapping; import pro.taskana.rest.WorkbasketController; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.links.PageLinks; +import pro.taskana.workbasket.api.WorkbasketService; +import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.internal.WorkbasketImpl; /** Resource assembler for {@link WorkbasketSummaryResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java index 72d5d847c..3018299c7 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java @@ -13,9 +13,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.context.support.SpringBeanAutowiringSupport; +import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** This class deserializes the string list to real workbaskets. */ diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java index 75e33fa36..a18618cf9 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java @@ -32,7 +32,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import pro.taskana.task.api.ObjectReference; import pro.taskana.RestHelper; import pro.taskana.TaskanaSpringBootTest; import pro.taskana.rest.resource.ClassificationSummaryResource; @@ -40,6 +39,7 @@ import pro.taskana.rest.resource.TaskResource; import pro.taskana.rest.resource.TaskSummaryListResource; import pro.taskana.rest.resource.WorkbasketSummaryResource; import pro.taskana.sampledata.SampleDataGenerator; +import pro.taskana.task.api.ObjectReference; /** Test Task Controller. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java index 2f2477636..c96bdbe2a 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java @@ -14,9 +14,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; import pro.taskana.RestHelper; -import pro.taskana.task.api.TaskanaRole; import pro.taskana.TaskanaSpringBootTest; import pro.taskana.rest.resource.TaskanaUserInfoResource; +import pro.taskana.task.api.TaskanaRole; /** Test TaskanaEngineController. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java index 287e2879d..8fda76fff 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketDefinitionControllerIntTest.java @@ -44,22 +44,20 @@ import pro.taskana.TaskanaSpringBootTest; import pro.taskana.rest.resource.WorkbasketDefinitionResource; import pro.taskana.sampledata.SampleDataGenerator; -/** - * Integration tests for WorkbasketDefinitionController. - */ +/** Integration tests for WorkbasketDefinitionController. */ @TaskanaSpringBootTest class WorkbasketDefinitionControllerIntTest { private static RestTemplate template; + @Value("${taskana.schemaName:TASKANA}") String schemaName; + ObjectMapper objMapper = new ObjectMapper(); - @Autowired - RestHelper restHelper; + @Autowired RestHelper restHelper; - @Autowired - private DataSource dataSource; + @Autowired private DataSource dataSource; @BeforeAll static void init() { @@ -74,8 +72,8 @@ class WorkbasketDefinitionControllerIntTest { @Test void testExportWorkbasketFromDomain() { - ResponseEntity> response = executeExportRequestForDomain( - "DOMAIN_A"); + ResponseEntity> response = + executeExportRequestForDomain("DOMAIN_A"); assertNotNull(response.getBody()); assertEquals(HttpStatus.OK, response.getStatusCode()); @@ -88,7 +86,7 @@ class WorkbasketDefinitionControllerIntTest { allAuthorizationsAreEmpty = false; } if (allDistributionTargetsAreEmpty - && !workbasketDefinition.getDistributionTargets().isEmpty()) { + && !workbasketDefinition.getDistributionTargets().isEmpty()) { allDistributionTargetsAreEmpty = false; } if (!allAuthorizationsAreEmpty && !allDistributionTargetsAreEmpty) { @@ -101,8 +99,8 @@ class WorkbasketDefinitionControllerIntTest { @Test void testExportWorkbasketsFromWrongDomain() { - ResponseEntity> response = executeExportRequestForDomain( - "wrongDomain"); + ResponseEntity> response = + executeExportRequestForDomain("wrongDomain"); assertEquals(0, response.getBody().size()); } @@ -206,8 +204,8 @@ class WorkbasketDefinitionControllerIntTest { theDestroyer.setDistributionTargets( Collections.singleton(differentLogicalId.getWorkbasket().workbasketId)); - expectStatusWhenExecutingImportRequestOfWorkbaskets(HttpStatus.NO_CONTENT, w, - differentLogicalId, theDestroyer); + expectStatusWhenExecutingImportRequestOfWorkbaskets( + HttpStatus.NO_CONTENT, w, differentLogicalId, theDestroyer); } @Test @@ -217,13 +215,15 @@ class WorkbasketDefinitionControllerIntTest { String w1String = workbasketToString(w); w.getWorkbasket().setKey("new Key for this WB"); String w2String = workbasketToString(w); - Assertions.assertThrows(HttpClientErrorException.class, - () -> expectStatusWhenExecutingImportRequestOfWorkbaskets(HttpStatus.CONFLICT, - Arrays.asList(w1String, w2String))); + Assertions.assertThrows( + HttpClientErrorException.class, + () -> + expectStatusWhenExecutingImportRequestOfWorkbaskets( + HttpStatus.CONFLICT, Arrays.asList(w1String, w2String))); } - private void changeWorkbasketIdOrKey(WorkbasketDefinitionResource w, - String newId, String newKey) { + private void changeWorkbasketIdOrKey( + WorkbasketDefinitionResource w, String newId, String newKey) { if (newId != null && !newId.isEmpty()) { w.getWorkbasket().setWorkbasketId(newId); w.getAuthorizations().forEach(auth -> auth.setWorkbasketId(newId)); @@ -240,21 +240,18 @@ class WorkbasketDefinitionControllerIntTest { restHelper.toUrl(Mapping.URL_WORKBASKETDEFIITIONS) + "?domain=" + domain, HttpMethod.GET, restHelper.defaultRequest(), - new ParameterizedTypeReference>() { - }); + new ParameterizedTypeReference>() {}); } - private void expectStatusWhenExecutingImportRequestOfWorkbaskets(HttpStatus expectedStatus, - WorkbasketDefinitionResource... workbaskets) - throws IOException { + private void expectStatusWhenExecutingImportRequestOfWorkbaskets( + HttpStatus expectedStatus, WorkbasketDefinitionResource... workbaskets) throws IOException { List workbasketStrings = Arrays.stream(workbaskets).map(wb -> workbasketToString(wb)).collect(Collectors.toList()); expectStatusWhenExecutingImportRequestOfWorkbaskets(expectedStatus, workbasketStrings); } - private void expectStatusWhenExecutingImportRequestOfWorkbaskets(HttpStatus expectedStatus, - List workbasketStrings) - throws IOException { + private void expectStatusWhenExecutingImportRequestOfWorkbaskets( + HttpStatus expectedStatus, List workbasketStrings) throws IOException { File tmpFile = File.createTempFile("test", ".tmp"); OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(tmpFile), UTF_8); writer.write(workbasketStrings.toString()); @@ -268,8 +265,8 @@ class WorkbasketDefinitionControllerIntTest { HttpEntity> requestEntity = new HttpEntity<>(body, headers); String serverUrl = restHelper.toUrl(Mapping.URL_WORKBASKETDEFIITIONS); - ResponseEntity responseImport = template - .postForEntity(serverUrl, requestEntity, Void.class); + ResponseEntity responseImport = + template.postForEntity(serverUrl, requestEntity, Void.class); assertEquals(expectedStatus, responseImport.getStatusCode()); } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java index b09e02a93..04b9d6e85 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java @@ -5,9 +5,9 @@ import org.junit.Assert; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.TaskanaSpringBootTest; import pro.taskana.classification.internal.ClassificationImpl; import pro.taskana.rest.Mapping; diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationSummaryAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationSummaryAssemblerTest.java index 5e2efd4b4..18c80cb4a 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationSummaryAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationSummaryAssemblerTest.java @@ -5,9 +5,9 @@ import org.junit.Assert; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.ClassificationSummary; -import pro.taskana.TaskanaSpringBootTest; import pro.taskana.classification.internal.ClassificationImpl; /** Test for {@link ClassificationSummaryResourceAssembler}. */ 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 7a20fe282..f203d8954 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 @@ -17,11 +17,11 @@ import org.junit.jupiter.api.Test; 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.ClassificationReport; -import pro.taskana.report.api.WorkbasketReport; /** Test for {@link ReportResourceAssembler}. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java index acaf0b72c..ec97574f1 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java @@ -8,20 +8,20 @@ import org.junit.Assert; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import pro.taskana.task.api.Attachment; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; +import pro.taskana.common.api.exceptions.InvalidArgumentException; +import pro.taskana.rest.Mapping; +import pro.taskana.task.api.Attachment; import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; -import pro.taskana.TaskanaSpringBootTest; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.task.internal.AttachmentImpl; import pro.taskana.task.internal.TaskImpl; -import pro.taskana.rest.Mapping; +import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.workbasket.api.WorkbasketService; /** Test for {@link TaskResourceAssembler}. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskSummaryAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskSummaryAssemblerTest.java index 8449eb52b..b1ae56432 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskSummaryAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskSummaryAssemblerTest.java @@ -7,18 +7,18 @@ import org.junit.Assert; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import pro.taskana.task.api.AttachmentSummary; +import pro.taskana.TaskanaSpringBootTest; import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; +import pro.taskana.task.api.AttachmentSummary; import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; -import pro.taskana.TaskanaSpringBootTest; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.task.internal.AttachmentImpl; import pro.taskana.task.internal.TaskImpl; import pro.taskana.task.internal.TaskSummaryImpl; +import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.workbasket.api.WorkbasketService; @TaskanaSpringBootTest class TaskSummaryAssemblerTest { diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java index 9e73f4a36..c2710db66 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java @@ -6,13 +6,13 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.TaskanaSpringBootTest; +import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.rest.Mapping; import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; -import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; import pro.taskana.workbasket.internal.WorkbasketImpl; -import pro.taskana.rest.Mapping; /** Test for {@link WorkbasketResourceAssembler}. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/security/SampleLoginModule.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/security/SampleLoginModule.java index 24e511d74..65b53539a 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/security/SampleLoginModule.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/security/SampleLoginModule.java @@ -10,10 +10,10 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.spi.LoginModule; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import pro.taskana.ldap.LdapCacheTestImpl; -import pro.taskana.rest.resource.AccessIdResource; import pro.taskana.common.internal.security.GroupPrincipal; import pro.taskana.common.internal.security.UserPrincipal; +import pro.taskana.ldap.LdapCacheTestImpl; +import pro.taskana.rest.resource.AccessIdResource; /** * This class will take care of Test API calls authentification. Also see {@link WebSecurityConfig}