You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2019/09/19 07:08:10 UTC
[james-project] branch master updated (42d7d55 -> 72eeef8)
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 42d7d55 JAMES-2879 Prevent ConfigurationClient connects with a non-started server
new 8768d7b JAMES-2813 Make BlobStoreVaultGarbageCollectionTask serializable
new f5be855 JAMES-2813 Make BlobStoreVaultGarbageCollectionTask.AdditionalInformation serializable
new 1a6010a JAMES-2813 Extract DeletedMessagesVaultRestoreTaskDTO
new 6948b81 JAMES-2813 Add DeletedMessagesVaultRestoreTaskDTO.AdditionalInformation serialization
new b0c05b5 JAMES-2813 Extract DeletedMessagesVaultExportTask
new 07aac2b JAMES-2813 Add DeletedMessagesVaultExportTask.AdditionalInformation serialization
new 72eeef8 JAMES-2813 don't serialize unnecessary information for BlobStoreVaultGarbageCollectionTask
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../vault/blob/BlobStoreDeletedMessageVault.java | 23 +++--
.../blob/BlobStoreVaultGarbageCollectionTask.java | 32 +++++-
...bageCollectionTaskAdditionalInformationDTO.java | 76 ++++++++++++++
.../BlobStoreVaultGarbageCollectionTaskDTO.java | 31 +++---
...aultGarbageCollectionTaskSerializationTest.java | 53 +++++++---
.../routes/DeletedMessagesVaultExportTask.java | 96 ++---------------
...gesVaultExportTaskAdditionalInformationDTO.java | 87 ++++++++++++++++
.../routes/DeletedMessagesVaultExportTaskDTO.java | 110 ++++++++++++++++++++
.../routes/DeletedMessagesVaultRestoreTask.java | 114 +++++----------------
...esVaultRestoreTaskAdditionalInformationDTO.java | 80 +++++++++++++++
.../routes/DeletedMessagesVaultRestoreTaskDTO.java | 95 +++++++++++++++++
...edMessagesVaultExportTaskSerializationTest.java | 38 +++++--
...dMessagesVaultRestoreTaskSerializationTest.java | 37 +++++--
.../WebadminApiQuerySerializationContractTest.java | 4 +-
14 files changed, 640 insertions(+), 236 deletions(-)
create mode 100644 mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.java
copy server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskDTO.java => mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskDTO.java (57%)
copy server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java => mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java (51%)
create mode 100644 server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskAdditionalInformationDTO.java
create mode 100644 server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskDTO.java
create mode 100644 server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
create mode 100644 server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskDTO.java
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 04/07: JAMES-2813 Add
DeletedMessagesVaultRestoreTaskDTO.AdditionalInformation serialization
Posted by ro...@apache.org.
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 6948b81c766871d3b5ce7f1695b4c6430a9e03dd
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Tue Sep 3 18:17:50 2019 +0200
JAMES-2813 Add DeletedMessagesVaultRestoreTaskDTO.AdditionalInformation serialization
---
.../routes/DeletedMessagesVaultRestoreTask.java | 6 ++
...esVaultRestoreTaskAdditionalInformationDTO.java | 82 ++++++++++++++++++++++
...dMessagesVaultRestoreTaskSerializationTest.java | 34 ++++++---
3 files changed, 113 insertions(+), 9 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
index ffe95d9..8803c67 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
@@ -50,6 +50,12 @@ class DeletedMessagesVaultRestoreTask implements Task {
this.errorRestoreCount = new AtomicLong();
}
+ AdditionalInformation(User user, AtomicLong successfulRestoreCount, AtomicLong errorRestoreCount) {
+ this.user = user;
+ this.successfulRestoreCount = successfulRestoreCount;
+ this.errorRestoreCount = errorRestoreCount;
+ }
+
public long getSuccessfulRestoreCount() {
return successfulRestoreCount.get();
}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
new file mode 100644
index 0000000..d7a7c41
--- /dev/null
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
@@ -0,0 +1,82 @@
+/**
+ * *************************************************************
+ * 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.concurrent.atomic.AtomicLong;
+
+import org.apache.james.core.User;
+import org.apache.james.json.DTOModule;
+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 DeletedMessagesVaultRestoreTaskAdditionalInformationDTO implements AdditionalInformationDTO {
+
+ private static DeletedMessagesVaultRestoreTaskAdditionalInformationDTO fromDomainObject(DeletedMessagesVaultRestoreTask.AdditionalInformation additionalInformation, String type) {
+ return new DeletedMessagesVaultRestoreTaskAdditionalInformationDTO(
+ additionalInformation.getUser(),
+ additionalInformation.getSuccessfulRestoreCount(),
+ additionalInformation.getErrorRestoreCount()
+ );
+ }
+
+ public static final AdditionalInformationDTOModule<DeletedMessagesVaultRestoreTask.AdditionalInformation, DeletedMessagesVaultRestoreTaskAdditionalInformationDTO> MODULE =
+ DTOModule
+ .forDomainObject(DeletedMessagesVaultRestoreTask.AdditionalInformation.class)
+ .convertToDTO(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.class)
+ .toDomainObjectConverter(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO::toDomainObject)
+ .toDTOConverter(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO::fromDomainObject)
+ .typeName(DeletedMessagesVaultRestoreTask.TYPE.asString())
+ .withFactory(AdditionalInformationDTOModule::new);
+
+ private final String user;
+ private final Long successfulRestoreCount;
+ private final Long errorRestoreCount;
+
+ public DeletedMessagesVaultRestoreTaskAdditionalInformationDTO(@JsonProperty("user") String user,
+ @JsonProperty("successfulRestoreCount") Long successfulRestoreCount,
+ @JsonProperty("errorRestoreCount") Long errorRestoreCount) {
+ this.user = user;
+ this.successfulRestoreCount = successfulRestoreCount;
+ this.errorRestoreCount = errorRestoreCount;
+ }
+
+ public String getUser() {
+ return user;
+ }
+
+ public Long getSuccessfulRestoreCount() {
+ return successfulRestoreCount;
+ }
+
+ public Long getErrorRestoreCount() {
+ return errorRestoreCount;
+ }
+
+ DeletedMessagesVaultRestoreTask.AdditionalInformation toDomainObject() {
+ return new DeletedMessagesVaultRestoreTask.AdditionalInformation(
+ User.fromUsername(user),
+ new AtomicLong(successfulRestoreCount),
+ new AtomicLong(errorRestoreCount)
+ );
+ }
+}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
index d2bb22e..adfcd75 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
@@ -23,9 +23,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import java.io.IOException;
+import java.util.concurrent.atomic.AtomicLong;
import org.apache.james.core.User;
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.apache.james.task.Task;
import org.apache.james.vault.dto.query.QueryTranslator;
@@ -44,14 +46,18 @@ class DeletedMessagesVaultRestoreTaskSerializationTest {
private JsonTaskSerializer taskSerializer;
- private static final String username = "james";
- private static final User userToRestore = User.fromUsername(username);
- private static final Query query = Query.of(CriterionFactory.hasAttachment(true));
+ private static final String USERNAME = "james";
+ private static final User USER_TO_RESTORE = User.fromUsername(USERNAME);
+ private static final Query QUERY = Query.of(CriterionFactory.hasAttachment(true));
+ private static final DeletedMessagesVaultRestoreTask.AdditionalInformation DETAILS = new DeletedMessagesVaultRestoreTask.AdditionalInformation(USER_TO_RESTORE, new AtomicLong(42), new AtomicLong(10));
- private static final String serializedDeleteMessagesVaultRestoreTask = "{\"type\":\"deletedMessages/restore\"," +
+ private static final String SERIALIZED_DELETE_MESSAGES_VAULT_RESTORE_TASK = "{\"type\":\"deletedMessages/restore\"," +
"\"userToRestore\":\"james\"," +
"\"query\":{\"combinator\":\"and\",\"criteria\":[{\"fieldName\":\"hasAttachment\",\"operator\":\"equals\",\"value\":\"true\"}]}" +
"}";
+ private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"user\":\"james\",\"successfulRestoreCount\":42,\"errorRestoreCount\":10}";
+
+ private static final JsonTaskAdditionalInformationsSerializer JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new JsonTaskAdditionalInformationsSerializer(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.MODULE);
@BeforeEach
void setUp() {
@@ -62,22 +68,32 @@ class DeletedMessagesVaultRestoreTaskSerializationTest {
@Test
void deleteMessagesVaultRestoreTaskShouldBeSerializable() throws JsonProcessingException {
- DeletedMessagesVaultRestoreTask task = new DeletedMessagesVaultRestoreTask(exportService, userToRestore, query);
+ DeletedMessagesVaultRestoreTask task = new DeletedMessagesVaultRestoreTask(exportService, USER_TO_RESTORE, QUERY);
assertThatJson(taskSerializer.serialize(task))
- .isEqualTo(serializedDeleteMessagesVaultRestoreTask);
+ .isEqualTo(SERIALIZED_DELETE_MESSAGES_VAULT_RESTORE_TASK);
}
@Test
void deleteMessagesVaultRestoreTaskShouldBeDeserializable() throws IOException {
- DeletedMessagesVaultRestoreTask task = new DeletedMessagesVaultRestoreTask(exportService, userToRestore, query);
+ DeletedMessagesVaultRestoreTask task = new DeletedMessagesVaultRestoreTask(exportService, USER_TO_RESTORE, QUERY);
- Task deserializedTask = taskSerializer.deserialize(serializedDeleteMessagesVaultRestoreTask);
+ Task deserializedTask = taskSerializer.deserialize(SERIALIZED_DELETE_MESSAGES_VAULT_RESTORE_TASK);
assertThat(deserializedTask)
.isEqualToComparingOnlyGivenFields(task, "userToRestore");
DeletedMessagesVaultRestoreTask deserializedRestoreTask = (DeletedMessagesVaultRestoreTask) deserializedTask;
- assertThat(queryTranslator.toDTO(deserializedRestoreTask.query)).isEqualTo(queryTranslator.toDTO(query));
+ assertThat(queryTranslator.toDTO(deserializedRestoreTask.query)).isEqualTo(queryTranslator.toDTO(QUERY));
+ }
+
+ @Test
+ void additionalInformationShouldBeSerializable() throws JsonProcessingException {
+ assertThatJson(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION_TASK);
}
+ @Test
+ void additonalInformationShouldBeDeserializable() throws IOException {
+ assertThat(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize("deletedMessages/restore", SERIALIZED_ADDITIONAL_INFORMATION_TASK))
+ .isEqualToComparingFieldByField(DETAILS);
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/07: JAMES-2813 Make
BlobStoreVaultGarbageCollectionTask.AdditionalInformation serializable
Posted by ro...@apache.org.
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 f5be8554913d85c1a1cc15a90453ba0ef6ab405f
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Tue Sep 3 16:34:13 2019 +0200
JAMES-2813 Make BlobStoreVaultGarbageCollectionTask.AdditionalInformation serializable
---
...bageCollectionTaskAdditionalInformationDTO.java | 76 ++++++++++++++++++++++
...aultGarbageCollectionTaskSerializationTest.java | 20 +++++-
2 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.java
new file mode 100644
index 0000000..cc68f1a
--- /dev/null
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.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.james.vault.blob;
+
+import java.time.ZonedDateTime;
+import java.util.Collection;
+
+import org.apache.james.blob.api.BucketName;
+import org.apache.james.json.DTOModule;
+import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
+import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.steveash.guavate.Guavate;
+
+public class BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO implements AdditionalInformationDTO {
+ static BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO fromDomainObject(BlobStoreVaultGarbageCollectionTask.AdditionalInformation additionalInformation, String type) {
+ return new BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO(
+ additionalInformation.getBeginningOfRetentionPeriod().toString(),
+ additionalInformation.getDeletedBuckets()
+ );
+ }
+
+ public static final AdditionalInformationDTOModule<BlobStoreVaultGarbageCollectionTask.AdditionalInformation, BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO> MODULE =
+ DTOModule
+ .forDomainObject(BlobStoreVaultGarbageCollectionTask.AdditionalInformation.class)
+ .convertToDTO(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.class)
+ .toDomainObjectConverter(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO::toDomainObject)
+ .toDTOConverter(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO::fromDomainObject)
+ .typeName(BlobStoreVaultGarbageCollectionTask.TYPE.asString())
+ .withFactory(AdditionalInformationDTOModule::new);
+
+ private final String beginningOfRetentionPeriod;
+ private final Collection<String> deletedBuckets;
+
+ BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO(@JsonProperty("beginningOfRetentionPeriod") String beginningOfRetentionPeriod,
+ @JsonProperty("deletedBuckets") Collection<String> deletedBuckets) {
+ this.beginningOfRetentionPeriod = beginningOfRetentionPeriod;
+ this.deletedBuckets = deletedBuckets;
+ }
+
+ BlobStoreVaultGarbageCollectionTask.AdditionalInformation toDomainObject() {
+ return new BlobStoreVaultGarbageCollectionTask.AdditionalInformation(
+ ZonedDateTime.parse(beginningOfRetentionPeriod),
+ deletedBuckets
+ .stream()
+ .map(BucketName::of)
+ .collect(Guavate.toImmutableList()));
+ }
+
+ public String getBeginningOfRetentionPeriod() {
+ return beginningOfRetentionPeriod;
+ }
+
+ public Collection<String> getDeletedBuckets() {
+ return deletedBuckets;
+ }
+}
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
index 82767c2..97a93af 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
@@ -27,10 +27,12 @@ import java.io.IOException;
import java.time.ZonedDateTime;
import org.apache.james.blob.api.BucketName;
+import org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.Task;
import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.collect.ImmutableList;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
@@ -38,10 +40,15 @@ class BlobStoreVaultGarbageCollectionTaskSerializationTest {
private static final JsonTaskSerializer TASK_SERIALIZER = new JsonTaskSerializer(BlobStoreVaultGarbageCollectionTaskDTO.MODULE);
private static final ZonedDateTime BEGINNING_OF_RETENTION_PERIOD = ZonedDateTime.parse("2019-09-03T15:26:13.356+02:00[Europe/Paris]");
- private static final Flux<BucketName> RETENTION_OPERATION = Flux.just("1", "2", "3").map(BucketName::of);
+ private static final ImmutableList<BucketName> BUCKET_IDS = ImmutableList.of(BucketName.of("1"), BucketName.of("2"), BucketName.of("3"));
+ private static final Flux<BucketName> RETENTION_OPERATION = Flux.fromIterable(BUCKET_IDS);
+ private static final BlobStoreVaultGarbageCollectionTask.AdditionalInformation DETAILS = new BlobStoreVaultGarbageCollectionTask.AdditionalInformation(BEGINNING_OF_RETENTION_PERIOD, BUCKET_IDS);
private static final BlobStoreVaultGarbageCollectionTask TASK = new BlobStoreVaultGarbageCollectionTask(BEGINNING_OF_RETENTION_PERIOD, RETENTION_OPERATION);
private static final String SERIALIZED_TASK = "{\"beginningOfRetentionPeriod\":\"2019-09-03T15:26:13.356+02:00[Europe/Paris]\",\"retentionOperation\":[\"1\", \"2\", \"3\"],\"type\":\"deletedMessages/blobStoreBasedGarbageCollection\"}";
+ private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"beginningOfRetentionPeriod\":\"2019-09-03T15:26:13.356+02:00[Europe/Paris]\",\"deletedBuckets\":[\"1\", \"2\", \"3\"]}";
+
+ private static final JsonTaskAdditionalInformationsSerializer JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new JsonTaskAdditionalInformationsSerializer(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.MODULE);
@Test
void taskShouldBeSerializable() throws JsonProcessingException {
@@ -66,4 +73,15 @@ class BlobStoreVaultGarbageCollectionTaskSerializationTest {
.collectList()
.block());
}
+
+ @Test
+ void additionalInformationShouldBeSerializable() throws JsonProcessingException {
+ assertThatJson(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION_TASK);
+ }
+
+ @Test
+ void additonalInformationShouldBeDeserializable() throws IOException {
+ assertThat(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize("deletedMessages/blobStoreBasedGarbageCollection", SERIALIZED_ADDITIONAL_INFORMATION_TASK))
+ .isEqualToComparingFieldByField(DETAILS);
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 07/07: JAMES-2813 don't serialize unnecessary
information for BlobStoreVaultGarbageCollectionTask
Posted by ro...@apache.org.
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 72eeef88e33c24d1b85d17b390e3184998d29201
Author: Rémi Kowalski <rk...@linagora.com>
AuthorDate: Wed Sep 4 18:23:18 2019 +0200
JAMES-2813 don't serialize unnecessary information for BlobStoreVaultGarbageCollectionTask
---
.../vault/blob/BlobStoreDeletedMessageVault.java | 23 +++++++----
.../blob/BlobStoreVaultGarbageCollectionTask.java | 22 +++++++++--
.../BlobStoreVaultGarbageCollectionTaskDTO.java | 45 +++++-----------------
...aultGarbageCollectionTaskSerializationTest.java | 32 ++++++++-------
4 files changed, 60 insertions(+), 62 deletions(-)
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVault.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVault.java
index 143825c..ac9c1b7 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVault.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVault.java
@@ -47,7 +47,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
-
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
@@ -68,18 +67,20 @@ public class BlobStoreDeletedMessageVault implements DeletedMessageVault {
private final BucketNameGenerator nameGenerator;
private final Clock clock;
private final RetentionConfiguration retentionConfiguration;
+ private final BlobStoreVaultGarbageCollectionTask.Factory taskFactory;
@Inject
public BlobStoreDeletedMessageVault(MetricFactory metricFactory, DeletedMessageMetadataVault messageMetadataVault,
- BlobStore blobStore, BucketNameGenerator nameGenerator,
- Clock clock,
- RetentionConfiguration retentionConfiguration) {
+ BlobStore blobStore, BucketNameGenerator nameGenerator,
+ Clock clock,
+ RetentionConfiguration retentionConfiguration) {
this.metricFactory = metricFactory;
this.messageMetadataVault = messageMetadataVault;
this.blobStore = blobStore;
this.nameGenerator = nameGenerator;
this.clock = clock;
this.retentionConfiguration = retentionConfiguration;
+ this.taskFactory = new BlobStoreVaultGarbageCollectionTask.Factory(this);
}
@Override
@@ -158,15 +159,21 @@ public class BlobStoreDeletedMessageVault implements DeletedMessageVault {
@Override
public Task deleteExpiredMessagesTask() {
- ZonedDateTime now = ZonedDateTime.now(clock);
- ZonedDateTime beginningOfRetentionPeriod = now.minus(retentionConfiguration.getRetentionPeriod());
+ return taskFactory.create();
+ }
+
- Flux<BucketName> metricAbleDeleteOperation = metricFactory.runPublishingTimerMetric(
+ Flux<BucketName> deleteExpiredMessages(ZonedDateTime beginningOfRetentionPeriod) {
+ return metricFactory.runPublishingTimerMetric(
DELETE_EXPIRED_MESSAGES_METRIC_NAME,
retentionQualifiedBuckets(beginningOfRetentionPeriod)
.flatMap(bucketName -> deleteBucketData(bucketName).then(Mono.just(bucketName))));
- return new BlobStoreVaultGarbageCollectionTask(beginningOfRetentionPeriod, metricAbleDeleteOperation);
+ }
+
+ ZonedDateTime getBeginningOfRetentionPeriod() {
+ ZonedDateTime now = ZonedDateTime.now(clock);
+ return now.minus(retentionConfiguration.getRetentionPeriod());
}
@VisibleForTesting
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java
index cfddb37..cf49b6a 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java
@@ -25,13 +25,14 @@ import java.util.List;
import java.util.Optional;
import java.util.concurrent.ConcurrentLinkedQueue;
+import javax.inject.Inject;
+
import org.apache.james.blob.api.BucketName;
import org.apache.james.task.Task;
import org.apache.james.task.TaskExecutionDetails;
import org.apache.james.task.TaskType;
import com.github.steveash.guavate.Guavate;
-
import reactor.core.publisher.Flux;
import reactor.core.scheduler.Schedulers;
@@ -64,9 +65,22 @@ public class BlobStoreVaultGarbageCollectionTask implements Task {
private final ZonedDateTime beginningOfRetentionPeriod;
private final Collection<BucketName> deletedBuckets;
- BlobStoreVaultGarbageCollectionTask(ZonedDateTime beginningOfRetentionPeriod, Flux<BucketName> retentionOperation) {
- this.retentionOperation = retentionOperation;
- this.beginningOfRetentionPeriod = beginningOfRetentionPeriod;
+ public static class Factory {
+ private final BlobStoreDeletedMessageVault deletedMessageVault;
+
+ @Inject
+ public Factory(BlobStoreDeletedMessageVault deletedMessageVault) {
+ this.deletedMessageVault = deletedMessageVault;
+ }
+
+ public BlobStoreVaultGarbageCollectionTask create() {
+ return new BlobStoreVaultGarbageCollectionTask(deletedMessageVault);
+ }
+ }
+
+ private BlobStoreVaultGarbageCollectionTask(BlobStoreDeletedMessageVault deletedMessageVault) {
+ this.beginningOfRetentionPeriod = deletedMessageVault.getBeginningOfRetentionPeriod();
+ this.retentionOperation = deletedMessageVault.deleteExpiredMessages(beginningOfRetentionPeriod);
this.deletedBuckets = new ConcurrentLinkedQueue<>();
}
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskDTO.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskDTO.java
index bbdb794..da62197 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskDTO.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskDTO.java
@@ -7,9 +7,9 @@
* 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 *
@@ -20,57 +20,37 @@
package org.apache.james.vault.blob;
-import java.time.ZonedDateTime;
-import java.util.Collection;
+import java.util.function.Function;
-import org.apache.james.blob.api.BucketName;
import org.apache.james.json.DTOModule;
import org.apache.james.server.task.json.dto.TaskDTO;
import org.apache.james.server.task.json.dto.TaskDTOModule;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.steveash.guavate.Guavate;
-import reactor.core.publisher.Flux;
public class BlobStoreVaultGarbageCollectionTaskDTO implements TaskDTO {
static BlobStoreVaultGarbageCollectionTaskDTO fromDomainObject(BlobStoreVaultGarbageCollectionTask task, String type) {
- return new BlobStoreVaultGarbageCollectionTaskDTO(
- type,
- task.getBeginningOfRetentionPeriod().toString(),
- task.getRetentionOperation()
- .map(BucketName::asString)
- .collect(Guavate.toImmutableList())
- .block()
- );
+ return new BlobStoreVaultGarbageCollectionTaskDTO(type);
}
- public static final TaskDTOModule<BlobStoreVaultGarbageCollectionTask, BlobStoreVaultGarbageCollectionTaskDTO> MODULE =
+ public static final Function<BlobStoreVaultGarbageCollectionTask.Factory, TaskDTOModule<BlobStoreVaultGarbageCollectionTask, BlobStoreVaultGarbageCollectionTaskDTO>> MODULE = factory ->
DTOModule
.forDomainObject(BlobStoreVaultGarbageCollectionTask.class)
.convertToDTO(BlobStoreVaultGarbageCollectionTaskDTO.class)
- .toDomainObjectConverter(BlobStoreVaultGarbageCollectionTaskDTO::toDomainObject)
+ .toDomainObjectConverter(dto -> BlobStoreVaultGarbageCollectionTaskDTO.toDomainObject(factory))
.toDTOConverter(BlobStoreVaultGarbageCollectionTaskDTO::fromDomainObject)
.typeName(BlobStoreVaultGarbageCollectionTask.TYPE.asString())
.withFactory(TaskDTOModule::new);
private final String type;
- private final String beginningOfRetentionPeriod;
- private final Collection<String> retentionOperation;
- BlobStoreVaultGarbageCollectionTaskDTO(@JsonProperty("type") String type,
- @JsonProperty("beginningOfRetentionPeriod") String beginningOfRetentionPeriod,
- @JsonProperty("retentionOperation") Collection<String> retentionOperation) {
+ BlobStoreVaultGarbageCollectionTaskDTO(@JsonProperty("type") String type) {
this.type = type;
- this.beginningOfRetentionPeriod = beginningOfRetentionPeriod;
- this.retentionOperation = retentionOperation;
}
- BlobStoreVaultGarbageCollectionTask toDomainObject() {
- return new BlobStoreVaultGarbageCollectionTask(
- ZonedDateTime.parse(beginningOfRetentionPeriod),
- Flux.fromIterable(retentionOperation)
- .map(BucketName::of));
+ private static BlobStoreVaultGarbageCollectionTask toDomainObject(BlobStoreVaultGarbageCollectionTask.Factory factory) {
+ return factory.create();
}
@Override
@@ -78,11 +58,4 @@ public class BlobStoreVaultGarbageCollectionTaskDTO implements TaskDTO {
return type;
}
- public String getBeginningOfRetentionPeriod() {
- return beginningOfRetentionPeriod;
- }
-
- public Collection<String> getRetentionOperation() {
- return retentionOperation;
- }
}
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
index 97a93af..85e6f6b 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
@@ -22,6 +22,7 @@ package org.apache.james.vault.blob;
import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
import java.io.IOException;
import java.time.ZonedDateTime;
@@ -33,23 +34,37 @@ import org.apache.james.task.Task;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.collect.ImmutableList;
+
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
import reactor.core.publisher.Flux;
class BlobStoreVaultGarbageCollectionTaskSerializationTest {
+ private static final BlobStoreDeletedMessageVault DELETED_MESSAGE_VAULT = Mockito.mock(BlobStoreDeletedMessageVault.class);
+ private static final BlobStoreVaultGarbageCollectionTask.Factory TASK_FACTORY = new BlobStoreVaultGarbageCollectionTask.Factory(DELETED_MESSAGE_VAULT);
- private static final JsonTaskSerializer TASK_SERIALIZER = new JsonTaskSerializer(BlobStoreVaultGarbageCollectionTaskDTO.MODULE);
+ private static final JsonTaskSerializer TASK_SERIALIZER = new JsonTaskSerializer(BlobStoreVaultGarbageCollectionTaskDTO.MODULE.apply(TASK_FACTORY));
private static final ZonedDateTime BEGINNING_OF_RETENTION_PERIOD = ZonedDateTime.parse("2019-09-03T15:26:13.356+02:00[Europe/Paris]");
private static final ImmutableList<BucketName> BUCKET_IDS = ImmutableList.of(BucketName.of("1"), BucketName.of("2"), BucketName.of("3"));
private static final Flux<BucketName> RETENTION_OPERATION = Flux.fromIterable(BUCKET_IDS);
private static final BlobStoreVaultGarbageCollectionTask.AdditionalInformation DETAILS = new BlobStoreVaultGarbageCollectionTask.AdditionalInformation(BEGINNING_OF_RETENTION_PERIOD, BUCKET_IDS);
- private static final BlobStoreVaultGarbageCollectionTask TASK = new BlobStoreVaultGarbageCollectionTask(BEGINNING_OF_RETENTION_PERIOD, RETENTION_OPERATION);
+ private static final BlobStoreVaultGarbageCollectionTask TASK = TASK_FACTORY.create();
- private static final String SERIALIZED_TASK = "{\"beginningOfRetentionPeriod\":\"2019-09-03T15:26:13.356+02:00[Europe/Paris]\",\"retentionOperation\":[\"1\", \"2\", \"3\"],\"type\":\"deletedMessages/blobStoreBasedGarbageCollection\"}";
+ private static final String SERIALIZED_TASK = "{\"type\":\"deletedMessages/blobStoreBasedGarbageCollection\"}";
private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"beginningOfRetentionPeriod\":\"2019-09-03T15:26:13.356+02:00[Europe/Paris]\",\"deletedBuckets\":[\"1\", \"2\", \"3\"]}";
private static final JsonTaskAdditionalInformationsSerializer JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new JsonTaskAdditionalInformationsSerializer(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.MODULE);
+ @BeforeAll
+ static void setUp() {
+ Mockito.when(DELETED_MESSAGE_VAULT.getBeginningOfRetentionPeriod())
+ .thenReturn(BEGINNING_OF_RETENTION_PERIOD);
+ Mockito.when(DELETED_MESSAGE_VAULT.deleteExpiredMessages(any()))
+ .thenReturn(RETENTION_OPERATION);
+ }
+
@Test
void taskShouldBeSerializable() throws JsonProcessingException {
assertThatJson(TASK_SERIALIZER.serialize(TASK))
@@ -61,17 +76,6 @@ class BlobStoreVaultGarbageCollectionTaskSerializationTest {
Task deserialized = TASK_SERIALIZER.deserialize(SERIALIZED_TASK);
assertThat(deserialized).isInstanceOf(BlobStoreVaultGarbageCollectionTask.class);
- BlobStoreVaultGarbageCollectionTask blobStoreVaultGarbageCollectionTask = (BlobStoreVaultGarbageCollectionTask) deserialized;
- assertThat(blobStoreVaultGarbageCollectionTask.getBeginningOfRetentionPeriod())
- .isEqualTo(TASK.getBeginningOfRetentionPeriod());
- assertThat(blobStoreVaultGarbageCollectionTask
- .getRetentionOperation()
- .collectList()
- .block())
- .isEqualTo(TASK
- .getRetentionOperation()
- .collectList()
- .block());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/07: JAMES-2813 Make
BlobStoreVaultGarbageCollectionTask serializable
Posted by ro...@apache.org.
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 8768d7be991f8c3b92b4f705f98b4c32421500dc
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Tue Sep 3 15:46:22 2019 +0200
JAMES-2813 Make BlobStoreVaultGarbageCollectionTask serializable
---
.../blob/BlobStoreVaultGarbageCollectionTask.java | 10 ++-
.../BlobStoreVaultGarbageCollectionTaskDTO.java | 88 ++++++++++++++++++++++
...aultGarbageCollectionTaskSerializationTest.java | 69 +++++++++++++++++
3 files changed, 166 insertions(+), 1 deletion(-)
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java
index 0d3c014..cfddb37 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTask.java
@@ -58,7 +58,7 @@ public class BlobStoreVaultGarbageCollectionTask implements Task {
}
}
- private static final TaskType TYPE = TaskType.of("deletedMessages/blobStoreBasedGarbageCollection");
+ static final TaskType TYPE = TaskType.of("deletedMessages/blobStoreBasedGarbageCollection");
private final Flux<BucketName> retentionOperation;
private final ZonedDateTime beginningOfRetentionPeriod;
@@ -90,4 +90,12 @@ public class BlobStoreVaultGarbageCollectionTask implements Task {
public Optional<TaskExecutionDetails.AdditionalInformation> details() {
return Optional.of(new AdditionalInformation(beginningOfRetentionPeriod, deletedBuckets));
}
+
+ ZonedDateTime getBeginningOfRetentionPeriod() {
+ return beginningOfRetentionPeriod;
+ }
+
+ Flux<BucketName> getRetentionOperation() {
+ return retentionOperation;
+ }
}
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskDTO.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskDTO.java
new file mode 100644
index 0000000..bbdb794
--- /dev/null
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskDTO.java
@@ -0,0 +1,88 @@
+/**
+ * *************************************************************
+ * 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.vault.blob;
+
+import java.time.ZonedDateTime;
+import java.util.Collection;
+
+import org.apache.james.blob.api.BucketName;
+import org.apache.james.json.DTOModule;
+import org.apache.james.server.task.json.dto.TaskDTO;
+import org.apache.james.server.task.json.dto.TaskDTOModule;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.steveash.guavate.Guavate;
+import reactor.core.publisher.Flux;
+
+public class BlobStoreVaultGarbageCollectionTaskDTO implements TaskDTO {
+ static BlobStoreVaultGarbageCollectionTaskDTO fromDomainObject(BlobStoreVaultGarbageCollectionTask task, String type) {
+ return new BlobStoreVaultGarbageCollectionTaskDTO(
+ type,
+ task.getBeginningOfRetentionPeriod().toString(),
+ task.getRetentionOperation()
+ .map(BucketName::asString)
+ .collect(Guavate.toImmutableList())
+ .block()
+ );
+ }
+
+ public static final TaskDTOModule<BlobStoreVaultGarbageCollectionTask, BlobStoreVaultGarbageCollectionTaskDTO> MODULE =
+ DTOModule
+ .forDomainObject(BlobStoreVaultGarbageCollectionTask.class)
+ .convertToDTO(BlobStoreVaultGarbageCollectionTaskDTO.class)
+ .toDomainObjectConverter(BlobStoreVaultGarbageCollectionTaskDTO::toDomainObject)
+ .toDTOConverter(BlobStoreVaultGarbageCollectionTaskDTO::fromDomainObject)
+ .typeName(BlobStoreVaultGarbageCollectionTask.TYPE.asString())
+ .withFactory(TaskDTOModule::new);
+
+
+ private final String type;
+ private final String beginningOfRetentionPeriod;
+ private final Collection<String> retentionOperation;
+
+ BlobStoreVaultGarbageCollectionTaskDTO(@JsonProperty("type") String type,
+ @JsonProperty("beginningOfRetentionPeriod") String beginningOfRetentionPeriod,
+ @JsonProperty("retentionOperation") Collection<String> retentionOperation) {
+ this.type = type;
+ this.beginningOfRetentionPeriod = beginningOfRetentionPeriod;
+ this.retentionOperation = retentionOperation;
+ }
+
+ BlobStoreVaultGarbageCollectionTask toDomainObject() {
+ return new BlobStoreVaultGarbageCollectionTask(
+ ZonedDateTime.parse(beginningOfRetentionPeriod),
+ Flux.fromIterable(retentionOperation)
+ .map(BucketName::of));
+ }
+
+ @Override
+ public String getType() {
+ return type;
+ }
+
+ public String getBeginningOfRetentionPeriod() {
+ return beginningOfRetentionPeriod;
+ }
+
+ public Collection<String> getRetentionOperation() {
+ return retentionOperation;
+ }
+}
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
new file mode 100644
index 0000000..82767c2
--- /dev/null
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
@@ -0,0 +1,69 @@
+/**
+ * *************************************************************
+ * 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.vault.blob;
+
+import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.time.ZonedDateTime;
+
+import org.apache.james.blob.api.BucketName;
+import org.apache.james.server.task.json.JsonTaskSerializer;
+import org.apache.james.task.Task;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Flux;
+
+class BlobStoreVaultGarbageCollectionTaskSerializationTest {
+
+ private static final JsonTaskSerializer TASK_SERIALIZER = new JsonTaskSerializer(BlobStoreVaultGarbageCollectionTaskDTO.MODULE);
+ private static final ZonedDateTime BEGINNING_OF_RETENTION_PERIOD = ZonedDateTime.parse("2019-09-03T15:26:13.356+02:00[Europe/Paris]");
+ private static final Flux<BucketName> RETENTION_OPERATION = Flux.just("1", "2", "3").map(BucketName::of);
+ private static final BlobStoreVaultGarbageCollectionTask TASK = new BlobStoreVaultGarbageCollectionTask(BEGINNING_OF_RETENTION_PERIOD, RETENTION_OPERATION);
+
+ private static final String SERIALIZED_TASK = "{\"beginningOfRetentionPeriod\":\"2019-09-03T15:26:13.356+02:00[Europe/Paris]\",\"retentionOperation\":[\"1\", \"2\", \"3\"],\"type\":\"deletedMessages/blobStoreBasedGarbageCollection\"}";
+
+ @Test
+ void taskShouldBeSerializable() throws JsonProcessingException {
+ assertThatJson(TASK_SERIALIZER.serialize(TASK))
+ .isEqualTo(SERIALIZED_TASK);
+ }
+
+ @Test
+ void taskShouldBeDeserializable() throws IOException {
+ Task deserialized = TASK_SERIALIZER.deserialize(SERIALIZED_TASK);
+
+ assertThat(deserialized).isInstanceOf(BlobStoreVaultGarbageCollectionTask.class);
+ BlobStoreVaultGarbageCollectionTask blobStoreVaultGarbageCollectionTask = (BlobStoreVaultGarbageCollectionTask) deserialized;
+ assertThat(blobStoreVaultGarbageCollectionTask.getBeginningOfRetentionPeriod())
+ .isEqualTo(TASK.getBeginningOfRetentionPeriod());
+ assertThat(blobStoreVaultGarbageCollectionTask
+ .getRetentionOperation()
+ .collectList()
+ .block())
+ .isEqualTo(TASK
+ .getRetentionOperation()
+ .collectList()
+ .block());
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 06/07: JAMES-2813 Add
DeletedMessagesVaultExportTask.AdditionalInformation serialization
Posted by ro...@apache.org.
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 07aac2bbdd9858db28af9594f2b8cc32d9c664f1
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Tue Sep 3 19:10:16 2019 +0200
JAMES-2813 Add DeletedMessagesVaultExportTask.AdditionalInformation serialization
---
.../routes/DeletedMessagesVaultExportTask.java | 2 +-
...gesVaultExportTaskAdditionalInformationDTO.java | 87 ++++++++++++++++++++++
.../routes/DeletedMessagesVaultRestoreTask.java | 44 +++++------
...esVaultRestoreTaskAdditionalInformationDTO.java | 6 +-
...edMessagesVaultExportTaskSerializationTest.java | 34 +++++++--
...dMessagesVaultRestoreTaskSerializationTest.java | 3 +-
6 files changed, 140 insertions(+), 36 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
index 59bbff1..d90daee 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
@@ -39,7 +39,7 @@ class DeletedMessagesVaultExportTask implements Task {
static final TaskType TYPE = TaskType.of("deletedMessages/export");
- public class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
+ public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final User userExportFrom;
private final MailAddress exportTo;
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskAdditionalInformationDTO.java
new file mode 100644
index 0000000..27897ca
--- /dev/null
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskAdditionalInformationDTO.java
@@ -0,0 +1,87 @@
+/**
+ * *************************************************************
+ * 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 javax.mail.internet.AddressException;
+
+import org.apache.james.core.MailAddress;
+import org.apache.james.core.User;
+import org.apache.james.json.DTOModule;
+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 DeletedMessagesVaultExportTaskAdditionalInformationDTO implements AdditionalInformationDTO {
+
+ private static DeletedMessagesVaultExportTaskAdditionalInformationDTO fromDomainObject(DeletedMessagesVaultExportTask.AdditionalInformation additionalInformation, String type) {
+ return new DeletedMessagesVaultExportTaskAdditionalInformationDTO(
+ additionalInformation.getUserExportFrom(),
+ additionalInformation.getExportTo(),
+ additionalInformation.getTotalExportedMessages()
+ );
+ }
+
+ public static final AdditionalInformationDTOModule<DeletedMessagesVaultExportTask.AdditionalInformation, DeletedMessagesVaultExportTaskAdditionalInformationDTO> MODULE =
+ DTOModule
+ .forDomainObject(DeletedMessagesVaultExportTask.AdditionalInformation.class)
+ .convertToDTO(DeletedMessagesVaultExportTaskAdditionalInformationDTO.class)
+ .toDomainObjectConverter(DeletedMessagesVaultExportTaskAdditionalInformationDTO::toDomainObject)
+ .toDTOConverter(DeletedMessagesVaultExportTaskAdditionalInformationDTO::fromDomainObject)
+ .typeName(DeletedMessagesVaultExportTask.TYPE.asString())
+ .withFactory(AdditionalInformationDTOModule::new);
+
+ private final String userExportFrom;
+ private final String exportTo;
+ private final Long totalExportedMessages;
+
+ public DeletedMessagesVaultExportTaskAdditionalInformationDTO(@JsonProperty("user") String userExportFrom,
+ @JsonProperty("exportTo") String exportTo,
+ @JsonProperty("errorRestoreCount") Long totalExportedMessages) {
+ this.userExportFrom = userExportFrom;
+ this.exportTo = exportTo;
+ this.totalExportedMessages = totalExportedMessages;
+ }
+
+ public String getUserExportFrom() {
+ return userExportFrom;
+ }
+
+ public String getExportTo() {
+ return exportTo;
+ }
+
+ public Long getTotalExportedMessages() {
+ return totalExportedMessages;
+ }
+
+ DeletedMessagesVaultExportTask.AdditionalInformation toDomainObject() {
+ try {
+ return new DeletedMessagesVaultExportTask.AdditionalInformation(
+ User.fromUsername(userExportFrom),
+ new MailAddress(exportTo),
+ totalExportedMessages
+ );
+ } catch (AddressException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
index 8803c67..6ea283d 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
@@ -41,47 +41,34 @@ class DeletedMessagesVaultRestoreTask implements Task {
public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final User user;
- private final AtomicLong successfulRestoreCount;
- private final AtomicLong errorRestoreCount;
+ private final long successfulRestoreCount;
+ private final long errorRestoreCount;
- AdditionalInformation(User user) {
- this.user = user;
- this.successfulRestoreCount = new AtomicLong();
- this.errorRestoreCount = new AtomicLong();
- }
-
- AdditionalInformation(User user, AtomicLong successfulRestoreCount, AtomicLong errorRestoreCount) {
+ AdditionalInformation(User user, long successfulRestoreCount, long errorRestoreCount) {
this.user = user;
this.successfulRestoreCount = successfulRestoreCount;
this.errorRestoreCount = errorRestoreCount;
}
public long getSuccessfulRestoreCount() {
- return successfulRestoreCount.get();
+ return successfulRestoreCount;
}
public long getErrorRestoreCount() {
- return errorRestoreCount.get();
+ return errorRestoreCount;
}
public String getUser() {
return user.asString();
}
-
- void incrementSuccessfulRestoreCount() {
- successfulRestoreCount.incrementAndGet();
- }
-
- void incrementErrorRestoreCount() {
- errorRestoreCount.incrementAndGet();
- }
}
private static final Logger LOGGER = LoggerFactory.getLogger(DeletedMessagesVaultRestoreTask.class);
private final User userToRestore;
private final RestoreService vaultRestore;
- private final AdditionalInformation additionalInformation;
+ private final AtomicLong successfulRestoreCount;
+ private final AtomicLong errorRestoreCount;
@VisibleForTesting
final Query query;
@@ -89,7 +76,8 @@ class DeletedMessagesVaultRestoreTask implements Task {
this.query = query;
this.userToRestore = userToRestore;
this.vaultRestore = vaultRestore;
- this.additionalInformation = new AdditionalInformation(userToRestore);
+ this.successfulRestoreCount = new AtomicLong();
+ this.errorRestoreCount = new AtomicLong();
}
@Override
@@ -116,14 +104,22 @@ class DeletedMessagesVaultRestoreTask implements Task {
private void updateInformation(RestoreService.RestoreResult restoreResult) {
switch (restoreResult) {
case RESTORE_FAILED:
- additionalInformation.incrementErrorRestoreCount();
+ incrementErrorRestoreCount();
break;
case RESTORE_SUCCEED:
- additionalInformation.incrementSuccessfulRestoreCount();
+ incrementSuccessfulRestoreCount();
break;
}
}
+ private void incrementSuccessfulRestoreCount() {
+ successfulRestoreCount.incrementAndGet();
+ }
+
+ private void incrementErrorRestoreCount() {
+ errorRestoreCount.incrementAndGet();
+ }
+
@Override
public TaskType type() {
return TYPE;
@@ -131,7 +127,7 @@ class DeletedMessagesVaultRestoreTask implements Task {
@Override
public Optional<TaskExecutionDetails.AdditionalInformation> details() {
- return Optional.of(additionalInformation);
+ return Optional.of(new AdditionalInformation(userToRestore, successfulRestoreCount.get(), errorRestoreCount.get()));
}
User getUserToRestore() {
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
index d7a7c41..1d58b2d 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.java
@@ -20,8 +20,6 @@
package org.apache.james.webadmin.vault.routes;
-import java.util.concurrent.atomic.AtomicLong;
-
import org.apache.james.core.User;
import org.apache.james.json.DTOModule;
import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
@@ -75,8 +73,8 @@ public class DeletedMessagesVaultRestoreTaskAdditionalInformationDTO implements
DeletedMessagesVaultRestoreTask.AdditionalInformation toDomainObject() {
return new DeletedMessagesVaultRestoreTask.AdditionalInformation(
User.fromUsername(user),
- new AtomicLong(successfulRestoreCount),
- new AtomicLong(errorRestoreCount)
+ successfulRestoreCount,
+ errorRestoreCount
);
}
}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
index 5bd8648..57ccf5e 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
@@ -20,6 +20,7 @@ package org.apache.james.webadmin.vault.routes;
import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
import static org.mockito.Mockito.mock;
import java.io.IOException;
@@ -29,6 +30,7 @@ import javax.mail.internet.AddressException;
import org.apache.james.core.MailAddress;
import org.apache.james.core.User;
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.apache.james.task.Task;
import org.apache.james.vault.dto.query.QueryTranslator;
@@ -49,18 +51,23 @@ class DeletedMessagesVaultExportTaskSerializationTest {
private JsonTaskSerializer taskSerializer;
private static final String username = "james";
- private static final User userExportFrom = User.fromUsername(username);
- private static final Query query = Query.of(CriterionFactory.hasAttachment(true));
+ private static final User USER_EXPORT_FROM = User.fromUsername(username);
+ private static final Query QUERY = Query.of(CriterionFactory.hasAttachment(true));
private static MailAddress exportTo;
+ private static DeletedMessagesVaultExportTask.AdditionalInformation details;
private static final String serializedDeleteMessagesVaultExportTask = "{\"type\":\"deletedMessages/export\"," +
"\"userExportFrom\":\"james\"," +
"\"exportQuery\":{\"combinator\":\"and\",\"criteria\":[{\"fieldName\":\"hasAttachment\",\"operator\":\"equals\",\"value\":\"true\"}]}," +
"\"exportTo\":\"james@apache.org\"}\n";
+ private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK = "{\"exportTo\":\"james@apache.org\",\"userExportFrom\":\"james\",\"totalExportedMessages\":42}";
+
+ private static final JsonTaskAdditionalInformationsSerializer JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new JsonTaskAdditionalInformationsSerializer(DeletedMessagesVaultExportTaskAdditionalInformationDTO.MODULE);
@BeforeAll
static void init() throws AddressException {
exportTo = new MailAddress("james@apache.org");
+ details = new DeletedMessagesVaultExportTask.AdditionalInformation(USER_EXPORT_FROM, exportTo, 42);
}
@BeforeEach
@@ -72,7 +79,7 @@ class DeletedMessagesVaultExportTaskSerializationTest {
@Test
void deleteMessagesVaultExportTaskShouldBeSerializable() throws JsonProcessingException {
- DeletedMessagesVaultExportTask task = new DeletedMessagesVaultExportTask(exportService, userExportFrom, query, exportTo);
+ DeletedMessagesVaultExportTask task = new DeletedMessagesVaultExportTask(exportService, USER_EXPORT_FROM, QUERY, exportTo);
assertThatJson(taskSerializer.serialize(task))
.isEqualTo(serializedDeleteMessagesVaultExportTask);
@@ -80,14 +87,31 @@ class DeletedMessagesVaultExportTaskSerializationTest {
@Test
void deleteMessagesVaultExportTaskShouldBeDeserializable() throws IOException {
- DeletedMessagesVaultExportTask task = new DeletedMessagesVaultExportTask(exportService, userExportFrom, query, exportTo);
+ DeletedMessagesVaultExportTask task = new DeletedMessagesVaultExportTask(exportService, USER_EXPORT_FROM, QUERY, exportTo);
Task deserializedTask = taskSerializer.deserialize(serializedDeleteMessagesVaultExportTask);
assertThat(deserializedTask)
.isEqualToComparingOnlyGivenFields(task, "userExportFrom", "exportTo");
DeletedMessagesVaultExportTask deserializedExportTask = (DeletedMessagesVaultExportTask) deserializedTask;
- assertThat(queryTranslator.toDTO(deserializedExportTask.exportQuery)).isEqualTo(queryTranslator.toDTO(query));
+ assertThat(queryTranslator.toDTO(deserializedExportTask.exportQuery)).isEqualTo(queryTranslator.toDTO(QUERY));
}
+ @Test
+ void additionalInformationShouldBeSerializable() throws JsonProcessingException {
+ assertThatJson(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.serialize(details)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION_TASK);
+ }
+
+ @Test
+ void additonalInformationShouldBeDeserializable() throws IOException {
+ assertThat(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize("deletedMessages/export", SERIALIZED_ADDITIONAL_INFORMATION_TASK))
+ .isEqualToComparingFieldByField(details);
+ }
+
+ @Test
+ void additonalInformationWithInvalidMailAddressShouldThrow() throws IOException {
+ String invalidSerializedAdditionalInformationTask = "{\"exportTo\":\"invalid\",\"userExportFrom\":\"james\",\"totalExportedMessages\":42}";;
+ assertThatCode(() -> JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize("deletedMessages/export", invalidSerializedAdditionalInformationTask))
+ .hasCauseInstanceOf(AddressException.class);
+ }
}
\ No newline at end of file
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
index adfcd75..d6dba23 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import java.io.IOException;
-import java.util.concurrent.atomic.AtomicLong;
import org.apache.james.core.User;
import org.apache.james.mailbox.model.TestId;
@@ -49,7 +48,7 @@ class DeletedMessagesVaultRestoreTaskSerializationTest {
private static final String USERNAME = "james";
private static final User USER_TO_RESTORE = User.fromUsername(USERNAME);
private static final Query QUERY = Query.of(CriterionFactory.hasAttachment(true));
- private static final DeletedMessagesVaultRestoreTask.AdditionalInformation DETAILS = new DeletedMessagesVaultRestoreTask.AdditionalInformation(USER_TO_RESTORE, new AtomicLong(42), new AtomicLong(10));
+ private static final DeletedMessagesVaultRestoreTask.AdditionalInformation DETAILS = new DeletedMessagesVaultRestoreTask.AdditionalInformation(USER_TO_RESTORE,42, 10);
private static final String SERIALIZED_DELETE_MESSAGES_VAULT_RESTORE_TASK = "{\"type\":\"deletedMessages/restore\"," +
"\"userToRestore\":\"james\"," +
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 03/07: JAMES-2813 Extract
DeletedMessagesVaultRestoreTaskDTO
Posted by ro...@apache.org.
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 1a6010adf56d676329cc631b2b616513fec84427
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Tue Sep 3 17:12:14 2019 +0200
JAMES-2813 Extract DeletedMessagesVaultRestoreTaskDTO
---
.../routes/DeletedMessagesVaultRestoreTask.java | 72 +---------------
.../routes/DeletedMessagesVaultRestoreTaskDTO.java | 95 ++++++++++++++++++++++
...dMessagesVaultRestoreTaskSerializationTest.java | 4 +-
.../WebadminApiQuerySerializationContractTest.java | 4 +-
4 files changed, 103 insertions(+), 72 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
index 75249d5..ffe95d9 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java
@@ -23,90 +23,22 @@ import static org.apache.james.webadmin.vault.routes.RestoreService.RestoreResul
import java.util.Optional;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Function;
-
-import javax.inject.Inject;
import org.apache.james.core.User;
-import org.apache.james.json.DTOModule;
import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.server.task.json.dto.TaskDTO;
-import org.apache.james.server.task.json.dto.TaskDTOModule;
import org.apache.james.task.Task;
import org.apache.james.task.TaskExecutionDetails;
import org.apache.james.task.TaskType;
-import org.apache.james.vault.dto.query.QueryDTO;
-import org.apache.james.vault.dto.query.QueryTranslator;
import org.apache.james.vault.search.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
class DeletedMessagesVaultRestoreTask implements Task {
static final TaskType TYPE = TaskType.of("deletedMessages/restore");
- public static final Function<DeletedMessagesVaultRestoreTask.Factory, TaskDTOModule<DeletedMessagesVaultRestoreTask, DeletedMessagesVaultRestoreTaskDTO>> MODULE = (factory) ->
- DTOModule
- .forDomainObject(DeletedMessagesVaultRestoreTask.class)
- .convertToDTO(DeletedMessagesVaultRestoreTask.DeletedMessagesVaultRestoreTaskDTO.class)
- .toDomainObjectConverter(factory::create)
- .toDTOConverter(factory::createDTO)
- .typeName(TYPE.asString())
- .withFactory(TaskDTOModule::new);
-
- public static class DeletedMessagesVaultRestoreTaskDTO implements TaskDTO {
-
- private final String type;
- private final String userToRestore;
- private final QueryDTO query;
-
- public DeletedMessagesVaultRestoreTaskDTO(@JsonProperty("type") String type,
- @JsonProperty("userToRestore") String userToRestore,
- @JsonProperty("query") QueryDTO query) {
- this.type = type;
- this.userToRestore = userToRestore;
- this.query = query;
- }
-
- public String getUserToRestore() {
- return userToRestore;
- }
-
- public QueryDTO getQuery() {
- return query;
- }
-
- public String getType() {
- return type;
- }
-
- }
-
- public static class Factory {
-
- private final RestoreService restoreService;
- private final QueryTranslator queryTranslator;
-
- @Inject
- public Factory(RestoreService restoreService, QueryTranslator queryTranslator) {
- this.restoreService = restoreService;
- this.queryTranslator = queryTranslator;
- }
-
- public DeletedMessagesVaultRestoreTask create(DeletedMessagesVaultRestoreTask.DeletedMessagesVaultRestoreTaskDTO dto) {
- User userToRestore = User.fromUsername(dto.userToRestore);
- Query query = queryTranslator.translate(dto.query);
- return new DeletedMessagesVaultRestoreTask(restoreService, userToRestore, query);
- }
-
- public DeletedMessagesVaultRestoreTask.DeletedMessagesVaultRestoreTaskDTO createDTO(DeletedMessagesVaultRestoreTask task, String type) {
- return new DeletedMessagesVaultRestoreTask.DeletedMessagesVaultRestoreTaskDTO(type, task.userToRestore.asString(), queryTranslator.toDTO(task.query));
- }
- }
-
public static class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final User user;
private final AtomicLong successfulRestoreCount;
@@ -195,4 +127,8 @@ class DeletedMessagesVaultRestoreTask implements Task {
public Optional<TaskExecutionDetails.AdditionalInformation> details() {
return Optional.of(additionalInformation);
}
+
+ User getUserToRestore() {
+ return userToRestore;
+ }
}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskDTO.java
new file mode 100644
index 0000000..2b13f11
--- /dev/null
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskDTO.java
@@ -0,0 +1,95 @@
+/**
+ * *************************************************************
+ * 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 javax.inject.Inject;
+
+import org.apache.james.core.User;
+import org.apache.james.json.DTOModule;
+import org.apache.james.server.task.json.dto.TaskDTO;
+import org.apache.james.server.task.json.dto.TaskDTOModule;
+import org.apache.james.vault.dto.query.QueryDTO;
+import org.apache.james.vault.dto.query.QueryTranslator;
+import org.apache.james.vault.search.Query;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class DeletedMessagesVaultRestoreTaskDTO implements TaskDTO {
+
+ public static class Factory {
+
+ private final RestoreService restoreService;
+ private final QueryTranslator queryTranslator;
+
+ @Inject
+ public Factory(RestoreService restoreService, QueryTranslator queryTranslator) {
+ this.restoreService = restoreService;
+ this.queryTranslator = queryTranslator;
+ }
+
+ public DeletedMessagesVaultRestoreTask create(DeletedMessagesVaultRestoreTaskDTO dto) {
+ User userToRestore = User.fromUsername(dto.userToRestore);
+ Query query = queryTranslator.translate(dto.query);
+ return new DeletedMessagesVaultRestoreTask(restoreService, userToRestore, query);
+ }
+
+ public DeletedMessagesVaultRestoreTaskDTO createDTO(DeletedMessagesVaultRestoreTask task, String type) {
+ return new DeletedMessagesVaultRestoreTaskDTO(type, task.getUserToRestore().asString(), queryTranslator.toDTO(task.query));
+ }
+ }
+
+ public static final Function<DeletedMessagesVaultRestoreTaskDTO.Factory, TaskDTOModule<DeletedMessagesVaultRestoreTask, DeletedMessagesVaultRestoreTaskDTO>> MODULE = (factory) ->
+ DTOModule
+ .forDomainObject(DeletedMessagesVaultRestoreTask.class)
+ .convertToDTO(DeletedMessagesVaultRestoreTaskDTO.class)
+ .toDomainObjectConverter(factory::create)
+ .toDTOConverter(factory::createDTO)
+ .typeName(DeletedMessagesVaultRestoreTask.TYPE.asString())
+ .withFactory(TaskDTOModule::new);
+
+
+ private final String type;
+ private final String userToRestore;
+ private final QueryDTO query;
+
+ public DeletedMessagesVaultRestoreTaskDTO(@JsonProperty("type") String type,
+ @JsonProperty("userToRestore") String userToRestore,
+ @JsonProperty("query") QueryDTO query) {
+ this.type = type;
+ this.userToRestore = userToRestore;
+ this.query = query;
+ }
+
+ public String getUserToRestore() {
+ return userToRestore;
+ }
+
+ public QueryDTO getQuery() {
+ return query;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
index 48a82ec..d2bb22e 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
@@ -56,8 +56,8 @@ class DeletedMessagesVaultRestoreTaskSerializationTest {
@BeforeEach
void setUp() {
exportService = mock(RestoreService.class);
- DeletedMessagesVaultRestoreTask.Factory factory = new DeletedMessagesVaultRestoreTask.Factory(exportService, queryTranslator);
- taskSerializer = new JsonTaskSerializer(DeletedMessagesVaultRestoreTask.MODULE.apply(factory));
+ DeletedMessagesVaultRestoreTaskDTO.Factory factory = new DeletedMessagesVaultRestoreTaskDTO.Factory(exportService, queryTranslator);
+ taskSerializer = new JsonTaskSerializer(DeletedMessagesVaultRestoreTaskDTO.MODULE.apply(factory));
}
@Test
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebadminApiQuerySerializationContractTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebadminApiQuerySerializationContractTest.java
index 967ef88..f2e45d5 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebadminApiQuerySerializationContractTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/WebadminApiQuerySerializationContractTest.java
@@ -93,8 +93,8 @@ class WebadminApiQuerySerializationContractTest {
private final static TestId.Factory mailboxIdFactory = new TestId.Factory();
private final static QueryTranslator queryTranslator = new QueryTranslator(mailboxIdFactory);
private final static RestoreService restoreService = Mockito.mock(RestoreService.class);
- private final static DeletedMessagesVaultRestoreTask.Factory factory = new DeletedMessagesVaultRestoreTask.Factory(restoreService, queryTranslator);
- private final static JsonTaskSerializer taskSerializer = new JsonTaskSerializer(DeletedMessagesVaultRestoreTask.MODULE.apply(factory));
+ private final static DeletedMessagesVaultRestoreTaskDTO.Factory factory = new DeletedMessagesVaultRestoreTaskDTO.Factory(restoreService, queryTranslator);
+ private final static JsonTaskSerializer taskSerializer = new JsonTaskSerializer(DeletedMessagesVaultRestoreTaskDTO.MODULE.apply(factory));
/**
* Enforce that the format of the query serialized in json in the body of the request to the webadmin is stable.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 05/07: JAMES-2813 Extract
DeletedMessagesVaultExportTask
Posted by ro...@apache.org.
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 b0c05b5de7fde5c06a7f612575aca2649cd8a536
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Tue Sep 3 18:32:06 2019 +0200
JAMES-2813 Extract DeletedMessagesVaultExportTask
---
.../routes/DeletedMessagesVaultExportTask.java | 94 ++----------------
.../routes/DeletedMessagesVaultExportTaskDTO.java | 110 +++++++++++++++++++++
...edMessagesVaultExportTaskSerializationTest.java | 4 +-
3 files changed, 122 insertions(+), 86 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
index d10cc1c..59bbff1 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
@@ -22,105 +22,23 @@ package org.apache.james.webadmin.vault.routes;
import java.io.IOException;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Function;
-
-import javax.inject.Inject;
-import javax.mail.internet.AddressException;
import org.apache.james.core.MailAddress;
import org.apache.james.core.User;
-import org.apache.james.json.DTOModule;
-import org.apache.james.server.task.json.dto.TaskDTO;
-import org.apache.james.server.task.json.dto.TaskDTOModule;
import org.apache.james.task.Task;
import org.apache.james.task.TaskExecutionDetails;
import org.apache.james.task.TaskType;
-import org.apache.james.vault.dto.query.QueryDTO;
-import org.apache.james.vault.dto.query.QueryTranslator;
import org.apache.james.vault.search.Query;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
class DeletedMessagesVaultExportTask implements Task {
static final TaskType TYPE = TaskType.of("deletedMessages/export");
- public static final Function<DeletedMessagesVaultExportTask.Factory, TaskDTOModule<DeletedMessagesVaultExportTask, DeletedMessagesVaultExportTaskDTO>> MODULE = (factory) ->
- DTOModule
- .forDomainObject(DeletedMessagesVaultExportTask.class)
- .convertToDTO(DeletedMessagesVaultExportTask.DeletedMessagesVaultExportTaskDTO.class)
- .toDomainObjectConverter(dto -> {
- try {
- return factory.create(dto);
- } catch (AddressException e) {
- throw new RuntimeException(e);
- }
- })
- .toDTOConverter(factory::createDTO)
- .typeName(TYPE.asString())
- .withFactory(TaskDTOModule::new);
-
- public static class DeletedMessagesVaultExportTaskDTO implements TaskDTO {
-
- private final String type;
- private final String userExportFrom;
- private final QueryDTO exportQuery;
- private final String exportTo;
-
- public DeletedMessagesVaultExportTaskDTO(@JsonProperty("type") String type,
- @JsonProperty("userExportFrom") String userExportFrom,
- @JsonProperty("exportQuery") QueryDTO exportQuery,
- @JsonProperty("exportTo") String exportTo) {
- this.type = type;
- this.userExportFrom = userExportFrom;
- this.exportQuery = exportQuery;
- this.exportTo = exportTo;
- }
-
- public String getUserExportFrom() {
- return userExportFrom;
- }
-
- public QueryDTO getExportQuery() {
- return exportQuery;
- }
-
- public String getExportTo() {
- return exportTo;
- }
-
- public String getType() {
- return type;
- }
-
- }
-
- public static class Factory {
-
- private final ExportService exportService;
- private final QueryTranslator queryTranslator;
-
- @Inject
- public Factory(ExportService exportService, QueryTranslator queryTranslator) {
- this.exportService = exportService;
- this.queryTranslator = queryTranslator;
- }
-
- public DeletedMessagesVaultExportTask create(DeletedMessagesVaultExportTask.DeletedMessagesVaultExportTaskDTO dto) throws AddressException {
- User userExportFrom = User.fromUsername(dto.userExportFrom);
- Query exportQuery = queryTranslator.translate(dto.exportQuery);
- MailAddress exportTo = new MailAddress(dto.exportTo);
- return new DeletedMessagesVaultExportTask(exportService, userExportFrom, exportQuery, exportTo);
- }
-
- public DeletedMessagesVaultExportTask.DeletedMessagesVaultExportTaskDTO createDTO(DeletedMessagesVaultExportTask task, String type) {
- return new DeletedMessagesVaultExportTask.DeletedMessagesVaultExportTaskDTO(type, task.userExportFrom.asString(), queryTranslator.toDTO(task.exportQuery), task.exportTo.asString());
- }
- }
-
public class AdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final User userExportFrom;
@@ -151,7 +69,7 @@ class DeletedMessagesVaultExportTask implements Task {
private final ExportService exportService;
private final User userExportFrom;
@VisibleForTesting
- public final Query exportQuery;
+ final Query exportQuery;
private final MailAddress exportTo;
private final AtomicLong totalExportedMessages;
@@ -184,4 +102,12 @@ class DeletedMessagesVaultExportTask implements Task {
public Optional<TaskExecutionDetails.AdditionalInformation> details() {
return Optional.of(new AdditionalInformation(userExportFrom, exportTo, totalExportedMessages.get()));
}
+
+ User getUserExportFrom() {
+ return userExportFrom;
+ }
+
+ MailAddress getExportTo() {
+ return exportTo;
+ }
}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskDTO.java
new file mode 100644
index 0000000..2c46b41
--- /dev/null
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskDTO.java
@@ -0,0 +1,110 @@
+/**
+ * *************************************************************
+ * 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 javax.inject.Inject;
+import javax.mail.internet.AddressException;
+
+import org.apache.james.core.MailAddress;
+import org.apache.james.core.User;
+import org.apache.james.json.DTOModule;
+import org.apache.james.server.task.json.dto.TaskDTO;
+import org.apache.james.server.task.json.dto.TaskDTOModule;
+import org.apache.james.vault.dto.query.QueryDTO;
+import org.apache.james.vault.dto.query.QueryTranslator;
+import org.apache.james.vault.search.Query;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class DeletedMessagesVaultExportTaskDTO implements TaskDTO {
+
+ public static final Function<Factory, TaskDTOModule<DeletedMessagesVaultExportTask, DeletedMessagesVaultExportTaskDTO>> MODULE = (factory) ->
+ DTOModule
+ .forDomainObject(DeletedMessagesVaultExportTask.class)
+ .convertToDTO(DeletedMessagesVaultExportTaskDTO.class)
+ .toDomainObjectConverter(dto -> {
+ try {
+ return factory.create(dto);
+ } catch (AddressException e) {
+ throw new RuntimeException(e);
+ }
+ })
+ .toDTOConverter(factory::createDTO)
+ .typeName(DeletedMessagesVaultExportTask.TYPE.asString())
+ .withFactory(TaskDTOModule::new);
+
+ public static class Factory {
+
+ private final ExportService exportService;
+ private final QueryTranslator queryTranslator;
+
+ @Inject
+ public Factory(ExportService exportService, QueryTranslator queryTranslator) {
+ this.exportService = exportService;
+ this.queryTranslator = queryTranslator;
+ }
+
+ public DeletedMessagesVaultExportTask create(DeletedMessagesVaultExportTaskDTO dto) throws AddressException {
+ User userExportFrom = User.fromUsername(dto.userExportFrom);
+ Query exportQuery = queryTranslator.translate(dto.exportQuery);
+ MailAddress exportTo = new MailAddress(dto.exportTo);
+ return new DeletedMessagesVaultExportTask(exportService, userExportFrom, exportQuery, exportTo);
+ }
+
+ DeletedMessagesVaultExportTaskDTO createDTO(DeletedMessagesVaultExportTask task, String type) {
+ return new DeletedMessagesVaultExportTaskDTO(type, task.getUserExportFrom().asString(), queryTranslator.toDTO(task.exportQuery), task.getExportTo().asString());
+ }
+ }
+
+ private final String type;
+ private final String userExportFrom;
+ private final QueryDTO exportQuery;
+ private final String exportTo;
+
+ public DeletedMessagesVaultExportTaskDTO(@JsonProperty("type") String type,
+ @JsonProperty("userExportFrom") String userExportFrom,
+ @JsonProperty("exportQuery") QueryDTO exportQuery,
+ @JsonProperty("exportTo") String exportTo) {
+ this.type = type;
+ this.userExportFrom = userExportFrom;
+ this.exportQuery = exportQuery;
+ this.exportTo = exportTo;
+ }
+
+ public String getUserExportFrom() {
+ return userExportFrom;
+ }
+
+ public QueryDTO getExportQuery() {
+ return exportQuery;
+ }
+
+ public String getExportTo() {
+ return exportTo;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
index 86f60c4..5bd8648 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
@@ -66,8 +66,8 @@ class DeletedMessagesVaultExportTaskSerializationTest {
@BeforeEach
void setUp() {
exportService = mock(ExportService.class);
- DeletedMessagesVaultExportTask.Factory factory = new DeletedMessagesVaultExportTask.Factory(exportService, queryTranslator);
- taskSerializer = new JsonTaskSerializer(DeletedMessagesVaultExportTask.MODULE.apply(factory));
+ DeletedMessagesVaultExportTaskDTO.Factory factory = new DeletedMessagesVaultExportTaskDTO.Factory(exportService, queryTranslator);
+ taskSerializer = new JsonTaskSerializer(DeletedMessagesVaultExportTaskDTO.MODULE.apply(factory));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org