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 bt...@apache.org on 2020/06/03 07:20:02 UTC
[james-project] 12/12: JAMES-3184 rename RunningOptionsParser to
avoid conflict with other parsers
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 609ee55b02363fd9035e4c6ceef4b4d41fec8513
Author: LanKhuat <kh...@gmail.com>
AuthorDate: Tue Jun 2 10:05:36 2020 +0700
JAMES-3184 rename RunningOptionsParser to avoid conflict with other parsers
---
.../main/java/org/apache/james/webadmin/routes/MailboxesRoutes.java | 6 +++---
...unningOptionsParser.java => ReindexingRunningOptionsParser.java} | 3 ++-
.../java/org/apache/james/webadmin/routes/UserMailboxesRoutes.java | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/MailboxesRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/MailboxesRoutes.java
index 512d26d..8fd0900 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/MailboxesRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/MailboxesRoutes.java
@@ -109,10 +109,10 @@ public class MailboxesRoutes implements Routes {
boolean indexingCorrection = !Strings.isNullOrEmpty(request.queryParams(RE_INDEX_FAILED_MESSAGES_QUERY_PARAM));
if (indexingCorrection) {
IndexingDetailInformation indexingDetailInformation = retrieveIndexingExecutionDetails(previousReIndexingService, request);
- return reIndexer.reIndex(indexingDetailInformation.failures(), RunningOptionsParser.parse(request));
+ return reIndexer.reIndex(indexingDetailInformation.failures(), new ReindexingRunningOptionsParser().parse(request));
}
- return reIndexer.reIndex(RunningOptionsParser.parse(request));
+ return reIndexer.reIndex(ReindexingRunningOptionsParser.parse(request));
}
private static IndexingDetailInformation retrieveIndexingExecutionDetails(PreviousReIndexingService previousReIndexingService, Request request) {
@@ -191,7 +191,7 @@ public class MailboxesRoutes implements Routes {
@ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "Bad request - details in the returned error message")
})
private static TaskFromRequest toTask(ReIndexer reIndexer, MailboxId.Factory mailboxIdFactory) {
- return wrap(request -> reIndexer.reIndex(extractMailboxId(mailboxIdFactory, request), RunningOptionsParser.parse(request)));
+ return wrap(request -> reIndexer.reIndex(extractMailboxId(mailboxIdFactory, request), ReindexingRunningOptionsParser.parse(request)));
}
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/RunningOptionsParser.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/ReindexingRunningOptionsParser.java
similarity index 97%
rename from server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/RunningOptionsParser.java
rename to server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/ReindexingRunningOptionsParser.java
index 733c7f5..c3f869e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/RunningOptionsParser.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/ReindexingRunningOptionsParser.java
@@ -25,7 +25,8 @@ import org.apache.james.mailbox.indexer.ReIndexer.RunningOptions;
import spark.Request;
-public class RunningOptionsParser {
+public class ReindexingRunningOptionsParser {
+
public static RunningOptions parse(Request request) {
return intQueryParameter(request, "messagesPerSecond")
.map(RunningOptions::new)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserMailboxesRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserMailboxesRoutes.java
index 55f950c..c714376 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserMailboxesRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserMailboxesRoutes.java
@@ -74,7 +74,7 @@ public class UserMailboxesRoutes implements Routes {
public static class UserReIndexingTaskRegistration extends TaskRegistration {
@Inject
public UserReIndexingTaskRegistration(ReIndexer reIndexer) {
- super(RE_INDEX, request -> reIndexer.reIndex(getUsernameParam(request), RunningOptionsParser.parse(request)));
+ super(RE_INDEX, request -> reIndexer.reIndex(getUsernameParam(request), ReindexingRunningOptionsParser.parse(request)));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org