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 26a4abebdde2d90735d3988a7088b71a8a409b0d
Author: Gautier DI FOLCO <gdifo...@linagora.com>
AuthorDate: Wed Sep 4 14:39:38 2019 +0200

    JAMES-2813 Add MappingsSourcesMigrationTask serialization
---
 .../migration/MappingsSourcesMigration.java        |  4 +-
 .../migration/MappingsSourcesMigrationTaskDTO.java | 60 ++++++++++++++++++++++
 ...pingsSourcesMigrationTaskSerializationTest.java | 52 +++++++++++++++++++
 3 files changed, 114 insertions(+), 2 deletions(-)

diff --git 
a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigration.java
 
b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigration.java
index 425a6e9..dd61851 100644
--- 
a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigration.java
+++ 
b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigration.java
@@ -41,7 +41,7 @@ import reactor.core.publisher.Mono;
 
 public class MappingsSourcesMigration implements Migration {
 
-    private static class MappingsSourcesMigrationTask implements Task {
+    public static class MappingsSourcesMigrationTask implements Task {
 
         private final MappingsSourcesMigration migration;
 
@@ -66,7 +66,7 @@ public class MappingsSourcesMigration implements Migration {
     }
 
     private static final Logger LOGGER = 
LoggerFactory.getLogger(MappingsSourcesMigration.class);
-    private static final TaskType TYPE = 
TaskType.of("mappingsSourcesMigration");
+    public static final TaskType TYPE = 
TaskType.of("mappingsSourcesMigration");
 
     public static class AdditionalInformation implements 
TaskExecutionDetails.AdditionalInformation {
         private final long successfulMappingsCount;
diff --git 
a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskDTO.java
 
b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskDTO.java
new file mode 100644
index 0000000..d2d45a2
--- /dev/null
+++ 
b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskDTO.java
@@ -0,0 +1,60 @@
+/**
+ * *************************************************************
+ * 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.rrt.cassandra.migration;
+
+import java.util.function.Function;
+
+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;
+
+public class MappingsSourcesMigrationTaskDTO implements TaskDTO {
+
+    private static MappingsSourcesMigrationTaskDTO 
fromDomainObject(MappingsSourcesMigration.MappingsSourcesMigrationTask task, 
String type) {
+        return new MappingsSourcesMigrationTaskDTO(type);
+    }
+
+    public static final Function<MappingsSourcesMigration, 
TaskDTOModule<MappingsSourcesMigration.MappingsSourcesMigrationTask, 
MappingsSourcesMigrationTaskDTO>> MODULE = (migration) ->
+        DTOModule
+            
.forDomainObject(MappingsSourcesMigration.MappingsSourcesMigrationTask.class)
+            .convertToDTO(MappingsSourcesMigrationTaskDTO.class)
+            .toDomainObjectConverter(dto -> dto.toDomainObject(migration))
+            .toDTOConverter(MappingsSourcesMigrationTaskDTO::fromDomainObject)
+            .typeName(MappingsSourcesMigration.TYPE.asString())
+            .withFactory(TaskDTOModule::new);
+
+    private final String type;
+
+    public MappingsSourcesMigrationTaskDTO(@JsonProperty("type") String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    private MappingsSourcesMigration.MappingsSourcesMigrationTask 
toDomainObject(MappingsSourcesMigration migration) {
+        return new 
MappingsSourcesMigration.MappingsSourcesMigrationTask(migration);
+    }
+}
diff --git 
a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
 
b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
new file mode 100644
index 0000000..7853b9c
--- /dev/null
+++ 
b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
@@ -0,0 +1,52 @@
+/**
+ * *************************************************************
+ * 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.rrt.cassandra.migration;
+
+import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import java.io.IOException;
+
+import org.apache.james.server.task.json.JsonTaskSerializer;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.junit.jupiter.api.Test;
+
+class MappingsSourcesMigrationTaskSerializationTest {
+    private static final MappingsSourcesMigration MIGRATION = 
mock(MappingsSourcesMigration.class);
+    private static final MappingsSourcesMigration.MappingsSourcesMigrationTask 
TASK = new MappingsSourcesMigration.MappingsSourcesMigrationTask(MIGRATION);
+    private static final String SERIALIZED_TASK = "{\"type\": 
\"mappingsSourcesMigration\"}";
+
+    private static final JsonTaskSerializer TASK_SERIALIZER = new 
JsonTaskSerializer(MappingsSourcesMigrationTaskDTO.MODULE.apply(MIGRATION));
+
+    @Test
+    void taskShouldBeSerializable() throws JsonProcessingException {
+        assertThatJson(TASK_SERIALIZER.serialize(TASK))
+            .isEqualTo(SERIALIZED_TASK);
+    }
+
+    @Test
+    void taskShouldBeDeserializable() throws IOException {
+        assertThat(TASK_SERIALIZER.deserialize(SERIALIZED_TASK))
+            .isEqualToComparingFieldByField(TASK);
+    }
+}
\ 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

Reply via email to