This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 4de2ae0ff2b4ae986c8b00475d8bfc1614cf19aa
Author: Rémi Kowalski <rkowal...@linagora.com>
AuthorDate: Thu Sep 5 09:05:12 2019 +0200
JAMES-2813 strongly type TaskType
---
.../org/apache/james/FixingGhostMailboxTest.java | 2 +-
.../routes/CassandraMappingsRoutesTest.java | 2 +-
.../routes/CassandraMigrationRoutesTest.java | 3 ++-
.../james/webadmin/routes/TasksRoutesTest.java | 2 +-
.../routes/DeletedMessagesVaultRoutesTest.java | 16 ++++++-------
.../routes/EventDeadLettersRoutesTest.java | 6 ++---
.../webadmin/routes/ReindexingRoutesTest.java | 26 +++++++++++-----------
.../james/webadmin/routes/MailQueueRoutesTest.java | 8 +++----
8 files changed, 33 insertions(+), 32 deletions(-)
diff --git
a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
index 6b76b6e..09e473d 100644
---
a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
+++
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
@@ -284,7 +284,7 @@ public class FixingGhostMailboxTest {
.body("additionalInformation.totalMessageCount", is(1))
.body("additionalInformation.messageMovedCount", is(1))
.body("additionalInformation.messageFailedCount", is(0))
- .body("type", is(MailboxMergingTask.MAILBOX_MERGING))
+ .body("type", is(MailboxMergingTask.MAILBOX_MERGING.asString()))
.body("submitDate", is(not(nullValue())))
.body("startedDate", is(not(nullValue())))
.body("completedDate", is(not(nullValue())));
diff --git
a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
index 1e8e5ed..cd2d09b 100644
---
a/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-cassandra-data/src/test/java/org/apache/james/webadmin/routes/CassandraMappingsRoutesTest.java
@@ -123,7 +123,7 @@ class CassandraMappingsRoutesTest {
.body("taskId", is(taskId))
.body("additionalInformation.successfulMappingsCount", is(0))
.body("additionalInformation.errorMappingsCount", is(0))
- .body("type", is(CassandraMappingsSolveInconsistenciesTask.TYPE))
+ .body("type",
is(CassandraMappingsSolveInconsistenciesTask.TYPE.asString()))
.body("startedDate", is(notNullValue()))
.body("submitDate", is(notNullValue()))
.body("completedDate", is(notNullValue()));
diff --git
a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index 0bd7a1d..b3471b5 100644
---
a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -56,6 +56,7 @@ import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.ImmutableMap;
+
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import reactor.core.publisher.Mono;
@@ -277,7 +278,7 @@ public class CassandraMigrationRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(MigrationTask.CASSANDRA_MIGRATION))
+ .body("type", is(MigrationTask.CASSANDRA_MIGRATION.asString()))
.body("additionalInformation.toVersion",
is(LATEST_VERSION.getValue()))
.body("startedDate", is(notNullValue()))
.body("submitDate", is(notNullValue()))
diff --git
a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index f6122e2..bdd8081 100644
---
a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -139,7 +139,7 @@ class TasksRoutesTest {
.body("", hasSize(1))
.body("[0].status", is(TaskManager.Status.IN_PROGRESS.getValue()))
.body("[0].taskId", is(taskId.asString()))
- .body("[0].type", is(Task.UNKNOWN));
+ .body("[0].type", is(Task.UNKNOWN.asString()));
}
@Test
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 b64d477..f93461e 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
@@ -1534,7 +1534,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("failed"))
.body("taskId", is(taskId))
- .body("type", is(DeletedMessagesVaultRestoreTask.TYPE))
+ .body("type",
is(DeletedMessagesVaultRestoreTask.TYPE.asString()))
.body("additionalInformation.successfulRestoreCount",
is(0))
.body("additionalInformation.errorRestoreCount", is(0))
.body("additionalInformation.user", is(USER.asString()))
@@ -1572,7 +1572,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("failed"))
.body("taskId", is(taskId))
- .body("type", is(DeletedMessagesVaultRestoreTask.TYPE))
+ .body("type",
is(DeletedMessagesVaultRestoreTask.TYPE.asString()))
.body("additionalInformation.successfulRestoreCount",
is(0))
.body("additionalInformation.errorRestoreCount", is(2))
.body("additionalInformation.user", is(USER.asString()))
@@ -1605,7 +1605,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("failed"))
.body("taskId", is(taskId))
- .body("type", is(DeletedMessagesVaultRestoreTask.TYPE))
+ .body("type",
is(DeletedMessagesVaultRestoreTask.TYPE.asString()))
.body("additionalInformation.successfulRestoreCount",
is(0))
.body("additionalInformation.errorRestoreCount", is(0))
.body("additionalInformation.user", is(USER.asString()))
@@ -1647,7 +1647,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is(DeletedMessagesVaultRestoreTask.TYPE))
+ .body("type",
is(DeletedMessagesVaultRestoreTask.TYPE.asString()))
.body("additionalInformation.successfulRestoreCount", is(2))
.body("additionalInformation.errorRestoreCount", is(0))
.body("additionalInformation.user", is(USER.asString()))
@@ -1842,7 +1842,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is(DeletedMessagesVaultExportTask.TYPE))
+ .body("type",
is(DeletedMessagesVaultExportTask.TYPE.asString()))
.body("additionalInformation.userExportFrom",
is(USER.asString()))
.body("additionalInformation.exportTo",
is(USER_2.asString()))
.body("additionalInformation.totalExportedMessages", is(2))
@@ -2091,7 +2091,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is(DeletedMessagesVaultDeleteTask.TYPE))
+ .body("type",
is(DeletedMessagesVaultDeleteTask.TYPE.asString()))
.body("additionalInformation.user", is(USER.asString()))
.body("additionalInformation.deleteMessageId",
is(MESSAGE_ID.serialize()))
.body("startedDate", is(notNullValue()))
@@ -2117,7 +2117,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(taskId))
- .body("type", is(DeletedMessagesVaultDeleteTask.TYPE))
+ .body("type",
is(DeletedMessagesVaultDeleteTask.TYPE.asString()))
.body("additionalInformation.user", is(USER.asString()))
.body("additionalInformation.deleteMessageId",
is(MESSAGE_ID.serialize()))
.body("startedDate", is(notNullValue()))
@@ -2202,7 +2202,7 @@ class DeletedMessagesVaultRoutesTest {
.then()
.body("status", is("failed"))
.body("taskId", is(taskId))
- .body("type", is(DeletedMessagesVaultDeleteTask.TYPE))
+ .body("type",
is(DeletedMessagesVaultDeleteTask.TYPE.asString()))
.body("additionalInformation.user", is(USER.asString()))
.body("additionalInformation.deleteMessageId",
is(MESSAGE_ID.serialize()))
.body("startedDate", is(notNullValue()))
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
index 1fe7d60..14bee4a 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java
@@ -410,7 +410,7 @@ class EventDeadLettersRoutesTest {
.body("additionalInformation.failedRedeliveriesCount", is(0))
.body("additionalInformation.group", is(nullValue()))
.body("additionalInformation.insertionId", is(nullValue()))
- .body("type", is(EventDeadLettersRedeliverTask.TYPE))
+ .body("type",
is(EventDeadLettersRedeliverTask.TYPE.asString()))
.body("startedDate", is(notNullValue()))
.body("submitDate", is(notNullValue()))
.body("completedDate", is(notNullValue()));
@@ -597,7 +597,7 @@ class EventDeadLettersRoutesTest {
.body("additionalInformation.failedRedeliveriesCount", is(0))
.body("additionalInformation.group", is(SERIALIZED_GROUP_A))
.body("additionalInformation.insertionId", is(nullValue()))
- .body("type", is(EventDeadLettersRedeliverTask.TYPE))
+ .body("type",
is(EventDeadLettersRedeliverTask.TYPE.asString()))
.body("startedDate", is(notNullValue()))
.body("submitDate", is(notNullValue()))
.body("completedDate", is(notNullValue()));
@@ -817,7 +817,7 @@ class EventDeadLettersRoutesTest {
.body("additionalInformation.failedRedeliveriesCount", is(0))
.body("additionalInformation.group", is(SERIALIZED_GROUP_A))
.body("additionalInformation.insertionId",
is(INSERTION_UUID_1))
- .body("type", is(EventDeadLettersRedeliverTask.TYPE))
+ .body("type",
is(EventDeadLettersRedeliverTask.TYPE.asString()))
.body("startedDate", is(notNullValue()))
.body("submitDate", is(notNullValue()))
.body("completedDate", is(notNullValue()));
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 b1c9e86..93301d7 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
@@ -160,7 +160,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(FullReindexingTask.FULL_RE_INDEXING))
+ .body("type",
is(FullReindexingTask.FULL_RE_INDEXING.asString()))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount",
is(0))
.body("startedDate", is(notNullValue()))
@@ -189,7 +189,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(FullReindexingTask.FULL_RE_INDEXING))
+ .body("type",
is(FullReindexingTask.FULL_RE_INDEXING.asString()))
.body("additionalInformation.successfullyReprocessedMailCount", is(1))
.body("additionalInformation.failedReprocessedMailCount",
is(0))
.body("startedDate", is(notNullValue()))
@@ -223,7 +223,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("failed"))
.body("taskId", is(notNullValue()))
- .body("type", is(FullReindexingTask.FULL_RE_INDEXING))
+ .body("type",
is(FullReindexingTask.FULL_RE_INDEXING.asString()))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount",
is(1))
.body("additionalInformation.failures.\"" +
mailboxId.serialize() + "\"[0].uid", is(Long.valueOf(uidAsLong).intValue()))
@@ -336,7 +336,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(UserReindexingTask.USER_RE_INDEXING))
+ .body("type",
is(UserReindexingTask.USER_RE_INDEXING.asString()))
.body("additionalInformation.user", is("be...@apache.org"))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount",
is(0))
@@ -369,7 +369,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(UserReindexingTask.USER_RE_INDEXING))
+ .body("type",
is(UserReindexingTask.USER_RE_INDEXING.asString()))
.body("additionalInformation.user", is("be...@apache.org"))
.body("additionalInformation.successfullyReprocessedMailCount", is(1))
.body("additionalInformation.failedReprocessedMailCount",
is(0))
@@ -406,7 +406,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("failed"))
.body("taskId", is(notNullValue()))
- .body("type", is(UserReindexingTask.USER_RE_INDEXING))
+ .body("type",
is(UserReindexingTask.USER_RE_INDEXING.asString()))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount",
is(1))
.body("additionalInformation.failures.\"" +
mailboxId.serialize() + "\"[0].uid", is(Long.valueOf(uidAsLong).intValue()))
@@ -532,7 +532,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type",
is(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING))
+ .body("type",
is(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString()))
.body("additionalInformation.mailboxId",
is(mailboxId.serialize()))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount",
is(0))
@@ -562,7 +562,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type",
is(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING))
+ .body("type",
is(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString()))
.body("additionalInformation.mailboxId",
is(mailboxId.serialize()))
.body("additionalInformation.successfullyReprocessedMailCount", is(1))
.body("additionalInformation.failedReprocessedMailCount",
is(0))
@@ -597,7 +597,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("failed"))
.body("taskId", is(notNullValue()))
- .body("type",
is(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING))
+ .body("type",
is(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString()))
.body("additionalInformation.successfullyReprocessedMailCount", is(0))
.body("additionalInformation.failedReprocessedMailCount",
is(1))
.body("additionalInformation.failures.\"" +
mailboxId.serialize() + "\"[0].uid", is(Long.valueOf(uidAsLong).intValue()))
@@ -731,7 +731,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type",
is(SingleMessageReindexingTask.MESSAGE_RE_INDEXING))
+ .body("type",
is(SingleMessageReindexingTask.MESSAGE_RE_INDEXING.asString()))
.body("additionalInformation.mailboxId",
is(mailboxId.serialize()))
.body("additionalInformation.uid", is(1))
.body("startedDate", is(notNullValue()))
@@ -761,7 +761,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type",
is(SingleMessageReindexingTask.MESSAGE_RE_INDEXING))
+ .body("type",
is(SingleMessageReindexingTask.MESSAGE_RE_INDEXING.asString()))
.body("additionalInformation.mailboxId",
is(mailboxId.serialize()))
.body("additionalInformation.uid", is((int)
composedMessageId.getUid().asLong()))
.body("startedDate", is(notNullValue()))
@@ -862,7 +862,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(MessageIdReIndexingTask.TYPE))
+ .body("type", is(MessageIdReIndexingTask.TYPE.asString()))
.body("additionalInformation.messageId", is("1"))
.body("startedDate", is(notNullValue()))
.body("submitDate", is(notNullValue()))
@@ -890,7 +890,7 @@ class ReindexingRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(MessageIdReIndexingTask.TYPE))
+ .body("type", is(MessageIdReIndexingTask.TYPE.asString()))
.body("additionalInformation.messageId",
is(composedMessageId.getMessageId().serialize()))
.body("startedDate", is(notNullValue()))
.body("submitDate", is(notNullValue()))
diff --git
a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index ec62b10..526bfaf 100644
---
a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -681,7 +681,7 @@ class MailQueueRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(DeleteMailsFromMailQueueTask.TYPE))
+ .body("type",
is(DeleteMailsFromMailQueueTask.TYPE.asString()))
.body("additionalInformation.mailQueueName",
is(FIRST_QUEUE))
.body("additionalInformation.initialCount", is(2))
.body("additionalInformation.remainingCount", is(1))
@@ -716,7 +716,7 @@ class MailQueueRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(DeleteMailsFromMailQueueTask.TYPE))
+ .body("type",
is(DeleteMailsFromMailQueueTask.TYPE.asString()))
.body("additionalInformation.mailQueueName",
is(FIRST_QUEUE))
.body("additionalInformation.initialCount", is(2))
.body("additionalInformation.remainingCount", is(1))
@@ -758,7 +758,7 @@ class MailQueueRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(DeleteMailsFromMailQueueTask.TYPE))
+ .body("type",
is(DeleteMailsFromMailQueueTask.TYPE.asString()))
.body("additionalInformation.mailQueueName",
is(FIRST_QUEUE))
.body("additionalInformation.initialCount", is(3))
.body("additionalInformation.remainingCount", is(1))
@@ -971,7 +971,7 @@ class MailQueueRoutesTest {
.then()
.body("status", is("completed"))
.body("taskId", is(notNullValue()))
- .body("type", is(ClearMailQueueTask.TYPE))
+ .body("type", is(ClearMailQueueTask.TYPE.asString()))
.body("additionalInformation.mailQueueName", is(FIRST_QUEUE))
.body("additionalInformation.initialCount", is(3))
.body("additionalInformation.remainingCount", is(0))
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
