You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2020/06/11 15:25:45 UTC
[james-project] 08/17: JAMES-3194 Homogeneous naming for Additional
Information serialization modules
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e6ae7ebf77fef4b10cb44bda3b81584728c53400
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 10 09:28:33 2020 +0700
JAMES-3194 Homogeneous naming for Additional Information serialization modules
---
.../MigrationTaskAdditionalInformationDTO.java | 2 +-
.../migration/MigrationTaskSerializationTest.java | 2 +-
...MailboxMergingTaskAdditionalInformationDTO.java | 6 ++++--
...ailboxCountersTaskAdditionalInformationDTO.java | 6 ++++--
...nconsistenciesTaskAdditionalInformationDTO.java | 7 ++++---
...nconsistenciesTaskAdditionalInformationDTO.java | 6 +++---
.../mail/task/MailboxMergingTaskTest.java | 2 +-
...omputeMailboxCountersTaskSerializationTest.java | 2 +-
...ailboxInconsistenciesTaskSerializationTest.java | 2 +-
...essageInconsistenciesTaskSerializationTest.java | 4 ++--
...bageCollectionTaskAdditionalInformationDTO.java | 9 ++++++++
...aultGarbageCollectionTaskSerializationTest.java | 2 +-
...geIdReindexingTaskAdditionalInformationDTO.java | 2 +-
.../indexer/ReprocessingContextInformationDTO.java | 6 +++---
...lboxReindexingTaskAdditionalInformationDTO.java | 2 +-
...sageReindexingTaskAdditionalInformationDTO.java | 2 +-
...UserReindexingTaskAdditionalInformationDTO.java | 2 +-
...rorRecoveryIndexationTaskSerializationTest.java | 4 ++--
.../FullReindexingTaskSerializationTest.java | 4 ++--
.../MessageIdReindexingTaskSerializationTest.java | 2 +-
...ngleMailboxReindexingTaskSerializationTest.java | 4 ++--
...ngleMessageReindexingTaskSerializationTest.java | 2 +-
.../UserReindexingTaskSerializationTest.java | 4 ++--
...eCurrentQuotasTaskAdditionalInformationDTO.java | 6 +++---
...ecomputeCurrentQuotasTaskSerializationTest.java | 4 ++--
...assandraConsistencyTaskSerializationModule.java | 24 +++++++++++-----------
.../vault/VaultTaskSerializationModule.java | 16 +++++++--------
.../mailbox/ReIndexingTaskSerializationModule.java | 12 +++++------
.../server/JmapTaskSerializationModule.java | 8 ++++----
.../WebAdminReIndexingTaskSerializationModule.java | 4 ++--
.../WebadminMailboxTaskSerializationModule.java | 16 +++++++--------
.../server/MailQueueTaskSerializationModule.java | 8 ++++----
.../MailRepositoryTaskSerializationModule.java | 12 +++++------
...urcesMigrationTaskAdditionalInformationDTO.java | 2 +-
...pingsSourcesMigrationTaskSerializationTest.java | 2 +-
.../routes/CassandraMappingsRoutesTest.java | 2 +-
...AdminMigrationTaskAdditionalInformationDTO.java | 2 +-
.../WebAdminMigrationTaskSerializationTest.java | 3 +--
.../routes/CassandraMigrationRoutesTest.java | 3 +--
...lveMessageInconsistenciesRequestToTaskTest.java | 2 +-
...uteAllFastViewTaskAdditionalInformationDTO.java | 5 +++--
...teUserFastViewTaskAdditionalInformationDTO.java | 5 +++--
...llFastViewProjectionItemsRequestToTaskTest.java | 2 +-
...ctionItemsTaskAdditionalInformationDTOTest.java | 4 ++--
...erFastViewProjectionItemsRequestToTaskTest.java | 2 +-
...ctionItemsTaskAdditionalInformationDTOTest.java | 4 ++--
...gesVaultDeleteTaskAdditionalInformationDTO.java | 2 +-
...gesVaultExportTaskAdditionalInformationDTO.java | 6 +++---
...esVaultRestoreTaskAdditionalInformationDTO.java | 6 +++---
...gesVaultDeleteTaskAdditionalInformationDTO.java | 2 +-
...esVaultRestoreTaskAdditionalInformationDTO.java | 6 +++---
...edMessagesVaultDeleteTaskSerializationTest.java | 2 +-
...edMessagesVaultExportTaskSerializationTest.java | 4 ++--
...dMessagesVaultRestoreTaskSerializationTest.java | 2 +-
.../routes/DeletedMessagesVaultRoutesTest.java | 8 ++++----
...edMessagesVaultDeleteTaskSerializationTest.java | 2 +-
...dMessagesVaultRestoreTaskSerializationTest.java | 2 +-
...tersRedeliveryTaskAdditionalInformationDTO.java | 17 +++++++--------
.../routes/EventDeadLettersRoutesTest.java | 6 +++---
.../james/webadmin/routes/MailboxesRoutesTest.java | 7 +------
.../james/webadmin/routes/MessageRoutesTest.java | 2 +-
.../routes/WebAdminQuotaSearchTestSystem.java | 2 +-
.../service/EventDeadLettersRedeliverTaskTest.java | 6 +++---
...ClearMailQueueTaskAdditionalInformationDTO.java | 8 ++++----
...sFromMailQueueTaskAdditionalInformationDTO.java | 7 +++----
...sFromMailQueueTaskAdditionalInformationDTO.java | 7 +++----
.../james/webadmin/routes/MailQueueRoutesTest.java | 5 ++---
.../webadmin/service/ClearMailQueueTaskTest.java | 2 +-
.../service/DeleteMailsFromMailQueueTaskTest.java | 5 ++---
...mMailQueueTaskAdditionalInformationDTOTest.java | 2 +-
...MailRepositoryTaskAdditionalInformationDTO.java | 9 ++++----
...essingAllMailsTaskAdditionalInformationDTO.java | 9 ++++----
...cessingOneMailTaskAdditionalInformationDTO.java | 9 ++++----
...MailRepositoryTaskAdditionalInformationDTO.java | 9 ++++----
.../routes/MailRepositoriesRoutesTest.java | 7 +++----
.../service/ClearMailRepositoryTaskTest.java | 2 +-
.../service/ReprocessingAllMailsTaskTest.java | 2 +-
.../service/ReprocessingOneMailTaskTest.java | 2 +-
.../WebAdminClearMailRepositoryTaskDTOTest.java | 2 +-
79 files changed, 201 insertions(+), 200 deletions(-)
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java
index aef36f5..bb768cc 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class MigrationTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<MigrationTask.AdditionalInformation, MigrationTaskAdditionalInformationDTO> serializationModule() {
+ public static AdditionalInformationDTOModule<MigrationTask.AdditionalInformation, MigrationTaskAdditionalInformationDTO> module() {
return DTOModule.forDomainObject(MigrationTask.AdditionalInformation.class)
.convertToDTO(MigrationTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new MigrationTask.AdditionalInformation(new SchemaVersion(dto.getTargetVersion()), dto.timestamp))
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/MigrationTaskSerializationTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/MigrationTaskSerializationTest.java
index 7dd5686..5a97860 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/MigrationTaskSerializationTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/MigrationTaskSerializationTest.java
@@ -44,7 +44,7 @@ class MigrationTaskSerializationTest {
private final CassandraSchemaTransitions transitions = mock(CassandraSchemaTransitions.class);
private final MigrationTask.Factory factory = target -> new MigrationTask(cassandraSchemaVersionDAO, transitions, target);
private final JsonTaskSerializer taskSerializer = JsonTaskSerializer.of(MigrationTaskDTO.module(factory));
- private JsonTaskAdditionalInformationSerializer jsonAdditionalInformationSerializer = JsonTaskAdditionalInformationSerializer.of(MigrationTaskAdditionalInformationDTO.serializationModule());
+ private JsonTaskAdditionalInformationSerializer jsonAdditionalInformationSerializer = JsonTaskAdditionalInformationSerializer.of(MigrationTaskAdditionalInformationDTO.module());
@Test
void taskShouldBeSerializable() throws JsonProcessingException {
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskAdditionalInformationDTO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskAdditionalInformationDTO.java
index df3dd79..dd569e0 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskAdditionalInformationDTO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskAdditionalInformationDTO.java
@@ -44,13 +44,15 @@ public class MailboxMergingTaskAdditionalInformationDTO implements AdditionalInf
);
}
- public static final AdditionalInformationDTOModule<MailboxMergingTask.Details, MailboxMergingTaskAdditionalInformationDTO> SERIALIZATION_MODULE =
- DTOModule.forDomainObject(MailboxMergingTask.Details.class)
+ public static AdditionalInformationDTOModule<MailboxMergingTask.Details, MailboxMergingTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(MailboxMergingTask.Details.class)
.convertToDTO(MailboxMergingTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(MailboxMergingTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(MailboxMergingTaskAdditionalInformationDTO::fromDomainObject)
.typeName(MailboxMergingTask.MAILBOX_MERGING.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
+
private final String type;
private final String oldMailboxId;
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskAdditionalInformationDTO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskAdditionalInformationDTO.java
index e7eef3d..ee88d87 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskAdditionalInformationDTO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskAdditionalInformationDTO.java
@@ -37,14 +37,16 @@ public class RecomputeMailboxCountersTaskAdditionalInformationDTO implements Add
details.timestamp());
}
- public static final AdditionalInformationDTOModule<RecomputeMailboxCountersTask.Details, RecomputeMailboxCountersTaskAdditionalInformationDTO> MODULE =
- DTOModule
+ public static final AdditionalInformationDTOModule<RecomputeMailboxCountersTask.Details, RecomputeMailboxCountersTaskAdditionalInformationDTO> module() {
+ return DTOModule
.forDomainObject(RecomputeMailboxCountersTask.Details.class)
.convertToDTO(RecomputeMailboxCountersTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(RecomputeMailboxCountersTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(RecomputeMailboxCountersTaskAdditionalInformationDTO::fromDomainObject)
.typeName(RecomputeMailboxCountersTask.RECOMPUTE_MAILBOX_COUNTERS.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
+
private final String type;
private final long processedMailboxes;
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTaskAdditionalInformationDTO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTaskAdditionalInformationDTO.java
index d74e706..5811a68 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTaskAdditionalInformationDTO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTaskAdditionalInformationDTO.java
@@ -40,14 +40,15 @@ public class SolveMailboxInconsistenciesTaskAdditionalInformationDTO implements
details.timestamp());
}
- public static final AdditionalInformationDTOModule<SolveMailboxInconsistenciesTask.Details, SolveMailboxInconsistenciesTaskAdditionalInformationDTO> MODULE =
- DTOModule
- .forDomainObject(SolveMailboxInconsistenciesTask.Details.class)
+ public static AdditionalInformationDTOModule<SolveMailboxInconsistenciesTask.Details, SolveMailboxInconsistenciesTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(SolveMailboxInconsistenciesTask.Details.class)
.convertToDTO(SolveMailboxInconsistenciesTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(SolveMailboxInconsistenciesTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(SolveMailboxInconsistenciesTaskAdditionalInformationDTO::fromDomainObject)
.typeName(SolveMailboxInconsistenciesTask.SOLVE_MAILBOX_INCONSISTENCIES.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
+
private final String type;
private final long processedMailboxEntries;
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTaskAdditionalInformationDTO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTaskAdditionalInformationDTO.java
index c8ae05d..ca1484c 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTaskAdditionalInformationDTO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTaskAdditionalInformationDTO.java
@@ -49,14 +49,14 @@ public class SolveMessageInconsistenciesTaskAdditionalInformationDTO implements
details.getErrors());
}
- public static final AdditionalInformationDTOModule<Details, SolveMessageInconsistenciesTaskAdditionalInformationDTO> MODULE =
- DTOModule
- .forDomainObject(Details.class)
+ public static AdditionalInformationDTOModule<Details, SolveMessageInconsistenciesTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(Details.class)
.convertToDTO(SolveMessageInconsistenciesTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(SolveMessageInconsistenciesTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(SolveMessageInconsistenciesTaskAdditionalInformationDTO::fromDomainObject)
.typeName(SOLVE_MESSAGE_INCONSISTENCIES.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final Instant timestamp;
private final String type;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskTest.java
index 02e4b16..aacd4c2 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskTest.java
@@ -46,7 +46,7 @@ class MailboxMergingTaskTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(MailboxMergingTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ JsonSerializationVerifier.dtoModule(MailboxMergingTaskAdditionalInformationDTO.module())
.bean(DETAILS)
.json(SERIALIZED_ADDITIONAL_INFORMATION)
.verify();
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskSerializationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskSerializationTest.java
index d5bd9d8..9484710 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskSerializationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskSerializationTest.java
@@ -84,7 +84,7 @@ class RecomputeMailboxCountersTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(RecomputeMailboxCountersTaskAdditionalInformationDTO.MODULE)
+ JsonSerializationVerifier.dtoModule(RecomputeMailboxCountersTaskAdditionalInformationDTO.module())
.bean(DETAILS)
.json(SERIALIZED_ADDITIONAL_INFORMATION)
.verify();
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTaskSerializationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTaskSerializationTest.java
index f490060..e44d347 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTaskSerializationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTaskSerializationTest.java
@@ -78,7 +78,7 @@ class SolveMailboxInconsistenciesTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(SolveMailboxInconsistenciesTaskAdditionalInformationDTO.MODULE)
+ JsonSerializationVerifier.dtoModule(SolveMailboxInconsistenciesTaskAdditionalInformationDTO.module())
.bean(DETAILS)
.json(SERIALIZED_ADDITIONAL_INFORMATION)
.verify();
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTaskSerializationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTaskSerializationTest.java
index 0d7717a..d450a52 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTaskSerializationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTaskSerializationTest.java
@@ -86,7 +86,7 @@ public class SolveMessageInconsistenciesTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(SolveMessageInconsistenciesTaskAdditionalInformationDTO.MODULE)
+ JsonSerializationVerifier.dtoModule(SolveMessageInconsistenciesTaskAdditionalInformationDTO.module())
.bean(DETAILS)
.json(ClassLoaderUtils.getSystemResourceAsString("json/solveMessageInconsistencies.additionalInformation.json"))
.verify();
@@ -94,7 +94,7 @@ public class SolveMessageInconsistenciesTaskSerializationTest {
@Test
void legacyAdditionalInformationShouldBeDeserializable() throws Exception {
- SolveMessageInconsistenciesTask.Details legacyDetails = JsonGenericSerializer.forModules(SolveMessageInconsistenciesTaskAdditionalInformationDTO.MODULE)
+ SolveMessageInconsistenciesTask.Details legacyDetails = JsonGenericSerializer.forModules(SolveMessageInconsistenciesTaskAdditionalInformationDTO.module())
.withoutNestedType()
.deserialize(ClassLoaderUtils.getSystemResourceAsString("json/solveMessageInconsistencies.additionalInformation.legacy.json"));
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.java
index c757f38..5689e8e 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.java
@@ -51,6 +51,15 @@ public class BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO impleme
.typeName(BlobStoreVaultGarbageCollectionTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ public static final AdditionalInformationDTOModule<BlobStoreVaultGarbageCollectionTask.AdditionalInformation, BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(BlobStoreVaultGarbageCollectionTask.AdditionalInformation.class)
+ .convertToDTO(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.class)
+ .toDomainObjectConverter(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO::toDomainObject)
+ .toDTOConverter(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO::fromDomainObject)
+ .typeName(BlobStoreVaultGarbageCollectionTask.TYPE.asString())
+ .withFactory(AdditionalInformationDTOModule::new);
+ }
+
private final String beginningOfRetentionPeriod;
private final Collection<String> deletedBuckets;
private final String type;
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
index 2d2cd34..482668c 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
@@ -56,7 +56,7 @@ class BlobStoreVaultGarbageCollectionTaskSerializationTest {
private static final String SERIALIZED_TASK = "{\"type\":\"deleted-messages-blob-store-based-garbage-collection\"}";
private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"type\":\"deleted-messages-blob-store-based-garbage-collection\", \"beginningOfRetentionPeriod\":\"2019-09-03T15:26:13.356+02:00[Europe/Paris]\",\"deletedBuckets\":[\"1\", \"2\", \"3\"], \"timestamp\": \"2018-11-13T12:00:55Z\"}";
- private static final JsonTaskAdditionalInformationSerializer JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = JsonTaskAdditionalInformationSerializer.of(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.MODULE);
+ private static final JsonTaskAdditionalInformationSerializer JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = JsonTaskAdditionalInformationSerializer.of(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.module());
@BeforeAll
static void setUp() {
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskAdditionalInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskAdditionalInformationDTO.java
index b417db8..4716591 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskAdditionalInformationDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskAdditionalInformationDTO.java
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class MessageIdReindexingTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<MessageIdReIndexingTask.AdditionalInformation, MessageIdReindexingTaskAdditionalInformationDTO> serializationModule(MessageId.Factory factory) {
+ public static AdditionalInformationDTOModule<MessageIdReIndexingTask.AdditionalInformation, MessageIdReindexingTaskAdditionalInformationDTO> module(MessageId.Factory factory) {
return DTOModule.forDomainObject(MessageIdReIndexingTask.AdditionalInformation.class)
.convertToDTO(MessageIdReindexingTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new MessageIdReIndexingTask.AdditionalInformation(factory.fromString(dto.getMessageId()), dto.timestamp))
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java
index 363cc42..eaab926 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java
@@ -35,8 +35,8 @@ import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.steveash.guavate.Guavate;
-import com.google.common.base.Preconditions;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableListMultimap;
@@ -77,7 +77,7 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
}
}
- public static AdditionalInformationDTOModule<ReprocessingContextInformationForErrorRecoveryIndexationTask, DTO> serializationModule(MailboxId.Factory mailboxIdFactory) {
+ public static AdditionalInformationDTOModule<ReprocessingContextInformationForErrorRecoveryIndexationTask, DTO> module(MailboxId.Factory mailboxIdFactory) {
return DTOModule.forDomainObject(ReprocessingContextInformationForErrorRecoveryIndexationTask.class)
.convertToDTO(DTO.class)
.toDomainObjectConverter(dto -> new ReprocessingContextInformationForErrorRecoveryIndexationTask(
@@ -128,7 +128,7 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
}
}
- public static AdditionalInformationDTOModule<ReprocessingContextInformationForFullReindexingTask, DTO> serializationModule(MailboxId.Factory mailboxIdFactory) {
+ public static AdditionalInformationDTOModule<ReprocessingContextInformationForFullReindexingTask, DTO> module(MailboxId.Factory mailboxIdFactory) {
return DTOModule.forDomainObject(ReprocessingContextInformationForFullReindexingTask.class)
.convertToDTO(DTO.class)
.toDomainObjectConverter(dto -> new ReprocessingContextInformationForFullReindexingTask(
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java
index 21950e7..37b1cb8 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java
@@ -35,7 +35,7 @@ import com.google.common.collect.ImmutableList;
public class SingleMailboxReindexingTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<SingleMailboxReindexingTask.AdditionalInformation, SingleMailboxReindexingTaskAdditionalInformationDTO> serializationModule(MailboxId.Factory factory) {
+ public static AdditionalInformationDTOModule<SingleMailboxReindexingTask.AdditionalInformation, SingleMailboxReindexingTaskAdditionalInformationDTO> module(MailboxId.Factory factory) {
return DTOModule.forDomainObject(SingleMailboxReindexingTask.AdditionalInformation.class)
.convertToDTO(SingleMailboxReindexingTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new SingleMailboxReindexingTask.AdditionalInformation(factory.fromString(dto.getMailboxId()),
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskAdditionalInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskAdditionalInformationDTO.java
index c783c63..1dab8a5 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskAdditionalInformationDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskAdditionalInformationDTO.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class SingleMessageReindexingTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<SingleMessageReindexingTask.AdditionalInformation, SingleMessageReindexingTaskAdditionalInformationDTO> serializationModule(MailboxId.Factory factory) {
+ public static AdditionalInformationDTOModule<SingleMessageReindexingTask.AdditionalInformation, SingleMessageReindexingTaskAdditionalInformationDTO> module(MailboxId.Factory factory) {
return DTOModule.forDomainObject(SingleMessageReindexingTask.AdditionalInformation.class)
.convertToDTO(SingleMessageReindexingTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new SingleMessageReindexingTask.AdditionalInformation(
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTaskAdditionalInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTaskAdditionalInformationDTO.java
index 220a7f0..f242ef4 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTaskAdditionalInformationDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTaskAdditionalInformationDTO.java
@@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableList;
public class UserReindexingTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<UserReindexingTask.AdditionalInformation, UserReindexingTaskAdditionalInformationDTO> serializationModule(MailboxId.Factory factory) {
+ public static AdditionalInformationDTOModule<UserReindexingTask.AdditionalInformation, UserReindexingTaskAdditionalInformationDTO> module(MailboxId.Factory factory) {
return DTOModule.forDomainObject(UserReindexingTask.AdditionalInformation.class)
.convertToDTO(UserReindexingTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new UserReindexingTask.AdditionalInformation(Username.of(dto.getUser()),
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
index 05ba84d..3ad7d4f 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
@@ -90,7 +90,7 @@ class ErrorRecoveryIndexationTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
ReprocessingContextInformationForErrorRecoveryIndexationTask details = new ReprocessingContextInformationForErrorRecoveryIndexationTask(successfullyReprocessedMailCount, failedReprocessedMailCount, executionFailures, TIMESTAMP, RunningOptions.DEFAULT);
- JsonSerializationVerifier.dtoModule(ReprocessingContextInformationForErrorRecoveryIndexationTask.serializationModule(mailboxIdFactory))
+ JsonSerializationVerifier.dtoModule(ReprocessingContextInformationForErrorRecoveryIndexationTask.module(mailboxIdFactory))
.bean(details)
.json(serializedAdditionalInformation)
.verify();
@@ -98,7 +98,7 @@ class ErrorRecoveryIndexationTaskSerializationTest {
@Test
void legacyAdditionalInformationShouldBeDeserializable() throws Exception {
- ReprocessingContextInformationForErrorRecoveryIndexationTask legacyAdditionalInformation = JsonGenericSerializer.forModules(ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask.serializationModule(new TestId.Factory()))
+ ReprocessingContextInformationForErrorRecoveryIndexationTask legacyAdditionalInformation = JsonGenericSerializer.forModules(ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask.module(new TestId.Factory()))
.withoutNestedType()
.deserialize(legacySerializedAdditionalInformation);
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
index 49b3511..a19d8d1 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
@@ -90,7 +90,7 @@ class FullReindexingTaskSerializationTest {
void additionalInformationShouldBeSerializable() throws Exception {
ReprocessingContextInformationForFullReindexingTask details = new ReprocessingContextInformationForFullReindexingTask(successfullyReprocessedMailCount, failedReprocessedMailCount, reIndexingExecutionFailures, TIMESTAMP, RunningOptions.DEFAULT);
- JsonSerializationVerifier.dtoModule(ReprocessingContextInformationForFullReindexingTask.serializationModule(new TestId.Factory()))
+ JsonSerializationVerifier.dtoModule(ReprocessingContextInformationForFullReindexingTask.module(new TestId.Factory()))
.bean(details)
.json(serializedAdditionalInformation)
.verify();
@@ -98,7 +98,7 @@ class FullReindexingTaskSerializationTest {
@Test
void legacyAdditionalInformationShouldBeDeserializable() throws Exception {
- ReprocessingContextInformationForFullReindexingTask legacyAdditionalInformation = JsonGenericSerializer.forModules(ReprocessingContextInformationForFullReindexingTask.serializationModule(new TestId.Factory()))
+ ReprocessingContextInformationForFullReindexingTask legacyAdditionalInformation = JsonGenericSerializer.forModules(ReprocessingContextInformationForFullReindexingTask.module(new TestId.Factory()))
.withoutNestedType()
.deserialize(legacySerializedAdditionalInformation);
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskSerializationTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskSerializationTest.java
index f309686..d1015d9 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskSerializationTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskSerializationTest.java
@@ -59,7 +59,7 @@ class MessageIdReindexingTaskSerializationTest {
MessageId messageId = messageIdFactory.fromString("1");
MessageIdReIndexingTask.AdditionalInformation details = new MessageIdReIndexingTask.AdditionalInformation(messageId, TIMESTAMP);
- JsonSerializationVerifier.dtoModule(MessageIdReindexingTaskAdditionalInformationDTO.serializationModule(messageIdFactory))
+ JsonSerializationVerifier.dtoModule(MessageIdReindexingTaskAdditionalInformationDTO.module(messageIdFactory))
.bean(details)
.json(serializedAdditionalInformation)
.verify();
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskSerializationTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskSerializationTest.java
index 3e1028a..df5a50d 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskSerializationTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskSerializationTest.java
@@ -88,7 +88,7 @@ class SingleMailboxReindexingTaskSerializationTest {
void additionalInformationShouldBeSerializable() throws Exception {
SingleMailboxReindexingTask.AdditionalInformation details = new SingleMailboxReindexingTask.AdditionalInformation(mailboxId, successfullyReprocessedMailCount, failedReprocessedMailCount, reIndexingExecutionFailures, TIMESTAMP, RunningOptions.DEFAULT);
- JsonSerializationVerifier.dtoModule(SingleMailboxReindexingTaskAdditionalInformationDTO.serializationModule(new TestId.Factory()))
+ JsonSerializationVerifier.dtoModule(SingleMailboxReindexingTaskAdditionalInformationDTO.module(new TestId.Factory()))
.bean(details)
.json(serializedAdditionalInformation)
.verify();
@@ -96,7 +96,7 @@ class SingleMailboxReindexingTaskSerializationTest {
@Test
void legacyAdditionalInformationShouldBeDeserializable() throws Exception {
- SingleMailboxReindexingTask.AdditionalInformation legacyAdditionalInformation = JsonGenericSerializer.forModules(SingleMailboxReindexingTaskAdditionalInformationDTO.serializationModule(new TestId.Factory()))
+ SingleMailboxReindexingTask.AdditionalInformation legacyAdditionalInformation = JsonGenericSerializer.forModules(SingleMailboxReindexingTaskAdditionalInformationDTO.module(new TestId.Factory()))
.withoutNestedType()
.deserialize(legacySerializedAdditionalInformation);
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskSerializationTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskSerializationTest.java
index 119098c..2aa0d26 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskSerializationTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskSerializationTest.java
@@ -57,7 +57,7 @@ class SingleMessageReindexingTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
SingleMessageReindexingTask.AdditionalInformation details = new SingleMessageReindexingTask.AdditionalInformation(mailboxId, messageUid, TIMESTAMP);
- JsonSerializationVerifier.dtoModule(SingleMessageReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory))
+ JsonSerializationVerifier.dtoModule(SingleMessageReindexingTaskAdditionalInformationDTO.module(mailboxIdFactory))
.bean(details)
.json(serializedAdditionalInformation)
.verify();
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/UserReindexingTaskSerializationTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/UserReindexingTaskSerializationTest.java
index 84c9efd..7dbb40d 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/UserReindexingTaskSerializationTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/UserReindexingTaskSerializationTest.java
@@ -89,7 +89,7 @@ class UserReindexingTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
UserReindexingTask.AdditionalInformation details = new UserReindexingTask.AdditionalInformation(USERNAME, successfullyReprocessedMailCount, failedReprocessedMailCount, reIndexingExecutionFailures, TIMESTAMP, RunningOptions.DEFAULT);
- JsonSerializationVerifier.dtoModule(UserReindexingTaskAdditionalInformationDTO.serializationModule(new TestId.Factory()))
+ JsonSerializationVerifier.dtoModule(UserReindexingTaskAdditionalInformationDTO.module(new TestId.Factory()))
.bean(details)
.json(serializedAdditionalInformation)
.verify();
@@ -97,7 +97,7 @@ class UserReindexingTaskSerializationTest {
@Test
void legacyAdditionalInformationShouldBeDeserializable() throws Exception {
- UserReindexingTask.AdditionalInformation legacyAdditionalInformation = JsonGenericSerializer.forModules(UserReindexingTaskAdditionalInformationDTO.serializationModule(new TestId.Factory()))
+ UserReindexingTask.AdditionalInformation legacyAdditionalInformation = JsonGenericSerializer.forModules(UserReindexingTaskAdditionalInformationDTO.module(new TestId.Factory()))
.withoutNestedType()
.deserialize(legacySerializedAdditionalInformation);
diff --git a/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTaskAdditionalInformationDTO.java b/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTaskAdditionalInformationDTO.java
index 5d8a56f..8d807e3 100644
--- a/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTaskAdditionalInformationDTO.java
+++ b/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTaskAdditionalInformationDTO.java
@@ -40,14 +40,14 @@ public class RecomputeCurrentQuotasTaskAdditionalInformationDTO implements Addit
details.timestamp());
}
- public static final AdditionalInformationDTOModule<RecomputeCurrentQuotasTask.Details, RecomputeCurrentQuotasTaskAdditionalInformationDTO> MODULE =
- DTOModule
- .forDomainObject(RecomputeCurrentQuotasTask.Details.class)
+ public static AdditionalInformationDTOModule<RecomputeCurrentQuotasTask.Details, RecomputeCurrentQuotasTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(RecomputeCurrentQuotasTask.Details.class)
.convertToDTO(RecomputeCurrentQuotasTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(RecomputeCurrentQuotasTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(RecomputeCurrentQuotasTaskAdditionalInformationDTO::fromDomainObject)
.typeName(RecomputeCurrentQuotasTask.RECOMPUTE_CURRENT_QUOTAS.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final String type;
private final long processedQuotaRoots;
diff --git a/mailbox/tools/quota-recompute/src/test/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTaskSerializationTest.java b/mailbox/tools/quota-recompute/src/test/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTaskSerializationTest.java
index 73fbc5b..116ae10 100644
--- a/mailbox/tools/quota-recompute/src/test/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTaskSerializationTest.java
+++ b/mailbox/tools/quota-recompute/src/test/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTaskSerializationTest.java
@@ -66,7 +66,7 @@ class RecomputeCurrentQuotasTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(RecomputeCurrentQuotasTaskAdditionalInformationDTO.MODULE)
+ JsonSerializationVerifier.dtoModule(RecomputeCurrentQuotasTaskAdditionalInformationDTO.module())
.bean(DETAILS)
.json(SERIALIZED_ADDITIONAL_INFORMATION)
.verify();
@@ -84,7 +84,7 @@ class RecomputeCurrentQuotasTaskSerializationTest {
@Test
void shouldDeserializeLegacyDetails() throws Exception {
- RecomputeCurrentQuotasTask.Details legacyDetails = JsonGenericSerializer.forModules(RecomputeCurrentQuotasTaskAdditionalInformationDTO.MODULE)
+ RecomputeCurrentQuotasTask.Details legacyDetails = JsonGenericSerializer.forModules(RecomputeCurrentQuotasTaskAdditionalInformationDTO.module())
.withoutNestedType()
.deserialize(SERIALIZED_ADDITIONAL_INFORMATION_LEGACY);
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/CassandraConsistencyTaskSerializationModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/CassandraConsistencyTaskSerializationModule.java
index 7c1546b..735b4ac 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/CassandraConsistencyTaskSerializationModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/CassandraConsistencyTaskSerializationModule.java
@@ -83,67 +83,67 @@ public class CassandraConsistencyTaskSerializationModule extends AbstractModule
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> cassandraMappingsSolveInconsistenciesAdditionalInformation() {
- return MappingsSourcesMigrationTaskAdditionalInformationDTO.serializationModule(CassandraMappingsSolveInconsistenciesTask.TYPE);
+ return MappingsSourcesMigrationTaskAdditionalInformationDTO.module(CassandraMappingsSolveInconsistenciesTask.TYPE);
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminCassandraMappingsSolveInconsistenciesAdditionalInformation() {
- return MappingsSourcesMigrationTaskAdditionalInformationDTO.serializationModule(CassandraMappingsSolveInconsistenciesTask.TYPE);
+ return MappingsSourcesMigrationTaskAdditionalInformationDTO.module(CassandraMappingsSolveInconsistenciesTask.TYPE);
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> mailboxMergingAdditionalInformation() {
- return MailboxMergingTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return MailboxMergingTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminMailboxMergingAdditionalInformation() {
- return MailboxMergingTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return MailboxMergingTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> solveMailboxInconsistenciesAdditionalInformation() {
- return SolveMailboxInconsistenciesTaskAdditionalInformationDTO.MODULE;
+ return SolveMailboxInconsistenciesTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminSolveMailboxInconsistenciesAdditionalInformation() {
- return SolveMailboxInconsistenciesTaskAdditionalInformationDTO.MODULE;
+ return SolveMailboxInconsistenciesTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> recomputeMailboxCountersAdditionalInformation() {
- return RecomputeMailboxCountersTaskAdditionalInformationDTO.MODULE;
+ return RecomputeMailboxCountersTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminRecomputeMailboxCountersAdditionalInformation() {
- return RecomputeMailboxCountersTaskAdditionalInformationDTO.MODULE;
+ return RecomputeMailboxCountersTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> migrationTaskAdditionalInformation() {
- return MigrationTaskAdditionalInformationDTO.serializationModule();
+ return MigrationTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminMigrationTaskAdditionalInformation() {
- return WebAdminMigrationTaskAdditionalInformationDTO.serializationModule();
+ return WebAdminMigrationTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> solveMessageInconsistenciesAdditionalInformation() {
- return SolveMessageInconsistenciesTaskAdditionalInformationDTO.MODULE;
+ return SolveMessageInconsistenciesTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminSolveMessageInconsistenciesAdditionalInformation() {
- return SolveMessageInconsistenciesTaskAdditionalInformationDTO.MODULE;
+ return SolveMessageInconsistenciesTaskAdditionalInformationDTO.module();
}
}
diff --git a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/VaultTaskSerializationModule.java b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/VaultTaskSerializationModule.java
index cc7340e..2121d52 100644
--- a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/VaultTaskSerializationModule.java
+++ b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/VaultTaskSerializationModule.java
@@ -66,45 +66,45 @@ public class VaultTaskSerializationModule extends AbstractModule {
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> blobStoreVaultGarbageCollectionAdditionalInformation() {
- return BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.MODULE;
+ return BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminBlobStoreVaultGarbageCollectionAdditionalInformation() {
- return BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.MODULE;
+ return BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> deletedMessagesVaultDeleteAdditionalInformation(MessageId.Factory factory) {
- return DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.serializationModule(factory);
+ return DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.module(factory);
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminDeletedMessagesVaultDeleteAdditionalInformation(MessageId.Factory factory) {
- return WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.serializationModule(factory);
+ return WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.module(factory);
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> deletedMessagesVaultExportAdditionalInformation() {
- return DeletedMessagesVaultExportTaskAdditionalInformationDTO.MODULE;
+ return DeletedMessagesVaultExportTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminDeletedMessagesVaultExportAdditionalInformation() {
- return DeletedMessagesVaultExportTaskAdditionalInformationDTO.MODULE;
+ return DeletedMessagesVaultExportTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> deletedMessagesVaultRestoreAdditionalInformation() {
- return DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.MODULE;
+ return DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminDeletedMessagesVaultRestoreAdditionalInformation() {
- return WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.MODULE;
+ return WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.module();
}
}
diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ReIndexingTaskSerializationModule.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ReIndexingTaskSerializationModule.java
index fda0438..cc90eb6 100644
--- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ReIndexingTaskSerializationModule.java
+++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ReIndexingTaskSerializationModule.java
@@ -80,31 +80,31 @@ public class ReIndexingTaskSerializationModule extends AbstractModule {
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> errorRecoveryAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask.serializationModule(mailboxIdFactory);
+ return ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask.module(mailboxIdFactory);
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> fullReindexAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask.serializationModule(mailboxIdFactory);
+ return ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask.module(mailboxIdFactory);
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> messageIdReindexingAdditionalInformation(MessageId.Factory messageIdFactory) {
- return MessageIdReindexingTaskAdditionalInformationDTO.serializationModule(messageIdFactory);
+ return MessageIdReindexingTaskAdditionalInformationDTO.module(messageIdFactory);
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> singleMailboxReindexingAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return SingleMailboxReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory);
+ return SingleMailboxReindexingTaskAdditionalInformationDTO.module(mailboxIdFactory);
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> singleMessageReindexingAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return SingleMessageReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory);
+ return SingleMessageReindexingTaskAdditionalInformationDTO.module(mailboxIdFactory);
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> userReindexingAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return UserReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory);
+ return UserReindexingTaskAdditionalInformationDTO.module(mailboxIdFactory);
}
}
diff --git a/server/container/guice/protocols/webadmin-jmap/src/main/java/org/apache/james/modules/server/JmapTaskSerializationModule.java b/server/container/guice/protocols/webadmin-jmap/src/main/java/org/apache/james/modules/server/JmapTaskSerializationModule.java
index 2c45797..4c09c55 100644
--- a/server/container/guice/protocols/webadmin-jmap/src/main/java/org/apache/james/modules/server/JmapTaskSerializationModule.java
+++ b/server/container/guice/protocols/webadmin-jmap/src/main/java/org/apache/james/modules/server/JmapTaskSerializationModule.java
@@ -48,23 +48,23 @@ public class JmapTaskSerializationModule extends AbstractModule {
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> recomputeAllJmapPreviewsAdditionalInformation() {
- return RecomputeAllFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return RecomputeAllFastViewTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminRecomputeAllJmapPreviewsAdditionalInformation() {
- return RecomputeAllFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return RecomputeAllFastViewTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> recomputeUserJmapPreviewsAdditionalInformation() {
- return RecomputeUserFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return RecomputeUserFastViewTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminRecomputeUserJmapPreviewsAdditionalInformation() {
- return RecomputeUserFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return RecomputeUserFastViewTaskAdditionalInformationDTO.module();
}
}
diff --git a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java
index 819ffd0..ffa3130 100644
--- a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java
+++ b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java
@@ -50,7 +50,7 @@ public class WebAdminReIndexingTaskSerializationModule extends AbstractModule {
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> messageIdReindexingAdditionalInformation(MessageId.Factory messageIdFactory) {
- return MessageIdReindexingTaskAdditionalInformationDTO.serializationModule(messageIdFactory);
+ return MessageIdReindexingTaskAdditionalInformationDTO.module(messageIdFactory);
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@@ -62,7 +62,7 @@ public class WebAdminReIndexingTaskSerializationModule extends AbstractModule {
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> singleMessageReindexingAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return SingleMessageReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory);
+ return SingleMessageReindexingTaskAdditionalInformationDTO.module(mailboxIdFactory);
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
diff --git a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebadminMailboxTaskSerializationModule.java b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebadminMailboxTaskSerializationModule.java
index dd5ffbe..ab4767e 100644
--- a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebadminMailboxTaskSerializationModule.java
+++ b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebadminMailboxTaskSerializationModule.java
@@ -61,45 +61,45 @@ public class WebadminMailboxTaskSerializationModule extends AbstractModule {
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> eventDeadLettersRedeliveryAdditionalInformationForAll() {
- return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForAll.MODULE;
+ return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForAll.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminEventDeadLettersRedeliveryAdditionalInformationForAll() {
- return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForAll.MODULE;
+ return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForAll.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> eventDeadLettersRedeliveryAdditionalInformationForGroup() {
- return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.MODULE;
+ return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminEventDeadLettersRedeliveryAdditionalInformationForGroup() {
- return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.MODULE;
+ return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> eventDeadLettersRedeliveryAdditionalInformationForOne() {
- return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForOne.MODULE;
+ return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForOne.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminEventDeadLettersRedeliveryAdditionalInformationForOne() {
- return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForOne.MODULE;
+ return EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForOne.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> recomputeCurrentQuotasAdditionalInformation() {
- return RecomputeCurrentQuotasTaskAdditionalInformationDTO.MODULE;
+ return RecomputeCurrentQuotasTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminRecomputeCurrentQuotasAdditionalInformation() {
- return RecomputeCurrentQuotasTaskAdditionalInformationDTO.MODULE;
+ return RecomputeCurrentQuotasTaskAdditionalInformationDTO.module();
}
}
diff --git a/server/container/guice/protocols/webadmin-mailqueue/src/main/java/org/apache/james/modules/server/MailQueueTaskSerializationModule.java b/server/container/guice/protocols/webadmin-mailqueue/src/main/java/org/apache/james/modules/server/MailQueueTaskSerializationModule.java
index 75c220d..752ed99 100644
--- a/server/container/guice/protocols/webadmin-mailqueue/src/main/java/org/apache/james/modules/server/MailQueueTaskSerializationModule.java
+++ b/server/container/guice/protocols/webadmin-mailqueue/src/main/java/org/apache/james/modules/server/MailQueueTaskSerializationModule.java
@@ -50,23 +50,23 @@ public class MailQueueTaskSerializationModule extends AbstractModule {
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> clearMailQueueAdditionalInformation() {
- return ClearMailQueueTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return ClearMailQueueTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminClearMailQueueAdditionalInformation() {
- return ClearMailQueueTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return ClearMailQueueTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> deleteMailsFromMailQueueAdditionalInformation() {
- return DeleteMailsFromMailQueueTaskAdditionalInformationDTO.MODULE;
+ return DeleteMailsFromMailQueueTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminDeleteMailsFromMailQueueAdditionalInformation() {
- return WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.MODULE;
+ return WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.module();
}
}
diff --git a/server/container/guice/protocols/webadmin-mailrepository/src/main/java/org/apache/james/modules/server/MailRepositoryTaskSerializationModule.java b/server/container/guice/protocols/webadmin-mailrepository/src/main/java/org/apache/james/modules/server/MailRepositoryTaskSerializationModule.java
index 1af8fe9..2d0356f 100644
--- a/server/container/guice/protocols/webadmin-mailrepository/src/main/java/org/apache/james/modules/server/MailRepositoryTaskSerializationModule.java
+++ b/server/container/guice/protocols/webadmin-mailrepository/src/main/java/org/apache/james/modules/server/MailRepositoryTaskSerializationModule.java
@@ -59,34 +59,34 @@ public class MailRepositoryTaskSerializationModule extends AbstractModule {
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> clearMailRepositoryAdditionalInformation() {
- return ClearMailRepositoryTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return ClearMailRepositoryTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminClearMailRepositoryAdditionalInformation() {
- return WebAdminClearMailRepositoryTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return WebAdminClearMailRepositoryTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> reprocessingAllMailsAdditionalInformation() {
- return ReprocessingAllMailsTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return ReprocessingAllMailsTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminReprocessingAllMailsAdditionalInformation() {
- return ReprocessingAllMailsTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return ReprocessingAllMailsTaskAdditionalInformationDTO.module();
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> reprocessingOneMailAdditionalInformation() {
- return ReprocessingOneMailTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return ReprocessingOneMailTaskAdditionalInformationDTO.module();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> webAdminReprocessingOneMailAdditionalInformation() {
- return ReprocessingOneMailTaskAdditionalInformationDTO.SERIALIZATION_MODULE;
+ return ReprocessingOneMailTaskAdditionalInformationDTO.module();
}
}
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskAdditionalInformationDTO.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskAdditionalInformationDTO.java
index 3915342..8dce4cb 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskAdditionalInformationDTO.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskAdditionalInformationDTO.java
@@ -40,7 +40,7 @@ public class MappingsSourcesMigrationTaskAdditionalInformationDTO implements Add
);
}
- public static AdditionalInformationDTOModule<MappingsSourcesMigration.AdditionalInformation, MappingsSourcesMigrationTaskAdditionalInformationDTO> serializationModule(TaskType type) {
+ public static AdditionalInformationDTOModule<MappingsSourcesMigration.AdditionalInformation, MappingsSourcesMigrationTaskAdditionalInformationDTO> module(TaskType type) {
return DTOModule
.forDomainObject(MappingsSourcesMigration.AdditionalInformation.class)
.convertToDTO(MappingsSourcesMigrationTaskAdditionalInformationDTO.class)
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
index b3c53a1..11a4a36 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
@@ -45,7 +45,7 @@ class MappingsSourcesMigrationTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(MappingsSourcesMigrationTaskAdditionalInformationDTO.serializationModule(MappingsSourcesMigration.TYPE))
+ JsonSerializationVerifier.dtoModule(MappingsSourcesMigrationTaskAdditionalInformationDTO.module(MappingsSourcesMigration.TYPE))
.bean(DETAILS)
.json(SERIALIZED_ADDITIONAL_INFORMATION)
.verify();
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
index 6812278..1473173 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
@@ -83,7 +83,7 @@ class CassandraMappingsRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new CassandraMappingsRoutes(cassandraMappingsService, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer,
- DTOConverter.of(MappingsSourcesMigrationTaskAdditionalInformationDTO.serializationModule(CassandraMappingsSolveInconsistenciesTask.TYPE))))
+ DTOConverter.of(MappingsSourcesMigrationTaskAdditionalInformationDTO.module(CassandraMappingsSolveInconsistenciesTask.TYPE))))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/dto/WebAdminMigrationTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/dto/WebAdminMigrationTaskAdditionalInformationDTO.java
index dc6be00..7871a68 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/dto/WebAdminMigrationTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/dto/WebAdminMigrationTaskAdditionalInformationDTO.java
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class WebAdminMigrationTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<MigrationTask.AdditionalInformation, WebAdminMigrationTaskAdditionalInformationDTO> serializationModule() {
+ public static AdditionalInformationDTOModule<MigrationTask.AdditionalInformation, WebAdminMigrationTaskAdditionalInformationDTO> module() {
return DTOModule.forDomainObject(MigrationTask.AdditionalInformation.class)
.convertToDTO(WebAdminMigrationTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new MigrationTask.AdditionalInformation(new SchemaVersion(dto.getToVersion()), dto.timestamp))
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/dto/WebAdminMigrationTaskSerializationTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/dto/WebAdminMigrationTaskSerializationTest.java
index 3d9abc6..09bc378 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/dto/WebAdminMigrationTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/dto/WebAdminMigrationTaskSerializationTest.java
@@ -22,7 +22,6 @@ import java.time.Instant;
import org.apache.james.JsonSerializationVerifier;
import org.apache.james.backends.cassandra.migration.MigrationTask;
-import org.apache.james.backends.cassandra.migration.MigrationTaskAdditionalInformationDTO;
import org.apache.james.backends.cassandra.versions.SchemaVersion;
import org.junit.jupiter.api.Test;
@@ -32,7 +31,7 @@ class WebAdminMigrationTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(WebAdminMigrationTaskAdditionalInformationDTO.serializationModule())
+ JsonSerializationVerifier.dtoModule(WebAdminMigrationTaskAdditionalInformationDTO.module())
.bean(new MigrationTask.AdditionalInformation(new SchemaVersion(12), TIMESTAMP))
.json(SERIALIZED_ADDITIONAL_INFORMATION)
.verify();
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index ddf52e4..8ba58a6 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -41,7 +41,6 @@ import org.apache.james.backends.cassandra.migration.CassandraMigrationService;
import org.apache.james.backends.cassandra.migration.CassandraSchemaTransitions;
import org.apache.james.backends.cassandra.migration.Migration;
import org.apache.james.backends.cassandra.migration.MigrationTask;
-import org.apache.james.backends.cassandra.migration.MigrationTaskAdditionalInformationDTO;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO;
import org.apache.james.backends.cassandra.versions.SchemaTransition;
import org.apache.james.backends.cassandra.versions.SchemaVersion;
@@ -91,7 +90,7 @@ public class CassandraMigrationRoutesTest {
new CassandraMigrationRoutes(new CassandraMigrationService(schemaVersionDAO, transitions, version -> new MigrationTask(schemaVersionDAO, transitions, version), LATEST_VERSION),
taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer,
- DTOConverter.of(WebAdminMigrationTaskAdditionalInformationDTO.serializationModule())))
+ DTOConverter.of(WebAdminMigrationTaskAdditionalInformationDTO.module())))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMessageInconsistenciesRequestToTaskTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMessageInconsistenciesRequestToTaskTest.java
index 00ccadd..33fddd2 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMessageInconsistenciesRequestToTaskTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMessageInconsistenciesRequestToTaskTest.java
@@ -91,7 +91,7 @@ public class SolveMessageInconsistenciesRequestToTaskTest {
Mockito.when(service.fixMessageInconsistencies(any(), any())).thenReturn(Mono.just(Task.Result.COMPLETED));
webAdminServer = WebAdminUtils.createWebAdminServer(
- new TasksRoutes(taskManager, jsonTransformer, DTOConverter.of(SolveMessageInconsistenciesTaskAdditionalInformationDTO.MODULE)),
+ new TasksRoutes(taskManager, jsonTransformer, DTOConverter.of(SolveMessageInconsistenciesTaskAdditionalInformationDTO.module())),
new JMAPRoutes(
service,
taskManager))
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java
index 8e1461e..5290fd1 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java
@@ -31,13 +31,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
public class RecomputeAllFastViewTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static final AdditionalInformationDTOModule<RecomputeAllFastViewProjectionItemsTask.AdditionalInformation, RecomputeAllFastViewTaskAdditionalInformationDTO> SERIALIZATION_MODULE =
- DTOModule.forDomainObject(RecomputeAllFastViewProjectionItemsTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<RecomputeAllFastViewProjectionItemsTask.AdditionalInformation, RecomputeAllFastViewTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(RecomputeAllFastViewProjectionItemsTask.AdditionalInformation.class)
.convertToDTO(RecomputeAllFastViewTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(RecomputeAllFastViewTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(RecomputeAllFastViewTaskAdditionalInformationDTO::toDTO)
.typeName(RecomputeAllFastViewProjectionItemsTask.TASK_TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private static RecomputeAllFastViewProjectionItemsTask.AdditionalInformation toDomainObject(RecomputeAllFastViewTaskAdditionalInformationDTO dto) {
return new RecomputeAllFastViewProjectionItemsTask.AdditionalInformation(
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java
index 5a5c133..8ae9692 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java
@@ -31,13 +31,14 @@ import org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.Ru
import com.fasterxml.jackson.annotation.JsonProperty;
public class RecomputeUserFastViewTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static final AdditionalInformationDTOModule<RecomputeUserFastViewProjectionItemsTask.AdditionalInformation, RecomputeUserFastViewTaskAdditionalInformationDTO> SERIALIZATION_MODULE =
- DTOModule.forDomainObject(RecomputeUserFastViewProjectionItemsTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<RecomputeUserFastViewProjectionItemsTask.AdditionalInformation, RecomputeUserFastViewTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(RecomputeUserFastViewProjectionItemsTask.AdditionalInformation.class)
.convertToDTO(RecomputeUserFastViewTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(RecomputeUserFastViewTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(RecomputeUserFastViewTaskAdditionalInformationDTO::toDTO)
.typeName(RecomputeUserFastViewProjectionItemsTask.TASK_TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private static RecomputeUserFastViewTaskAdditionalInformationDTO toDTO(RecomputeUserFastViewProjectionItemsTask.AdditionalInformation details, String type) {
return new RecomputeUserFastViewTaskAdditionalInformationDTO(
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsRequestToTaskTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsRequestToTaskTest.java
index 35e402e..9ac2f1e 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsRequestToTaskTest.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsRequestToTaskTest.java
@@ -121,7 +121,7 @@ class RecomputeAllFastViewProjectionItemsRequestToTaskTest {
MessageFastViewPrecomputedProperties.Factory projectionItemFactory = new MessageFastViewPrecomputedProperties.Factory(previewFactory);
webAdminServer = WebAdminUtils.createWebAdminServer(
new TasksRoutes(taskManager, jsonTransformer,
- DTOConverter.of(RecomputeAllFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE)),
+ DTOConverter.of(RecomputeAllFastViewTaskAdditionalInformationDTO.module())),
new JMAPRoutes(
new MessageFastViewProjectionCorrector(usersRepository, mailboxManager, messageFastViewProjection, projectionItemFactory),
taskManager))
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest.java
index 15108e7..5f301af 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest.java
@@ -41,7 +41,7 @@ class RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest {
@Test
void shouldMatchJsonSerializationContract() throws Exception {
- JsonSerializationVerifier.dtoModule(RecomputeAllFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ JsonSerializationVerifier.dtoModule(RecomputeAllFastViewTaskAdditionalInformationDTO.module())
.bean(DOMAIN_OBJECT)
.json(ClassLoaderUtils.getSystemResourceAsString("json/recomputeAll.additionalInformation.json"))
.verify();
@@ -49,7 +49,7 @@ class RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest {
@Test
void shouldDeserializeLegacy() throws Exception {
- RecomputeAllFastViewProjectionItemsTask.AdditionalInformation legacyDetails = JsonGenericSerializer.forModules(RecomputeAllFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ RecomputeAllFastViewProjectionItemsTask.AdditionalInformation legacyDetails = JsonGenericSerializer.forModules(RecomputeAllFastViewTaskAdditionalInformationDTO.module())
.withoutNestedType()
.deserialize(ClassLoaderUtils.getSystemResourceAsString("json/recomputeAll.additionalInformation.legacy.json"));
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsRequestToTaskTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsRequestToTaskTest.java
index 91eabc8..3e4ad41 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsRequestToTaskTest.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsRequestToTaskTest.java
@@ -135,7 +135,7 @@ class RecomputeUserFastViewProjectionItemsRequestToTaskTest {
MessageFastViewPrecomputedProperties.Factory projectionItemFactory = new MessageFastViewPrecomputedProperties.Factory(previewFactory);
webAdminServer = WebAdminUtils.createWebAdminServer(
new TasksRoutes(taskManager, jsonTransformer,
- DTOConverter.of(RecomputeUserFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE)),
+ DTOConverter.of(RecomputeUserFastViewTaskAdditionalInformationDTO.module())),
new JMAPRoutes(
new MessageFastViewProjectionCorrector(usersRepository, mailboxManager, messageFastViewProjection, projectionItemFactory),
taskManager, usersRepository))
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest.java
index 22355a9..baeb7c1 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest.java
@@ -37,7 +37,7 @@ class RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest {
@Test
void shouldMatchJsonSerializationContract() throws Exception {
- JsonSerializationVerifier.dtoModule(RecomputeUserFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ JsonSerializationVerifier.dtoModule(RecomputeUserFastViewTaskAdditionalInformationDTO.module())
.bean(DOMAIN_OBJECT)
.json(ClassLoaderUtils.getSystemResourceAsString("json/recomputeUser.additionalInformation.json"))
.verify();
@@ -46,7 +46,7 @@ class RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest {
@Test
void shouldDeserializeLegacy() throws Exception {
- RecomputeUserFastViewProjectionItemsTask.AdditionalInformation legacyDetails = JsonGenericSerializer.forModules(RecomputeUserFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ RecomputeUserFastViewProjectionItemsTask.AdditionalInformation legacyDetails = JsonGenericSerializer.forModules(RecomputeUserFastViewTaskAdditionalInformationDTO.module())
.withoutNestedType()
.deserialize(ClassLoaderUtils.getSystemResourceAsString("json/recomputeUser.additionalInformation.legacy.json"));
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java
index 33c8bdf..a9d1713 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class DeletedMessagesVaultDeleteTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<DeletedMessagesVaultDeleteTask.AdditionalInformation, DeletedMessagesVaultDeleteTaskAdditionalInformationDTO> serializationModule(MessageId.Factory factory) {
+ public static AdditionalInformationDTOModule<DeletedMessagesVaultDeleteTask.AdditionalInformation, DeletedMessagesVaultDeleteTaskAdditionalInformationDTO> module(MessageId.Factory factory) {
return DTOModule.forDomainObject(DeletedMessagesVaultDeleteTask.AdditionalInformation.class)
.convertToDTO(DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new DeletedMessagesVaultDeleteTask.AdditionalInformation(Username.of(dto.userName), factory.fromString(dto.getMessageId()), dto.getTimestamp()))
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskAdditionalInformationDTO.java
index f8a66ad..5470f32 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskAdditionalInformationDTO.java
@@ -44,14 +44,14 @@ public class DeletedMessagesVaultExportTaskAdditionalInformationDTO implements A
);
}
- public static final AdditionalInformationDTOModule<DeletedMessagesVaultExportTask.AdditionalInformation, DeletedMessagesVaultExportTaskAdditionalInformationDTO> MODULE =
- DTOModule
- .forDomainObject(DeletedMessagesVaultExportTask.AdditionalInformation.class)
+ public static final AdditionalInformationDTOModule<DeletedMessagesVaultExportTask.AdditionalInformation, DeletedMessagesVaultExportTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(DeletedMessagesVaultExportTask.AdditionalInformation.class)
.convertToDTO(DeletedMessagesVaultExportTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(DeletedMessagesVaultExportTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(DeletedMessagesVaultExportTaskAdditionalInformationDTO::fromDomainObject)
.typeName(DeletedMessagesVaultExportTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final String type;
private final String userExportFrom;
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
index e93839b..7d93afe 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
@@ -41,14 +41,14 @@ public class DeletedMessagesVaultRestoreTaskAdditionalInformationDTO implements
);
}
- public static final AdditionalInformationDTOModule<DeletedMessagesVaultRestoreTask.AdditionalInformation, DeletedMessagesVaultRestoreTaskAdditionalInformationDTO> MODULE =
- DTOModule
- .forDomainObject(DeletedMessagesVaultRestoreTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<DeletedMessagesVaultRestoreTask.AdditionalInformation, DeletedMessagesVaultRestoreTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(DeletedMessagesVaultRestoreTask.AdditionalInformation.class)
.convertToDTO(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO::fromDomainObject)
.typeName(DeletedMessagesVaultRestoreTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final String type;
private final String user;
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java
index f387ecc..14a7dcf 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<DeletedMessagesVaultDeleteTask.AdditionalInformation, WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO> serializationModule(MessageId.Factory factory) {
+ public static AdditionalInformationDTOModule<DeletedMessagesVaultDeleteTask.AdditionalInformation, WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO> module(MessageId.Factory factory) {
return DTOModule.forDomainObject(DeletedMessagesVaultDeleteTask.AdditionalInformation.class)
.convertToDTO(WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new DeletedMessagesVaultDeleteTask.AdditionalInformation(Username.of(dto.username), factory.fromString(dto.getDeleteMessageId()), dto.getTimestamp()))
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
index 7e498ae..1d532b0 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
@@ -41,14 +41,14 @@ public class WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO imp
);
}
- public static final AdditionalInformationDTOModule<DeletedMessagesVaultRestoreTask.AdditionalInformation, WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO> MODULE =
- DTOModule
- .forDomainObject(DeletedMessagesVaultRestoreTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<DeletedMessagesVaultRestoreTask.AdditionalInformation, WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(DeletedMessagesVaultRestoreTask.AdditionalInformation.class)
.convertToDTO(WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO::toDomainObject)
.toDTOConverter(WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO::fromDomainObject)
.typeName(DeletedMessagesVaultRestoreTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final String type;
private final String username;
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskSerializationTest.java
index 0b85ce6..291da2b 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskSerializationTest.java
@@ -58,7 +58,7 @@ class DeletedMessagesVaultDeleteTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.serializationModule(messageIdFactory))
+ JsonSerializationVerifier.dtoModule(DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.module(messageIdFactory))
.bean(new DeletedMessagesVaultDeleteTask.AdditionalInformation(username, messageId, TIMESTAMP))
.json(serializedAdditionalInformation)
.verify();
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
index 0699822..9f20209 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
@@ -84,7 +84,7 @@ class DeletedMessagesVaultExportTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(DeletedMessagesVaultExportTaskAdditionalInformationDTO.MODULE)
+ JsonSerializationVerifier.dtoModule(DeletedMessagesVaultExportTaskAdditionalInformationDTO.module())
.bean(details)
.json(SERIALIZED_ADDITIONAL_INFORMATION_TASK)
.verify();
@@ -93,7 +93,7 @@ class DeletedMessagesVaultExportTaskSerializationTest {
@Test
void additionalInformationWithInvalidMailAddressShouldThrow() {
String invalidSerializedAdditionalInformationTask = "{\"type\":\"deleted-messages-export\",\"exportTo\":\"invalid\",\"userExportFrom\":\"james\",\"totalExportedMessages\":42}";;
- assertThatCode(() -> JsonTaskAdditionalInformationSerializer.of(DeletedMessagesVaultExportTaskAdditionalInformationDTO.MODULE)
+ assertThatCode(() -> JsonTaskAdditionalInformationSerializer.of(DeletedMessagesVaultExportTaskAdditionalInformationDTO.module())
.deserialize(invalidSerializedAdditionalInformationTask))
.hasCauseInstanceOf(AddressException.class);
}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
index e243190..e50f99e 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
@@ -72,7 +72,7 @@ class DeletedMessagesVaultRestoreTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.MODULE)
+ JsonSerializationVerifier.dtoModule(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.module())
.bean(DETAILS)
.json(SERIALIZED_ADDITIONAL_INFORMATION_TASK)
.verify();
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index c66f372..0c12862 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -197,10 +197,10 @@ class DeletedMessagesVaultRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new TasksRoutes(taskManager, jsonTransformer,
DTOConverter.of(
- WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.serializationModule(messageIdFactory),
- DeletedMessagesVaultExportTaskAdditionalInformationDTO.MODULE,
- WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.MODULE,
- BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.MODULE)),
+ WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.module(messageIdFactory),
+ DeletedMessagesVaultExportTaskAdditionalInformationDTO.module(),
+ WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.module(),
+ BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.module())),
new DeletedMessagesVaultRoutes(vault, vaultRestore, exportService, jsonTransformer, taskManager, queryTranslator, usersRepository, messageIdFactory))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultDeleteTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultDeleteTaskSerializationTest.java
index d02c2ce..ac88a10 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultDeleteTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultDeleteTaskSerializationTest.java
@@ -36,7 +36,7 @@ class WebAdminDeletedMessagesVaultDeleteTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.serializationModule(messageIdFactory))
+ JsonSerializationVerifier.dtoModule(WebAdminDeletedMessagesVaultDeleteTaskAdditionalInformationDTO.module(messageIdFactory))
.bean(new DeletedMessagesVaultDeleteTask.AdditionalInformation(username, messageId, TIMESTAMP))
.json(serializedAdditionalInformation)
.verify();
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultRestoreTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultRestoreTaskSerializationTest.java
index 71e73d1..010b459 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultRestoreTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebAdminDeletedMessagesVaultRestoreTaskSerializationTest.java
@@ -33,7 +33,7 @@ class WebAdminDeletedMessagesVaultRestoreTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.MODULE)
+ JsonSerializationVerifier.dtoModule(WebAdminDeletedMessagesVaultRestoreTaskAdditionalInformationDTO.module())
.bean(DETAILS)
.json(SERIALIZED_ADDITIONAL_INFORMATION_TASK)
.verify();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliveryTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliveryTaskAdditionalInformationDTO.java
index 552aa8b..479c729 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliveryTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliveryTaskAdditionalInformationDTO.java
@@ -26,8 +26,8 @@ public class EventDeadLettersRedeliveryTaskAdditionalInformationDTO implements A
}
}
- public static final AdditionalInformationDTOModule<EventDeadLettersRedeliveryTaskAdditionalInformationForAll, DTO> MODULE =
- DTOModule
+ public static AdditionalInformationDTOModule<EventDeadLettersRedeliveryTaskAdditionalInformationForAll, DTO> module() {
+ return DTOModule
.forDomainObject(EventDeadLettersRedeliveryTaskAdditionalInformationForAll.class)
.convertToDTO(DTO.class)
.toDomainObjectConverter(EventDeadLettersRedeliveryTaskAdditionalInformationDTO::fromAll)
@@ -39,6 +39,7 @@ public class EventDeadLettersRedeliveryTaskAdditionalInformationDTO implements A
domainObject.timestamp()))
.typeName(EventDeadLettersRedeliverAllTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
EventDeadLettersRedeliveryTaskAdditionalInformationForAll(long successfulRedeliveriesCount, long failedRedeliveriesCount, Instant timestamp) {
@@ -59,9 +60,8 @@ public class EventDeadLettersRedeliveryTaskAdditionalInformationDTO implements A
}
}
- public static final AdditionalInformationDTOModule<EventDeadLettersRedeliveryTaskAdditionalInformationForGroup, DTO> MODULE =
- DTOModule
- .forDomainObject(EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.class)
+ public static AdditionalInformationDTOModule<EventDeadLettersRedeliveryTaskAdditionalInformationForGroup, DTO> module() {
+ return DTOModule.forDomainObject(EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.class)
.convertToDTO(DTO.class)
.toDomainObjectConverter(EventDeadLettersRedeliveryTaskAdditionalInformationDTO::fromGroup)
.toDTOConverter((domainObject, typeName) -> new DTO(typeName,
@@ -72,6 +72,7 @@ public class EventDeadLettersRedeliveryTaskAdditionalInformationDTO implements A
domainObject.timestamp()))
.typeName(EventDeadLettersRedeliverGroupTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
EventDeadLettersRedeliveryTaskAdditionalInformationForGroup(long successfulRedeliveriesCount, long failedRedeliveriesCount, Optional<Group> group, Instant timestamp) {
@@ -91,9 +92,8 @@ public class EventDeadLettersRedeliveryTaskAdditionalInformationDTO implements A
}
}
- public static final AdditionalInformationDTOModule<EventDeadLettersRedeliveryTaskAdditionalInformationForOne, DTO> MODULE =
- DTOModule
- .forDomainObject(EventDeadLettersRedeliveryTaskAdditionalInformationForOne.class)
+ public static AdditionalInformationDTOModule<EventDeadLettersRedeliveryTaskAdditionalInformationForOne, DTO> module() {
+ return DTOModule.forDomainObject(EventDeadLettersRedeliveryTaskAdditionalInformationForOne.class)
.convertToDTO(DTO.class)
.toDomainObjectConverter(EventDeadLettersRedeliveryTaskAdditionalInformationDTO::fromOne)
.toDTOConverter((domainObject, typeName) -> new DTO(typeName,
@@ -104,6 +104,7 @@ public class EventDeadLettersRedeliveryTaskAdditionalInformationDTO implements A
domainObject.timestamp()))
.typeName(EventDeadLettersRedeliverOneTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
EventDeadLettersRedeliveryTaskAdditionalInformationForOne(
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
index eb08117..21bc893 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
@@ -128,9 +128,9 @@ class EventDeadLettersRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new EventDeadLettersRoutes(service, eventSerializer, taskManager, jsonTransformer),
new TasksRoutes(taskManager, jsonTransformer,
- DTOConverter.of(EventDeadLettersRedeliveryTaskAdditionalInformationForOne.MODULE,
- EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.MODULE,
- EventDeadLettersRedeliveryTaskAdditionalInformationForAll.MODULE)))
+ DTOConverter.of(EventDeadLettersRedeliveryTaskAdditionalInformationForOne.module(),
+ EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.module(),
+ EventDeadLettersRedeliveryTaskAdditionalInformationForAll.module())))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer).build();
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
index 56a2290..280399e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
@@ -50,7 +50,6 @@ import org.apache.james.task.Hostname;
import org.apache.james.task.MemoryTaskManager;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
-import org.apache.james.webadmin.dto.WebAdminReprocessingContextInformationDTO;
import org.apache.james.webadmin.dto.WebAdminReprocessingContextInformationDTO.WebAdminErrorRecoveryIndexationDTO;
import org.apache.james.webadmin.dto.WebAdminReprocessingContextInformationDTO.WebAdminFullIndexationDTO;
import org.apache.james.webadmin.dto.WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO;
@@ -60,14 +59,10 @@ import org.apache.james.webadmin.utils.JsonTransformer;
import org.apache.mailbox.tools.indexer.FullReindexingTask;
import org.apache.mailbox.tools.indexer.ReIndexerImpl;
import org.apache.mailbox.tools.indexer.ReIndexerPerformer;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask;
import org.apache.mailbox.tools.indexer.SingleMailboxReindexingTask;
-import org.apache.mailbox.tools.indexer.SingleMailboxReindexingTaskAdditionalInformationDTO;
import org.apache.mailbox.tools.indexer.SingleMessageReindexingTask;
import org.apache.mailbox.tools.indexer.SingleMessageReindexingTaskAdditionalInformationDTO;
import org.eclipse.jetty.http.HttpStatus;
-import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
@@ -112,7 +107,7 @@ class MailboxesRoutesTest {
WebAdminErrorRecoveryIndexationDTO.serializationModule(mailboxIdFactory),
WebAdminFullIndexationDTO.serializationModule(mailboxIdFactory),
WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory),
- SingleMessageReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory))),
+ SingleMessageReindexingTaskAdditionalInformationDTO.module(mailboxIdFactory))),
new MailboxesRoutes(taskManager,
jsonTransformer,
ImmutableSet.of(
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MessageRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MessageRoutesTest.java
index bd24736..27058fa 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MessageRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MessageRoutesTest.java
@@ -89,7 +89,7 @@ class MessageRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new TasksRoutes(taskManager, jsonTransformer,
DTOConverter.of(
- MessageIdReindexingTaskAdditionalInformationDTO.serializationModule(mailboxManager.getMessageIdFactory()))),
+ MessageIdReindexingTaskAdditionalInformationDTO.module(mailboxManager.getMessageIdFactory()))),
new MessagesRoutes(taskManager,
new InMemoryMessageId.Factory(),
new MessageIdReIndexerImpl(reIndexerPerformer),
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
index a84d9f7..4c56ac8 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
@@ -63,7 +63,7 @@ public class WebAdminQuotaSearchTestSystem {
RecomputeCurrentQuotasService mock = mock(RecomputeCurrentQuotasService.class);
when(mock.recomputeCurrentQuotas(any(), any())).thenReturn(Mono.just(Task.Result.COMPLETED));
TasksRoutes tasksRoutes = new TasksRoutes(taskManager, new JsonTransformer(),
- DTOConverter.of(RecomputeCurrentQuotasTaskAdditionalInformationDTO.MODULE));
+ DTOConverter.of(RecomputeCurrentQuotasTaskAdditionalInformationDTO.module()));
UserQuotaRoutes userQuotaRoutes = new UserQuotaRoutes(quotaSearchTestSystem.getUsersRepository(),
userQuotaService,
jsonTransformer,
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
index 7e9217e..88dfb05 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
@@ -84,7 +84,7 @@ class EventDeadLettersRedeliverTaskTest {
@Test
void redeliverAllAdditionalInformationShouldMatchJsonSerializationContract() throws Exception {
- JsonSerializationVerifier.dtoModule(EventDeadLettersRedeliveryTaskAdditionalInformationForAll.MODULE)
+ JsonSerializationVerifier.dtoModule(EventDeadLettersRedeliveryTaskAdditionalInformationForAll.module())
.bean(new EventDeadLettersRedeliveryTaskAdditionalInformationForAll(SUCCESSFUL_REDELIVERY_COUNT, FAILED_REDELIVERY_COUNT, TIMESTAMP))
.json(SERIALIZED_TASK_ADDITIONAL_INFORMATION_ALL)
.verify();
@@ -92,7 +92,7 @@ class EventDeadLettersRedeliverTaskTest {
@Test
void redeliverGroupAdditionalInformationShouldMatchJsonSerializationContract() throws Exception {
- JsonSerializationVerifier.dtoModule(EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.MODULE)
+ JsonSerializationVerifier.dtoModule(EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.module())
.bean(new EventDeadLettersRedeliveryTaskAdditionalInformationForGroup(SUCCESSFUL_REDELIVERY_COUNT, FAILED_REDELIVERY_COUNT, SOME_GROUP, TIMESTAMP))
.json(SERIALIZED_TASK_ADDITIONAL_INFORMATION_GROUP)
.verify();
@@ -100,7 +100,7 @@ class EventDeadLettersRedeliverTaskTest {
@Test
void redeliverOneAdditionalInformationShouldMatchJsonSerializationContract() throws Exception {
- JsonSerializationVerifier.dtoModule(EventDeadLettersRedeliveryTaskAdditionalInformationForOne.MODULE)
+ JsonSerializationVerifier.dtoModule(EventDeadLettersRedeliveryTaskAdditionalInformationForOne.module())
.bean(new EventDeadLettersRedeliveryTaskAdditionalInformationForOne(SUCCESSFUL_REDELIVERY_COUNT, FAILED_REDELIVERY_COUNT, SOME_GROUP, SOME_INSERTION_ID, TIMESTAMP))
.json(SERIALIZED_TASK_ADDITIONAL_INFORMATION_ONE)
.verify();
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/ClearMailQueueTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/ClearMailQueueTaskAdditionalInformationDTO.java
index 9cbc1e9..9e9b2d8 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/ClearMailQueueTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/ClearMailQueueTaskAdditionalInformationDTO.java
@@ -29,15 +29,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class ClearMailQueueTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static final AdditionalInformationDTOModule<ClearMailQueueTask.AdditionalInformation, ClearMailQueueTaskAdditionalInformationDTO> SERIALIZATION_MODULE =
- DTOModule.forDomainObject(ClearMailQueueTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<ClearMailQueueTask.AdditionalInformation, ClearMailQueueTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(ClearMailQueueTask.AdditionalInformation.class)
.convertToDTO(ClearMailQueueTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new ClearMailQueueTask.AdditionalInformation(
MailQueueName.of(dto.mailQueueName),
dto.initialCount,
dto.remainingCount,
- dto.timestamp
- ))
+ dto.timestamp))
.toDTOConverter((details, type) -> new ClearMailQueueTaskAdditionalInformationDTO(
type,
details.getMailQueueName(),
@@ -46,6 +45,7 @@ public class ClearMailQueueTaskAdditionalInformationDTO implements AdditionalInf
details.timestamp()))
.typeName(ClearMailQueueTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final String mailQueueName;
private final String type;
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskAdditionalInformationDTO.java
index 077c1df..3f3a98c 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskAdditionalInformationDTO.java
@@ -32,15 +32,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.fge.lambdas.Throwing;
public class DeleteMailsFromMailQueueTaskAdditionalInformationDTO implements AdditionalInformationDTO {
-
- public static final AdditionalInformationDTOModule<DeleteMailsFromMailQueueTask.AdditionalInformation, DeleteMailsFromMailQueueTaskAdditionalInformationDTO> MODULE =
- DTOModule
- .forDomainObject(DeleteMailsFromMailQueueTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<DeleteMailsFromMailQueueTask.AdditionalInformation, DeleteMailsFromMailQueueTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(DeleteMailsFromMailQueueTask.AdditionalInformation.class)
.convertToDTO(DeleteMailsFromMailQueueTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(DeleteMailsFromMailQueueTaskAdditionalInformationDTO::fromDTO)
.toDTOConverter(DeleteMailsFromMailQueueTaskAdditionalInformationDTO::toDTO)
.typeName(DeleteMailsFromMailQueueTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private static DeleteMailsFromMailQueueTaskAdditionalInformationDTO toDTO(DeleteMailsFromMailQueueTask.AdditionalInformation domainObject, String typeName) {
return new DeleteMailsFromMailQueueTaskAdditionalInformationDTO(
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.java
index fbd858e..5ac1d63 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/service/WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.java
@@ -32,15 +32,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.fge.lambdas.Throwing;
public class WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO implements AdditionalInformationDTO {
-
- public static final AdditionalInformationDTOModule<DeleteMailsFromMailQueueTask.AdditionalInformation, WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO> MODULE =
- DTOModule
- .forDomainObject(DeleteMailsFromMailQueueTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<DeleteMailsFromMailQueueTask.AdditionalInformation, WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(DeleteMailsFromMailQueueTask.AdditionalInformation.class)
.convertToDTO(WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO::fromDTO)
.toDTOConverter(WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO::toDTO)
.typeName(DeleteMailsFromMailQueueTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private static WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO toDTO(DeleteMailsFromMailQueueTask.AdditionalInformation domainObject, String typeName) {
return new WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO(
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index d16dd01..6212c7d 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -52,7 +52,6 @@ import org.apache.james.webadmin.WebAdminUtils;
import org.apache.james.webadmin.service.ClearMailQueueTask;
import org.apache.james.webadmin.service.ClearMailQueueTaskAdditionalInformationDTO;
import org.apache.james.webadmin.service.DeleteMailsFromMailQueueTask;
-import org.apache.james.webadmin.service.DeleteMailsFromMailQueueTaskAdditionalInformationDTO;
import org.apache.james.webadmin.service.WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO;
import org.apache.james.webadmin.utils.JsonTransformer;
import org.apache.mailet.Mail;
@@ -96,8 +95,8 @@ class MailQueueRoutesTest {
return WebAdminUtils.createWebAdminServer(
new MailQueueRoutes(mailQueueFactory, jsonTransformer, taskManager),
new TasksRoutes(taskManager, jsonTransformer,
- DTOConverter.of(WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.MODULE,
- ClearMailQueueTaskAdditionalInformationDTO.SERIALIZATION_MODULE)))
+ DTOConverter.of(WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.module(),
+ ClearMailQueueTaskAdditionalInformationDTO.module())))
.start();
}
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/ClearMailQueueTaskTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/ClearMailQueueTaskTest.java
index c78a4c4..ff74eeb 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/ClearMailQueueTaskTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/ClearMailQueueTaskTest.java
@@ -72,7 +72,7 @@ class ClearMailQueueTaskTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
ClearMailQueueTask.AdditionalInformation details = new ClearMailQueueTask.AdditionalInformation(QUEUE_NAME, INITIAL_COUNT, REMAINING_COUNT, TIMESTAMP);
- JsonSerializationVerifier.dtoModule(ClearMailQueueTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ JsonSerializationVerifier.dtoModule(ClearMailQueueTaskAdditionalInformationDTO.module())
.bean(details)
.json(SERIALIZED_TASK_ADDITIONAL_INFORMATION)
.verify();
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskTest.java
index eb2b79c..ca68379 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskTest.java
@@ -20,7 +20,6 @@ package org.apache.james.webadmin.service;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -104,7 +103,7 @@ class DeleteMailsFromMailQueueTaskTest {
DeleteMailsFromMailQueueTask.AdditionalInformation detailsRecipient = new DeleteMailsFromMailQueueTask.AdditionalInformation(queue.getName(), 6L, 6L,
Optional.empty(), Optional.empty(), Optional.of(new MailAddress("d@e.f")), TIMESTAMP);
- JsonSerializationVerifier.dtoModule(DeleteMailsFromMailQueueTaskAdditionalInformationDTO.MODULE)
+ JsonSerializationVerifier.dtoModule(DeleteMailsFromMailQueueTaskAdditionalInformationDTO.module())
.testCase(detailsSender,
"{\"type\": \"delete-mails-from-mail-queue\", \"queue\": \"anyQueue\", \"sender\": \"a@b.c\", \"initialCount\" : 10, \"remainingCount\":5, \"timestamp\": \"2018-11-13T12:00:55Z\"}")
.testCase(detailsName,
@@ -117,7 +116,7 @@ class DeleteMailsFromMailQueueTaskTest {
@Test
void additionalInformationShouldThrowWhenDeserializeAMalformedMailAddress() {
String serializedJson = "{\"type\": \"delete-mails-from-mail-queue\", \"queue\": \"anyQueue\", \"sender\": \"a.b.c\", \"initialCount\" : 10, \"remainingCount\":5}";
- assertThatThrownBy(() -> JsonTaskAdditionalInformationSerializer.of(DeleteMailsFromMailQueueTaskAdditionalInformationDTO.MODULE)
+ assertThatThrownBy(() -> JsonTaskAdditionalInformationSerializer.of(DeleteMailsFromMailQueueTaskAdditionalInformationDTO.module())
.deserialize(serializedJson))
.isInstanceOf(AddressException.class);
}
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTOTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTOTest.java
index 9d6986a..09ea48c 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTOTest.java
@@ -39,7 +39,7 @@ class WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTOTest {
DeleteMailsFromMailQueueTask.AdditionalInformation detailsRecipient = new DeleteMailsFromMailQueueTask.AdditionalInformation(queueName, 6L, 6L,
Optional.empty(), Optional.empty(), Optional.of(new MailAddress("d@e.f")), TIMESTAMP);
- JsonSerializationVerifier.dtoModule(WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.MODULE)
+ JsonSerializationVerifier.dtoModule(WebAdminDeleteMailsFromMailQueueTaskAdditionalInformationDTO.module())
.testCase(detailsSender,
"{\"type\": \"delete-mails-from-mail-queue\", \"mailQueueName\": \"anyQueue\", \"sender\": \"a@b.c\", \"initialCount\" : 10, \"remainingCount\":5, \"timestamp\": \"2018-11-13T12:00:55Z\"}")
.testCase(detailsName,
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskAdditionalInformationDTO.java
index 2b9d9f7..46827dd 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskAdditionalInformationDTO.java
@@ -28,16 +28,14 @@ import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ClearMailRepositoryTaskAdditionalInformationDTO implements AdditionalInformationDTO {
-
- public static final AdditionalInformationDTOModule<ClearMailRepositoryTask.AdditionalInformation, ClearMailRepositoryTaskAdditionalInformationDTO> SERIALIZATION_MODULE =
- DTOModule.forDomainObject(ClearMailRepositoryTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<ClearMailRepositoryTask.AdditionalInformation, ClearMailRepositoryTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(ClearMailRepositoryTask.AdditionalInformation.class)
.convertToDTO(ClearMailRepositoryTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new ClearMailRepositoryTask.AdditionalInformation(
MailRepositoryPath.from(dto.mailRepositoryPath),
dto.initialCount,
dto.remainingCount,
- dto.timestamp
- ))
+ dto.timestamp))
.toDTOConverter((details, type) -> new ClearMailRepositoryTaskAdditionalInformationDTO(
type,
details.getRepositoryPath(),
@@ -46,6 +44,7 @@ public class ClearMailRepositoryTaskAdditionalInformationDTO implements Addition
details.timestamp()))
.typeName(ClearMailRepositoryTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final String mailRepositoryPath;
private final String type;
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskAdditionalInformationDTO.java
index ee821a5..adacac9 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskAdditionalInformationDTO.java
@@ -30,9 +30,8 @@ import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ReprocessingAllMailsTaskAdditionalInformationDTO implements AdditionalInformationDTO {
-
- public static final AdditionalInformationDTOModule<ReprocessingAllMailsTask.AdditionalInformation, ReprocessingAllMailsTaskAdditionalInformationDTO> SERIALIZATION_MODULE =
- DTOModule.forDomainObject(ReprocessingAllMailsTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<ReprocessingAllMailsTask.AdditionalInformation, ReprocessingAllMailsTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(ReprocessingAllMailsTask.AdditionalInformation.class)
.convertToDTO(ReprocessingAllMailsTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new ReprocessingAllMailsTask.AdditionalInformation(
MailRepositoryPath.from(dto.repositoryPath),
@@ -40,8 +39,7 @@ public class ReprocessingAllMailsTaskAdditionalInformationDTO implements Additio
dto.targetProcessor,
dto.initialCount,
dto.remainingCount,
- dto.timestamp
- ))
+ dto.timestamp))
.toDTOConverter((details, type) -> new ReprocessingAllMailsTaskAdditionalInformationDTO(
type,
details.getRepositoryPath(),
@@ -52,6 +50,7 @@ public class ReprocessingAllMailsTaskAdditionalInformationDTO implements Additio
details.timestamp()))
.typeName(ReprocessingAllMailsTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final String type;
private final String repositoryPath;
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskAdditionalInformationDTO.java
index 89dd1d8..f84ae9d 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskAdditionalInformationDTO.java
@@ -31,17 +31,15 @@ import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ReprocessingOneMailTaskAdditionalInformationDTO implements AdditionalInformationDTO {
-
- public static final AdditionalInformationDTOModule<ReprocessingOneMailTask.AdditionalInformation, ReprocessingOneMailTaskAdditionalInformationDTO> SERIALIZATION_MODULE =
- DTOModule.forDomainObject(ReprocessingOneMailTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<ReprocessingOneMailTask.AdditionalInformation, ReprocessingOneMailTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(ReprocessingOneMailTask.AdditionalInformation.class)
.convertToDTO(ReprocessingOneMailTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new ReprocessingOneMailTask.AdditionalInformation(
MailRepositoryPath.from(dto.repositoryPath),
MailQueueName.of(dto.targetQueue),
new MailKey(dto.mailKey),
dto.targetProcessor,
- dto.timestamp
- ))
+ dto.timestamp))
.toDTOConverter((details, type) -> new ReprocessingOneMailTaskAdditionalInformationDTO(
type,
details.getRepositoryPath(),
@@ -51,6 +49,7 @@ public class ReprocessingOneMailTaskAdditionalInformationDTO implements Addition
details.timestamp()))
.typeName(ReprocessingOneMailTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final String type;
private final String repositoryPath;
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/WebAdminClearMailRepositoryTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/WebAdminClearMailRepositoryTaskAdditionalInformationDTO.java
index 25acd2e..31359fb 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/WebAdminClearMailRepositoryTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/WebAdminClearMailRepositoryTaskAdditionalInformationDTO.java
@@ -28,16 +28,14 @@ import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import com.fasterxml.jackson.annotation.JsonProperty;
public class WebAdminClearMailRepositoryTaskAdditionalInformationDTO implements AdditionalInformationDTO {
-
- public static final AdditionalInformationDTOModule<ClearMailRepositoryTask.AdditionalInformation, WebAdminClearMailRepositoryTaskAdditionalInformationDTO> SERIALIZATION_MODULE =
- DTOModule.forDomainObject(ClearMailRepositoryTask.AdditionalInformation.class)
+ public static AdditionalInformationDTOModule<ClearMailRepositoryTask.AdditionalInformation, WebAdminClearMailRepositoryTaskAdditionalInformationDTO> module() {
+ return DTOModule.forDomainObject(ClearMailRepositoryTask.AdditionalInformation.class)
.convertToDTO(WebAdminClearMailRepositoryTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> new ClearMailRepositoryTask.AdditionalInformation(
MailRepositoryPath.from(dto.repositoryPath),
dto.initialCount,
dto.remainingCount,
- dto.timestamp
- ))
+ dto.timestamp))
.toDTOConverter((details, type) -> new WebAdminClearMailRepositoryTaskAdditionalInformationDTO(
type,
details.getRepositoryPath(),
@@ -46,6 +44,7 @@ public class WebAdminClearMailRepositoryTaskAdditionalInformationDTO implements
details.timestamp()))
.typeName(ClearMailRepositoryTask.TYPE.asString())
.withFactory(AdditionalInformationDTOModule::new);
+ }
private final String repositoryPath;
private final String type;
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index 6444bee..d1806a2 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -72,7 +72,6 @@ import org.apache.james.webadmin.Constants;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
import org.apache.james.webadmin.service.ClearMailRepositoryTask;
-import org.apache.james.webadmin.service.ClearMailRepositoryTaskAdditionalInformationDTO;
import org.apache.james.webadmin.service.MailRepositoryStoreService;
import org.apache.james.webadmin.service.ReprocessingAllMailsTask;
import org.apache.james.webadmin.service.ReprocessingAllMailsTaskAdditionalInformationDTO;
@@ -131,9 +130,9 @@ public class MailRepositoriesRoutesTest {
new MailRepositoriesRoutes(repositoryStoreService,
jsonTransformer, reprocessingService, taskManager),
new TasksRoutes(taskManager, jsonTransformer,
- DTOConverter.of(ReprocessingOneMailTaskAdditionalInformationDTO.SERIALIZATION_MODULE,
- ReprocessingAllMailsTaskAdditionalInformationDTO.SERIALIZATION_MODULE,
- WebAdminClearMailRepositoryTaskAdditionalInformationDTO.SERIALIZATION_MODULE)))
+ DTOConverter.of(ReprocessingOneMailTaskAdditionalInformationDTO.module(),
+ ReprocessingAllMailsTaskAdditionalInformationDTO.module(),
+ WebAdminClearMailRepositoryTaskAdditionalInformationDTO.module())))
.start();
RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminServer)
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskTest.java
index 06aa208..df0cf35 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskTest.java
@@ -64,7 +64,7 @@ class ClearMailRepositoryTaskTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(ClearMailRepositoryTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ JsonSerializationVerifier.dtoModule(ClearMailRepositoryTaskAdditionalInformationDTO.module())
.bean(new ClearMailRepositoryTask.AdditionalInformation(MAIL_REPOSITORY_PATH, INITIAL_COUNT, REMAINING_COUNT, TIMESTAMP))
.json(SERIALIZED_TASK_ADDITIONAL_INFORMATION)
.verify();
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskTest.java
index 7ad6a8b..d9eb9ca 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskTest.java
@@ -73,7 +73,7 @@ class ReprocessingAllMailsTaskTest {
ReprocessingAllMailsTask.AdditionalInformation detailsWithoutProcessor = new ReprocessingAllMailsTask.AdditionalInformation(REPOSITORY_PATH, TARGET_QUEUE, Optional.empty(),
REPOSITORY_SIZE, REMAINING_COUNT, TIMESTAMP);
- JsonSerializationVerifier.dtoModule(ReprocessingAllMailsTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ JsonSerializationVerifier.dtoModule(ReprocessingAllMailsTaskAdditionalInformationDTO.module())
.testCase(details, SERIALIZED_TASK_ADDITIONAL_INFORMATION_WITH_TARGET_PROCESSOR)
.testCase(detailsWithoutProcessor, SERIALIZED_TASK_ADDITIONAL_INFORMATION_WITHOUT_TARGET_PROCESSOR)
.verify();
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskTest.java
index b61ed7e..1d89553 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskTest.java
@@ -72,7 +72,7 @@ class ReprocessingOneMailTaskTest {
@Test
void additionalInformationShouldBeSerializable() throws IOException {
ReprocessingOneMailTask.AdditionalInformation details = new ReprocessingOneMailTask.AdditionalInformation(REPOSITORY_PATH, TARGET_QUEUE, MAIL_KEY, TARGET_PROCESSOR, TIMESTAMP);
- JsonSerializationVerifier.dtoModule(ReprocessingOneMailTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ JsonSerializationVerifier.dtoModule(ReprocessingOneMailTaskAdditionalInformationDTO.module())
.bean(details)
.json(SERIALIZED_TASK_1_ADDITIONAL_INFORMATION)
.verify();
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/WebAdminClearMailRepositoryTaskDTOTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/WebAdminClearMailRepositoryTaskDTOTest.java
index 4496652..9aaaf88 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/WebAdminClearMailRepositoryTaskDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/WebAdminClearMailRepositoryTaskDTOTest.java
@@ -36,7 +36,7 @@ class WebAdminClearMailRepositoryTaskDTOTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- JsonSerializationVerifier.dtoModule(WebAdminClearMailRepositoryTaskAdditionalInformationDTO.SERIALIZATION_MODULE)
+ JsonSerializationVerifier.dtoModule(WebAdminClearMailRepositoryTaskAdditionalInformationDTO.module())
.bean(new ClearMailRepositoryTask.AdditionalInformation(MAIL_REPOSITORY_PATH, INITIAL_COUNT, REMAINING_COUNT, TIMESTAMP))
.json(SERIALIZED_TASK_ADDITIONAL_INFORMATION)
.verify();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org