You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/03/11 05:11:01 UTC
[james-project] 02/03: JAMES-3723 Fix a typo Reprocessing/Reindexing
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 33f3d94bd3d390b2d3a7dc267569de7e9498546c
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat Mar 5 22:08:14 2022 +0700
JAMES-3723 Fix a typo Reprocessing/Reindexing
---
.../tools/indexer/ErrorRecoveryIndexationTask.java | 14 ++--
.../mailbox/tools/indexer/FullReindexingTask.java | 14 ++--
.../mailbox/tools/indexer/ReIndexerPerformer.java | 38 +++++-----
...ocessingContext.java => ReIndexingContext.java} | 4 +-
...tion.java => ReIndexingContextInformation.java} | 6 +-
...O.java => ReIndexingContextInformationDTO.java} | 58 +++++++-------
.../tools/indexer/SingleMailboxReindexingTask.java | 14 ++--
...lboxReindexingTaskAdditionalInformationDTO.java | 28 +++----
.../tools/indexer/SingleMessageReindexingTask.java | 2 +-
.../mailbox/tools/indexer/UserReindexingTask.java | 14 ++--
...UserReindexingTaskAdditionalInformationDTO.java | 24 +++---
.../tools/indexer/CassandraReIndexerImplTest.java | 12 +--
...rorRecoveryIndexationTaskSerializationTest.java | 14 ++--
.../FullReindexingTaskSerializationTest.java | 10 +--
.../mailbox/ReIndexingTaskSerializationModule.java | 6 +-
.../WebAdminReIndexingTaskSerializationModule.java | 6 +-
...> WebAdminIndexationContextInformationDTO.java} | 22 +++---
...lboxReindexingTaskAdditionalInformationDTO.java | 4 +-
...UserReindexingTaskAdditionalInformationDTO.java | 4 +-
...bAdminIndexationContextInformationDTOTest.java} | 20 ++---
...a => WebAdminSingleMailboxIndexingDTOTest.java} | 2 +-
...est.java => WebAdminUserReIndexingDTOTest.java} | 2 +-
.../james/webadmin/routes/MailboxesRoutesTest.java | 88 +++++++++++-----------
.../james/webadmin/routes/MessageRoutesTest.java | 2 +-
.../webadmin/routes/UserMailboxesRoutesTest.java | 3 +-
25 files changed, 205 insertions(+), 206 deletions(-)
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java
index 5f5c1e4..28c13a2 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTask.java
@@ -77,20 +77,20 @@ public class ErrorRecoveryIndexationTask implements Task {
}
private final ReIndexerPerformer reIndexerPerformer;
- private final ReprocessingContext reprocessingContext;
+ private final ReIndexingContext reIndexingContext;
private final ReIndexingExecutionFailures previousFailures;
private final RunningOptions runningOptions;
public ErrorRecoveryIndexationTask(ReIndexerPerformer reIndexerPerformer, ReIndexingExecutionFailures previousFailures, RunningOptions runningOptions) {
this.reIndexerPerformer = reIndexerPerformer;
this.previousFailures = previousFailures;
- this.reprocessingContext = new ReprocessingContext();
+ this.reIndexingContext = new ReIndexingContext();
this.runningOptions = runningOptions;
}
@Override
public Result run() {
- return reIndexerPerformer.reIndexErrors(reprocessingContext, previousFailures, runningOptions).block();
+ return reIndexerPerformer.reIndexErrors(reIndexingContext, previousFailures, runningOptions).block();
}
@Override
@@ -108,10 +108,10 @@ public class ErrorRecoveryIndexationTask implements Task {
@Override
public Optional<TaskExecutionDetails.AdditionalInformation> details() {
- return Optional.of(new ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask(
- reprocessingContext.successfullyReprocessedMailCount(),
- reprocessingContext.failedReprocessingMailCount(),
- reprocessingContext.failures(),
+ return Optional.of(new ReIndexingContextInformationDTO.ReIndexingContextInformationForErrorRecoveryIndexationTask(
+ reIndexingContext.successfullyReprocessedMailCount(),
+ reIndexingContext.failedReprocessingMailCount(),
+ reIndexingContext.failures(),
Clock.systemUTC().instant(),
runningOptions));
}
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java
index b99eb5f..f974cb3 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/FullReindexingTask.java
@@ -36,19 +36,19 @@ public class FullReindexingTask implements Task {
public static final TaskType FULL_RE_INDEXING = TaskType.of("full-reindexing");
private final ReIndexerPerformer reIndexerPerformer;
- private final ReprocessingContext reprocessingContext;
+ private final ReIndexingContext reIndexingContext;
private final RunningOptions runningOptions;
@Inject
public FullReindexingTask(ReIndexerPerformer reIndexerPerformer, RunningOptions runningOptions) {
this.reIndexerPerformer = reIndexerPerformer;
- this.reprocessingContext = new ReprocessingContext();
+ this.reIndexingContext = new ReIndexingContext();
this.runningOptions = runningOptions;
}
@Override
public Result run() {
- return reIndexerPerformer.reIndexAllMessages(reprocessingContext, runningOptions)
+ return reIndexerPerformer.reIndexAllMessages(reIndexingContext, runningOptions)
.onErrorResume(e -> Mono.just(Result.PARTIAL))
.block();
}
@@ -64,10 +64,10 @@ public class FullReindexingTask implements Task {
@Override
public Optional<TaskExecutionDetails.AdditionalInformation> details() {
- return Optional.of(new ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask(
- reprocessingContext.successfullyReprocessedMailCount(),
- reprocessingContext.failedReprocessingMailCount(),
- reprocessingContext.failures(),
+ return Optional.of(new ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask(
+ reIndexingContext.successfullyReprocessedMailCount(),
+ reIndexingContext.failedReprocessingMailCount(),
+ reIndexingContext.failures(),
Clock.systemUTC().instant(),
runningOptions));
}
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java
index 5f32f55..9844ab7 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexerPerformer.java
@@ -84,7 +84,7 @@ public class ReIndexerPerformer {
}
private interface Failure {
- void recordFailure(ReprocessingContext context);
+ void recordFailure(ReIndexingContext context);
}
private static class MailboxFailure implements Failure {
@@ -99,7 +99,7 @@ public class ReIndexerPerformer {
}
@Override
- public void recordFailure(ReprocessingContext context) {
+ public void recordFailure(ReIndexingContext context) {
context.recordMailboxFailure(mailboxId);
}
}
@@ -122,7 +122,7 @@ public class ReIndexerPerformer {
}
@Override
- public void recordFailure(ReprocessingContext context) {
+ public void recordFailure(ReIndexingContext context) {
context.recordFailureDetailsForMessage(mailboxId, uid);
}
}
@@ -146,28 +146,28 @@ public class ReIndexerPerformer {
this.mailboxSessionMapperFactory = mailboxSessionMapperFactory;
}
- Mono<Result> reIndexAllMessages(ReprocessingContext reprocessingContext, RunningOptions runningOptions) {
+ Mono<Result> reIndexAllMessages(ReIndexingContext reIndexingContext, RunningOptions runningOptions) {
MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXER_PERFORMER_USER);
LOGGER.info("Starting a full reindex");
Flux<Either<Failure, ReIndexingEntry>> entriesToIndex = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).list()
.flatMap(mailbox -> reIndexingEntriesForMailbox(mailbox, mailboxSession, runningOptions), MAILBOX_CONCURRENCY);
- return reIndexMessages(entriesToIndex, runningOptions, reprocessingContext)
+ return reIndexMessages(entriesToIndex, runningOptions, reIndexingContext)
.doFinally(any -> LOGGER.info("Full reindex finished"));
}
- Mono<Result> reIndexSingleMailbox(MailboxId mailboxId, ReprocessingContext reprocessingContext, RunningOptions runningOptions) {
+ Mono<Result> reIndexSingleMailbox(MailboxId mailboxId, ReIndexingContext reIndexingContext, RunningOptions runningOptions) {
MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXER_PERFORMER_USER);
Flux<Either<Failure, ReIndexingEntry>> entriesToIndex = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession)
.findMailboxById(mailboxId)
.flatMapMany(mailbox -> reIndexingEntriesForMailbox(mailbox, mailboxSession, runningOptions));
- return reIndexMessages(entriesToIndex, runningOptions, reprocessingContext);
+ return reIndexMessages(entriesToIndex, runningOptions, reIndexingContext);
}
- Mono<Result> reIndexUserMailboxes(Username username, ReprocessingContext reprocessingContext, RunningOptions runningOptions) {
+ Mono<Result> reIndexUserMailboxes(Username username, ReIndexingContext reIndexingContext, RunningOptions runningOptions) {
MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
MailboxMapper mailboxMapper = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession);
LOGGER.info("Starting a reindex for user {}", username.asString());
@@ -178,7 +178,7 @@ public class ReIndexerPerformer {
Flux<Either<Failure, ReIndexingEntry>> entriesToIndex = mailboxMapper.findMailboxWithPathLike(mailboxQuery.asUserBound())
.flatMap(mailbox -> reIndexingEntriesForMailbox(mailbox, mailboxSession, runningOptions), MAILBOX_CONCURRENCY);
- return reIndexMessages(entriesToIndex, runningOptions, reprocessingContext)
+ return reIndexMessages(entriesToIndex, runningOptions, reIndexingContext)
.doFinally(any -> LOGGER.info("User {} reindex finished", username.asString()));
} catch (Exception e) {
LOGGER.error("Error fetching mailboxes for user: {}", username.asString());
@@ -186,7 +186,7 @@ public class ReIndexerPerformer {
}
}
- Mono<Result> reIndexSingleMessage(MailboxId mailboxId, MessageUid uid, ReprocessingContext reprocessingContext) {
+ Mono<Result> reIndexSingleMessage(MailboxId mailboxId, MessageUid uid, ReIndexingContext reIndexingContext) {
MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXER_PERFORMER_USER);
return mailboxSessionMapperFactory.getMailboxMapper(mailboxSession)
@@ -211,7 +211,7 @@ public class ReIndexerPerformer {
});
}
- Mono<Result> reIndexErrors(ReprocessingContext reprocessingContext, ReIndexingExecutionFailures previousReIndexingFailures, RunningOptions runningOptions) {
+ Mono<Result> reIndexErrors(ReIndexingContext reIndexingContext, ReIndexingExecutionFailures previousReIndexingFailures, RunningOptions runningOptions) {
MailboxSession mailboxSession = mailboxManager.createSystemSession(RE_INDEXER_PERFORMER_USER);
MailboxMapper mapper = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession);
@@ -226,7 +226,7 @@ public class ReIndexerPerformer {
return Mono.just(Either.left(new MailboxFailure(mailboxId)));
}), MAILBOX_CONCURRENCY));
- return reIndexMessages(entriesToIndex, runningOptions, reprocessingContext);
+ return reIndexMessages(entriesToIndex, runningOptions, reIndexingContext);
}
private Mono<Result> reIndex(MailboxMessage mailboxMessage, MailboxSession session) {
@@ -281,29 +281,29 @@ public class ReIndexerPerformer {
}
}
- private Mono<Task.Result> reIndexMessages(Flux<Either<Failure, ReIndexingEntry>> entriesToIndex, RunningOptions runningOptions, ReprocessingContext reprocessingContext) {
+ private Mono<Task.Result> reIndexMessages(Flux<Either<Failure, ReIndexingEntry>> entriesToIndex, RunningOptions runningOptions, ReIndexingContext reIndexingContext) {
return entriesToIndex.transform(
ReactorUtils.<Either<Failure, ReIndexingEntry>, Task.Result>throttle()
.elements(runningOptions.getMessagesPerSecond())
.per(Duration.ofSeconds(1))
- .forOperation(entry -> reIndex(entry, reprocessingContext, runningOptions)))
+ .forOperation(entry -> reIndex(entry, reIndexingContext, runningOptions)))
.reduce(Task::combine)
.switchIfEmpty(Mono.just(Result.COMPLETED));
}
- private Mono<Task.Result> reIndex(Either<Failure, ReIndexingEntry> failureOrEntry, ReprocessingContext reprocessingContext, RunningOptions runningOptions) {
+ private Mono<Task.Result> reIndex(Either<Failure, ReIndexingEntry> failureOrEntry, ReIndexingContext reIndexingContext, RunningOptions runningOptions) {
return toMono(failureOrEntry.map(entry -> reIndex(entry, runningOptions)))
.map(this::flatten)
- .map(failureOrTaskResult -> recordIndexingResult(failureOrTaskResult, reprocessingContext));
+ .map(failureOrTaskResult -> recordIndexingResult(failureOrTaskResult, reIndexingContext));
}
- private Result recordIndexingResult(Either<Failure, Result> failureOrTaskResult, ReprocessingContext reprocessingContext) {
+ private Result recordIndexingResult(Either<Failure, Result> failureOrTaskResult, ReIndexingContext reIndexingContext) {
return failureOrTaskResult.fold(
failure -> {
- failure.recordFailure(reprocessingContext);
+ failure.recordFailure(reIndexingContext);
return Result.PARTIAL;
},
- result -> result.onComplete(reprocessingContext::recordSuccess));
+ result -> result.onComplete(reIndexingContext::recordSuccess));
}
private Mono<Either<Failure, Result>> reIndex(ReIndexingEntry entry, RunningOptions runningOptions) {
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContext.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexingContext.java
similarity index 98%
rename from mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContext.java
rename to mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexingContext.java
index bc4facb..5a8b0a7 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContext.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexingContext.java
@@ -28,13 +28,13 @@ import org.apache.james.mailbox.model.MailboxId;
import com.google.common.collect.ImmutableList;
-class ReprocessingContext {
+class ReIndexingContext {
private final AtomicInteger successfullyReprocessedMails;
private final AtomicInteger failedReprocessingMails;
private final ConcurrentLinkedDeque<ReIndexingExecutionFailures.ReIndexingFailure> failures;
private final ConcurrentLinkedDeque<MailboxId> mailboxFailures;
- ReprocessingContext() {
+ ReIndexingContext() {
failedReprocessingMails = new AtomicInteger(0);
successfullyReprocessedMails = new AtomicInteger(0);
failures = new ConcurrentLinkedDeque<>();
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformation.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexingContextInformation.java
similarity index 87%
rename from mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformation.java
rename to mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexingContextInformation.java
index 0dc02b0..41aace0 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformation.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexingContextInformation.java
@@ -26,7 +26,7 @@ import org.apache.james.mailbox.indexer.ReIndexer.RunningOptions;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
import org.apache.james.task.TaskExecutionDetails;
-public class ReprocessingContextInformation implements TaskExecutionDetails.AdditionalInformation, IndexingDetailInformation {
+public class ReIndexingContextInformation implements TaskExecutionDetails.AdditionalInformation, IndexingDetailInformation {
private final int successfullyReprocessedMailCount;
private final int failedReprocessedMailCount;
@@ -34,8 +34,8 @@ public class ReprocessingContextInformation implements TaskExecutionDetails.Addi
private final Instant timestamp;
private final RunningOptions runningOptions;
- ReprocessingContextInformation(int successfullyReprocessedMailCount, int failedReprocessedMailCount,
- ReIndexingExecutionFailures failures, Instant timestamp, RunningOptions runningOptions) {
+ ReIndexingContextInformation(int successfullyReprocessedMailCount, int failedReprocessedMailCount,
+ ReIndexingExecutionFailures failures, Instant timestamp, RunningOptions runningOptions) {
this.successfullyReprocessedMailCount = successfullyReprocessedMailCount;
this.failedReprocessedMailCount = failedReprocessedMailCount;
this.failures = failures;
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexingContextInformationDTO.java
similarity index 80%
rename from mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java
rename to mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexingContextInformationDTO.java
index d22ea83..c458630 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformationDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReIndexingContextInformationDTO.java
@@ -40,7 +40,7 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableListMultimap;
-public class ReprocessingContextInformationDTO implements AdditionalInformationDTO {
+public class ReIndexingContextInformationDTO implements AdditionalInformationDTO {
public static class ReindexingFailureDTO {
@@ -61,9 +61,9 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
}
}
- public static class ReprocessingContextInformationForErrorRecoveryIndexationTask extends ReprocessingContextInformation {
+ public static class ReIndexingContextInformationForErrorRecoveryIndexationTask extends ReIndexingContextInformation {
- public static class DTO extends ReprocessingContextInformationDTO {
+ public static class DTO extends ReIndexingContextInformationDTO {
DTO(@JsonProperty("type") String type,
@JsonProperty("successfullyReprocessedMailCount") int successfullyReprocessedMailCount,
@@ -77,10 +77,10 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
}
}
- public static AdditionalInformationDTOModule<ReprocessingContextInformationForErrorRecoveryIndexationTask, DTO> module(MailboxId.Factory mailboxIdFactory) {
- return DTOModule.forDomainObject(ReprocessingContextInformationForErrorRecoveryIndexationTask.class)
+ public static AdditionalInformationDTOModule<ReIndexingContextInformationForErrorRecoveryIndexationTask, DTO> module(MailboxId.Factory mailboxIdFactory) {
+ return DTOModule.forDomainObject(ReIndexingContextInformationForErrorRecoveryIndexationTask.class)
.convertToDTO(DTO.class)
- .toDomainObjectConverter(dto -> new ReprocessingContextInformationForErrorRecoveryIndexationTask(
+ .toDomainObjectConverter(dto -> new ReIndexingContextInformationForErrorRecoveryIndexationTask(
dto.successfullyReprocessedMailCount,
dto.failedReprocessedMailCount,
deserializeFailures(mailboxIdFactory, dto.messageFailures, dto.mailboxFailures.orElse(ImmutableList.of())),
@@ -103,18 +103,18 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
}
@VisibleForTesting
- public ReprocessingContextInformationForErrorRecoveryIndexationTask(int successfullyReprocessedMailCount,
- int failedReprocessedMailCount,
- ReIndexingExecutionFailures failures,
- Instant timestamp,
- RunningOptions runningOptions) {
+ public ReIndexingContextInformationForErrorRecoveryIndexationTask(int successfullyReprocessedMailCount,
+ int failedReprocessedMailCount,
+ ReIndexingExecutionFailures failures,
+ Instant timestamp,
+ RunningOptions runningOptions) {
super(successfullyReprocessedMailCount, failedReprocessedMailCount, failures, timestamp, runningOptions);
}
}
- public static class ReprocessingContextInformationForFullReindexingTask extends ReprocessingContextInformation {
+ public static class ReIndexingContextInformationForFullReindexingTask extends ReIndexingContextInformation {
- public static class DTO extends ReprocessingContextInformationDTO {
+ public static class DTO extends ReIndexingContextInformationDTO {
DTO(@JsonProperty("type") String type,
@JsonProperty("successfullyReprocessedMailCount") int successfullyReprocessedMailCount,
@@ -128,10 +128,10 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
}
}
- public static AdditionalInformationDTOModule<ReprocessingContextInformationForFullReindexingTask, DTO> module(MailboxId.Factory mailboxIdFactory) {
- return DTOModule.forDomainObject(ReprocessingContextInformationForFullReindexingTask.class)
+ public static AdditionalInformationDTOModule<ReIndexingContextInformationForFullReindexingTask, DTO> module(MailboxId.Factory mailboxIdFactory) {
+ return DTOModule.forDomainObject(ReIndexingContextInformationForFullReindexingTask.class)
.convertToDTO(DTO.class)
- .toDomainObjectConverter(dto -> new ReprocessingContextInformationForFullReindexingTask(
+ .toDomainObjectConverter(dto -> new ReIndexingContextInformationForFullReindexingTask(
dto.successfullyReprocessedMailCount,
dto.failedReprocessedMailCount,
deserializeFailures(mailboxIdFactory, dto.messageFailures, dto.mailboxFailures.orElse(ImmutableList.of())),
@@ -153,11 +153,11 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
}
@VisibleForTesting
- public ReprocessingContextInformationForFullReindexingTask(int successfullyReprocessedMailCount,
- int failedReprocessedMailCount,
- ReIndexingExecutionFailures failures,
- Instant timestamp,
- RunningOptions runningOptions) {
+ public ReIndexingContextInformationForFullReindexingTask(int successfullyReprocessedMailCount,
+ int failedReprocessedMailCount,
+ ReIndexingExecutionFailures failures,
+ Instant timestamp,
+ RunningOptions runningOptions) {
super(successfullyReprocessedMailCount, failedReprocessedMailCount, failures, timestamp, runningOptions);
}
}
@@ -223,14 +223,14 @@ public class ReprocessingContextInformationDTO implements AdditionalInformationD
protected final Instant timestamp;
protected final Optional<RunningOptionsDTO> runningOptions;
- ReprocessingContextInformationDTO(@JsonProperty("type") String type,
- @JsonProperty("successfullyReprocessedMailCount") int successfullyReprocessedMailCount,
- @JsonProperty("failedReprocessedMailCount") int failedReprocessedMailCount,
- @JsonProperty("failures") Optional<List<ReindexingFailureDTO>> failures,
- @JsonProperty("messageFailures") Optional<List<ReindexingFailureDTO>> messageFailures,
- @JsonProperty("mailboxFailures") Optional<List<String>> mailboxFailures,
- @JsonProperty("timestamp") Instant timestamp,
- @JsonProperty("runningOptions") Optional<RunningOptionsDTO> runningOptions) {
+ ReIndexingContextInformationDTO(@JsonProperty("type") String type,
+ @JsonProperty("successfullyReprocessedMailCount") int successfullyReprocessedMailCount,
+ @JsonProperty("failedReprocessedMailCount") int failedReprocessedMailCount,
+ @JsonProperty("failures") Optional<List<ReindexingFailureDTO>> failures,
+ @JsonProperty("messageFailures") Optional<List<ReindexingFailureDTO>> messageFailures,
+ @JsonProperty("mailboxFailures") Optional<List<String>> mailboxFailures,
+ @JsonProperty("timestamp") Instant timestamp,
+ @JsonProperty("runningOptions") Optional<RunningOptionsDTO> runningOptions) {
this.type = type;
this.successfullyReprocessedMailCount = successfullyReprocessedMailCount;
this.failedReprocessedMailCount = failedReprocessedMailCount;
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 668b934..3285d5a 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
@@ -38,7 +38,7 @@ public class SingleMailboxReindexingTask implements Task {
public static final TaskType TYPE = TaskType.of("mailbox-reindexing");
- public static class AdditionalInformation extends ReprocessingContextInformation {
+ public static class AdditionalInformation extends ReIndexingContextInformation {
private final MailboxId mailboxId;
@VisibleForTesting
@@ -76,21 +76,21 @@ public class SingleMailboxReindexingTask implements Task {
private final ReIndexerPerformer reIndexerPerformer;
private final MailboxId mailboxId;
- private final ReprocessingContext reprocessingContext;
+ private final ReIndexingContext reIndexingContext;
private final RunningOptions runningOptions;
@Inject
public SingleMailboxReindexingTask(ReIndexerPerformer reIndexerPerformer, MailboxId mailboxId, RunningOptions runningOptions) {
this.reIndexerPerformer = reIndexerPerformer;
this.mailboxId = mailboxId;
- this.reprocessingContext = new ReprocessingContext();
+ this.reIndexingContext = new ReIndexingContext();
this.runningOptions = runningOptions;
}
@Override
public Result run() {
try {
- return reIndexerPerformer.reIndexSingleMailbox(mailboxId, reprocessingContext, runningOptions)
+ return reIndexerPerformer.reIndexSingleMailbox(mailboxId, reIndexingContext, runningOptions)
.block();
} catch (Exception e) {
return Result.PARTIAL;
@@ -115,9 +115,9 @@ public class SingleMailboxReindexingTask implements Task {
return Optional.of(
new SingleMailboxReindexingTask.AdditionalInformation(
mailboxId,
- reprocessingContext.successfullyReprocessedMailCount(),
- reprocessingContext.failedReprocessingMailCount(),
- reprocessingContext.failures(),
+ reIndexingContext.successfullyReprocessedMailCount(),
+ reIndexingContext.failedReprocessingMailCount(),
+ reIndexingContext.failures(),
Clock.systemUTC().instant(),
runningOptions)
);
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 faec1f4..d4ef440 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
@@ -40,7 +40,7 @@ public class SingleMailboxReindexingTaskAdditionalInformationDTO implements Addi
.toDomainObjectConverter(dto -> new SingleMailboxReindexingTask.AdditionalInformation(factory.fromString(dto.getMailboxId()),
dto.getSuccessfullyReprocessedMailCount(),
dto.getFailedReprocessedMailCount(),
- ReprocessingContextInformationDTO.deserializeFailures(factory, dto.getMessageFailures(), dto.getMailboxFailures().orElse(ImmutableList.of())),
+ ReIndexingContextInformationDTO.deserializeFailures(factory, dto.getMessageFailures(), dto.getMailboxFailures().orElse(ImmutableList.of())),
dto.getTimestamp(),
dto.getRunningOptions()
.map(RunningOptionsDTO::toDomainObject)
@@ -52,7 +52,7 @@ public class SingleMailboxReindexingTaskAdditionalInformationDTO implements Addi
details.getSuccessfullyReprocessedMailCount(),
details.getFailedReprocessedMailCount(),
Optional.empty(),
- Optional.of(ReprocessingContextInformationDTO.serializeFailures(details.failures())),
+ Optional.of(ReIndexingContextInformationDTO.serializeFailures(details.failures())),
Optional.of(details.failures().mailboxFailures().stream().map(MailboxId::serialize).collect(ImmutableList.toImmutableList())),
details.timestamp(),
Optional.of(RunningOptionsDTO.toDTO(details.getRunningOptions()))
@@ -61,7 +61,7 @@ public class SingleMailboxReindexingTaskAdditionalInformationDTO implements Addi
.withFactory(AdditionalInformationDTOModule::new);
}
- private final ReprocessingContextInformationDTO reprocessingContextInformationDTO;
+ private final ReIndexingContextInformationDTO reIndexingContextInformationDTO;
private final String mailboxId;
@JsonCreator
@@ -69,13 +69,13 @@ public class SingleMailboxReindexingTaskAdditionalInformationDTO implements Addi
@JsonProperty("mailboxId") String mailboxId,
@JsonProperty("successfullyReprocessedMailCount") int successfullyReprocessedMailCount,
@JsonProperty("failedReprocessedMailCount") int failedReprocessedMailCount,
- @JsonProperty("failures") Optional<List<ReprocessingContextInformationDTO.ReindexingFailureDTO>> failures,
- @JsonProperty("messageFailures") Optional<List<ReprocessingContextInformationDTO.ReindexingFailureDTO>> messageFailures,
+ @JsonProperty("failures") Optional<List<ReIndexingContextInformationDTO.ReindexingFailureDTO>> failures,
+ @JsonProperty("messageFailures") Optional<List<ReIndexingContextInformationDTO.ReindexingFailureDTO>> messageFailures,
@JsonProperty("mailboxFailures") Optional<List<String>> mailboxFailures,
@JsonProperty("timestamp") Instant timestamp,
@JsonProperty("runningOptions") Optional<RunningOptionsDTO> runningOptions) {
this.mailboxId = mailboxId;
- this.reprocessingContextInformationDTO = new ReprocessingContextInformationDTO(
+ this.reIndexingContextInformationDTO = new ReIndexingContextInformationDTO(
type,
successfullyReprocessedMailCount,
failedReprocessedMailCount,
@@ -88,11 +88,11 @@ public class SingleMailboxReindexingTaskAdditionalInformationDTO implements Addi
@Override
public String getType() {
- return reprocessingContextInformationDTO.getType();
+ return reIndexingContextInformationDTO.getType();
}
public Instant getTimestamp() {
- return reprocessingContextInformationDTO.getTimestamp();
+ return reIndexingContextInformationDTO.getTimestamp();
}
public String getMailboxId() {
@@ -100,22 +100,22 @@ public class SingleMailboxReindexingTaskAdditionalInformationDTO implements Addi
}
public int getSuccessfullyReprocessedMailCount() {
- return reprocessingContextInformationDTO.getSuccessfullyReprocessedMailCount();
+ return reIndexingContextInformationDTO.getSuccessfullyReprocessedMailCount();
}
public int getFailedReprocessedMailCount() {
- return reprocessingContextInformationDTO.getFailedReprocessedMailCount();
+ return reIndexingContextInformationDTO.getFailedReprocessedMailCount();
}
- public List<ReprocessingContextInformationDTO.ReindexingFailureDTO> getMessageFailures() {
- return reprocessingContextInformationDTO.getMessageFailures();
+ public List<ReIndexingContextInformationDTO.ReindexingFailureDTO> getMessageFailures() {
+ return reIndexingContextInformationDTO.getMessageFailures();
}
public Optional<List<String>> getMailboxFailures() {
- return reprocessingContextInformationDTO.getMailboxFailures();
+ return reIndexingContextInformationDTO.getMailboxFailures();
}
public Optional<RunningOptionsDTO> getRunningOptions() {
- return reprocessingContextInformationDTO.getRunningOptions();
+ return reIndexingContextInformationDTO.getRunningOptions();
}
}
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java
index a5a787d..5264100 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTask.java
@@ -96,7 +96,7 @@ public class SingleMessageReindexingTask implements Task {
@Override
public Result run() {
- return reIndexerPerformer.reIndexSingleMessage(mailboxId, uid, new ReprocessingContext())
+ return reIndexerPerformer.reIndexSingleMessage(mailboxId, uid, new ReIndexingContext())
.onErrorResume(e -> {
LOGGER.warn("Error encountered while reindexing {} : {}", mailboxId, uid, e);
return Mono.just(Result.PARTIAL);
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java
index 5fe450b..f7b82c9 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTask.java
@@ -40,7 +40,7 @@ public class UserReindexingTask implements Task {
public static final TaskType USER_RE_INDEXING = TaskType.of("user-reindexing");
- public static class AdditionalInformation extends ReprocessingContextInformation {
+ public static class AdditionalInformation extends ReIndexingContextInformation {
private final Username username;
@VisibleForTesting
@@ -59,14 +59,14 @@ public class UserReindexingTask implements Task {
private final ReIndexerPerformer reIndexerPerformer;
private final Username username;
- private final ReprocessingContext reprocessingContext;
+ private final ReIndexingContext reIndexingContext;
private final RunningOptions runningOptions;
@Inject
public UserReindexingTask(ReIndexerPerformer reIndexerPerformer, Username username, RunningOptions runningOptions) {
this.reIndexerPerformer = reIndexerPerformer;
this.username = username;
- this.reprocessingContext = new ReprocessingContext();
+ this.reIndexingContext = new ReIndexingContext();
this.runningOptions = runningOptions;
}
@@ -90,7 +90,7 @@ public class UserReindexingTask implements Task {
@Override
public Result run() {
- return reIndexerPerformer.reIndexUserMailboxes(username, reprocessingContext, runningOptions)
+ return reIndexerPerformer.reIndexUserMailboxes(username, reIndexingContext, runningOptions)
.onErrorResume(e -> Mono.just(Result.PARTIAL))
.block();
}
@@ -111,9 +111,9 @@ public class UserReindexingTask implements Task {
@Override
public Optional<TaskExecutionDetails.AdditionalInformation> details() {
return Optional.of(new UserReindexingTask.AdditionalInformation(username,
- reprocessingContext.successfullyReprocessedMailCount(),
- reprocessingContext.failedReprocessingMailCount(),
- reprocessingContext.failures(),
+ reIndexingContext.successfullyReprocessedMailCount(),
+ reIndexingContext.failedReprocessingMailCount(),
+ reIndexingContext.failures(),
Clock.systemUTC().instant(),
runningOptions)
);
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTaskAdditionalInformationDTO.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTaskAdditionalInformationDTO.java
index ce952b6..7817bef 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTaskAdditionalInformationDTO.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/UserReindexingTaskAdditionalInformationDTO.java
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.indexer.ReIndexer;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO.ReindexingFailureDTO;
+import org.apache.mailbox.tools.indexer.ReIndexingContextInformationDTO.ReindexingFailureDTO;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -42,7 +42,7 @@ public class UserReindexingTaskAdditionalInformationDTO implements AdditionalInf
.toDomainObjectConverter(dto -> new UserReindexingTask.AdditionalInformation(Username.of(dto.getUser()),
dto.getSuccessfullyReprocessedMailCount(),
dto.getFailedReprocessedMailCount(),
- ReprocessingContextInformationDTO.deserializeFailures(factory, dto.getMessageFailures(), dto.getMailboxFailures().orElse(ImmutableList.of())),
+ ReIndexingContextInformationDTO.deserializeFailures(factory, dto.getMessageFailures(), dto.getMailboxFailures().orElse(ImmutableList.of())),
dto.getTimestamp(),
dto.getRunningOptions()
.map(RunningOptionsDTO::toDomainObject)
@@ -54,7 +54,7 @@ public class UserReindexingTaskAdditionalInformationDTO implements AdditionalInf
details.getSuccessfullyReprocessedMailCount(),
details.getFailedReprocessedMailCount(),
Optional.empty(),
- Optional.of(ReprocessingContextInformationDTO.serializeFailures(details.failures())),
+ Optional.of(ReIndexingContextInformationDTO.serializeFailures(details.failures())),
Optional.of(details.failures().mailboxFailures().stream().map(MailboxId::serialize).collect(ImmutableList.toImmutableList())),
details.timestamp(),
Optional.of(RunningOptionsDTO.toDTO(details.getRunningOptions()))))
@@ -62,7 +62,7 @@ public class UserReindexingTaskAdditionalInformationDTO implements AdditionalInf
.withFactory(AdditionalInformationDTOModule::new);
}
- private final ReprocessingContextInformationDTO reprocessingContextInformationDTO;
+ private final ReIndexingContextInformationDTO reIndexingContextInformationDTO;
private final String user;
@JsonCreator
@@ -77,7 +77,7 @@ public class UserReindexingTaskAdditionalInformationDTO implements AdditionalInf
@JsonProperty("runningOptions") Optional<RunningOptionsDTO> runningOptions
) {
this.user = user;
- this.reprocessingContextInformationDTO = new ReprocessingContextInformationDTO(type,
+ this.reIndexingContextInformationDTO = new ReIndexingContextInformationDTO(type,
successfullyReprocessedMailCount,
failedReprocessedMailCount,
failures,
@@ -89,11 +89,11 @@ public class UserReindexingTaskAdditionalInformationDTO implements AdditionalInf
@Override
public String getType() {
- return reprocessingContextInformationDTO.getType();
+ return reIndexingContextInformationDTO.getType();
}
public Instant getTimestamp() {
- return reprocessingContextInformationDTO.getTimestamp();
+ return reIndexingContextInformationDTO.getTimestamp();
}
public String getUser() {
@@ -101,22 +101,22 @@ public class UserReindexingTaskAdditionalInformationDTO implements AdditionalInf
}
public int getSuccessfullyReprocessedMailCount() {
- return reprocessingContextInformationDTO.getSuccessfullyReprocessedMailCount();
+ return reIndexingContextInformationDTO.getSuccessfullyReprocessedMailCount();
}
public int getFailedReprocessedMailCount() {
- return reprocessingContextInformationDTO.getFailedReprocessedMailCount();
+ return reIndexingContextInformationDTO.getFailedReprocessedMailCount();
}
public List<ReindexingFailureDTO> getMessageFailures() {
- return reprocessingContextInformationDTO.getMessageFailures();
+ return reIndexingContextInformationDTO.getMessageFailures();
}
public Optional<List<String>> getMailboxFailures() {
- return reprocessingContextInformationDTO.getMailboxFailures();
+ return reIndexingContextInformationDTO.getMailboxFailures();
}
public Optional<RunningOptionsDTO> getRunningOptions() {
- return reprocessingContextInformationDTO.getRunningOptions();
+ return reIndexingContextInformationDTO.getRunningOptions();
}
}
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java
index 9ccdd1f..0ddf6df 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java
@@ -53,8 +53,8 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.apache.james.task.Task;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask;
+import org.apache.mailbox.tools.indexer.ReIndexingContextInformationDTO.ReIndexingContextInformationForErrorRecoveryIndexationTask;
+import org.apache.mailbox.tools.indexer.ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -154,7 +154,7 @@ public class CassandraReIndexerImplTest {
Task task = reIndexer.reIndex(ReIndexer.RunningOptions.DEFAULT);
task.run();
- ReprocessingContextInformationForFullReindexingTask information = (ReprocessingContextInformationForFullReindexingTask) task.details().get();
+ ReIndexingContextInformationForFullReindexingTask information = (ReIndexingContextInformationForFullReindexingTask) task.details().get();
assertThat(information.failures().mailboxFailures()).containsExactly(mailbox.getId());
}
@@ -279,7 +279,7 @@ public class CassandraReIndexerImplTest {
ReIndexer.RunningOptions.DEFAULT);
task.run();
- ReprocessingContextInformationForErrorRecoveryIndexationTask information = (ReprocessingContextInformationForErrorRecoveryIndexationTask) task.details().get();
+ ReIndexingContextInformationForErrorRecoveryIndexationTask information = (ReIndexingContextInformationForErrorRecoveryIndexationTask) task.details().get();
assertThat(information.failures().mailboxFailures()).containsExactly(mailbox.getId());
}
@@ -303,7 +303,7 @@ public class CassandraReIndexerImplTest {
ReIndexer.RunningOptions.DEFAULT);
task.run();
- ReprocessingContextInformationForErrorRecoveryIndexationTask information = (ReprocessingContextInformationForErrorRecoveryIndexationTask) task.details().get();
+ ReIndexingContextInformationForErrorRecoveryIndexationTask information = (ReIndexingContextInformationForErrorRecoveryIndexationTask) task.details().get();
assertThat(information.failures().messageFailures()).containsExactly(new ReIndexingFailure(mailbox.getId(), appendResult.getId().getUid()));
}
@@ -323,7 +323,7 @@ public class CassandraReIndexerImplTest {
Task task = reIndexer.reIndex(ReIndexer.RunningOptions.DEFAULT);
task.run();
- ReprocessingContextInformationForFullReindexingTask information = (ReprocessingContextInformationForFullReindexingTask) task.details().get();
+ ReIndexingContextInformationForFullReindexingTask information = (ReIndexingContextInformationForFullReindexingTask) task.details().get();
assertThat(information.failures().messageFailures()).containsExactly(new ReIndexingFailure(mailbox.getId(), appendResult.getId().getUid()));
}
}
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
index 7ef471c..a964c03 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
@@ -30,7 +30,7 @@ import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.indexer.ReIndexer.RunningOptions;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
import org.apache.james.mailbox.model.TestId;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask;
+import org.apache.mailbox.tools.indexer.ReIndexingContextInformationDTO.ReIndexingContextInformationForErrorRecoveryIndexationTask;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -90,8 +90,8 @@ class ErrorRecoveryIndexationTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws Exception {
- ReprocessingContextInformationForErrorRecoveryIndexationTask details = new ReprocessingContextInformationForErrorRecoveryIndexationTask(successfullyReprocessedMailCount, failedReprocessedMailCount, executionFailures, TIMESTAMP, RunningOptions.DEFAULT);
- JsonSerializationVerifier.dtoModule(ReprocessingContextInformationForErrorRecoveryIndexationTask.module(mailboxIdFactory))
+ ReIndexingContextInformationForErrorRecoveryIndexationTask details = new ReIndexingContextInformationForErrorRecoveryIndexationTask(successfullyReprocessedMailCount, failedReprocessedMailCount, executionFailures, TIMESTAMP, RunningOptions.DEFAULT);
+ JsonSerializationVerifier.dtoModule(ReIndexingContextInformationForErrorRecoveryIndexationTask.module(mailboxIdFactory))
.bean(details)
.json(serializedAdditionalInformation)
.verify();
@@ -102,8 +102,8 @@ class ErrorRecoveryIndexationTaskSerializationTest {
RunningOptions runningOptions = RunningOptions.builder()
.mode(RunningOptions.Mode.FIX_OUTDATED)
.build();
- ReprocessingContextInformationForErrorRecoveryIndexationTask details = new ReprocessingContextInformationForErrorRecoveryIndexationTask(successfullyReprocessedMailCount, failedReprocessedMailCount, executionFailures, TIMESTAMP, runningOptions);
- JsonSerializationVerifier.dtoModule(ReprocessingContextInformationForErrorRecoveryIndexationTask.module(mailboxIdFactory))
+ ReIndexingContextInformationForErrorRecoveryIndexationTask details = new ReIndexingContextInformationForErrorRecoveryIndexationTask(successfullyReprocessedMailCount, failedReprocessedMailCount, executionFailures, TIMESTAMP, runningOptions);
+ JsonSerializationVerifier.dtoModule(ReIndexingContextInformationForErrorRecoveryIndexationTask.module(mailboxIdFactory))
.bean(details)
.json(serializedAdditionalInformationWithCorrectMode)
.verify();
@@ -111,11 +111,11 @@ class ErrorRecoveryIndexationTaskSerializationTest {
@Test
void legacyAdditionalInformationShouldBeDeserializable() throws Exception {
- ReprocessingContextInformationForErrorRecoveryIndexationTask legacyAdditionalInformation = JsonGenericSerializer.forModules(ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask.module(new TestId.Factory()))
+ ReIndexingContextInformationForErrorRecoveryIndexationTask legacyAdditionalInformation = JsonGenericSerializer.forModules(ReIndexingContextInformationForErrorRecoveryIndexationTask.module(new TestId.Factory()))
.withoutNestedType()
.deserialize(legacySerializedAdditionalInformation);
- ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask expected = new ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask(
+ ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask expected = new ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask(
42,
2,
new ReIndexingExecutionFailures(failures, ImmutableList.of()),
diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
index 81ae782..a540f48 100644
--- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
+++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
@@ -29,7 +29,7 @@ import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.indexer.ReIndexer.RunningOptions;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
import org.apache.james.mailbox.model.TestId;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask;
+import org.apache.mailbox.tools.indexer.ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -91,9 +91,9 @@ class FullReindexingTaskSerializationTest {
RunningOptions runningOptions = RunningOptions.builder()
.mode(RunningOptions.Mode.FIX_OUTDATED)
.build();
- ReprocessingContextInformationForFullReindexingTask details = new ReprocessingContextInformationForFullReindexingTask(successfullyReprocessedMailCount, failedReprocessedMailCount, reIndexingExecutionFailures, TIMESTAMP, runningOptions);
+ ReIndexingContextInformationForFullReindexingTask details = new ReIndexingContextInformationForFullReindexingTask(successfullyReprocessedMailCount, failedReprocessedMailCount, reIndexingExecutionFailures, TIMESTAMP, runningOptions);
- JsonSerializationVerifier.dtoModule(ReprocessingContextInformationForFullReindexingTask.module(new TestId.Factory()))
+ JsonSerializationVerifier.dtoModule(ReIndexingContextInformationForFullReindexingTask.module(new TestId.Factory()))
.bean(details)
.json(serializedAdditionalInformation)
.verify();
@@ -101,11 +101,11 @@ class FullReindexingTaskSerializationTest {
@Test
void legacyAdditionalInformationShouldBeDeserializable() throws Exception {
- ReprocessingContextInformationForFullReindexingTask legacyAdditionalInformation = JsonGenericSerializer.forModules(ReprocessingContextInformationForFullReindexingTask.module(new TestId.Factory()))
+ ReIndexingContextInformationForFullReindexingTask legacyAdditionalInformation = JsonGenericSerializer.forModules(ReIndexingContextInformationForFullReindexingTask.module(new TestId.Factory()))
.withoutNestedType()
.deserialize(legacySerializedAdditionalInformation);
- ReprocessingContextInformationForFullReindexingTask expected = new ReprocessingContextInformationForFullReindexingTask(
+ ReIndexingContextInformationForFullReindexingTask expected = new ReIndexingContextInformationForFullReindexingTask(
42,
2,
new ReIndexingExecutionFailures(ImmutableList.of(
diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ReIndexingTaskSerializationModule.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ReIndexingTaskSerializationModule.java
index cc90eb6..0ec7c4e 100644
--- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ReIndexingTaskSerializationModule.java
+++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ReIndexingTaskSerializationModule.java
@@ -33,7 +33,7 @@ import org.apache.mailbox.tools.indexer.MessageIdReIndexingTask;
import org.apache.mailbox.tools.indexer.MessageIdReindexingTaskAdditionalInformationDTO;
import org.apache.mailbox.tools.indexer.MessageIdReindexingTaskDTO;
import org.apache.mailbox.tools.indexer.ReIndexerPerformer;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO;
+import org.apache.mailbox.tools.indexer.ReIndexingContextInformationDTO;
import org.apache.mailbox.tools.indexer.SingleMailboxReindexingTask;
import org.apache.mailbox.tools.indexer.SingleMailboxReindexingTaskAdditionalInformationDTO;
import org.apache.mailbox.tools.indexer.SingleMailboxReindexingTaskDTO;
@@ -80,12 +80,12 @@ public class ReIndexingTaskSerializationModule extends AbstractModule {
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> errorRecoveryAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask.module(mailboxIdFactory);
+ return ReIndexingContextInformationDTO.ReIndexingContextInformationForErrorRecoveryIndexationTask.module(mailboxIdFactory);
}
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> fullReindexAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask.module(mailboxIdFactory);
+ return ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask.module(mailboxIdFactory);
}
@ProvidesIntoSet
diff --git a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java
index 537d758..960878d 100644
--- a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java
+++ b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java
@@ -24,7 +24,7 @@ import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import org.apache.james.task.TaskExecutionDetails;
import org.apache.james.webadmin.dto.DTOModuleInjections;
-import org.apache.james.webadmin.dto.WebAdminReprocessingContextInformationDTO;
+import org.apache.james.webadmin.dto.WebAdminIndexationContextInformationDTO;
import org.apache.james.webadmin.dto.WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO;
import org.apache.james.webadmin.dto.WebAdminUserReindexingTaskAdditionalInformationDTO;
import org.apache.mailbox.tools.indexer.MessageIdReindexingTaskAdditionalInformationDTO;
@@ -38,13 +38,13 @@ public class WebAdminReIndexingTaskSerializationModule extends AbstractModule {
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> errorRecoveryAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return WebAdminReprocessingContextInformationDTO.WebAdminErrorRecoveryIndexationDTO.serializationModule();
+ return WebAdminIndexationContextInformationDTO.WebAdminErrorRecoveryIndexationDTO.serializationModule();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> fullReindexAdditionalInformation() {
- return WebAdminReprocessingContextInformationDTO.WebAdminFullIndexationDTO.serializationModule();
+ return WebAdminIndexationContextInformationDTO.WebAdminFullIndexationDTO.serializationModule();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminIndexationContextInformationDTO.java
similarity index 82%
rename from server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java
rename to server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminIndexationContextInformationDTO.java
index 35aa0b2..de6e1e1 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminIndexationContextInformationDTO.java
@@ -29,15 +29,15 @@ import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import org.apache.mailbox.tools.indexer.ErrorRecoveryIndexationTask;
import org.apache.mailbox.tools.indexer.FullReindexingTask;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO;
+import org.apache.mailbox.tools.indexer.ReIndexingContextInformationDTO;
import org.apache.mailbox.tools.indexer.RunningOptionsDTO;
import com.google.common.collect.ImmutableList;
-public class WebAdminReprocessingContextInformationDTO implements AdditionalInformationDTO {
- public static class WebAdminErrorRecoveryIndexationDTO extends WebAdminReprocessingContextInformationDTO {
- public static AdditionalInformationDTOModule<ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask, WebAdminErrorRecoveryIndexationDTO> serializationModule() {
- return DTOModule.forDomainObject(ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask.class)
+public class WebAdminIndexationContextInformationDTO implements AdditionalInformationDTO {
+ public static class WebAdminErrorRecoveryIndexationDTO extends WebAdminIndexationContextInformationDTO {
+ public static AdditionalInformationDTOModule<ReIndexingContextInformationDTO.ReIndexingContextInformationForErrorRecoveryIndexationTask, WebAdminErrorRecoveryIndexationDTO> serializationModule() {
+ return DTOModule.forDomainObject(ReIndexingContextInformationDTO.ReIndexingContextInformationForErrorRecoveryIndexationTask.class)
.convertToDTO(WebAdminErrorRecoveryIndexationDTO.class)
.toDomainObjectConverter(dto -> {
throw new NotImplementedException("Deserialization not implemented for this DTO");
@@ -59,9 +59,9 @@ public class WebAdminReprocessingContextInformationDTO implements AdditionalInfo
}
}
- public static class WebAdminFullIndexationDTO extends WebAdminReprocessingContextInformationDTO {
- public static AdditionalInformationDTOModule<ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask, WebAdminFullIndexationDTO> serializationModule() {
- return DTOModule.forDomainObject(ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask.class)
+ public static class WebAdminFullIndexationDTO extends WebAdminIndexationContextInformationDTO {
+ public static AdditionalInformationDTOModule<ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask, WebAdminFullIndexationDTO> serializationModule() {
+ return DTOModule.forDomainObject(ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask.class)
.convertToDTO(WebAdminFullIndexationDTO.class)
.toDomainObjectConverter(dto -> {
throw new NotImplementedException("Deserialization not implemented for this DTO");
@@ -91,9 +91,9 @@ public class WebAdminReprocessingContextInformationDTO implements AdditionalInfo
private final List<String> mailboxFailures;
protected final Instant timestamp;
- WebAdminReprocessingContextInformationDTO(String type, RunningOptionsDTO runningOptions, int successfullyReprocessedMailCount, int failedReprocessedMailCount,
- ReIndexingExecutionFailures failures,
- Instant timestamp) {
+ WebAdminIndexationContextInformationDTO(String type, RunningOptionsDTO runningOptions, int successfullyReprocessedMailCount, int failedReprocessedMailCount,
+ ReIndexingExecutionFailures failures,
+ Instant timestamp) {
this.type = type;
this.runningOptions = runningOptions;
this.successfullyReprocessedMailCount = successfullyReprocessedMailCount;
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 49c2692..d4ddc12 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
@@ -51,7 +51,7 @@ public class WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO impleme
.withFactory(AdditionalInformationDTOModule::new);
}
- private final WebAdminReprocessingContextInformationDTO reprocessingContextInformationDTO;
+ private final WebAdminIndexationContextInformationDTO reprocessingContextInformationDTO;
private final String mailboxId;
@JsonCreator
@@ -63,7 +63,7 @@ public class WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO impleme
ReIndexingExecutionFailures failures,
Instant timestamp) {
this.mailboxId = mailboxId;
- this.reprocessingContextInformationDTO = new WebAdminReprocessingContextInformationDTO(
+ this.reprocessingContextInformationDTO = new WebAdminIndexationContextInformationDTO(
type, runningOptions, successfullyReprocessedMailCount, failedReprocessedMailCount, failures, timestamp);
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java
index e1c6f62..fe0485b 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java
@@ -51,7 +51,7 @@ public class WebAdminUserReindexingTaskAdditionalInformationDTO implements Addit
.withFactory(AdditionalInformationDTOModule::new);
}
- private final WebAdminReprocessingContextInformationDTO reprocessingContextInformationDTO;
+ private final WebAdminIndexationContextInformationDTO reprocessingContextInformationDTO;
private final String username;
@JsonCreator
@@ -63,7 +63,7 @@ public class WebAdminUserReindexingTaskAdditionalInformationDTO implements Addit
ReIndexingExecutionFailures failures,
Instant timestamp) {
this.username = username;
- this.reprocessingContextInformationDTO = new WebAdminReprocessingContextInformationDTO(
+ this.reprocessingContextInformationDTO = new WebAdminIndexationContextInformationDTO(
type,
runningOptions,
successfullyReprocessedMailCount,
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminIndexationContextInformationDTOTest.java
similarity index 85%
rename from server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java
rename to server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminIndexationContextInformationDTOTest.java
index 3f45a2d..0c2188a 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminIndexationContextInformationDTOTest.java
@@ -30,13 +30,13 @@ import org.apache.james.mailbox.indexer.ReIndexer;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.TestId;
-import org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO;
+import org.apache.mailbox.tools.indexer.ReIndexingContextInformationDTO;
import org.junit.jupiter.api.Test;
import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
import com.google.common.collect.ImmutableList;
-class WebAdminReprocessingContextInformationDTOTest {
+class WebAdminIndexationContextInformationDTOTest {
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
private final String serializedErrorRecoveryAdditionalInformation = "{" +
@@ -68,8 +68,8 @@ class WebAdminReprocessingContextInformationDTOTest {
@Test
void shouldSerializeErrorRecoveryAdditionalInformation() throws Exception {
- ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask domainObject =
- new ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask(
+ ReIndexingContextInformationDTO.ReIndexingContextInformationForErrorRecoveryIndexationTask domainObject =
+ new ReIndexingContextInformationDTO.ReIndexingContextInformationForErrorRecoveryIndexationTask(
42,
2,
executionFailures,
@@ -77,7 +77,7 @@ class WebAdminReprocessingContextInformationDTOTest {
ReIndexer.RunningOptions.DEFAULT);
String json =
- JsonGenericSerializer.forModules(WebAdminReprocessingContextInformationDTO.WebAdminErrorRecoveryIndexationDTO
+ JsonGenericSerializer.forModules(WebAdminIndexationContextInformationDTO.WebAdminErrorRecoveryIndexationDTO
.serializationModule())
.withoutNestedType()
.serialize(domainObject);
@@ -88,7 +88,7 @@ class WebAdminReprocessingContextInformationDTOTest {
@Test
void deserializeErrorRecoveryShouldNotBeSupported() {
- assertThatThrownBy(() -> JsonGenericSerializer.forModules(WebAdminReprocessingContextInformationDTO.WebAdminErrorRecoveryIndexationDTO
+ assertThatThrownBy(() -> JsonGenericSerializer.forModules(WebAdminIndexationContextInformationDTO.WebAdminErrorRecoveryIndexationDTO
.serializationModule())
.withoutNestedType()
.deserialize(serializedErrorRecoveryAdditionalInformation))
@@ -97,8 +97,8 @@ class WebAdminReprocessingContextInformationDTOTest {
@Test
void shouldSerializeFullAdditionalInformation() throws Exception {
- ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask domainObject =
- new ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask(
+ ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask domainObject =
+ new ReIndexingContextInformationDTO.ReIndexingContextInformationForFullReindexingTask(
42,
2,
executionFailures,
@@ -106,7 +106,7 @@ class WebAdminReprocessingContextInformationDTOTest {
ReIndexer.RunningOptions.DEFAULT);
String json =
- JsonGenericSerializer.forModules(WebAdminReprocessingContextInformationDTO.WebAdminFullIndexationDTO
+ JsonGenericSerializer.forModules(WebAdminIndexationContextInformationDTO.WebAdminFullIndexationDTO
.serializationModule())
.withoutNestedType()
.serialize(domainObject);
@@ -117,7 +117,7 @@ class WebAdminReprocessingContextInformationDTOTest {
@Test
void deserializeFullShouldNotBeSupported() {
- assertThatThrownBy(() -> JsonGenericSerializer.forModules(WebAdminReprocessingContextInformationDTO.WebAdminFullIndexationDTO
+ assertThatThrownBy(() -> JsonGenericSerializer.forModules(WebAdminIndexationContextInformationDTO.WebAdminFullIndexationDTO
.serializationModule())
.withoutNestedType()
.deserialize(serializedFullAdditionalInformation))
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxIndexingDTOTest.java
similarity index 98%
rename from server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java
rename to server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxIndexingDTOTest.java
index 03459e5..51361fb 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxIndexingDTOTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
import com.google.common.collect.ImmutableList;
-class WebAdminSingleMailboxReprocessingDTOTest {
+class WebAdminSingleMailboxIndexingDTOTest {
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
private final String serializedAdditionalInformation = "{" +
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReIndexingDTOTest.java
similarity index 99%
rename from server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java
rename to server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReIndexingDTOTest.java
index bce12a9..6a1fa55 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReIndexingDTOTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
import com.google.common.collect.ImmutableList;
-class WebAdminUserReprocessingDTOTest {
+class WebAdminUserReIndexingDTOTest {
private static final Instant TIMESTAMP = Instant.parse("2018-11-13T12:00:55Z");
private final String serializedAdditionalInformation = "{" +
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 935d075..344bd12 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
@@ -82,8 +82,8 @@ import org.apache.james.task.Hostname;
import org.apache.james.task.MemoryTaskManager;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
-import org.apache.james.webadmin.dto.WebAdminReprocessingContextInformationDTO.WebAdminErrorRecoveryIndexationDTO;
-import org.apache.james.webadmin.dto.WebAdminReprocessingContextInformationDTO.WebAdminFullIndexationDTO;
+import org.apache.james.webadmin.dto.WebAdminIndexationContextInformationDTO.WebAdminErrorRecoveryIndexationDTO;
+import org.apache.james.webadmin.dto.WebAdminIndexationContextInformationDTO.WebAdminFullIndexationDTO;
import org.apache.james.webadmin.dto.WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO;
import org.apache.james.webadmin.service.PreviousReIndexingService;
import org.apache.james.webadmin.utils.ErrorResponder;
@@ -202,11 +202,11 @@ class MailboxesRoutesTest {
}
@Nested
- class FullReprocessing {
+ class FullReIndexing {
@Nested
class Validation {
@Test
- void fullReprocessingShouldFailWithNoTask() {
+ void fullReIndexingShouldFailWithNoTask() {
when()
.post("/mailboxes")
.then()
@@ -218,7 +218,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingShouldFailWithBadTask() {
+ void fullReIndexingShouldFailWithBadTask() {
when()
.post("/mailboxes?task=bad")
.then()
@@ -233,7 +233,7 @@ class MailboxesRoutesTest {
@Nested
class TaskDetails {
@Test
- void fullReprocessingShouldNotFailWhenNoMail() {
+ void fullReIndexingShouldNotFailWhenNoMail() {
String taskId = with()
.post("/mailboxes?task=reIndex")
.jsonPath()
@@ -257,7 +257,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingShouldReturnTaskDetailsWhenMail() throws Exception {
+ void fullReIndexingShouldReturnTaskDetailsWhenMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(INBOX, systemSession).get();
mailboxManager.getMailbox(INBOX, systemSession)
@@ -288,7 +288,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingWithMessagesPerSecondShouldReturnTaskDetailsWhenMail() throws Exception {
+ void fullReIndexingWithMessagesPerSecondShouldReturnTaskDetailsWhenMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(INBOX, systemSession).get();
mailboxManager.getMailbox(INBOX, systemSession)
@@ -320,7 +320,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingShouldReturnTaskDetailsWhenFailing() throws Exception {
+ void fullReIndexingShouldReturnTaskDetailsWhenFailing() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
ComposedMessageId composedMessageId = mailboxManager.getMailbox(INBOX, systemSession)
@@ -356,7 +356,7 @@ class MailboxesRoutesTest {
}
@Test
- void userReprocessingShouldReturnTaskDetailsWhenFailingAtTheMailboxLevel() throws Exception {
+ void userReIndexingShouldReturnTaskDetailsWhenFailingAtTheMailboxLevel() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
@@ -380,7 +380,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingWithCorrectModeShouldReturnTaskDetailsWhenMails() throws Exception {
+ void fullReIndexingWithCorrectModeShouldReturnTaskDetailsWhenMails() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -431,7 +431,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingShouldAcceptRebuildAllNoCleanupMode() throws Exception {
+ void fullReIndexingShouldAcceptRebuildAllNoCleanupMode() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -485,7 +485,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingWithCorrectModeShouldFixInconsistenciesInES() throws Exception {
+ void fullReIndexingWithCorrectModeShouldFixInconsistenciesInES() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -526,7 +526,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingNoCleanupShouldNoopWhenNoInconsistencies() throws Exception {
+ void fullReIndexingNoCleanupShouldNoopWhenNoInconsistencies() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -554,7 +554,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingNoCleanupShouldSolveInconsistencies() throws Exception {
+ void fullReIndexingNoCleanupShouldSolveInconsistencies() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -591,7 +591,7 @@ class MailboxesRoutesTest {
}
@Test
- void fullReprocessingWithCorrectModeShouldNotChangeDocumentsInESWhenNoInconsistencies() throws Exception {
+ void fullReIndexingWithCorrectModeShouldNotChangeDocumentsInESWhenNoInconsistencies() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -621,7 +621,7 @@ class MailboxesRoutesTest {
@Disabled("JAMES-3202 Limitation of the current correct mode reindexation. We only check metadata and fix "
+ "inconsistencies with ES, but we don't check for inconsistencies from ES to metadata")
@Test
- void fullReprocessingWithCorrectModeShouldRemoveOrphanMessagesInES() throws Exception {
+ void fullReIndexingWithCorrectModeShouldRemoveOrphanMessagesInES() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -662,7 +662,7 @@ class MailboxesRoutesTest {
@Nested
class SideEffects {
@Test
- void fullReprocessingShouldPerformReprocessingWhenMail() throws Exception {
+ void fullReIndexingShouldPerformReIndexingWhenMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
ComposedMessageId createdMessage = mailboxManager.getMailbox(INBOX, systemSession)
@@ -699,11 +699,11 @@ class MailboxesRoutesTest {
}
@Nested
- class MailboxReprocessing {
+ class MailboxReIndexing {
@Nested
class Validation {
@Test
- void mailboxReprocessingShouldFailWithNoTask() throws Exception {
+ void mailboxReIndexingShouldFailWithNoTask() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
@@ -718,7 +718,7 @@ class MailboxesRoutesTest {
}
@Test
- void mailboxReprocessingShouldFailWithBadTask() throws Exception {
+ void mailboxReIndexingShouldFailWithBadTask() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
@@ -733,7 +733,7 @@ class MailboxesRoutesTest {
}
@Test
- void mailboxReprocessingShouldFailWithBadMailboxId() {
+ void mailboxReIndexingShouldFailWithBadMailboxId() {
when()
.post("/mailboxes/bad?task=reIndex")
.then()
@@ -744,7 +744,7 @@ class MailboxesRoutesTest {
}
@Test
- void mailboxReprocessingShouldFailWithNonExistentMailboxId() {
+ void mailboxReIndexingShouldFailWithNonExistentMailboxId() {
when()
.post("/mailboxes/36?task=reIndex")
.then()
@@ -758,7 +758,7 @@ class MailboxesRoutesTest {
@Nested
class TaskDetails {
@Test
- void mailboxReprocessingShouldNotFailWhenNoMail() throws Exception {
+ void mailboxReIndexingShouldNotFailWhenNoMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
@@ -786,7 +786,7 @@ class MailboxesRoutesTest {
}
@Test
- void mailboxReprocessingShouldReturnTaskDetailsWhenMail() throws Exception {
+ void mailboxReIndexingShouldReturnTaskDetailsWhenMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
mailboxManager.getMailbox(INBOX, systemSession)
@@ -817,7 +817,7 @@ class MailboxesRoutesTest {
}
@Test
- void mailboxReprocessingWithMessagesPerSecondShouldReturnTaskDetailsWhenMail() throws Exception {
+ void mailboxReIndexingWithMessagesPerSecondShouldReturnTaskDetailsWhenMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
mailboxManager.getMailbox(INBOX, systemSession)
@@ -850,7 +850,7 @@ class MailboxesRoutesTest {
}
@Test
- void mailboxReprocessingShouldReturnTaskDetailsWhenFailing() throws Exception {
+ void mailboxReIndexingShouldReturnTaskDetailsWhenFailing() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
ComposedMessageId composedMessageId = mailboxManager.getMailbox(INBOX, systemSession)
@@ -887,7 +887,7 @@ class MailboxesRoutesTest {
}
@Test
- void userReprocessingShouldReturnTaskDetailsWhenFailingAtTheMailboxLevel() throws Exception {
+ void userReIndexingShouldReturnTaskDetailsWhenFailingAtTheMailboxLevel() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
@@ -913,7 +913,7 @@ class MailboxesRoutesTest {
@Test
- void mailboxReprocessingWithCorrectModeShouldReturnTaskDetailsWhenMails() throws Exception {
+ void mailboxReIndexingWithCorrectModeShouldReturnTaskDetailsWhenMails() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -966,7 +966,7 @@ class MailboxesRoutesTest {
}
@Test
- void mailboxReprocessingWithCorrectModeShouldFixInconsistenciesInES() throws Exception {
+ void mailboxReIndexingWithCorrectModeShouldFixInconsistenciesInES() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -1009,7 +1009,7 @@ class MailboxesRoutesTest {
}
@Test
- void mailboxReprocessingWithCorrectModeShouldNotChangeDocumentsInESWhenNoInconsistencies() throws Exception {
+ void mailboxReIndexingWithCorrectModeShouldNotChangeDocumentsInESWhenNoInconsistencies() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -1041,7 +1041,7 @@ class MailboxesRoutesTest {
@Disabled("JAMES-3202 Limitation of the current correct mode reindexation. We only check metadata and fix "
+ "inconsistencies with ES, but we don't check for inconsistencies from ES to metadata")
@Test
- void mailboxReprocessingWithCorrectModeShouldRemoveOrphanMessagesInES() throws Exception {
+ void mailboxReIndexingWithCorrectModeShouldRemoveOrphanMessagesInES() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
Mailbox mailbox = mailboxManager.getMailbox(mailboxId, systemSession).getMailboxEntity();
@@ -1084,7 +1084,7 @@ class MailboxesRoutesTest {
@Nested
class SideEffects {
@Test
- void mailboxReprocessingShouldPerformReprocessingWhenMail() throws Exception {
+ void mailboxReIndexingShouldPerformReIndexingWhenMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
ComposedMessageId createdMessage = mailboxManager.getMailbox(INBOX, systemSession)
@@ -1122,11 +1122,11 @@ class MailboxesRoutesTest {
}
@Nested
- class MessageReprocessing {
+ class MessageReIndexing {
@Nested
class Validation {
@Test
- void messageReprocessingShouldFailWithNoTask() throws Exception {
+ void messageReIndexingShouldFailWithNoTask() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
@@ -1141,7 +1141,7 @@ class MailboxesRoutesTest {
}
@Test
- void messageReprocessingShouldFailWithBadTask() throws Exception {
+ void messageReIndexingShouldFailWithBadTask() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
@@ -1156,7 +1156,7 @@ class MailboxesRoutesTest {
}
@Test
- void messageReprocessingShouldFailWithBadMailboxId() {
+ void messageReIndexingShouldFailWithBadMailboxId() {
when()
.post("/mailboxes/bad/mails/7?task=reIndex")
.then()
@@ -1167,7 +1167,7 @@ class MailboxesRoutesTest {
}
@Test
- void messageReprocessingShouldFailWithNonExistentMailboxId() {
+ void messageReIndexingShouldFailWithNonExistentMailboxId() {
when()
.post("/mailboxes/36/mails/7?task=reIndex")
.then()
@@ -1178,7 +1178,7 @@ class MailboxesRoutesTest {
}
@Test
- void messageReprocessingShouldFailWithBadUid() {
+ void messageReIndexingShouldFailWithBadUid() {
when()
.post("/mailboxes/36/mails/bad?task=reIndex")
.then()
@@ -1192,7 +1192,7 @@ class MailboxesRoutesTest {
@Nested
class TaskDetails {
@Test
- void messageReprocessingShouldNotFailWhenUidNotFound() throws Exception {
+ void messageReIndexingShouldNotFailWhenUidNotFound() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
@@ -1217,7 +1217,7 @@ class MailboxesRoutesTest {
}
@Test
- void messageReprocessingShouldReturnTaskDetailsWhenMail() throws Exception {
+ void messageReIndexingShouldReturnTaskDetailsWhenMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
ComposedMessageId composedMessageId = mailboxManager.getMailbox(INBOX, systemSession)
@@ -1250,7 +1250,7 @@ class MailboxesRoutesTest {
@Nested
class SideEffects {
@Test
- void mailboxReprocessingShouldPerformReprocessingWhenMail() throws Exception {
+ void mailboxReIndexingShouldPerformReIndexingWhenMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
ComposedMessageId createdMessage = mailboxManager.getMailbox(INBOX, systemSession)
@@ -1530,7 +1530,7 @@ class MailboxesRoutesTest {
}
@Test
- void userReprocessingShouldReturnTaskDetailsWhenFailingAtTheMailboxLevel() throws Exception {
+ void userReIndexingShouldReturnTaskDetailsWhenFailingAtTheMailboxLevel() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
@@ -1570,7 +1570,7 @@ class MailboxesRoutesTest {
@Nested
class SideEffects {
@Test
- void fixingReprocessingShouldPerformReprocessingWhenMail() throws Exception {
+ void fixingReIndexingShouldPerformReIndexingWhenMail() throws Exception {
MailboxSession systemSession = mailboxManager.createSystemSession(USERNAME);
MailboxId mailboxId = mailboxManager.createMailbox(INBOX, systemSession).get();
ComposedMessageId createdMessage = mailboxManager.getMailbox(INBOX, systemSession)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MessageRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MessageRoutesTest.java
index 27058fa..f86221f 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MessageRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MessageRoutesTest.java
@@ -108,7 +108,7 @@ class MessageRoutesTest {
}
@Nested
- class MessageReprocessing {
+ class MessageReIndexing {
@Nested
class Validation {
@Test
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index fe79047..861cb7b 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -1444,8 +1444,7 @@ class UserMailboxesRoutesTest {
}
@Nested
- class UserReprocessing {
- static final int BATCH_SIZE = 1;
+ class UserReIndexing {
static final int SEARCH_SIZE = 1;
@RegisterExtension
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org