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 2020/06/11 15:25:46 UTC

[james-project] 09/17: JAMES-3194 Rename SingleMailboxReindexingTask TYPE

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 c9b0a70176eb5d83e48cd476d3fdc702c77d9536
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 10 09:29:36 2020 +0700

    JAMES-3194 Rename SingleMailboxReindexingTask TYPE
---
 .../apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java   | 4 ++--
 .../SingleMailboxReindexingTaskAdditionalInformationDTO.java        | 2 +-
 .../mailbox/tools/indexer/SingleMailboxReindexingTaskDTO.java       | 2 +-
 ...WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java | 2 +-
 .../java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java  | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java
index 167889d..668b934 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTask.java
@@ -36,7 +36,7 @@ import com.google.common.annotations.VisibleForTesting;
 
 public class SingleMailboxReindexingTask implements Task {
 
-    public static final TaskType MAILBOX_RE_INDEXING = TaskType.of("mailbox-reindexing");
+    public static final TaskType TYPE = TaskType.of("mailbox-reindexing");
 
     public static class AdditionalInformation extends ReprocessingContextInformation {
         private final MailboxId mailboxId;
@@ -103,7 +103,7 @@ public class SingleMailboxReindexingTask implements Task {
 
     @Override
     public TaskType type() {
-        return MAILBOX_RE_INDEXING;
+        return TYPE;
     }
 
     public RunningOptions getRunningOptions() {
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java
index 37b1cb8..9ab460a 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskAdditionalInformationDTO.java
@@ -58,7 +58,7 @@ public class SingleMailboxReindexingTaskAdditionalInformationDTO implements Addi
                 details.timestamp(),
                 Optional.of(RunningOptionsDTO.toDTO(details.getRunningOptions()))
                 ))
-            .typeName(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString())
+            .typeName(SingleMailboxReindexingTask.TYPE.asString())
             .withFactory(AdditionalInformationDTOModule::new);
     }
 
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskDTO.java
index 067c07a..e03b1ee 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskDTO.java
@@ -38,7 +38,7 @@ public class SingleMailboxReindexingTaskDTO implements TaskDTO {
             .convertToDTO(SingleMailboxReindexingTaskDTO.class)
             .toDomainObjectConverter(factory::create)
             .toDTOConverter(SingleMailboxReindexingTaskDTO::of)
-            .typeName(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString())
+            .typeName(SingleMailboxReindexingTask.TYPE.asString())
             .withFactory(TaskDTOModule::new);
     }
 
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java
index 199177c..7b84cde 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java
@@ -46,7 +46,7 @@ public class WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO impleme
                 details.getFailedReprocessedMailCount(),
                 details.failures(),
                 details.timestamp()))
-            .typeName(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString())
+            .typeName(SingleMailboxReindexingTask.TYPE.asString())
             .withFactory(AdditionalInformationDTOModule::new);
     }
 
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
index 280399e..dfb5867 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
@@ -363,7 +363,7 @@ class MailboxesRoutesTest {
                 .then()
                     .body("status", is("completed"))
                     .body("taskId", is(notNullValue()))
-                    .body("type", is(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString()))
+                    .body("type", is(SingleMailboxReindexingTask.TYPE.asString()))
                     .body("additionalInformation.mailboxId", is(mailboxId.serialize()))
                     .body("additionalInformation.successfullyReprocessedMailCount", is(0))
                     .body("additionalInformation.failedReprocessedMailCount", is(0))
@@ -393,7 +393,7 @@ class MailboxesRoutesTest {
                 .then()
                     .body("status", is("completed"))
                     .body("taskId", is(notNullValue()))
-                    .body("type", is(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString()))
+                    .body("type", is(SingleMailboxReindexingTask.TYPE.asString()))
                     .body("additionalInformation.mailboxId", is(mailboxId.serialize()))
                     .body("additionalInformation.successfullyReprocessedMailCount", is(1))
                     .body("additionalInformation.failedReprocessedMailCount", is(0))
@@ -428,7 +428,7 @@ class MailboxesRoutesTest {
                 .then()
                     .body("status", is("failed"))
                     .body("taskId", is(notNullValue()))
-                    .body("type", is(SingleMailboxReindexingTask.MAILBOX_RE_INDEXING.asString()))
+                    .body("type", is(SingleMailboxReindexingTask.TYPE.asString()))
                     .body("additionalInformation.successfullyReprocessedMailCount", is(0))
                     .body("additionalInformation.failedReprocessedMailCount", is(1))
                     .body("additionalInformation.failures.\"" + mailboxId.serialize() + "\"[0].uid", is(Long.valueOf(uidAsLong).intValue()))


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org