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 d1606c088f3ff4d44307314bd56a12887f1519b4
Author: Rémi Kowalski <rkowal...@linagora.com>
AuthorDate: Wed Sep 4 10:49:00 2019 +0200
JAMES-2813 extract EventDeadLettersRedeliverTaskDTO
---
.../service/EventDeadLettersRedeliverTask.java | 28 ------------
.../service/EventDeadLettersRedeliverTaskDTO.java | 50 ++++++++++++++++++++++
.../service/EventDeadLettersRedeliverTaskTest.java | 6 +--
3 files changed, 53 insertions(+), 31 deletions(-)
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTask.java
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTask.java
index 53a4832..845e456 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTask.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTask.java
@@ -21,19 +21,14 @@ package org.apache.james.webadmin.service;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.BiFunction;
-import org.apache.james.json.DTOModule;
import org.apache.james.mailbox.events.EventDeadLetters;
import org.apache.james.mailbox.events.Group;
-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 com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
public class EventDeadLettersRedeliverTask implements Task {
public static final TaskType TYPE =
TaskType.of("eventDeadLettersRedeliverTask");
@@ -71,29 +66,6 @@ public class EventDeadLettersRedeliverTask implements Task {
}
}
- private static class EventDeadLettersRedeliverTaskDTO implements TaskDTO {
-
- private final String type;
-
- public EventDeadLettersRedeliverTaskDTO(@JsonProperty("type") String
type) {
- this.type = type;
- }
-
- @Override
- public String getType() {
- return type;
- }
- }
-
- public static final BiFunction<EventDeadLettersRedeliverService,
EventRetriever, TaskDTOModule<EventDeadLettersRedeliverTask,
EventDeadLettersRedeliverTaskDTO>> MODULE = (service, eventRetriever) ->
- DTOModule
- .forDomainObject(EventDeadLettersRedeliverTask.class)
- .convertToDTO(EventDeadLettersRedeliverTaskDTO.class)
- .toDomainObjectConverter(dto -> new
EventDeadLettersRedeliverTask(service, eventRetriever))
- .toDTOConverter((domainObject, typeName) -> new
EventDeadLettersRedeliverTaskDTO(typeName))
- .typeName(TYPE.asString())
- .withFactory(TaskDTOModule::new);
-
private final EventDeadLettersRedeliverService service;
private final EventRetriever eventRetriever;
private final AtomicLong successfulRedeliveriesCount;
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskDTO.java
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskDTO.java
new file mode 100644
index 0000000..4f04af0
--- /dev/null
+++
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskDTO.java
@@ -0,0 +1,50 @@
+/****************************************************************
+ * 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.service;
+
+import java.util.function.BiFunction;
+
+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;
+
+class EventDeadLettersRedeliverTaskDTO implements TaskDTO {
+
+ public static final BiFunction<EventDeadLettersRedeliverService,
EventRetriever, TaskDTOModule<EventDeadLettersRedeliverTask,
EventDeadLettersRedeliverTaskDTO>> MODULE = (service, eventRetriever) ->
+ DTOModule
+ .forDomainObject(EventDeadLettersRedeliverTask.class)
+ .convertToDTO(EventDeadLettersRedeliverTaskDTO.class)
+ .toDomainObjectConverter(dto -> new
EventDeadLettersRedeliverTask(service, eventRetriever))
+ .toDTOConverter((domainObject, typeName) -> new
EventDeadLettersRedeliverTaskDTO(typeName))
+ .typeName(EventDeadLettersRedeliverTask.TYPE.asString())
+ .withFactory(TaskDTOModule::new);
+
+ private final String type;
+
+ public EventDeadLettersRedeliverTaskDTO(@JsonProperty("type") String type)
{
+ this.type = type;
+ }
+
+ @Override
+ public String getType() {
+ return type;
+ }
+}
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
index 8e5814d..f3382a3 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
@@ -24,18 +24,18 @@ import static org.mockito.Mockito.mock;
import java.io.IOException;
-import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.james.server.task.json.JsonTaskSerializer;
+import org.junit.jupiter.api.Test;
+import com.fasterxml.jackson.core.JsonProcessingException;
import net.javacrumbs.jsonunit.assertj.JsonAssertions;
-import org.junit.jupiter.api.Test;
class EventDeadLettersRedeliverTaskTest {
private static final String SERIALIZED =
"{\"type\":\"eventDeadLettersRedeliverTask\"}";
private static final EventDeadLettersRedeliverService SERVICE =
mock(EventDeadLettersRedeliverService.class);
private static final EventRetriever EVENT_RETRIEVER =
mock(EventRetriever.class);
private static final EventDeadLettersRedeliverTask TASK = new
EventDeadLettersRedeliverTask(SERVICE, EVENT_RETRIEVER);
- private static final JsonTaskSerializer TESTEE = new
JsonTaskSerializer(EventDeadLettersRedeliverTask.MODULE.apply(SERVICE,
EVENT_RETRIEVER));
+ private static final JsonTaskSerializer TESTEE = new
JsonTaskSerializer(EventDeadLettersRedeliverTaskDTO.MODULE.apply(SERVICE,
EVENT_RETRIEVER));
@Test
void taskShouldBeSerializable() throws JsonProcessingException {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
