This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit d95e7cbea4e734f0af6e4d8c05d2cb961b79e81b Author: Benoit Tellier <[email protected]> AuthorDate: Sun Feb 20 13:30:39 2022 +0700 [SONAR] Run inspections for Tasks projects --- .../apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java | 4 ++-- .../james/server/task/json/dto/AdditionalInformationDTOModule.java | 5 ----- .../src/main/java/org/apache/james/task/MemoryWorkQueue.java | 2 +- .../src/test/java/org/apache/james/task/TaskWithIdTest.java | 6 +++--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java index 09f49f3..bce12a9 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java @@ -72,7 +72,7 @@ class WebAdminUserReprocessingDTOTest { String json = JsonGenericSerializer.forModules(WebAdminUserReindexingTaskAdditionalInformationDTO - .serializationModule(new TestId.Factory())) + .serializationModule()) .withoutNestedType() .serialize(domainObject); @@ -83,7 +83,7 @@ class WebAdminUserReprocessingDTOTest { @Test void deserializeShouldNotBeSupported() { assertThatThrownBy(() -> JsonGenericSerializer.forModules(WebAdminUserReindexingTaskAdditionalInformationDTO - .serializationModule(new TestId.Factory())) + .serializationModule()) .withoutNestedType() .deserialize(serializedAdditionalInformation)) .isInstanceOf(InvalidDefinitionException.class); diff --git a/server/task/task-json/src/main/java/org/apache/james/server/task/json/dto/AdditionalInformationDTOModule.java b/server/task/task-json/src/main/java/org/apache/james/server/task/json/dto/AdditionalInformationDTOModule.java index 59af490..9a4f4fa 100644 --- a/server/task/task-json/src/main/java/org/apache/james/server/task/json/dto/AdditionalInformationDTOModule.java +++ b/server/task/task-json/src/main/java/org/apache/james/server/task/json/dto/AdditionalInformationDTOModule.java @@ -19,15 +19,10 @@ package org.apache.james.server.task.json.dto; import org.apache.james.json.DTOModule; -import org.apache.james.task.Task; import org.apache.james.task.TaskExecutionDetails; public class AdditionalInformationDTOModule<T extends TaskExecutionDetails.AdditionalInformation, U extends AdditionalInformationDTO> extends DTOModule<T, U> { - public static <TaskTypeT extends Task> Builder<TaskTypeT> forAdditionalInformation(Class<TaskTypeT> taskType) { - return new Builder<>(taskType); - } - public AdditionalInformationDTOModule(DTOConverter<T, U> converter, DomainObjectConverter<T, U> toDomainObjectConverter, Class<T> domainObjectType, Class<U> dtoType, String typeName) { super(converter, toDomainObjectConverter, domainObjectType, dtoType, typeName); } diff --git a/server/task/task-memory/src/main/java/org/apache/james/task/MemoryWorkQueue.java b/server/task/task-memory/src/main/java/org/apache/james/task/MemoryWorkQueue.java index 4446bd4..71275f2 100644 --- a/server/task/task-memory/src/main/java/org/apache/james/task/MemoryWorkQueue.java +++ b/server/task/task-memory/src/main/java/org/apache/james/task/MemoryWorkQueue.java @@ -57,7 +57,7 @@ public class MemoryWorkQueue implements WorkQueue { public void close() throws IOException { try { subscription.dispose(); - } catch (Throwable ignore) { + } catch (Exception ignore) { //avoid failing during close } worker.close(); diff --git a/server/task/task-memory/src/test/java/org/apache/james/task/TaskWithIdTest.java b/server/task/task-memory/src/test/java/org/apache/james/task/TaskWithIdTest.java index 40efa89..59462ab 100644 --- a/server/task/task-memory/src/test/java/org/apache/james/task/TaskWithIdTest.java +++ b/server/task/task-memory/src/test/java/org/apache/james/task/TaskWithIdTest.java @@ -23,10 +23,10 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -public class TaskWithIdTest { +class TaskWithIdTest { @Test - public void twoTasksWithSameIdShouldBeEqual() { + void twoTasksWithSameIdShouldBeEqual() { TaskId id = TaskId.generateTaskId(); Task task1 = new MemoryReferenceTask(() -> Task.Result.COMPLETED); Task task2 = new MemoryReferenceTask(() -> Task.Result.COMPLETED); @@ -36,7 +36,7 @@ public class TaskWithIdTest { } @Test - public void sameTaskWithDifferentIdShouldNotBeEqual() { + void sameTaskWithDifferentIdShouldNotBeEqual() { TaskId id1 = TaskId.generateTaskId(); TaskId id2 = TaskId.generateTaskId(); Task task = new MemoryReferenceTask(() -> Task.Result.COMPLETED); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
