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 31281c559d4ca8ff540e86ff939dc27f9f6a8f20 Author: Tran Tien Duc <[email protected]> AuthorDate: Mon Jan 6 10:11:49 2020 +0700 JAMES-2993 Rename `Previews` to `FastView` under discrepancy naming --- .../java/org/apache/james/modules/TaskSerializationModule.java | 8 ++++---- .../webadmin/data/jmap/MessageFastViewProjectionCorrector.java | 6 +++--- .../data/jmap/RecomputeAllFastViewProjectionItemsTask.java | 10 +++++----- ...a => RecomputeAllFastViewTaskAdditionalInformationDTO.java} | 10 +++++----- .../data/jmap/RecomputeUserFastViewProjectionItemsTask.java | 10 +++++----- ... => RecomputeUserFastViewTaskAdditionalInformationDTO.java} | 10 +++++----- ...astViewProjectionItemsTaskAdditionalInformationDTOTest.java | 2 +- ...astViewProjectionItemsTaskAdditionalInformationDTOTest.java | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/TaskSerializationModule.java b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/TaskSerializationModule.java index 2757813..46178f8 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/TaskSerializationModule.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/TaskSerializationModule.java @@ -54,9 +54,9 @@ import org.apache.james.vault.blob.BlobStoreVaultGarbageCollectionTaskAdditional import org.apache.james.vault.blob.BlobStoreVaultGarbageCollectionTaskDTO; import org.apache.james.webadmin.data.jmap.MessageFastViewProjectionCorrector; import org.apache.james.webadmin.data.jmap.RecomputeAllFastViewProjectionItemsTask; -import org.apache.james.webadmin.data.jmap.RecomputeAllPreviewsTaskAdditionalInformationDTO; +import org.apache.james.webadmin.data.jmap.RecomputeAllFastViewTaskAdditionalInformationDTO; import org.apache.james.webadmin.data.jmap.RecomputeUserFastViewProjectionItemsTask; -import org.apache.james.webadmin.data.jmap.RecomputeUserPreviewsTaskAdditionalInformationDTO; +import org.apache.james.webadmin.data.jmap.RecomputeUserFastViewTaskAdditionalInformationDTO; import org.apache.james.webadmin.service.CassandraMappingsSolveInconsistenciesTask; import org.apache.james.webadmin.service.ClearMailQueueTaskAdditionalInformationDTO; import org.apache.james.webadmin.service.ClearMailQueueTaskDTO; @@ -385,12 +385,12 @@ public class TaskSerializationModule extends AbstractModule { @ProvidesIntoSet public AdditionalInformationDTOModule<?, ?> recomputeAllJmapPreviewsAdditionalInformation() { - return RecomputeAllPreviewsTaskAdditionalInformationDTO.SERIALIZATION_MODULE; + return RecomputeAllFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE; } @ProvidesIntoSet public AdditionalInformationDTOModule<?, ?> recomputeUserJmapPreviewsAdditionalInformation() { - return RecomputeUserPreviewsTaskAdditionalInformationDTO.SERIALIZATION_MODULE; + return RecomputeUserFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE; } @Named(EVENT_NESTED_TYPES_INJECTION_NAME) 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 53a9c21..2ba423c 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 @@ -120,12 +120,12 @@ public class MessageFastViewProjectionCorrector { .concatMap(Throwing.function(messageManager -> correctMailboxProjectionItems(progress, messageManager, session))) .doOnComplete(progress.processedUserCount::incrementAndGet) .onErrorContinue((error, o) -> { - LOGGER.error("JMAP preview re-computation aborted for {}", username, error); + LOGGER.error("JMAP fastview re-computation aborted for {}", username, error); progress.failedUserCount.incrementAndGet(); }) .then(); } catch (MailboxException e) { - LOGGER.error("JMAP preview re-computation aborted for {} as we failed listing user mailboxes", username, e); + LOGGER.error("JMAP fastview re-computation aborted for {} as we failed listing user mailboxes", username, e); progress.failedUserCount.incrementAndGet(); return Mono.empty(); } @@ -138,7 +138,7 @@ public class MessageFastViewProjectionCorrector { .concatMap(pair -> storeProjectionEntry(pair) .doOnSuccess(any -> progress.processedMessageCount.incrementAndGet())) .onErrorContinue((error, triggeringValue) -> { - LOGGER.error("JMAP preview re-computation aborted for {} - {}", session.getUser(), triggeringValue, error); + LOGGER.error("JMAP fastview re-computation aborted for {} - {}", session.getUser(), triggeringValue, error); progress.failedMessageCount.incrementAndGet(); }) .then(); 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 9d3db13..5a95d37 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 @@ -83,10 +83,10 @@ public class RecomputeAllFastViewProjectionItemsTask implements Task { } } - public static class RecomputeAllPreviewsTaskDTO implements TaskDTO { + public static class RecomputeAllFastViewTaskDTO implements TaskDTO { private final String type; - public RecomputeAllPreviewsTaskDTO(@JsonProperty("type") String type) { + public RecomputeAllFastViewTaskDTO(@JsonProperty("type") String type) { this.type = type; } @@ -96,12 +96,12 @@ public class RecomputeAllFastViewProjectionItemsTask implements Task { } } - public static TaskDTOModule<RecomputeAllFastViewProjectionItemsTask, RecomputeAllPreviewsTaskDTO> module(MessageFastViewProjectionCorrector corrector) { + public static TaskDTOModule<RecomputeAllFastViewProjectionItemsTask, RecomputeAllFastViewTaskDTO> module(MessageFastViewProjectionCorrector corrector) { return DTOModule .forDomainObject(RecomputeAllFastViewProjectionItemsTask.class) - .convertToDTO(RecomputeAllPreviewsTaskDTO.class) + .convertToDTO(RecomputeAllFastViewTaskDTO.class) .toDomainObjectConverter(dto -> new RecomputeAllFastViewProjectionItemsTask(corrector)) - .toDTOConverter((task, type) -> new RecomputeAllPreviewsTaskDTO(type)) + .toDTOConverter((task, type) -> new RecomputeAllFastViewTaskDTO(type)) .typeName(TASK_TYPE.asString()) .withFactory(TaskDTOModule::new); } diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllPreviewsTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java similarity index 92% rename from server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllPreviewsTaskAdditionalInformationDTO.java rename to server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java index 56478e6..3c405d1 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllPreviewsTaskAdditionalInformationDTO.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeAllFastViewTaskAdditionalInformationDTO.java @@ -28,17 +28,17 @@ import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; -public class RecomputeAllPreviewsTaskAdditionalInformationDTO implements AdditionalInformationDTO { - public static final AdditionalInformationDTOModule<RecomputeAllFastViewProjectionItemsTask.AdditionalInformation, RecomputeAllPreviewsTaskAdditionalInformationDTO> SERIALIZATION_MODULE = +public class RecomputeAllFastViewTaskAdditionalInformationDTO implements AdditionalInformationDTO { + public static final AdditionalInformationDTOModule<RecomputeAllFastViewProjectionItemsTask.AdditionalInformation, RecomputeAllFastViewTaskAdditionalInformationDTO> SERIALIZATION_MODULE = DTOModule.forDomainObject(RecomputeAllFastViewProjectionItemsTask.AdditionalInformation.class) - .convertToDTO(RecomputeAllPreviewsTaskAdditionalInformationDTO.class) + .convertToDTO(RecomputeAllFastViewTaskAdditionalInformationDTO.class) .toDomainObjectConverter(dto -> new RecomputeAllFastViewProjectionItemsTask.AdditionalInformation( dto.getProcessedUserCount(), dto.getProcessedMessageCount(), dto.getFailedUserCount(), dto.getFailedMessageCount(), dto.timestamp)) - .toDTOConverter((details, type) -> new RecomputeAllPreviewsTaskAdditionalInformationDTO( + .toDTOConverter((details, type) -> new RecomputeAllFastViewTaskAdditionalInformationDTO( type, details.timestamp(), details.getProcessedUserCount(), @@ -56,7 +56,7 @@ public class RecomputeAllPreviewsTaskAdditionalInformationDTO implements Additio private final long failedMessageCount; @VisibleForTesting - RecomputeAllPreviewsTaskAdditionalInformationDTO(@JsonProperty("type") String type, + RecomputeAllFastViewTaskAdditionalInformationDTO(@JsonProperty("type") String type, @JsonProperty("timestamp") Instant timestamp, @JsonProperty("processedUserCount") long processedUserCount, @JsonProperty("processedMessageCount") long processedMessageCount, 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 4f30958..d29435a 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 @@ -76,11 +76,11 @@ public class RecomputeUserFastViewProjectionItemsTask implements Task { } } - public static class RecomputeUserPreviewsTaskDTO implements TaskDTO { + public static class RecomputeUserFastViewTaskDTO implements TaskDTO { private final String type; private final String username; - public RecomputeUserPreviewsTaskDTO( + public RecomputeUserFastViewTaskDTO( @JsonProperty("type") String type, @JsonProperty("username") String username) { this.type = type; @@ -97,12 +97,12 @@ public class RecomputeUserFastViewProjectionItemsTask implements Task { } } - public static TaskDTOModule<RecomputeUserFastViewProjectionItemsTask, RecomputeUserPreviewsTaskDTO> module(MessageFastViewProjectionCorrector corrector) { + public static TaskDTOModule<RecomputeUserFastViewProjectionItemsTask, RecomputeUserFastViewTaskDTO> module(MessageFastViewProjectionCorrector corrector) { return DTOModule .forDomainObject(RecomputeUserFastViewProjectionItemsTask.class) - .convertToDTO(RecomputeUserPreviewsTaskDTO.class) + .convertToDTO(RecomputeUserFastViewTaskDTO.class) .toDomainObjectConverter(dto -> new RecomputeUserFastViewProjectionItemsTask(corrector, Username.of(dto.username))) - .toDTOConverter((task, type) -> new RecomputeUserPreviewsTaskDTO(type, task.username.asString())) + .toDTOConverter((task, type) -> new RecomputeUserFastViewTaskDTO(type, task.username.asString())) .typeName(TASK_TYPE.asString()) .withFactory(TaskDTOModule::new); } diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserPreviewsTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java similarity index 92% rename from server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserPreviewsTaskAdditionalInformationDTO.java rename to server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java index 030c09c..f048a70 100644 --- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserPreviewsTaskAdditionalInformationDTO.java +++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RecomputeUserFastViewTaskAdditionalInformationDTO.java @@ -28,16 +28,16 @@ import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule; import com.fasterxml.jackson.annotation.JsonProperty; -public class RecomputeUserPreviewsTaskAdditionalInformationDTO implements AdditionalInformationDTO { - public static final AdditionalInformationDTOModule<RecomputeUserFastViewProjectionItemsTask.AdditionalInformation, RecomputeUserPreviewsTaskAdditionalInformationDTO> SERIALIZATION_MODULE = +public class RecomputeUserFastViewTaskAdditionalInformationDTO implements AdditionalInformationDTO { + public static final AdditionalInformationDTOModule<RecomputeUserFastViewProjectionItemsTask.AdditionalInformation, RecomputeUserFastViewTaskAdditionalInformationDTO> SERIALIZATION_MODULE = DTOModule.forDomainObject(RecomputeUserFastViewProjectionItemsTask.AdditionalInformation.class) - .convertToDTO(RecomputeUserPreviewsTaskAdditionalInformationDTO.class) + .convertToDTO(RecomputeUserFastViewTaskAdditionalInformationDTO.class) .toDomainObjectConverter(dto -> new RecomputeUserFastViewProjectionItemsTask.AdditionalInformation( Username.of(dto.username), dto.getProcessedMessageCount(), dto.getFailedMessageCount(), dto.timestamp)) - .toDTOConverter((details, type) -> new RecomputeUserPreviewsTaskAdditionalInformationDTO( + .toDTOConverter((details, type) -> new RecomputeUserFastViewTaskAdditionalInformationDTO( type, details.timestamp(), details.getUsername(), @@ -52,7 +52,7 @@ public class RecomputeUserPreviewsTaskAdditionalInformationDTO implements Additi private final long processedMessageCount; private final long failedMessageCount; - private RecomputeUserPreviewsTaskAdditionalInformationDTO(@JsonProperty("type") String type, + private RecomputeUserFastViewTaskAdditionalInformationDTO(@JsonProperty("type") String type, @JsonProperty("timestamp") Instant timestamp, @JsonProperty("username") String username, @JsonProperty("processedMessageCount") long processedMessageCount, 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 d1111bb..ad53227 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 @@ -31,7 +31,7 @@ class RecomputeAllFastViewProjectionItemsTaskAdditionalInformationDTOTest { @Test void shouldMatchJsonSerializationContract() throws Exception { - JsonSerializationVerifier.dtoModule(RecomputeAllPreviewsTaskAdditionalInformationDTO.SERIALIZATION_MODULE) + JsonSerializationVerifier.dtoModule(RecomputeAllFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE) .bean(DOMAIN_OBJECT) .json(ClassLoaderUtils.getSystemResourceAsString("json/recomputeAll.additionalInformation.json")) .verify(); 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 394d2b0..569b071 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 @@ -33,7 +33,7 @@ class RecomputeUserFastViewProjectionItemsTaskAdditionalInformationDTOTest { @Test void shouldMatchJsonSerializationContract() throws Exception { - JsonSerializationVerifier.dtoModule(RecomputeUserPreviewsTaskAdditionalInformationDTO.SERIALIZATION_MODULE) + JsonSerializationVerifier.dtoModule(RecomputeUserFastViewTaskAdditionalInformationDTO.SERIALIZATION_MODULE) .bean(DOMAIN_OBJECT) .json(ClassLoaderUtils.getSystemResourceAsString("json/recomputeUser.additionalInformation.json")) .verify(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
