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 0c4eab6c44a37066fa4be87465abc9e25f0a3cbc
Author: Rémi Kowalski <rkowal...@linagora.com>
AuthorDate: Tue Sep 3 11:18:37 2019 +0200
JAMES-2813 serialize MessageIdReindexingTaskAdditionalInformation
---
.../tools/indexer/MessageIdReIndexingTask.java | 2 +-
...geIdReindexingTaskAdditionalInformationDTO.java | 54 ++++++++++++++++++++++
.../MessageIdReindexingTaskSerializationTest.java | 23 +++++++++
3 files changed, 78 insertions(+), 1 deletion(-)
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 64435b8..4b9e279 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
@@ -49,7 +49,7 @@ public class MessageIdReIndexingTask implements Task {
}
}
- public final class AdditionalInformation implements
TaskExecutionDetails.AdditionalInformation {
+ public static final class AdditionalInformation implements
TaskExecutionDetails.AdditionalInformation {
private final MessageId messageId;
AdditionalInformation(MessageId messageId) {
diff --git
a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskAdditionalInformationDTO.java
b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskAdditionalInformationDTO.java
new file mode 100644
index 0000000..3d84a1c
--- /dev/null
+++
b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskAdditionalInformationDTO.java
@@ -0,0 +1,54 @@
+/****************************************************************
+ * 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.function.Function;
+
+import org.apache.james.json.DTOModule;
+import org.apache.james.mailbox.model.MessageId;
+import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
+import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class MessageIdReindexingTaskAdditionalInformationDTO implements
AdditionalInformationDTO {
+
+ static final Function<MessageId.Factory,
AdditionalInformationDTOModule<MessageIdReIndexingTask.AdditionalInformation,
MessageIdReindexingTaskAdditionalInformationDTO>> SERIALIZATION_MODULE =
+ factory ->
+
DTOModule.forDomainObject(MessageIdReIndexingTask.AdditionalInformation.class)
+
.convertToDTO(MessageIdReindexingTaskAdditionalInformationDTO.class)
+ .toDomainObjectConverter(dto -> new
MessageIdReIndexingTask.AdditionalInformation(factory.fromString(dto.getMessageId())))
+ .toDTOConverter((details, type) -> new
MessageIdReindexingTaskAdditionalInformationDTO(details.getMessageId()))
+ .typeName(MessageIdReIndexingTask.TYPE.asString())
+ .withFactory(AdditionalInformationDTOModule::new);
+
+ private final String messageId;
+
+ private
MessageIdReindexingTaskAdditionalInformationDTO(@JsonProperty("messageId")
String messageId) {
+ this.messageId = messageId;
+ }
+
+ public String getMessageId() {
+ return messageId;
+ }
+
+ public static MessageIdReindexingTaskAdditionalInformationDTO
of(MessageIdReIndexingTask task) {
+ return new
MessageIdReindexingTaskAdditionalInformationDTO(task.getMessageId().serialize());
+ }
+}
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 bfd7293..36cd393 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
@@ -26,6 +26,7 @@ import java.io.IOException;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.TestMessageId;
+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;
@@ -38,10 +39,17 @@ class MessageIdReindexingTaskSerializationTest {
private MessageId.Factory messageIdFactory;
private JsonTaskSerializer taskSerializer;
private final String serializedMessageIdReIndexingTask = "{\"type\":
\"MessageIdReIndexingTask\", \"messageId\": \"1\"}";
+ private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"messageId\":
\"1\"}";
+
+ private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer;
@BeforeEach
void setUp() {
messageIdFactory = new TestMessageId.Factory();
+ jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ MessageIdReindexingTaskAdditionalInformationDTO
+ .SERIALIZATION_MODULE
+ .apply(messageIdFactory));
reIndexerPerformer = mock(ReIndexerPerformer.class);
MessageIdReIndexingTask.Factory factory = new
MessageIdReIndexingTask.Factory(reIndexerPerformer, messageIdFactory);
taskSerializer = new
JsonTaskSerializer(MessageIdReindexingTaskDTO.MODULE.apply(factory));
@@ -64,5 +72,20 @@ class MessageIdReindexingTaskSerializationTest {
assertThat(taskSerializer.deserialize(serializedMessageIdReIndexingTask))
.isEqualToComparingOnlyGivenFields(task, "messageId");
}
+
+ @Test
+ void additionalInformationShouldBeSerializable() throws
JsonProcessingException {
+ MessageId messageId = messageIdFactory.fromString("1");
+ MessageIdReIndexingTask.AdditionalInformation details = new
MessageIdReIndexingTask.AdditionalInformation(messageId);
+
assertThatJson(jsonAdditionalInformationSerializer.serialize(details)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION);
+ }
+
+ @Test
+ void additonalInformationShouldBeDeserializable() throws IOException {
+ MessageId messageId = messageIdFactory.fromString("1");
+ MessageIdReIndexingTask.AdditionalInformation details = new
MessageIdReIndexingTask.AdditionalInformation(messageId);
+
assertThat(jsonAdditionalInformationSerializer.deserialize("MessageIdReIndexingTask",
SERIALIZED_ADDITIONAL_INFORMATION))
+ .isEqualToComparingFieldByField(details);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
