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 bfa896747c02cb17abac6461b867d25243b60ae0 Author: Benoit Tellier <[email protected]> AuthorDate: Tue Nov 17 17:03:05 2020 +0700 JAMES-3440 Generalize JMAP tasks RunningOptions for reuse --- .../jmap/MessageFastViewProjectionCorrector.java | 21 ---------------- .../RecomputeAllFastViewProjectionItemsTask.java | 1 - ...uteAllFastViewTaskAdditionalInformationDTO.java | 1 - .../RecomputeUserFastViewProjectionItemsTask.java | 1 - ...teUserFastViewTaskAdditionalInformationDTO.java | 1 - ...{RunningOptionsDTO.java => RunningOptions.java} | 28 ++++++++-------------- .../webadmin/data/jmap/RunningOptionsDTO.java | 2 -- .../webadmin/data/jmap/RunningOptionsParser.java | 2 -- ...ctionItemsTaskAdditionalInformationDTOTest.java | 1 - ...stViewProjectionItemsTaskSerializationTest.java | 1 - ...ctionItemsTaskAdditionalInformationDTOTest.java | 4 ++-- ...stViewProjectionItemsTaskSerializationTest.java | 1 - 12 files changed, 12 insertions(+), 52 deletions(-) diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/MessageFastViewProjectionCorrector.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/MessageFastViewProjectionCorrector.java index 612c6ca..ae8df05 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/MessageFastViewProjectionCorrector.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/MessageFastViewProjectionCorrector.java @@ -53,7 +53,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.github.fge.lambdas.Throwing; -import com.google.common.base.Preconditions; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -64,26 +63,6 @@ public class MessageFastViewProjectionCorrector { public static final int USER_CONCURRENCY = 1; public static final int MAILBOX_CONCURRENCY = 1; - public static class RunningOptions { - public static RunningOptions withMessageRatePerSecond(int messageRatePerSecond) { - return new RunningOptions(messageRatePerSecond); - } - - public static RunningOptions DEFAULT = new RunningOptions(10); - - private final int messagesPerSecond; - - public RunningOptions(int messagesPerSecond) { - Preconditions.checkArgument(messagesPerSecond > 0, "'messagesPerSecond' must be strictly positive"); - - this.messagesPerSecond = messagesPerSecond; - } - - public int getMessagesPerSecond() { - return messagesPerSecond; - } - } - private static class ProjectionEntry { private final MessageManager messageManager; private final MessageUid uid; diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTask.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTask.java index 5ff9dc5..f3ecd5a 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTask.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTask.java @@ -29,7 +29,6 @@ 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.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java index 5290fd1..8073074 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java @@ -25,7 +25,6 @@ import java.util.Optional; 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 org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTask.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTask.java index 3c4d90c..014044a 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTask.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTask.java @@ -20,7 +20,6 @@ package org.apache.james.webadmin.data.jmap; import static org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.Progress; -import static org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; import java.time.Clock; import java.time.Instant; diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java index 8ae9692..e0528cd 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java @@ -26,7 +26,6 @@ import org.apache.james.core.Username; 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 org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptions.java similarity index 61% copy from server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsDTO.java copy to server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptions.java index c8efe03..0ca7078 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsDTO.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptions.java @@ -19,32 +19,24 @@ package org.apache.james.webadmin.data.jmap; -import java.util.Optional; +import com.google.common.base.Preconditions; -import org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; +public class RunningOptions { + public static RunningOptions withMessageRatePerSecond(int messageRatePerSecond) { + return new RunningOptions(messageRatePerSecond); + } -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; + public static RunningOptions DEFAULT = new RunningOptions(10); -public class RunningOptionsDTO { - public static RunningOptionsDTO asDTO(RunningOptions domainObject) { - return new RunningOptionsDTO(Optional.of(domainObject.getMessagesPerSecond())); - } + private final int messagesPerSecond; - private final Optional<Integer> messagesPerSecond; + public RunningOptions(int messagesPerSecond) { + Preconditions.checkArgument(messagesPerSecond > 0, "'messagesPerSecond' must be strictly positive"); - @JsonCreator - public RunningOptionsDTO( - @JsonProperty("messagesPerSecond") Optional<Integer> messagesPerSecond) { this.messagesPerSecond = messagesPerSecond; } - public Optional<Integer> getMessagesPerSecond() { + public int getMessagesPerSecond() { return messagesPerSecond; } - - public RunningOptions asDomainObject() { - return messagesPerSecond.map(RunningOptions::withMessageRatePerSecond) - .orElse(RunningOptions.DEFAULT); - } } diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsDTO.java index c8efe03..0d27ec7 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsDTO.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsDTO.java @@ -21,8 +21,6 @@ package org.apache.james.webadmin.data.jmap; import java.util.Optional; -import org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsParser.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsParser.java index 8aebd6e..45e82c5 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsParser.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptionsParser.java @@ -21,8 +21,6 @@ package org.apache.james.webadmin.data.jmap; import java.util.Optional; -import org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; - import spark.Request; public class RunningOptionsParser { diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest.java index 5f301af..0a94124 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest.java +++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest.java @@ -26,7 +26,6 @@ import java.time.Instant; import org.apache.james.JsonSerializationVerifier; import org.apache.james.json.JsonGenericSerializer; import org.apache.james.util.ClassLoaderUtils; -import org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; import org.junit.jupiter.api.Test; class RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest { diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskSerializationTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskSerializationTest.java index fc9f89e..a31eea8 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskSerializationTest.java +++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewProjectionItemsTaskSerializationTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.mock; import org.apache.james.JsonSerializationVerifier; import org.apache.james.json.JsonGenericSerializer; import org.apache.james.util.ClassLoaderUtils; -import org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest.java index baeb7c1..ce0c123 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest.java +++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; class RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest { private static final Instant INSTANT = Instant.parse("2007-12-03T10:15:30.00Z"); private static final RecomputeUserFastViewProjectionItemsTask.AdditionalInformation DOMAIN_OBJECT = new RecomputeUserFastViewProjectionItemsTask.AdditionalInformation( - MessageFastViewProjectionCorrector.RunningOptions.withMessageRatePerSecond(20), + RunningOptions.withMessageRatePerSecond(20), Username.of("bob"), 2, 3, INSTANT); @Test @@ -51,7 +51,7 @@ class RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest { .deserialize(ClassLoaderUtils.getSystemResourceAsString("json/recomputeUser.additionalInformation.legacy.json")); RecomputeUserFastViewProjectionItemsTask.AdditionalInformation expected = new RecomputeUserFastViewProjectionItemsTask.AdditionalInformation( - MessageFastViewProjectionCorrector.RunningOptions.DEFAULT, + RunningOptions.DEFAULT, Username.of("bob"), 2, 3, diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskSerializationTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskSerializationTest.java index b5796ba..cb99cb1 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskSerializationTest.java +++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewProjectionItemsTaskSerializationTest.java @@ -26,7 +26,6 @@ import org.apache.james.JsonSerializationVerifier; import org.apache.james.core.Username; import org.apache.james.json.JsonGenericSerializer; import org.apache.james.util.ClassLoaderUtils; -import org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector.RunningOptions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
