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 fca4be5a9a2fe6defebb404f0a533e6b30ad8035 Author: Rémi Kowalski <[email protected]> AuthorDate: Fri Sep 20 17:28:49 2019 +0200 JAMES-2813 serialize additionalInformationDTO for SingleMailboxReindexingTask --- ...lboxReindexingTaskAdditionalInformationDTO.java | 76 ++++++++++++++++++++++ ...ngleMailboxReindexingTaskSerializationTest.java | 43 ++++++++++++ 2 files changed, 119 insertions(+) diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java new file mode 100644 index 0000000..c7b9efc --- /dev/null +++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java @@ -0,0 +1,76 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ +package org.apache.mailbox.tools.indexer; + +import java.util.List; +import java.util.function.Function; + +import org.apache.james.json.DTOModule; +import org.apache.james.mailbox.model.MailboxId; +import org.apache.james.server.task.json.dto.AdditionalInformationDTO; +import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class SingleMailboxReindexingTaskAdditionalInformationDTO implements AdditionalInformationDTO { + + public static final Function<MailboxId.Factory, AdditionalInformationDTOModule<SingleMailboxReindexingTask.AdditionalInformation, SingleMailboxReindexingTaskAdditionalInformationDTO>> SERIALIZATION_MODULE = + factory -> + DTOModule.forDomainObject(SingleMailboxReindexingTask.AdditionalInformation.class) + .convertToDTO(SingleMailboxReindexingTaskAdditionalInformationDTO.class) + .toDomainObjectConverter(dto -> new SingleMailboxReindexingTask.AdditionalInformation(factory.fromString(dto.getMailboxId()), + dto.getSuccessfullyReprocessedMailCount(), + dto.getFailedReprocessedMailCount(), + ReprocessingContextInformationDTO.deserializeFailures(factory, dto.getFailures()))) + .toDTOConverter((details, type) -> new SingleMailboxReindexingTaskAdditionalInformationDTO(details.getMailboxId(), details.getSuccessfullyReprocessedMailCount(), details.getFailedReprocessedMailCount(), + ReprocessingContextInformationDTO.serializeFailures(details.failures()))) + .typeName(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString()) + .withFactory(AdditionalInformationDTOModule::new); + + private final ReprocessingContextInformationDTO reprocessingContextInformationDTO; + private final String mailboxId; + + @JsonCreator + private SingleMailboxReindexingTaskAdditionalInformationDTO(@JsonProperty("mailboxId") String mailboxId, + @JsonProperty("successfullyReprocessedMailCount") int successfullyReprocessedMailCount, + @JsonProperty("failedReprocessedMailCount") int failedReprocessedMailCount, + @JsonProperty("failures") List<ReprocessingContextInformationDTO.ReindexingFailureDTO> failures) { + this.mailboxId = mailboxId; + this.reprocessingContextInformationDTO = new ReprocessingContextInformationDTO( + successfullyReprocessedMailCount, + failedReprocessedMailCount, failures); + } + + public String getMailboxId() { + return mailboxId; + } + + public int getSuccessfullyReprocessedMailCount() { + return reprocessingContextInformationDTO.getSuccessfullyReprocessedMailCount(); + } + + public int getFailedReprocessedMailCount() { + return reprocessingContextInformationDTO.getFailedReprocessedMailCount(); + } + + public List<ReprocessingContextInformationDTO.ReindexingFailureDTO> getFailures() { + return reprocessingContextInformationDTO.getFailures(); + } +} 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 6fa7c3a..4619f62 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 @@ -23,25 +23,55 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import java.io.IOException; +import java.util.List; +import org.apache.james.mailbox.MessageUid; +import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures; import org.apache.james.mailbox.model.TestId; +import org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer; import org.apache.james.server.task.json.JsonTaskSerializer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.core.JsonProcessingException; +import com.google.common.collect.ImmutableList; class SingleMailboxReindexingTaskSerializationTest { private ReIndexerPerformer reIndexerPerformer; private JsonTaskSerializer taskSerializer; + private JsonTaskAdditionalInformationsSerializer jsonAdditionalInformationSerializer; + + private final int successfullyReprocessedMailCount = 42; + private final int failedReprocessedMailCount = 2; + private ReIndexingExecutionFailures reIndexingExecutionFailures; + private final String serializedMailboxReindexingTask = "{\"type\": \"mailboxReIndexing\", \"mailboxId\": \"1\"}"; + private final String SERIALIZED_ADDITIONAL_INFORMATION = "{ \"mailboxId\": \"1\", \"successfullyReprocessedMailCount\":42,\"failedReprocessedMailCount\":2,\"failures\":[{\"mailboxId\":\"1\",\"uids\":[10, 20]}]}"; + + private final TestId mailboxId = TestId.of(1L); + private final MessageUid messageUid = MessageUid.of(10L); + private final MessageUid messageUid2 = MessageUid.of(20L); + + private final ReIndexingExecutionFailures.ReIndexingFailure indexingFailure = new ReIndexingExecutionFailures.ReIndexingFailure(mailboxId, messageUid); + private final ReIndexingExecutionFailures.ReIndexingFailure indexingFailure2 = new ReIndexingExecutionFailures.ReIndexingFailure(mailboxId, messageUid2); + private final List<ReIndexingExecutionFailures.ReIndexingFailure> failures = ImmutableList.of(indexingFailure, indexingFailure2); + @BeforeEach void setUp() { reIndexerPerformer = mock(ReIndexerPerformer.class); SingleMailboxReindexingTask.Factory factory = new SingleMailboxReindexingTask.Factory(reIndexerPerformer, new TestId.Factory()); taskSerializer = new JsonTaskSerializer(SingleMailboxReindexingTaskDTO.MODULE.apply(factory)); + + jsonAdditionalInformationSerializer = new JsonTaskAdditionalInformationsSerializer( + SingleMailboxReindexingTaskAdditionalInformationDTO + .SERIALIZATION_MODULE + .apply(new TestId.Factory())); + + reIndexingExecutionFailures = new ReIndexingExecutionFailures(ImmutableList.of( + new ReIndexingExecutionFailures.ReIndexingFailure(mailboxId, messageUid), + new ReIndexingExecutionFailures.ReIndexingFailure(mailboxId, messageUid2))); } @Test @@ -61,5 +91,18 @@ class SingleMailboxReindexingTaskSerializationTest { assertThat(taskSerializer.deserialize(serializedMailboxReindexingTask)) .isEqualToComparingOnlyGivenFields(task, "reIndexerPerformer", "mailboxId"); } + + @Test + void additionalInformationShouldBeSerializable() throws JsonProcessingException { + SingleMailboxReindexingTask.AdditionalInformation details = new SingleMailboxReindexingTask.AdditionalInformation(mailboxId, successfullyReprocessedMailCount, failedReprocessedMailCount, reIndexingExecutionFailures); + assertThatJson(jsonAdditionalInformationSerializer.serialize(details)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION); + } + + @Test + void additonalInformationShouldBeDeserializable() throws IOException { + SingleMailboxReindexingTask.AdditionalInformation details = new SingleMailboxReindexingTask.AdditionalInformation(mailboxId, successfullyReprocessedMailCount, failedReprocessedMailCount, reIndexingExecutionFailures); + assertThat(jsonAdditionalInformationSerializer.deserialize("mailboxReIndexing", SERIALIZED_ADDITIONAL_INFORMATION)) + .isEqualToComparingFieldByField(details); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
