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 2019/10/22 12:36:03 UTC
[james-project] 02/05: JAMES-2813 Normalize task types in kebab case
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 3cefd34a9f0b29b2a93e22fb2a717221a9e1fb77
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Fri Oct 18 14:31:43 2019 +0200
JAMES-2813 Normalize task types in kebab case
---
.../backends/cassandra/migration/Migration.java | 2 +-
.../cassandra/migration/MigrationTask.java | 2 +-
.../migration/MigrationTaskSerializationTest.java | 4 +--
.../mail/migration/MailboxPathV2Migration.java | 2 +-
.../cassandra/mail/task/MailboxMergingTask.java | 2 +-
...ailboxPathV2MigrationTaskSerializationTest.java | 4 +--
.../mail/task/MailboxMergingTaskTest.java | 4 +--
.../blob/BlobStoreVaultGarbageCollectionTask.java | 2 +-
...aultGarbageCollectionTaskSerializationTest.java | 4 +--
.../tools/indexer/ErrorRecoveryIndexationTask.java | 2 +-
.../mailbox/tools/indexer/FullReindexingTask.java | 2 +-
.../tools/indexer/MessageIdReIndexingTask.java | 2 +-
.../tools/indexer/SingleMailboxReindexingTask.java | 2 +-
.../tools/indexer/SingleMessageReindexingTask.java | 2 +-
.../mailbox/tools/indexer/UserReindexingTask.java | 2 +-
...rorRecoveryIndexationTaskSerializationTest.java | 4 +--
.../FullReindexingTaskSerializationTest.java | 4 +--
.../MessageIdReindexingTaskSerializationTest.java | 4 +--
...ngleMailboxReindexingTaskSerializationTest.java | 4 +--
...ngleMessageReindexingTaskSerializationTest.java | 4 +--
.../UserReindexingTaskSerializationTest.java | 4 +--
.../org/apache/james/CleanupTasksPerformer.java | 2 +-
.../migration/MappingsSourcesMigration.java | 2 +-
...pingsSourcesMigrationTaskSerializationTest.java | 4 +--
...dminServerTaskSerializationIntegrationTest.java | 38 +++++++++++-----------
.../CassandraMappingsSolveInconsistenciesTask.java | 2 +-
...sandraMappingsSolveInconsistenciesTaskTest.java | 2 +-
.../routes/DeletedMessagesVaultDeleteTask.java | 2 +-
.../routes/DeletedMessagesVaultExportTask.java | 2 +-
.../routes/DeletedMessagesVaultRestoreTask.java | 2 +-
...edMessagesVaultDeleteTaskSerializationTest.java | 4 +--
...edMessagesVaultExportTaskSerializationTest.java | 10 +++---
...dMessagesVaultRestoreTaskSerializationTest.java | 4 +--
.../routes/DeletedMessagesVaultRoutesTest.java | 4 +--
.../resources/query/contains_origin_mailbox.json | 2 +-
.../test/resources/query/contains_recipient.json | 2 +-
.../src/test/resources/query/has_attachment.json | 2 +-
.../test/resources/query/has_no_attachment.json | 2 +-
.../src/test/resources/query/has_sender.json | 2 +-
.../src/test/resources/query/string_contains.json | 2 +-
.../query/string_contains_ignore_case.json | 2 +-
.../src/test/resources/query/string_equals.json | 2 +-
.../resources/query/string_equals_ignore_case.json | 2 +-
.../query/zoned_date_time_after_or_equals.json | 2 +-
.../query/zoned_date_time_before_or_equals.json | 2 +-
.../service/EventDeadLettersRedeliverAllTask.java | 2 +-
.../EventDeadLettersRedeliverGroupTask.java | 2 +-
.../service/EventDeadLettersRedeliverOneTask.java | 2 +-
.../webadmin/routes/ReindexingRoutesTest.java | 6 ++--
.../service/EventDeadLettersRedeliverTaskTest.java | 12 +++----
.../webadmin/service/ClearMailRepositoryTask.java | 2 +-
.../webadmin/service/ReprocessingAllMailsTask.java | 2 +-
.../webadmin/service/ReprocessingOneMailTask.java | 2 +-
.../service/ClearMailRepositoryTaskTest.java | 6 ++--
.../service/ReprocessingAllMailsTaskTest.java | 10 +++---
.../service/ReprocessingOneMailTaskTest.java | 8 ++---
.../server/task/json/TaskDeserializerTest.java | 4 +--
.../james/server/task/json/TaskSerializerTest.java | 2 +-
.../apache/james/server/task/json/TestTask.java | 2 +-
.../server/task/json/dto/TestTaskDTOModules.java | 2 +-
src/site/markdown/server/manage-webadmin.md | 36 ++++++++++----------
61 files changed, 131 insertions(+), 131 deletions(-)
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/Migration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/Migration.java
index ff5092b..46556c5 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/Migration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/Migration.java
@@ -35,7 +35,7 @@ public interface Migration {
@Override
public TaskType type() {
- return TaskType.of("migration_sub_task");
+ return TaskType.of("migration-sub-task");
}
};
}
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java
index 6aebb3a..47ea068 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java
@@ -65,7 +65,7 @@ public class MigrationTask implements Task {
private static final Logger LOGGER = LoggerFactory.getLogger(MigrationTask.class);
- public static final TaskType CASSANDRA_MIGRATION = TaskType.of("CassandraMigration");
+ public static final TaskType CASSANDRA_MIGRATION = TaskType.of("cassandra-migration");
public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
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 bf729b4..c56e378 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
@@ -36,8 +36,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
class MigrationTaskSerializationTest {
private static final int SCHEMA_VERSION = 12;
- private static final String SERIALIZED_TASK = "{\"type\": \"CassandraMigration\", \"targetVersion\": 12}";
- private static final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"CassandraMigration\", \"targetVersion\": 12, \"timestamp\": \"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_TASK = "{\"type\": \"cassandra-migration\", \"targetVersion\": 12}";
+ private static final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"cassandra-migration\", \"targetVersion\": 12, \"timestamp\": \"2018-11-13T12:00:55Z\"}";
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
private final CassandraSchemaVersionDAO cassandraSchemaVersionDAO = mock(CassandraSchemaVersionDAO.class);
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2Migration.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2Migration.java
index d127444..28024cc 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2Migration.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2Migration.java
@@ -88,7 +88,7 @@ public class MailboxPathV2Migration implements Migration {
}
public static final Logger LOGGER = LoggerFactory.getLogger(MailboxPathV2Migration.class);
- public static final TaskType TYPE = TaskType.of("Cassandra_mailboxPathV2Migration");
+ public static final TaskType TYPE = TaskType.of("cassandra-mailbox-path-v2-migration");
private final CassandraMailboxPathDAOImpl daoV1;
private final CassandraMailboxPathV2DAO daoV2;
private final long initialCount;
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTask.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTask.java
index d11bd1c..ac2b4f7 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTask.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTask.java
@@ -30,7 +30,7 @@ import org.apache.james.task.TaskExecutionDetails;
import org.apache.james.task.TaskType;
public class MailboxMergingTask implements Task {
- public static final TaskType MAILBOX_MERGING = TaskType.of("mailboxMerging");
+ public static final TaskType MAILBOX_MERGING = TaskType.of("mailbox-merging");
public static class Details implements TaskExecutionDetails.AdditionalInformation {
private final CassandraId oldMailboxId;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTaskSerializationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTaskSerializationTest.java
index a389160..f0a0277 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTaskSerializationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTaskSerializationTest.java
@@ -38,9 +38,9 @@ class MailboxPathV2MigrationTaskSerializationTest {
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
private static final MailboxPathV2Migration MIGRATION = mock(MailboxPathV2Migration.class);
private static final MailboxPathV2Migration.MailboxPathV2MigrationTask TASK = new MailboxPathV2Migration.MailboxPathV2MigrationTask(MIGRATION);
- private static final String SERIALIZED_TASK = "{\"type\": \"Cassandra_mailboxPathV2Migration\"}";
+ private static final String SERIALIZED_TASK = "{\"type\": \"cassandra-mailbox-path-v2-migration\"}";
private static final MailboxPathV2Migration.AdditionalInformation DETAILS = new MailboxPathV2Migration.AdditionalInformation(42L, 10, TIMESTAMP);
- private static final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"Cassandra_mailboxPathV2Migration\", \"remainingCount\":42,\"initialCount\":10, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"cassandra-mailbox-path-v2-migration\", \"remainingCount\":42,\"initialCount\":10, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final JsonTaskSerializer TASK_SERIALIZER = new JsonTaskSerializer(MailboxPathV2MigrationTaskDTO.MODULE.apply(MIGRATION));
private static final JsonTaskAdditionalInformationSerializer JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new JsonTaskAdditionalInformationSerializer(MailboxPathV2MigrationTaskAdditionalInformationDTO.MODULE);
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 9ea4707..4e7b48e 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
@@ -37,8 +37,8 @@ import org.junit.jupiter.api.Test;
class MailboxMergingTaskTest {
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
private static final CassandraId.Factory CASSANDRA_ID_FACTORY = new CassandraId.Factory();
- private static final String SERIALIZED = "{\"type\":\"mailboxMerging\",\"totalMessageCount\":0,\"oldMailboxId\":\"3b8e5f90-b94f-20f8-ce7b-3c4aad93b90c\",\"newMailboxId\":\"2c7f4081-aa30-11e9-bf6c-2d3b9e84aafd\"}";
- private static final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\":\"mailboxMerging\", \"oldMailboxId\":\"3b8e5f90-b94f-20f8-ce7b-3c4aad93b90c\",\"newMailboxId\":\"2c7f4081-aa30-11e9-bf6c-2d3b9e84aafd\",\"totalMessageCount\":10,\"messageMovedCount\":15,\"messageFailedCount\":20, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED = "{\"type\":\"mailbox-merging\",\"totalMessageCount\":0,\"oldMailboxId\":\"3b8e5f90-b94f-20f8-ce7b-3c4aad93b90c\",\"newMailboxId\":\"2c7f4081-aa30-11e9-bf6c-2d3b9e84aafd\"}";
+ private static final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\":\"mailbox-merging\", \"oldMailboxId\":\"3b8e5f90-b94f-20f8-ce7b-3c4aad93b90c\",\"newMailboxId\":\"2c7f4081-aa30-11e9-bf6c-2d3b9e84aafd\",\"totalMessageCount\":10,\"messageMovedCount\":15,\"messageFailedCount\":20, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final MailboxMergingTaskRunner TASK_RUNNER = mock(MailboxMergingTaskRunner.class);
private static final MailboxMergingTask TASK = new MailboxMergingTask(TASK_RUNNER, 0L, CASSANDRA_ID_FACTORY.fromString("3b8e5f90-b94f-20f8-ce7b-3c4aad93b90c"), CASSANDRA_ID_FACTORY.fromString("2c7f4081-aa30-11e9-bf6c-2d3b9e84aafd"));
private static final MailboxMergingTask.Details DETAILS = new MailboxMergingTask.Details(CASSANDRA_ID_FACTORY.fromString("3b8e5f90-b94f-20f8-ce7b-3c4aad93b90c"), CASSANDRA_ID_FACTORY.fromString("2c7f4081-aa30-11e9-bf6c-2d3b9e84aafd"), 10, 15, 20, TIMESTAMP);
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java
index db85116..f82fc6a 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java
@@ -68,7 +68,7 @@ public class BlobStoreVaultGarbageCollectionTask implements Task {
}
}
- static final TaskType TYPE = TaskType.of("deletedMessages/blobStoreBasedGarbageCollection");
+ static final TaskType TYPE = TaskType.of("deleted-messages-blob-store-based-garbage-collection");
private final Flux<BucketName> retentionOperation;
private final ZonedDateTime beginningOfRetentionPeriod;
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 a1ad6b5..6852dd7 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
@@ -54,8 +54,8 @@ class BlobStoreVaultGarbageCollectionTaskSerializationTest {
private static final BlobStoreVaultGarbageCollectionTask.AdditionalInformation DETAILS = new BlobStoreVaultGarbageCollectionTask.AdditionalInformation(BEGINNING_OF_RETENTION_PERIOD, BUCKET_IDS, TIMESTAMP);
private static final BlobStoreVaultGarbageCollectionTask TASK = TASK_FACTORY.create();
- private static final String SERIALIZED_TASK = "{\"type\":\"deletedMessages/blobStoreBasedGarbageCollection\"}";
- private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"type\":\"deletedMessages/blobStoreBasedGarbageCollection\", \"beginningOfRetentionPeriod\":\"2019-09-03T15:26:13.356+02:00[Europe/Paris]\",\"deletedBuckets\":[\"1\", \"2\", \"3\"], \"timestamp\": \"2018-11-13T12:00:55Z\"}";
+ 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 = new JsonTaskAdditionalInformationSerializer(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.MODULE);
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java
index 399c40c..73259cb 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java
@@ -34,7 +34,7 @@ import org.apache.james.task.TaskType;
import com.github.steveash.guavate.Guavate;
public class ErrorRecoveryIndexationTask implements Task {
- public static final TaskType PREVIOUS_FAILURES_INDEXING = TaskType.of("ErrorRecoveryIndexation");
+ public static final TaskType PREVIOUS_FAILURES_INDEXING = TaskType.of("error-recovery-indexation");
public static class Factory {
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java
index 6546fe2..39aa268 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java
@@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class FullReindexingTask implements Task {
- public static final TaskType FULL_RE_INDEXING = TaskType.of("FullReIndexing");
+ public static final TaskType FULL_RE_INDEXING = TaskType.of("full-reindexing");
private final ReIndexerPerformer reIndexerPerformer;
private final ReprocessingContext reprocessingContext;
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReIndexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReIndexingTask.java
index 6cbba51..15a4b82 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReIndexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReIndexingTask.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
public class MessageIdReIndexingTask implements Task {
private static final Logger LOGGER = LoggerFactory.getLogger(MessageIdReIndexingTask.class);
- public static final TaskType TYPE = TaskType.of("MessageIdReIndexingTask");
+ public static final TaskType TYPE = TaskType.of("messageId-reindexing");
public static class Factory {
private ReIndexerPerformer reIndexerPerformer;
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java
index a9e3a16..737be90 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java
@@ -33,7 +33,7 @@ import org.apache.james.task.TaskType;
public class SingleMailboxReindexingTask implements Task {
- public static final TaskType MAILBOX_RE_INDEXING = TaskType.of("mailboxReIndexing");
+ public static final TaskType MAILBOX_RE_INDEXING = TaskType.of("mailbox-reindexing");
public static class AdditionalInformation extends ReprocessingContextInformation {
private final MailboxId mailboxId;
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java
index a5d3a52..8fe131a 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
public class SingleMessageReindexingTask implements Task {
private static final Logger LOGGER = LoggerFactory.getLogger(SingleMessageReindexingTask.class);
- public static final TaskType MESSAGE_RE_INDEXING = TaskType.of("messageReIndexing");
+ public static final TaskType MESSAGE_RE_INDEXING = TaskType.of("message-reindexing");
public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final MailboxId mailboxId;
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java
index 2be1147..ecba050 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java
@@ -34,7 +34,7 @@ import org.apache.james.task.TaskType;
public class UserReindexingTask implements Task {
- public static final TaskType USER_RE_INDEXING = TaskType.of("userReIndexing");
+ public static final TaskType USER_RE_INDEXING = TaskType.of("user-reindexing");
public static class AdditionalInformation extends ReprocessingContextInformation {
private final User user;
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 32f86a3..cbc823c 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
@@ -52,9 +52,9 @@ class ErrorRecoveryIndexationTaskSerializationTest {
private final int failedReprocessedMailCount = 2;
private ReIndexingExecutionFailures reIndexingExecutionFailures;
- private final String serializedErrorRecoveryReindexingTask = "{\"type\": \"ErrorRecoveryIndexation\"," +
+ private final String serializedErrorRecoveryReindexingTask = "{\"type\": \"error-recovery-indexation\"," +
" \"previousFailures\" : [{\"mailboxId\":\"1\",\"uids\":[10]},{\"mailboxId\":\"2\",\"uids\":[20]}]}";
- private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"ErrorRecoveryIndexation\", \"successfullyReprocessedMailCount\":42,\"failedReprocessedMailCount\":2,\"failures\":[{\"mailboxId\":\"1\",\"uids\":[10]},{\"mailboxId\":\"2\",\"uids\":[20]}], \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"error-recovery-indexation\", \"successfullyReprocessedMailCount\":42,\"failedReprocessedMailCount\":2,\"failures\":[{\"mailboxId\":\"1\",\"uids\":[10]},{\"mailboxId\":\"2\",\"uids\":[20]}], \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private final TestId mailboxId = TestId.of(1L);
private final MessageUid messageUid = MessageUid.of(10L);
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 fcc29e1..0c1a34b 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
@@ -55,8 +55,8 @@ class FullReindexingTaskSerializationTest {
private final int failedReprocessedMailCount = 2;
private ReIndexingExecutionFailures reIndexingExecutionFailures;
- private final String serializedFullReindexingTask = "{\"type\": \"FullReIndexing\"}";
- private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"FullReIndexing\", \"successfullyReprocessedMailCount\":42,\"failedReprocessedMailCount\":2,\"failures\":[{\"mailboxId\":\"1\",\"uids\":[10]},{\"mailboxId\":\"2\",\"uids\":[20]}], \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private final String serializedFullReindexingTask = "{\"type\": \"full-reindexing\"}";
+ private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"full-reindexing\", \"successfullyReprocessedMailCount\":42,\"failedReprocessedMailCount\":2,\"failures\":[{\"mailboxId\":\"1\",\"uids\":[10]},{\"mailboxId\":\"2\",\"uids\":[20]}], \"timestamp\":\"2018-11-13T12:00:55Z\"}";
@BeforeEach
void setUp() {
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 b6e88fb..c1a873e 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
@@ -41,8 +41,8 @@ class MessageIdReindexingTaskSerializationTest {
private ReIndexerPerformer reIndexerPerformer;
private MessageId.Factory messageIdFactory;
private JsonTaskSerializer taskSerializer;
- private final String serializedMessageIdReIndexingTask = "{\"type\": \"MessageIdReIndexingTask\", \"messageId\": \"1\"}";
- private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"MessageIdReIndexingTask\", \"messageId\": \"1\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private final String serializedMessageIdReIndexingTask = "{\"type\": \"messageId-reindexing\", \"messageId\": \"1\"}";
+ private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"messageId-reindexing\", \"messageId\": \"1\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private JsonTaskAdditionalInformationSerializer jsonAdditionalInformationSerializer;
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 872a748..0ce4f36 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
@@ -49,9 +49,9 @@ class SingleMailboxReindexingTaskSerializationTest {
private final int failedReprocessedMailCount = 2;
private ReIndexingExecutionFailures reIndexingExecutionFailures;
- private final String serializedMailboxReindexingTask = "{\"type\": \"mailboxReIndexing\", \"mailboxId\": \"1\"}";
+ private final String serializedMailboxReindexingTask = "{\"type\": \"mailbox-reindexing\", \"mailboxId\": \"1\"}";
- private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"mailboxReIndexing\", \"mailboxId\": \"1\", \"successfullyReprocessedMailCount\":42,\"failedReprocessedMailCount\":2,\"failures\":[{\"mailboxId\":\"1\",\"uids\":[10, 20]}], \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"mailbox-reindexing\", \"mailboxId\": \"1\", \"successfullyReprocessedMailCount\":42,\"failedReprocessedMailCount\":2,\"failures\":[{\"mailboxId\":\"1\",\"uids\":[10, 20]}], \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private final TestId mailboxId = TestId.of(1L);
private final MessageUid messageUid = MessageUid.of(10L);
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 6579df3..9ba44ee 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
@@ -41,8 +41,8 @@ class SingleMessageReindexingTaskSerializationTest {
private final TestId.Factory mailboxIdFactory = new TestId.Factory();
private ReIndexerPerformer reIndexerPerformer;
private JsonTaskSerializer taskSerializer;
- private final String serializedMessageReindexingTask = "{\"type\": \"messageReIndexing\", \"mailboxId\": \"1\", \"uid\": 10}";
- private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"messageReIndexing\", \"mailboxId\": \"1\", \"uid\": 10, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private final String serializedMessageReindexingTask = "{\"type\": \"message-reindexing\", \"mailboxId\": \"1\", \"uid\": 10}";
+ private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"message-reindexing\", \"mailboxId\": \"1\", \"uid\": 10, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private final TestId mailboxId = TestId.of(1L);
private final MessageUid messageUid = MessageUid.of(10L);
private JsonTaskAdditionalInformationSerializer jsonAdditionalInformationSerializer = new JsonTaskAdditionalInformationSerializer(
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 bc2d622..41443d4 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
@@ -50,9 +50,9 @@ class UserReindexingTaskSerializationTest {
private final int successfullyReprocessedMailCount = 42;
private final int failedReprocessedMailCount = 2;
private ReIndexingExecutionFailures reIndexingExecutionFailures;
- private final String serializedUserReindexingTask = "{\"type\": \"userReIndexing\", \"username\": \"foo@apache.org\"}";
+ private final String serializedUserReindexingTask = "{\"type\": \"user-reindexing\", \"username\": \"foo@apache.org\"}";
- private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"userReIndexing\", \"user\": \"foo@apache.org\", \"successfullyReprocessedMailCount\":42,\"failedReprocessedMailCount\":2,\"failures\":[{\"mailboxId\":\"1\",\"uids\":[10]},{\"mailboxId\":\"2\",\"uids\":[20]}], \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"user-reindexing\", \"user\": \"foo@apache.org\", \"successfullyReprocessedMailCount\":42,\"failedReprocessedMailCount\":2,\"failures\":[{\"mailboxId\":\"1\",\"uids\":[10]},{\"mailboxId\":\"2\",\"uids\":[20]}], \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private final TestId mailboxId = TestId.of(1L);
private final MessageUid messageUid = MessageUid.of(10L);
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java
index 1908899..55895f9 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java
@@ -35,7 +35,7 @@ public class CleanupTasksPerformer {
public interface CleanupTask extends Task {
default TaskType type() {
- return TaskType.of("cleanup_task");
+ return TaskType.of("cleanup-task");
}
}
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigration.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigration.java
index cc55a70..24dcbb0 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigration.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigration.java
@@ -68,7 +68,7 @@ public class MappingsSourcesMigration implements Migration {
}
private static final Logger LOGGER = LoggerFactory.getLogger(MappingsSourcesMigration.class);
- public static final TaskType TYPE = TaskType.of("mappingsSourcesMigration");
+ public static final TaskType TYPE = TaskType.of("mappings-sources-migration");
public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final long successfulMappingsCount;
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 f179dfe..e98fb43 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
@@ -37,9 +37,9 @@ class MappingsSourcesMigrationTaskSerializationTest {
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
private static final MappingsSourcesMigration MIGRATION = mock(MappingsSourcesMigration.class);
private static final MappingsSourcesMigration.MappingsSourcesMigrationTask TASK = new MappingsSourcesMigration.MappingsSourcesMigrationTask(MIGRATION);
- private static final String SERIALIZED_TASK = "{\"type\": \"mappingsSourcesMigration\"}";
+ private static final String SERIALIZED_TASK = "{\"type\": \"mappings-sources-migration\"}";
private static final MappingsSourcesMigration.AdditionalInformation DETAILS = new MappingsSourcesMigration.AdditionalInformation(42L, 10, TIMESTAMP);
- private static final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"mappingsSourcesMigration\", \"successfulMappingsCount\":42,\"errorMappingsCount\":10,\"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\": \"mappings-sources-migration\", \"successfulMappingsCount\":42,\"errorMappingsCount\":10,\"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final JsonTaskSerializer TASK_SERIALIZER = new JsonTaskSerializer(MappingsSourcesMigrationTaskDTO.MODULE.apply(MIGRATION));
private static final JsonTaskAdditionalInformationSerializer JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new JsonTaskAdditionalInformationSerializer(MappingsSourcesMigrationTaskAdditionalInformationDTO.serializationModule(MappingsSourcesMigration.TYPE));
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerTaskSerializationIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerTaskSerializationIntegrationTest.java
index 4878838..1b81507 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerTaskSerializationIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerTaskSerializationIntegrationTest.java
@@ -134,7 +134,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is("FullReIndexing"))
+ .body("type", is("full-reindexing"))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount", is(0))
.body("additionalInformation.failures", is(anEmptyMap()));
@@ -207,7 +207,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is("reprocessingAllTask"))
+ .body("type", is("reprocessing-all"))
.body("additionalInformation.repositoryPath", is(notNullValue()))
.body("additionalInformation.targetQueue", is(notNullValue()))
.body("additionalInformation.targetProcessor", is(nullValue()))
@@ -245,7 +245,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("failed"))
.body("taskId", is(notNullValue()))
- .body("type", is("reprocessingOneTask"))
+ .body("type", is("reprocessing-one"))
.body("additionalInformation.repositoryPath", is(mailRepositoryUrl.asString()))
.body("additionalInformation.targetQueue", is(notNullValue()))
.body("additionalInformation.mailKey", is(mailKey))
@@ -276,7 +276,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("messageReIndexing"))
+ .body("type", is("message-reindexing"))
.body("additionalInformation.mailboxId", is(mailboxId.serialize()))
.body("additionalInformation.uid", is(Math.toIntExact(composedMessageId.getUid().asLong())));
}
@@ -304,7 +304,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("MessageIdReIndexingTask"))
+ .body("type", is("messageId-reindexing"))
.body("additionalInformation.messageId", is(composedMessageId.getMessageId().serialize()));
}
@@ -324,7 +324,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("userReIndexing"))
+ .body("type", is("user-reindexing"))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount", is(0))
.body("additionalInformation.user", is(USERNAME))
@@ -357,7 +357,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("deletedMessages/restore"))
+ .body("type", is("deleted-messages-restore"))
.body("additionalInformation.user", is(USERNAME))
.body("additionalInformation.successfulRestoreCount", is(0))
.body("additionalInformation.errorRestoreCount", is(0));
@@ -391,7 +391,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("deletedMessages/export"))
+ .body("type", is("deleted-messages-export"))
.body("additionalInformation.userExportFrom", is(USERNAME))
.body("additionalInformation.exportTo", is(exportTo))
.body("additionalInformation.totalExportedMessages", is(0));
@@ -425,7 +425,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("ErrorRecoveryIndexation"))
+ .body("type", is("error-recovery-indexation"))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount", is(0))
.body("additionalInformation.failures", is(anEmptyMap()));
@@ -449,7 +449,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("eventDeadLettersRedeliverAllTask"))
+ .body("type", is("event-dead-letters-redeliver-all"))
.body("additionalInformation.successfulRedeliveriesCount", is(0))
.body("additionalInformation.failedRedeliveriesCount", is(0));
@@ -491,7 +491,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("failed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("eventDeadLettersRedeliverGroupTask"))
+ .body("type", is("event-dead-letters-redeliver-group"))
.body("additionalInformation.successfulRedeliveriesCount", is(0))
.body("additionalInformation.failedRedeliveriesCount", is(0))
.body("additionalInformation.group", is(group.asString()));
@@ -533,7 +533,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("failed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("eventDeadLettersRedeliverOneTask"))
+ .body("type", is("event-dead-letters-redeliver-one"))
.body("additionalInformation.successfulRedeliveriesCount", is(0))
.body("additionalInformation.failedRedeliveriesCount", is(0))
.body("additionalInformation.group", is(group.asString()))
@@ -589,7 +589,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is("deletedMessages/blobStoreBasedGarbageCollection"))
+ .body("type", is("deleted-messages-blob-store-based-garbage-collection"))
.body("additionalInformation.beginningOfRetentionPeriod", is(notNullValue()))
.body("additionalInformation.deletedBuckets", is(empty()));
}
@@ -620,7 +620,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is("clearMailRepository"))
+ .body("type", is("clear-mail-repository"))
.body("additionalInformation.repositoryPath", is(notNullValue()))
.body("additionalInformation.initialCount", is(0))
.body("additionalInformation.remainingCount", is(0));
@@ -647,7 +647,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is(TaskManager.Status.COMPLETED.getValue()))
.body("taskId", is(taskId))
- .body("type", is("mailboxMerging"))
+ .body("type", is("mailbox-merging"))
.body("additionalInformation.oldMailboxId", is(origin.serialize()))
.body("additionalInformation.newMailboxId", is(destination.serialize()))
.body("additionalInformation.totalMessageCount", is(0))
@@ -671,7 +671,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(Matchers.notNullValue()))
- .body("type", is("mailboxReIndexing"))
+ .body("type", is("mailbox-reindexing"))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount", is(0))
.body("additionalInformation.mailboxId", is(mailboxId.serialize()))
@@ -704,7 +704,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is("deletedMessages/delete"))
+ .body("type", is("deleted-messages-delete"))
.body("additionalInformation.user", is(USERNAME))
.body("additionalInformation.deleteMessageId", is(composedMessageId.getMessageId().serialize()));
}
@@ -725,7 +725,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is("CassandraMigration"))
+ .body("type", is("cassandra-migration"))
.body("additionalInformation.toVersion", is(toVersion.getValue()));
}
@@ -745,7 +745,7 @@ public class WebAdminServerTaskSerializationIntegrationTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is("cassandraMappingsSolveInconsistencies"))
+ .body("type", is("cassandra-mappings-solve-inconsistencies"))
.body("additionalInformation.successfulMappingsCount", is(0))
.body("additionalInformation.errorMappingsCount", is(0));
}
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTask.java b/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTask.java
index 75fd5b2..eb8f2eb 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTask.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTask.java
@@ -36,7 +36,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import reactor.core.publisher.Mono;
public class CassandraMappingsSolveInconsistenciesTask implements Task {
- public static final TaskType TYPE = TaskType.of("cassandraMappingsSolveInconsistencies");
+ public static final TaskType TYPE = TaskType.of("cassandra-mappings-solve-inconsistencies");
private static class CassandraMappingsSolveInconsistenciesTaskDTO implements TaskDTO {
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTaskTest.java b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTaskTest.java
index cc6dd02..9aa17cb 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTaskTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTaskTest.java
@@ -33,7 +33,7 @@ import net.javacrumbs.jsonunit.assertj.JsonAssertions;
import org.junit.jupiter.api.Test;
class CassandraMappingsSolveInconsistenciesTaskTest {
- private static final String SERIALIZED = "{\"type\":\"cassandraMappingsSolveInconsistencies\"}";
+ private static final String SERIALIZED = "{\"type\":\"cassandra-mappings-solve-inconsistencies\"}";
private static final MappingsSourcesMigration MAPPINGS_SOURCES_MIGRATION = mock(MappingsSourcesMigration.class);
private static final CassandraMappingsSourcesDAO CASSANDRA_MAPPINGS_SOURCES_DAO = mock(CassandraMappingsSourcesDAO.class);
private static final CassandraMappingsSolveInconsistenciesTask TASK = new CassandraMappingsSolveInconsistenciesTask(MAPPINGS_SOURCES_MIGRATION, CASSANDRA_MAPPINGS_SOURCES_DAO);
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java
index 0ab9b08..3705942 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java
@@ -36,7 +36,7 @@ import reactor.core.publisher.Mono;
public class DeletedMessagesVaultDeleteTask implements Task {
- public static final TaskType TYPE = TaskType.of("deletedMessages/delete");
+ public static final TaskType TYPE = TaskType.of("deleted-messages-delete");
public static class Factory {
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
index 3ca6b47..ba108d8 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
@@ -38,7 +38,7 @@ import com.google.common.annotations.VisibleForTesting;
public class DeletedMessagesVaultExportTask implements Task {
- static final TaskType TYPE = TaskType.of("deletedMessages/export");
+ static final TaskType TYPE = TaskType.of("deleted-messages-export");
public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
index 4b35ee4..61d4539 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
@@ -39,7 +39,7 @@ import com.google.common.annotations.VisibleForTesting;
public class DeletedMessagesVaultRestoreTask implements Task {
- static final TaskType TYPE = TaskType.of("deletedMessages/restore");
+ static final TaskType TYPE = TaskType.of("deleted-messages-restore");
public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final User user;
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 c444d7d..dc91974 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
@@ -48,8 +48,8 @@ class DeletedMessagesVaultDeleteTaskSerializationTest {
private final TestMessageId.Factory messageIdFactory = new TestMessageId.Factory();
private final MessageId messageId = messageIdFactory.generate();
- private final String serializedDeleteMessagesVaultDeleteTask = "{\"type\": \"deletedMessages/delete\", \"userName\":\"james\", \"messageId\": \"" + messageId.serialize() + "\"}";
- private final String serializedAdditionalInformation = "{\"type\": \"deletedMessages/delete\", \"userName\":\"james\", \"messageId\": \"" + messageId.serialize() + "\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private final String serializedDeleteMessagesVaultDeleteTask = "{\"type\": \"deleted-messages-delete\", \"userName\":\"james\", \"messageId\": \"" + messageId.serialize() + "\"}";
+ private final String serializedAdditionalInformation = "{\"type\": \"deleted-messages-delete\", \"userName\":\"james\", \"messageId\": \"" + messageId.serialize() + "\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private JsonTaskAdditionalInformationSerializer jsonAdditionalInformationSerializer;
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 0b59885..d71f364 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
@@ -59,11 +59,11 @@ class DeletedMessagesVaultExportTaskSerializationTest {
private static MailAddress exportTo;
private static DeletedMessagesVaultExportTask.AdditionalInformation details;
- private static final String serializedDeleteMessagesVaultExportTask = "{\"type\":\"deletedMessages/export\"," +
+ private static final String serializedDeleteMessagesVaultExportTask = "{\"type\":\"deleted-messages-export\"," +
"\"userExportFrom\":\"james\"," +
"\"exportQuery\":{\"combinator\":\"and\",\"criteria\":[{\"fieldName\":\"hasAttachment\",\"operator\":\"equals\",\"value\":\"true\"}]}," +
"\"exportTo\":\"james@apache.org\"}\n";
- private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"type\":\"deletedMessages/export\", \"exportTo\":\"james@apache.org\",\"userExportFrom\":\"james\",\"totalExportedMessages\":42, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"type\":\"deleted-messages-export\", \"exportTo\":\"james@apache.org\",\"userExportFrom\":\"james\",\"totalExportedMessages\":42, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final JsonTaskAdditionalInformationSerializer JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new JsonTaskAdditionalInformationSerializer(DeletedMessagesVaultExportTaskAdditionalInformationDTO.MODULE);
@@ -106,14 +106,14 @@ class DeletedMessagesVaultExportTaskSerializationTest {
}
@Test
- void additonalInformationShouldBeDeserializable() throws IOException {
+ void additionalInformationShouldBeDeserializable() throws IOException {
assertThat(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION_TASK))
.isEqualToComparingFieldByField(details);
}
@Test
- void additonalInformationWithInvalidMailAddressShouldThrow() throws IOException {
- String invalidSerializedAdditionalInformationTask = "{\"type\":\"deletedMessages/export\",\"exportTo\":\"invalid\",\"userExportFrom\":\"james\",\"totalExportedMessages\":42}";;
+ void additionalInformationWithInvalidMailAddressShouldThrow() throws IOException {
+ String invalidSerializedAdditionalInformationTask = "{\"type\":\"deleted-messages-export\",\"exportTo\":\"invalid\",\"userExportFrom\":\"james\",\"totalExportedMessages\":42}";;
assertThatCode(() -> JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.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 c91998b..afa8cea 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
@@ -53,11 +53,11 @@ class DeletedMessagesVaultRestoreTaskSerializationTest {
private static final Query QUERY = Query.of(CriterionFactory.hasAttachment(true));
private static final DeletedMessagesVaultRestoreTask.AdditionalInformation DETAILS = new DeletedMessagesVaultRestoreTask.AdditionalInformation(USER_TO_RESTORE,42, 10, TIMESTAMP);
- private static final String SERIALIZED_DELETE_MESSAGES_VAULT_RESTORE_TASK = "{\"type\":\"deletedMessages/restore\"," +
+ private static final String SERIALIZED_DELETE_MESSAGES_VAULT_RESTORE_TASK = "{\"type\":\"deleted-messages-restore\"," +
"\"userToRestore\":\"james\"," +
"\"query\":{\"combinator\":\"and\",\"criteria\":[{\"fieldName\":\"hasAttachment\",\"operator\":\"equals\",\"value\":\"true\"}]}" +
"}";
- private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"type\":\"deletedMessages/restore\", \"user\":\"james\",\"successfulRestoreCount\":42,\"errorRestoreCount\":10, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"type\":\"deleted-messages-restore\", \"user\":\"james\",\"successfulRestoreCount\":42,\"errorRestoreCount\":10, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final JsonTaskAdditionalInformationSerializer JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new JsonTaskAdditionalInformationSerializer(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.MODULE);
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 8744c9f..025d5d6 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
@@ -1963,7 +1963,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is("deletedMessages/blobStoreBasedGarbageCollection"))
+ .body("type", is("deleted-messages-blob-store-based-garbage-collection"))
.body("additionalInformation.beginningOfRetentionPeriod", is(notNullValue()))
.body("additionalInformation.deletedBuckets", contains("deleted-messages-2010-10-01"))
.body("startedDate", is(notNullValue()))
@@ -2054,7 +2054,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("failed"))
.body("taskId", is(taskId))
- .body("type", is("deletedMessages/blobStoreBasedGarbageCollection"))
+ .body("type", is("deleted-messages-blob-store-based-garbage-collection"))
.body("additionalInformation.beginningOfRetentionPeriod", is(notNullValue()))
.body("additionalInformation.deletedBuckets", hasSize(0))
.body("startedDate", is(notNullValue()))
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/contains_origin_mailbox.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/contains_origin_mailbox.json
index 14ba54c..e971bfe 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/contains_origin_mailbox.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/contains_origin_mailbox.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/contains_recipient.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/contains_recipient.json
index 4be0216..9f92a96 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/contains_recipient.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/contains_recipient.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_attachment.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_attachment.json
index c56056e..179c1b1 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_attachment.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_attachment.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_no_attachment.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_no_attachment.json
index 2dcc716..f7d49bb 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_no_attachment.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_no_attachment.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_sender.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_sender.json
index 91a0212..16c5e12 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_sender.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/has_sender.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_contains.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_contains.json
index 2cad5ec..bcceed8 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_contains.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_contains.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_contains_ignore_case.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_contains_ignore_case.json
index f585f3a..5e0ca8a 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_contains_ignore_case.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_contains_ignore_case.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_equals.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_equals.json
index 2f1f4e9..ab66009 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_equals.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_equals.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_equals_ignore_case.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_equals_ignore_case.json
index d277c6c..9ed947f 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_equals_ignore_case.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/string_equals_ignore_case.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/zoned_date_time_after_or_equals.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/zoned_date_time_after_or_equals.json
index 3fff15c..eec2ffa 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/zoned_date_time_after_or_equals.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/zoned_date_time_after_or_equals.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/zoned_date_time_before_or_equals.json b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/zoned_date_time_before_or_equals.json
index ca89aa0..0e5353f 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/zoned_date_time_before_or_equals.json
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/resources/query/zoned_date_time_before_or_equals.json
@@ -1,5 +1,5 @@
{
- "type": "deletedMessages/restore",
+ "type": "deleted-messages-restore",
"userToRestore": "james",
"query": {
"combinator": "and",
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverAllTask.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverAllTask.java
index 9087e0b..cd38108 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverAllTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverAllTask.java
@@ -29,7 +29,7 @@ import org.apache.james.task.TaskType;
import org.apache.james.webadmin.service.EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForAll;
public class EventDeadLettersRedeliverAllTask implements Task {
- public static final TaskType TYPE = TaskType.of("eventDeadLettersRedeliverAllTask");
+ public static final TaskType TYPE = TaskType.of("event-dead-letters-redeliver-all");
private final EventDeadLettersRedeliverService service;
private final EventRetriever eventRetriever;
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverGroupTask.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverGroupTask.java
index 71958fb..134d9cf 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverGroupTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverGroupTask.java
@@ -30,7 +30,7 @@ import org.apache.james.task.TaskType;
import org.apache.james.webadmin.service.EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForGroup;
public class EventDeadLettersRedeliverGroupTask implements Task {
- public static final TaskType TYPE = TaskType.of("eventDeadLettersRedeliverGroupTask");
+ public static final TaskType TYPE = TaskType.of("event-dead-letters-redeliver-group");
private final EventDeadLettersRedeliverService service;
private final EventRetriever eventRetriever;
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverOneTask.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverOneTask.java
index 8b15859..5b3407e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverOneTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverOneTask.java
@@ -30,7 +30,7 @@ import org.apache.james.task.TaskExecutionDetails;
import org.apache.james.task.TaskType;
public class EventDeadLettersRedeliverOneTask implements Task {
- public static final TaskType TYPE = TaskType.of("eventDeadLettersRedeliverOneTask");
+ public static final TaskType TYPE = TaskType.of("event-dead-letters-redeliver-one");
private final EventDeadLettersRedeliverService service;
private final EventRetriever eventRetriever;
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
index 482e618..950c2f0 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ReindexingRoutesTest.java
@@ -1052,7 +1052,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is("ErrorRecoveryIndexation"))
+ .body("type", is("error-recovery-indexation"))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount", is(0))
.body("startedDate", is(notNullValue()))
@@ -1096,7 +1096,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is("ErrorRecoveryIndexation"))
+ .body("type", is("error-recovery-indexation"))
.body("additionalInformation.successfullyReprocessedMailCount", is(1))
.body("additionalInformation.failedReprocessedMailCount", is(0))
.body("startedDate", is(notNullValue()))
@@ -1141,7 +1141,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("failed"))
.body("taskId", is(notNullValue()))
- .body("type", is("ErrorRecoveryIndexation"))
+ .body("type", is("error-recovery-indexation"))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount", is(1))
.body("additionalInformation.failures.\"" + mailboxId.serialize() + "\"[0].uid", is(Long.valueOf(uidAsLong).intValue()))
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 820dfdf..9764739 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
@@ -48,12 +48,12 @@ import org.junit.jupiter.params.provider.MethodSource;
class EventDeadLettersRedeliverTaskTest {
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
- private static final String SERIALIZED_ALL = "{\"type\":\"eventDeadLettersRedeliverAllTask\"}";
- private static final String SERIALIZED_GROUP = "{\"type\":\"eventDeadLettersRedeliverGroupTask\",\"group\":\"org.apache.james.mailbox.events.GenericGroup-abc\"}";
- private static final String SERIALIZED_ONE = "{\"type\":\"eventDeadLettersRedeliverOneTask\",\"group\":\"org.apache.james.mailbox.events.GenericGroup-abc\",\"insertionId\":\"fcbc3c92-e9a0-4ece-94ed-6e6b45045258\"}";
- private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_ALL = "{\"type\":\"eventDeadLettersRedeliverAllTask\",\"successfulRedeliveriesCount\":10,\"failedRedeliveriesCount\":4, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
- private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_GROUP = "{\"type\":\"eventDeadLettersRedeliverGroupTask\",\"successfulRedeliveriesCount\":10,\"failedRedeliveriesCount\":4,\"group\":\"org.apache.james.mailbox.events.GenericGroup-foo\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
- private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_ONE = "{\"type\":\"eventDeadLettersRedeliverOneTask\",\"successfulRedeliveriesCount\":10,\"failedRedeliveriesCount\":4,\"group\":\"org.apache.james.mailbox.events.GenericGroup-foo\",\"insertionId\":\"53db3dd9-80eb-476f-b25a-722ad364905a\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_ALL = "{\"type\":\"event-dead-letters-redeliver-all\"}";
+ private static final String SERIALIZED_GROUP = "{\"type\":\"event-dead-letters-redeliver-group\",\"group\":\"org.apache.james.mailbox.events.GenericGroup-abc\"}";
+ private static final String SERIALIZED_ONE = "{\"type\":\"event-dead-letters-redeliver-one\",\"group\":\"org.apache.james.mailbox.events.GenericGroup-abc\",\"insertionId\":\"fcbc3c92-e9a0-4ece-94ed-6e6b45045258\"}";
+ private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_ALL = "{\"type\":\"event-dead-letters-redeliver-all\",\"successfulRedeliveriesCount\":10,\"failedRedeliveriesCount\":4, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_GROUP = "{\"type\":\"event-dead-letters-redeliver-group\",\"successfulRedeliveriesCount\":10,\"failedRedeliveriesCount\":4,\"group\":\"org.apache.james.mailbox.events.GenericGroup-foo\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_ONE = "{\"type\":\"event-dead-letters-redeliver-one\",\"successfulRedeliveriesCount\":10,\"failedRedeliveriesCount\":4,\"group\":\"org.apache.james.mailbox.events.GenericGroup-foo\",\"insertionId\":\"53db3dd9-80eb-476f-b25a-722ad364905a\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final EventDeadLettersRedeliverService SERVICE = mock(EventDeadLettersRedeliverService.class);
private static final EventDeadLettersRedeliverAllTask TASK_ALL = new EventDeadLettersRedeliverAllTask(SERVICE);
private static final EventDeadLettersRedeliverGroupTask TASK_GROUP = new EventDeadLettersRedeliverGroupTask(SERVICE, new GenericGroup("abc"));
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTask.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTask.java
index 268f518..01bc4b8 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTask.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTask.java
@@ -39,7 +39,7 @@ import com.github.steveash.guavate.Guavate;
public class ClearMailRepositoryTask implements Task {
- public static final TaskType TYPE = TaskType.of("clearMailRepository");
+ public static final TaskType TYPE = TaskType.of("clear-mail-repository");
public static class Factory {
private final MailRepositoryStore mailRepositoryStore;
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingAllMailsTask.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingAllMailsTask.java
index fc731ea..1fa8d43 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingAllMailsTask.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingAllMailsTask.java
@@ -35,7 +35,7 @@ import org.apache.james.task.TaskType;
public class ReprocessingAllMailsTask implements Task {
- public static final TaskType TYPE = TaskType.of("reprocessingAllTask");
+ public static final TaskType TYPE = TaskType.of("reprocessing-all");
public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final MailRepositoryPath repositoryPath;
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingOneMailTask.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingOneMailTask.java
index c470bcd..0225abb 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingOneMailTask.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ReprocessingOneMailTask.java
@@ -34,7 +34,7 @@ import org.apache.james.task.TaskType;
public class ReprocessingOneMailTask implements Task {
- public static final TaskType TYPE = TaskType.of("reprocessingOneTask");
+ public static final TaskType TYPE = TaskType.of("reprocessing-one");
public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final MailRepositoryPath repositoryPath;
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 9d90357..33b47f4 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
@@ -42,8 +42,8 @@ class ClearMailRepositoryTaskTest {
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
- private static final String SERIALIZED = "{\"type\":\"clearMailRepository\",\"mailRepositoryPath\":\"a\"}";
- private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION = "{\"type\":\"clearMailRepository\", \"mailRepositoryPath\":\"a\", \"initialCount\": 0, \"remainingCount\": 10, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED = "{\"type\":\"clear-mail-repository\",\"mailRepositoryPath\":\"a\"}";
+ private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION = "{\"type\":\"clear-mail-repository\", \"mailRepositoryPath\":\"a\", \"initialCount\": 0, \"remainingCount\": 10, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final ClearMailRepositoryTask.Factory FACTORY = new ClearMailRepositoryTask.Factory(mock(MailRepositoryStore.class));
private static final ImmutableList<MailRepository> MAIL_REPOSITORIES = ImmutableList.of();
private static final MailRepositoryPath MAIL_REPOSITORY_PATH = MailRepositoryPath.from("a");
@@ -72,7 +72,7 @@ class ClearMailRepositoryTaskTest {
void taskShouldThrowOnDeserializationUrlDecodingError() {
JsonTaskSerializer testee = new JsonTaskSerializer(ClearMailRepositoryTaskDTO.module(FACTORY));
- assertThatThrownBy(() -> testee.deserialize("{\"type\":\"clearMailRepository\",\"mailRepositoryPath\":\"%\"}"))
+ assertThatThrownBy(() -> testee.deserialize("{\"type\":\"clear-mail-repository\",\"mailRepositoryPath\":\"%\"}"))
.isInstanceOf(ClearMailRepositoryTask.InvalidMailRepositoryPathDeserializationException.class);
}
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 faea61f..f05c984 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
@@ -51,10 +51,10 @@ class ReprocessingAllMailsTaskTest {
private static final MailKey MAIL_KEY = new MailKey("myMail");
private static final Optional<String> SOME_TARGET_PROCESSOR = Optional.of("targetProcessor");
private static final long REMAINING_COUNT = 3L;
- private static final String SERIALIZED_TASK_WITH_TARGET_PROCESSOR = "{\"type\":\"reprocessingAllTask\",\"repositorySize\":5,\"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"targetProcessor\":\"targetProcessor\"}";
- private static final String SERIALIZED_TASK_WITHOUT_TARGET_PROCESSOR = "{\"type\":\"reprocessingAllTask\",\"repositorySize\":5,\"repositoryPath\":\"a\",\"targetQueue\":\"queue\"}";
- private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_WITH_TARGET_PROCESSOR = "{\"type\":\"reprocessingAllTask\", \"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"targetProcessor\":\"targetProcessor\",\"initialCount\":5,\"remainingCount\":3, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
- private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_WITHOUT_TARGET_PROCESSOR = "{\"type\":\"reprocessingAllTask\", \"repositoryPath\":\"a\",\"targetQueue\":\"queue\", \"initialCount\":5,\"remainingCount\":3, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_TASK_WITH_TARGET_PROCESSOR = "{\"type\":\"reprocessing-all\",\"repositorySize\":5,\"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"targetProcessor\":\"targetProcessor\"}";
+ private static final String SERIALIZED_TASK_WITHOUT_TARGET_PROCESSOR = "{\"type\":\"reprocessing-all\",\"repositorySize\":5,\"repositoryPath\":\"a\",\"targetQueue\":\"queue\"}";
+ private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_WITH_TARGET_PROCESSOR = "{\"type\":\"reprocessing-all\", \"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"targetProcessor\":\"targetProcessor\",\"initialCount\":5,\"remainingCount\":3, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION_WITHOUT_TARGET_PROCESSOR = "{\"type\":\"reprocessing-all\", \"repositoryPath\":\"a\",\"targetQueue\":\"queue\", \"initialCount\":5,\"remainingCount\":3, \"timestamp\":\"2018-11-13T12:00:55Z\"}";
@ParameterizedTest
@MethodSource
@@ -99,7 +99,7 @@ class ReprocessingAllMailsTaskTest {
}
@ParameterizedTest
- @ValueSource(strings = {"{\"type\":\"reprocessingAllTask\",\"repositorySize\":5,\"repositoryPath\":\"%\",\"targetQueue\":\"queue\",\"targetProcessor\":\"targetProcessor\"}", "{\"type\":\"reprocessingAllTask\",\"repositorySize\":5,\"repositoryPath\":\"%\",\"targetQueue\":\"queue\"}"})
+ @ValueSource(strings = {"{\"type\":\"reprocessing-all\",\"repositorySize\":5,\"repositoryPath\":\"%\",\"targetQueue\":\"queue\",\"targetProcessor\":\"targetProcessor\"}", "{\"type\":\"reprocessing-all\",\"repositorySize\":5,\"repositoryPath\":\"%\",\"targetQueue\":\"queue\"}"})
void taskShouldThrowOnDeserializationUrlDecodingError(String serialized) {
JsonTaskSerializer testee = new JsonTaskSerializer(ReprocessingAllMailsTaskDTO.module(REPROCESSING_SERVICE));
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 2e6e189..b23c4cf 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
@@ -49,8 +49,8 @@ class ReprocessingOneMailTaskTest {
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
private static final Clock CLOCK = Clock.fixed(TIMESTAMP, ZoneId.of("UTC"));
private static final ReprocessingService REPROCESSING_SERVICE = mock(ReprocessingService.class);
- private static final String SERIALIZED_TASK_1 = "{\"type\":\"reprocessingOneTask\",\"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\",\"targetProcessor\":\"targetProcessor\"}";
- private static final String SERIALIZED_TASK_1_ADDITIONAL_INFORMATION = "{\"type\":\"reprocessingOneTask\", \"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\",\"targetProcessor\":\"targetProcessor\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
+ private static final String SERIALIZED_TASK_1 = "{\"type\":\"reprocessing-one\",\"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\",\"targetProcessor\":\"targetProcessor\"}";
+ private static final String SERIALIZED_TASK_1_ADDITIONAL_INFORMATION = "{\"type\":\"reprocessing-one\", \"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\",\"targetProcessor\":\"targetProcessor\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final MailRepositoryPath REPOSITORY_PATH = MailRepositoryPath.from("a");
private static final String TARGET_QUEUE = "queue";
private static final MailKey MAIL_KEY = new MailKey("myMail");
@@ -95,12 +95,12 @@ class ReprocessingOneMailTaskTest {
private static Stream<Arguments> allValidTasks() {
return Stream.of(
Arguments.of(REPOSITORY_PATH, TARGET_QUEUE, MAIL_KEY, TARGET_PROCESSOR, SERIALIZED_TASK_1),
- Arguments.of(REPOSITORY_PATH, TARGET_QUEUE, new MailKey("myMail"), Optional.empty(), "{\"type\":\"reprocessingOneTask\",\"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\"}")
+ Arguments.of(REPOSITORY_PATH, TARGET_QUEUE, new MailKey("myMail"), Optional.empty(), "{\"type\":\"reprocessing-one\",\"repositoryPath\":\"a\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\"}")
);
}
@ParameterizedTest
- @ValueSource(strings = {"{\"type\":\"reprocessingOneTask\",\"repositoryPath\":\"%\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\",\"targetProcessor\":\"targetProcessor\"}", "{\"type\":\"reprocessingOneTask\",\"repositoryPath\":\"%\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\"}"})
+ @ValueSource(strings = {"{\"type\":\"reprocessing-one\",\"repositoryPath\":\"%\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\",\"targetProcessor\":\"targetProcessor\"}", "{\"type\":\"reprocessing-one\",\"repositoryPath\":\"%\",\"targetQueue\":\"queue\",\"mailKey\": \"myMail\"}"})
void taskShouldThrowOnDeserializationUrlDecodingError(String serialized) {
JsonTaskSerializer testee = new JsonTaskSerializer(ReprocessingOneMailTaskDTO.module(CLOCK, REPROCESSING_SERVICE));
diff --git a/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskDeserializerTest.java b/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskDeserializerTest.java
index 0cb3d00..4d2a947 100644
--- a/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskDeserializerTest.java
+++ b/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskDeserializerTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
class TaskDeserializerTest {
private static final String TASK_AS_STRING = "{" +
- "\"type\": \"testTask\"," +
+ "\"type\": \"test-task\"," +
"\"parameter\": 1" +
"}";
@@ -39,7 +39,7 @@ class TaskDeserializerTest {
"}";
private static final String TWO_TYPES_TASK_AS_STRING = "{" +
- "\"type\": \"testTask\"," +
+ "\"type\": \"test-task\"," +
"\"type\": \"unknown\"," +
"\"parameter\": 1" +
"}";
diff --git a/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializerTest.java b/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializerTest.java
index fb6f1ef..38983bc 100644
--- a/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializerTest.java
+++ b/server/task/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializerTest.java
@@ -24,7 +24,7 @@ import net.javacrumbs.jsonunit.assertj.JsonAssertions;
class TaskSerializerTest {
private static final String TASK_AS_STRING = "{" +
- "\"type\": \"testTask\"," +
+ "\"type\": \"test-task\"," +
"\"parameter\": 1" +
"}";
diff --git a/server/task/task-json/src/test/java/org/apache/james/server/task/json/TestTask.java b/server/task/task-json/src/test/java/org/apache/james/server/task/json/TestTask.java
index 579e1f2..9e47442 100644
--- a/server/task/task-json/src/test/java/org/apache/james/server/task/json/TestTask.java
+++ b/server/task/task-json/src/test/java/org/apache/james/server/task/json/TestTask.java
@@ -41,7 +41,7 @@ public class TestTask implements Task {
@Override
public TaskType type() {
- return TaskType.of("testTask");
+ return TaskType.of("test-task");
}
@Override
diff --git a/server/task/task-json/src/test/java/org/apache/james/server/task/json/dto/TestTaskDTOModules.java b/server/task/task-json/src/test/java/org/apache/james/server/task/json/dto/TestTaskDTOModules.java
index c07f20d..0236c76 100644
--- a/server/task/task-json/src/test/java/org/apache/james/server/task/json/dto/TestTaskDTOModules.java
+++ b/server/task/task-json/src/test/java/org/apache/james/server/task/json/dto/TestTaskDTOModules.java
@@ -38,7 +38,7 @@ public interface TestTaskDTOModules {
.toDTOConverter((task, typeName) -> new TestTaskDTO(
typeName,
task.getParameter()))
- .typeName("testTask")
+ .typeName("test-task")
.withFactory(TaskDTOModule::new);
TaskDTOModule<FailedTask, FailedTaskDTO> FAILED_TASK_MODULE = DTOModule
diff --git a/src/site/markdown/server/manage-webadmin.md b/src/site/markdown/server/manage-webadmin.md
index 28f8b8f..b07daab 100644
--- a/src/site/markdown/server/manage-webadmin.md
+++ b/src/site/markdown/server/manage-webadmin.md
@@ -1125,7 +1125,7 @@ Note that several calls to this endpoint will be run in a sequential pattern.
If the server restarts during the migration, the migration is silently aborted.
-The scheduled task will have the following type `CassandraMigration` and the following `additionalInformation`:
+The scheduled task will have the following type `cassandra-migration` and the following `additionalInformation`:
```
{"toVersion":3}
@@ -1160,7 +1160,7 @@ Note that several calls to this endpoint will be run in a sequential pattern.
If the server restarts during the migration, the migration is silently aborted.
-The scheduled task will have the following type `CassandraMigration` and the following `additionalInformation`:
+The scheduled task will have the following type `cassandra-migration` and the following `additionalInformation`:
```
{"toVersion":2}
@@ -1201,7 +1201,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 400: Unable to parse the body.
-The scheduled task will have the following type `mailboxMerging` and the following `additionalInformation`:
+The scheduled task will have the following type `mailbox-merging` and the following `additionalInformation`:
```
{
@@ -2027,7 +2027,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 404: Could not find that mail repository
-The scheduled task will have the following type `clearMailRepository` and the following `additionalInformation`:
+The scheduled task will have the following type `clear-mail-repository` and the following `additionalInformation`:
```
{
@@ -2088,7 +2088,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 404: Could not find that mail repository
-The scheduled task will have the following type `reprocessingAllTask` and the following `additionalInformation`:
+The scheduled task will have the following type `reprocessing-all` and the following `additionalInformation`:
```
{
@@ -2149,7 +2149,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 404: Could not find that mail repository
-The scheduled task will have the following type `reprocessingOneTask` and the following `additionalInformation`:
+The scheduled task will have the following type `reprocessing-one` and the following `additionalInformation`:
```
{
@@ -2255,7 +2255,7 @@ Response codes:
- 400: Invalid request
- 404: The mail queue does not exist
-The scheduled task will have the following type `deleteMailsFromMailQueue` and the following `additionalInformation`:
+The scheduled task will have the following type `delete-mails-from-mail-queue` and the following `additionalInformation`:
```
{
@@ -2283,7 +2283,7 @@ Response codes:
- 400: Invalid request
- 404: The mail queue does not exist
-The scheduled task will have the following type `clearMailQueue` and the following `additionalInformation`:
+The scheduled task will have the following type `clear-mail-queue` and the following `additionalInformation`:
```
{
@@ -2601,7 +2601,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 400: Error in the request. Details can be found in the reported error.
-The scheduled task will have the following type `FullReIndexing` and the following `additionalInformation`:
+The scheduled task will have the following type `full-reindexing` and the following `additionalInformation`:
```
{
@@ -2648,7 +2648,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 400: Error in the request. Details can be found in the reported error.
-The scheduled task will have the following type `userReIndexing` and the following `additionalInformation`:
+The scheduled task will have the following type `user-reindexing` and the following `additionalInformation`:
```
{
@@ -2698,7 +2698,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 400: Error in the request. Details can be found in the reported error.
-The scheduled task will have the following type `mailboxReIndexing` and the following `additionalInformation`:
+The scheduled task will have the following type `mailbox-reindexing` and the following `additionalInformation`:
```
{
@@ -2748,7 +2748,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 400: Error in the request. Details can be found in the reported error.
-The scheduled task will have the following type `ReIndexPreviousFailures` and the following `additionalInformation`:
+The scheduled task will have the following type `error-recovery-indexation` and the following `additionalInformation`:
```
{
@@ -2790,7 +2790,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 400: Error in the request. Details can be found in the reported error.
-The scheduled task will have the following type `messageReIndexing` and the following `additionalInformation`:
+The scheduled task will have the following type `message-reindexing` and the following `additionalInformation`:
```
{
@@ -2832,7 +2832,7 @@ Response codes:
- 201: Success. Corresponding task id is returned.
- 400: Error in the request. Details can be found in the reported error.
-The scheduled task will have the following type `MessageIdReIndexingTask` and the following `additionalInformation`:
+The scheduled task will have the following type `messageId-reindexing` and the following `additionalInformation`:
```
{
@@ -3108,7 +3108,7 @@ Response code:
- Json query object values violate parsing rules
- 404: User not found
-The scheduled task will have the following type `deletedMessages/restore` and the following `additionalInformation`:
+The scheduled task will have the following type `deleted-messages-restore` and the following `additionalInformation`:
```
{
@@ -3148,7 +3148,7 @@ Response code:
- Json query object values violate parsing rules
- 404: User not found
-The scheduled task will have the following type `deletedMessages/export` and the following `additionalInformation`:
+The scheduled task will have the following type `deleted-messages-export` and the following `additionalInformation`:
```
{
@@ -3198,7 +3198,7 @@ Response code:
- messageId parameter is invalid
- 404: User not found
- The scheduled task will have the following type `deletedMessages/delete` and the following `additionalInformation`:
+ The scheduled task will have the following type `deleted-messages-delete` and the following `additionalInformation`:
```
{
@@ -3240,7 +3240,7 @@ An Execution Report will be returned:
"taskId": "3294a976-ce63-491e-bd52-1b6f465ed7a2",
"additionalInformation": {},
"status": "completed",
- "type": "typeOfTheTask"
+ "type": "type-of-the-task"
}
```
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org