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 a4625e1666ecbb481f7b75f804b13946653374fa Author: Benoit Tellier <[email protected]> AuthorDate: Wed Jun 10 13:43:55 2020 +0700 JAMES-3204 additionalInformation.failures should be renamed to messageFailures This avoids confusions with additionalInformation.mailboxFailures --- .../RabbitMQWebAdminServerTaskSerializationIntegrationTest.java | 8 ++++---- .../webadmin/dto/WebAdminReprocessingContextInformationDTO.java | 2 +- ...bAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java | 4 ++-- .../dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java | 4 ++-- .../dto/WebAdminReprocessingContextInformationDTOTest.java | 4 ++-- .../webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java | 3 +-- .../james/webadmin/dto/WebAdminUserReprocessingDTOTest.java | 4 +--- .../org/apache/james/webadmin/routes/MailboxesRoutesTest.java | 6 +++--- .../org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java | 2 +- src/site/markdown/server/manage-webadmin.md | 8 ++++---- 10 files changed, 21 insertions(+), 24 deletions(-) diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java index 0c165d2..753f992 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQWebAdminServerTaskSerializationIntegrationTest.java @@ -148,7 +148,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest { .body("type", is("full-reindexing")) .body("additionalInformation.successfullyReprocessedMailCount", is(0)) .body("additionalInformation.failedReprocessedMailCount", is(0)) - .body("additionalInformation.failures", is(anEmptyMap())); + .body("additionalInformation.messageFailures", is(anEmptyMap())); } @Test @@ -338,7 +338,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest { .body("additionalInformation.successfullyReprocessedMailCount", is(0)) .body("additionalInformation.failedReprocessedMailCount", is(0)) .body("additionalInformation.username", is(USERNAME)) - .body("additionalInformation.failures", is(anEmptyMap())); + .body("additionalInformation.messageFailures", is(anEmptyMap())); } @Test @@ -438,7 +438,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest { .body("type", is("error-recovery-indexation")) .body("additionalInformation.successfullyReprocessedMailCount", is(0)) .body("additionalInformation.failedReprocessedMailCount", is(0)) - .body("additionalInformation.failures", is(anEmptyMap())); + .body("additionalInformation.messageFailures", is(anEmptyMap())); } @Test @@ -669,7 +669,7 @@ class RabbitMQWebAdminServerTaskSerializationIntegrationTest { .body("additionalInformation.successfullyReprocessedMailCount", is(0)) .body("additionalInformation.failedReprocessedMailCount", is(0)) .body("additionalInformation.mailboxId", is(mailboxId.serialize())) - .body("additionalInformation.failures", is(anEmptyMap())); + .body("additionalInformation.messageFailures", is(anEmptyMap())); } @Test diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java index 1b43b3e..124fec3 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java @@ -110,7 +110,7 @@ public class WebAdminReprocessingContextInformationDTO implements AdditionalInfo return failedReprocessedMailCount; } - public SerializableReIndexingExecutionFailures getFailures() { + public SerializableReIndexingExecutionFailures getMessageFailures() { return messageFailures; } diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java index 7b84cde..19733ae 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java @@ -86,8 +86,8 @@ public class WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO impleme return reprocessingContextInformationDTO.getFailedReprocessedMailCount(); } - public SerializableReIndexingExecutionFailures getFailures() { - return reprocessingContextInformationDTO.getFailures(); + public SerializableReIndexingExecutionFailures getMessageFailures() { + return reprocessingContextInformationDTO.getMessageFailures(); } public List<String> getMailboxFailures() { diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java index 7991a04..2b00d4f 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java @@ -88,8 +88,8 @@ public class WebAdminUserReindexingTaskAdditionalInformationDTO implements Addit return reprocessingContextInformationDTO.getFailedReprocessedMailCount(); } - public SerializableReIndexingExecutionFailures getFailures() { - return reprocessingContextInformationDTO.getFailures(); + public SerializableReIndexingExecutionFailures getMessageFailures() { + return reprocessingContextInformationDTO.getMessageFailures(); } public List<String> getMailboxFailures() { diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java index cf0e6da..48ffab4 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java @@ -43,14 +43,14 @@ class WebAdminReprocessingContextInformationDTOTest { " \"type\":\"error-recovery-indexation\"," + " \"successfullyReprocessedMailCount\":42," + " \"failedReprocessedMailCount\":2," + - " \"failures\":{\"1\":[{\"uid\":10}],\"2\":[{\"uid\":20}]}," + + " \"messageFailures\":{\"1\":[{\"uid\":10}],\"2\":[{\"uid\":20}]}," + " \"mailboxFailures\":[\"3\", \"4\"]," + " \"timestamp\":\"2018-11-13T12:00:55Z\"}"; private final String serializedFullAdditionalInformation = "{" + " \"type\":\"full-reindexing\"," + " \"successfullyReprocessedMailCount\":42," + " \"failedReprocessedMailCount\":2," + - " \"failures\":{\"1\":[{\"uid\":10}],\"2\":[{\"uid\":20}]}," + + " \"messageFailures\":{\"1\":[{\"uid\":10}],\"2\":[{\"uid\":20}]}," + " \"mailboxFailures\":[\"3\", \"4\"]," + " \"timestamp\":\"2018-11-13T12:00:55Z\"}"; diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java index 02f4795..6409881 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java @@ -30,7 +30,6 @@ import org.apache.james.mailbox.indexer.ReIndexer; import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.TestId; -import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO; import org.apache.mailbox.tools.indexer.SingleMailboxReindexingTask; import org.junit.jupiter.api.Test; @@ -45,7 +44,7 @@ class WebAdminSingleMailboxReprocessingDTOTest { " \"mailboxId\":\"1\"," + " \"successfullyReprocessedMailCount\":42," + " \"failedReprocessedMailCount\":2," + - " \"failures\":{\"1\":[{\"uid\":10}],\"2\":[{\"uid\":20}]}," + + " \"messageFailures\":{\"1\":[{\"uid\":10}],\"2\":[{\"uid\":20}]}," + " \"mailboxFailures\":[\"3\", \"4\"]," + " \"timestamp\":\"2018-11-13T12:00:55Z\"}"; diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java index 48acc11..05987d4 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java @@ -37,8 +37,6 @@ import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.exc.InvalidDefinitionException; import com.google.common.collect.ImmutableList; -import net.javacrumbs.jsonunit.core.Option; - class WebAdminUserReprocessingDTOTest { private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z"); @@ -46,7 +44,7 @@ class WebAdminUserReprocessingDTOTest { " \"type\":\"user-reindexing\",\"username\":\"bob\"," + " \"successfullyReprocessedMailCount\":42," + " \"failedReprocessedMailCount\":2," + - " \"failures\":{\"1\":[{\"uid\":10}],\"2\":[{\"uid\":20}]}," + + " \"messageFailures\":{\"1\":[{\"uid\":10}],\"2\":[{\"uid\":20}]}," + " \"mailboxFailures\":[\"3\", \"4\"]," + " \"timestamp\":\"2018-11-13T12:00:55Z\"}"; diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java index e9ce823..65ce22a 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java @@ -243,7 +243,7 @@ class MailboxesRoutesTest { .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())) + .body("additionalInformation.messageFailures.\"" + mailboxId.serialize() + "\"[0].uid", is(Long.valueOf(uidAsLong).intValue())) .body("startedDate", is(notNullValue())) .body("submitDate", is(notNullValue())); } @@ -456,7 +456,7 @@ class MailboxesRoutesTest { .body("type", is(SingleMailboxReindexingTask.TYPE.asString())) .body("additionalInformation.successfullyReprocessedMailCount", is(0)) .body("additionalInformation.failedReprocessedMailCount", is(1)) - .body("additionalInformation.failures.\"" + mailboxId.serialize() + "\"[0].uid", is(Long.valueOf(uidAsLong).intValue())) + .body("additionalInformation.messageFailures.\"" + mailboxId.serialize() + "\"[0].uid", is(Long.valueOf(uidAsLong).intValue())) .body("startedDate", is(notNullValue())) .body("submitDate", is(notNullValue())); } @@ -877,7 +877,7 @@ class MailboxesRoutesTest { .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())) + .body("additionalInformation.messageFailures.\"" + mailboxId.serialize() + "\"[0].uid", is(Long.valueOf(uidAsLong).intValue())) .body("startedDate", is(notNullValue())) .body("submitDate", is(notNullValue())); } diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java index 2e8068d..f6eb6b5 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java @@ -1255,7 +1255,7 @@ class UserMailboxesRoutesTest { .body("type", Matchers.is(UserReindexingTask.USER_RE_INDEXING.asString())) .body("additionalInformation.successfullyReprocessedMailCount", Matchers.is(0)) .body("additionalInformation.failedReprocessedMailCount", Matchers.is(1)) - .body("additionalInformation.failures.\"" + mailboxId.serialize() + "\"[0].uid", Matchers.is(Long.valueOf(uidAsLong).intValue())) + .body("additionalInformation.messageFailures.\"" + mailboxId.serialize() + "\"[0].uid", Matchers.is(Long.valueOf(uidAsLong).intValue())) .body("startedDate", Matchers.is(notNullValue())) .body("submitDate", Matchers.is(notNullValue())); } diff --git a/src/site/markdown/server/manage-webadmin.md b/src/site/markdown/server/manage-webadmin.md index d3b0e93..abffd56 100644 --- a/src/site/markdown/server/manage-webadmin.md +++ b/src/site/markdown/server/manage-webadmin.md @@ -602,7 +602,7 @@ The scheduled task will have the following type `full-reindexing` and the follow "successfullyReprocessedMailCount":18, "failedReprocessedMailCount": 3, "mailboxFailures": ["12", "23" ], - "failures": [ + "messageFailures": [ { "mailboxId": "1", "uids": [1, 36] @@ -645,7 +645,7 @@ The scheduled task will have the following type `error-recovery-indexation` and "successfullyReprocessedMailCount":18, "failedReprocessedMailCount": 3, "mailboxFailures": ["12", "23" ], - "failures": [{ + "messageFailures": [{ "mailboxId": "1", "uids": [1, 36] }] @@ -698,7 +698,7 @@ The scheduled task will have the following type `mailbox-reindexing` and the fol "successfullyReprocessedMailCount":18, "failedReprocessedMailCount": 3, "mailboxFailures": ["12"], - "failures": [ + "messageFailures": [ { "mailboxId": "1", "uids": [1, 36] @@ -1025,7 +1025,7 @@ The scheduled task will have the following type `user-reindexing` and the follow "successfullyReprocessedMailCount":18, "failedReprocessedMailCount": 3, "mailboxFailures": ["12", "23" ], - "failures": [ + "messageFailures": [ { "mailboxId": "1", "uids": [1, 36] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
