From c7742b3056f4c2d11ff4ddeef980e177bb82bd64 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Wed, 24 Nov 2021 18:25:35 +0100 Subject: [PATCH] TSK-1775: reformatted entire backend code base with new formatter --- .../api/exceptions/SystemException.java | 1 - .../impl/LogfileHistoryServiceImplTest.java | 2 +- .../impl/TaskHistoryQueryImpl.java | 4 +--- .../query/QueryTaskHistoryAccTest.java | 8 ++----- .../internal/jobs/AbstractTaskanaJob.java | 4 ++-- .../taskana/task/api/TaskCommentQuery.java | 1 - .../task/api/TaskCommentQueryColumnName.java | 3 --- .../task/internal/TaskServiceImpl.java | 3 +-- .../pro/taskana/user/api/models/User.java | 23 +++++++++---------- .../java/acceptance/task/GetTaskAccTest.java | 13 +++-------- .../TaskanaEngineConfigurationModifier.java | 1 - .../monitor/rest/ReportFilterParameter.java | 1 - .../routing/dmn/spi/api/DmnValidator.java | 1 - .../routing/dmn/spi/TestDmnValidatorImpl.java | 6 ++--- 14 files changed, 23 insertions(+), 48 deletions(-) diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/SystemException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/SystemException.java index 76e1f60f8..924be18f4 100644 --- a/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/SystemException.java +++ b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/SystemException.java @@ -12,5 +12,4 @@ public class SystemException extends TaskanaRuntimeException { public SystemException(String msg, Throwable cause) { super(msg, ErrorCode.of(ERROR_KEY), cause); } - } diff --git a/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java b/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java index 6acb5b73a..903bb611c 100644 --- a/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java +++ b/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java @@ -24,11 +24,11 @@ import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEventType; class LogfileHistoryServiceImplTest { + static TaskanaEngine taskanaEngineMock; private final ObjectMapper objectMapper = new ObjectMapper().registerModule(new JavaTimeModule()); private final LogfileHistoryServiceImpl logfileHistoryServiceImpl = new LogfileHistoryServiceImpl(); private final TestLogger logger = TestLoggerFactory.getTestLogger("AUDIT"); - static TaskanaEngine taskanaEngineMock; @AfterEach public void clearLoggers() { diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java index 64e49bf81..1cbeed7dd 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java @@ -82,8 +82,7 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery { private String[] custom3Like; private String[] custom4Like; - public TaskHistoryQueryImpl( - TaskanaHistoryEngineImpl taskanaHistoryEngine) { + public TaskHistoryQueryImpl(TaskanaHistoryEngineImpl taskanaHistoryEngine) { this.taskanaHistoryEngine = taskanaHistoryEngine; this.orderBy = new ArrayList<>(); this.orderColumns = new ArrayList<>(); @@ -266,7 +265,6 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery { return custom4Like; } - @Override public TaskHistoryQuery idIn(String... idIn) { this.idIn = toUpperCopy(idIn); diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java index b344f7590..8487ae789 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java @@ -501,9 +501,7 @@ class QueryTaskHistoryAccTest extends AbstractAccTest { .list(); assertThat(taskHistoryEvents).hasSize(1); - assertThat(taskHistoryEvents.get(0)) - .extracting(TaskHistoryEvent::getUserLongName) - .isNull(); + assertThat(taskHistoryEvents.get(0)).extracting(TaskHistoryEvent::getUserLongName).isNull(); } @WithAccessId(user = "user-1-1") @@ -533,8 +531,6 @@ class QueryTaskHistoryAccTest extends AbstractAccTest { .list(); assertThat(taskHistoryEvents).hasSize(1); - assertThat(taskHistoryEvents.get(0)) - .extracting(TaskHistoryEvent::getUserLongName) - .isNull(); + assertThat(taskHistoryEvents.get(0)).extracting(TaskHistoryEvent::getUserLongName).isNull(); } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java index 45cdf894d..a54dfff37 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java @@ -13,12 +13,12 @@ import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; /** Abstract base for all background jobs of TASKANA. */ public abstract class AbstractTaskanaJob implements TaskanaJob { - protected Instant firstRun; - protected Duration runEvery; protected final TaskanaEngineImpl taskanaEngineImpl; protected final TaskanaTransactionProvider txProvider; protected final ScheduledJob scheduledJob; private final boolean async; + protected Instant firstRun; + protected Duration runEvery; protected AbstractTaskanaJob( TaskanaEngine taskanaEngine, diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskCommentQuery.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskCommentQuery.java index e21ca2651..3dc9a5860 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskCommentQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskCommentQuery.java @@ -51,7 +51,6 @@ public interface TaskCommentQuery extends BaseQuery