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 8459e2f8cee13e5bbf5481255c7b2d9805ab2251
Author: Rémi Kowalski <rkowal...@linagora.com>
AuthorDate: Tue Sep 3 11:46:16 2019 +0200
JAMES-2813 serialize DeletedMessagesVaultDeleteTaskAdditionalInformationDTO
---
.../routes/DeletedMessagesVaultDeleteTask.java | 2 +-
...gesVaultDeleteTaskAdditionalInformationDTO.java | 57 ++++++++++++++++++++++
...edMessagesVaultDeleteTaskSerializationTest.java | 18 +++++++
3 files changed, 76 insertions(+), 1 deletion(-)
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 c522107..c689bb9 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
@@ -54,7 +54,7 @@ public class DeletedMessagesVaultDeleteTask implements Task {
}
}
- public class AdditionalInformation implements
TaskExecutionDetails.AdditionalInformation {
+ public static class AdditionalInformation implements
TaskExecutionDetails.AdditionalInformation {
private final User user;
private final MessageId deleteMessageId;
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java
new file mode 100644
index 0000000..363e1c5
--- /dev/null
+++
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.java
@@ -0,0 +1,57 @@
+/****************************************************************
+ * 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.james.webadmin.vault.routes;
+
+import java.util.function.Function;
+
+import org.apache.james.core.User;
+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 DeletedMessagesVaultDeleteTaskAdditionalInformationDTO implements
AdditionalInformationDTO {
+
+ static final Function<MessageId.Factory,
AdditionalInformationDTOModule<DeletedMessagesVaultDeleteTask.AdditionalInformation,
DeletedMessagesVaultDeleteTaskAdditionalInformationDTO>> SERIALIZATION_MODULE =
+ factory ->
+
DTOModule.forDomainObject(DeletedMessagesVaultDeleteTask.AdditionalInformation.class)
+
.convertToDTO(DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.class)
+ .toDomainObjectConverter(dto -> new
DeletedMessagesVaultDeleteTask.AdditionalInformation(User.fromUsername(dto.userName),
factory.fromString(dto.getMessageId())))
+ .toDTOConverter((details, type) -> new
DeletedMessagesVaultDeleteTaskAdditionalInformationDTO(details.getUser(),
details.getDeleteMessageId()))
+ .typeName(DeletedMessagesVaultDeleteTask.TYPE.asString())
+ .withFactory(AdditionalInformationDTOModule::new);
+
+ private final String userName;
+ private final String messageId;
+
+ public
DeletedMessagesVaultDeleteTaskAdditionalInformationDTO(@JsonProperty("userName")
String userName, @JsonProperty("messageId") String messageId) {
+ this.userName = userName;
+ this.messageId = messageId;
+ }
+
+ public String getMessageId() {
+ return messageId;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+}
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 52c8159..c196d25 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
@@ -27,6 +27,7 @@ import java.io.IOException;
import org.apache.james.core.User;
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.apache.james.vault.DeletedMessageVault;
import org.junit.jupiter.api.BeforeEach;
@@ -45,12 +46,16 @@ class DeletedMessagesVaultDeleteTaskSerializationTest {
private final MessageId messageId = messageIdFactory.generate();
private final String serializedDeleteMessagesVaultDeleteTask = "{\"type\":
\"deletedMessages/delete\", \"userName\":\"james\", \"messageId\": \"" +
messageId.serialize() + "\"}";
+ private final String serializedAdditionalInformation =
"{\"userName\":\"james\", \"messageId\": \"" + messageId.serialize() + "\"}";
+
+ private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer;
@BeforeEach
void setUp() {
deletedMessageVault = mock(DeletedMessageVault.class);
DeletedMessagesVaultDeleteTask.Factory factory = new
DeletedMessagesVaultDeleteTask.Factory(deletedMessageVault, messageIdFactory);
taskSerializer = new
JsonTaskSerializer(DeletedMessagesVaultDeleteTaskDTO.MODULE.apply(factory));
+ jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.SERIALIZATION_MODULE.apply(messageIdFactory));
}
@Test
@@ -69,4 +74,17 @@ class DeletedMessagesVaultDeleteTaskSerializationTest {
.isEqualToComparingOnlyGivenFields(task, "user", "messageId");
}
+
+ @Test
+ void additionalInformationShouldBeSerializable() throws
JsonProcessingException {
+ DeletedMessagesVaultDeleteTask.AdditionalInformation details = new
DeletedMessagesVaultDeleteTask.AdditionalInformation(user, messageId);
+
assertThatJson(jsonAdditionalInformationSerializer.serialize(details)).isEqualTo(serializedAdditionalInformation);
+ }
+
+ @Test
+ void additonalInformationShouldBeDeserializable() throws IOException {
+ DeletedMessagesVaultDeleteTask.AdditionalInformation details = new
DeletedMessagesVaultDeleteTask.AdditionalInformation(user, messageId);
+
assertThat(jsonAdditionalInformationSerializer.deserialize("deletedMessages/delete",
serializedAdditionalInformation))
+ .isEqualToComparingFieldByField(details);
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
