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 9677cbf6fecc73a1fb06fcf6c9d74f8042781804 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Dec 13 05:11:15 2019 +0100 JAMES-3006 Shortcut for single-entry task factories --- .../james/webadmin/routes/CassandraMappingsRoutes.java | 5 ++--- .../java/org/apache/james/webadmin/tasks/TaskFactory.java | 6 ++++++ .../org/apache/james/webadmin/tasks/TaskFactoryTest.java | 4 +--- .../james/webadmin/routes/EventDeadLettersRoutes.java | 15 ++++++--------- .../james/webadmin/routes/MailRepositoriesRoutes.java | 10 ++++------ 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/routes/CassandraMappingsRoutes.java b/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/routes/CassandraMappingsRoutes.java index 5a4aa8d..5225f1c 100644 --- a/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/routes/CassandraMappingsRoutes.java +++ b/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/routes/CassandraMappingsRoutes.java @@ -97,8 +97,7 @@ public class CassandraMappingsRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = ACTION_REQUEST_CAN_NOT_BE_DONE) }) public Route performActionOnMappings() { - return TaskFactory.builder() - .register(SOLVE_INCONSISTENCIES, request -> cassandraMappingsService.solveMappingsSourcesInconsistencies()) - .buildAsRoute(taskManager); + return TaskFactory.of(SOLVE_INCONSISTENCIES, request -> cassandraMappingsService.solveMappingsSourcesInconsistencies()) + .asRoute(taskManager); } } diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFactory.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFactory.java index 7db9bef..a46c6c9 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFactory.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFactory.java @@ -104,6 +104,12 @@ public class TaskFactory implements TaskGenerator { return new Builder(); } + public static TaskFactory of(TaskRegistrationKey key, TaskGenerator generator) { + return TaskFactory.builder() + .register(key, generator) + .build(); + } + private final String taskParameterName; private final Map<TaskRegistrationKey, TaskGenerator> taskGenerators; diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFactoryTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFactoryTest.java index 648fc84..18b947f 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFactoryTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFactoryTest.java @@ -47,9 +47,7 @@ class TaskFactoryTest { .register(KEY_1, any -> TASK_1) .register(KEY_2, any -> TASK_2) .build(); - singleTaskFactory = TaskFactory.builder() - .register(KEY_1, any -> TASK_1) - .build(); + singleTaskFactory = TaskFactory.of(KEY_1, any -> TASK_1); } @Test diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/EventDeadLettersRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/EventDeadLettersRoutes.java index c877a50..cc1a9fe 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/EventDeadLettersRoutes.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/EventDeadLettersRoutes.java @@ -118,9 +118,8 @@ public class EventDeadLettersRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = INTERNAL_SERVER_ERROR) }) public Route performActionOnAllEvents() { - return TaskFactory.builder() - .register(RE_DELIVER, request -> eventDeadLettersService.redeliverAllEvents()) - .buildAsRoute(taskManager); + return TaskFactory.of(RE_DELIVER, request -> eventDeadLettersService.redeliverAllEvents()) + .asRoute(taskManager); } @GET @@ -185,9 +184,8 @@ public class EventDeadLettersRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = INTERNAL_SERVER_ERROR) }) public Route performActionOnGroupEvents() { - return TaskFactory.builder() - .register(RE_DELIVER, request -> eventDeadLettersService.redeliverGroupEvents(parseGroup(request))) - .buildAsRoute(taskManager); + return TaskFactory.of(RE_DELIVER, request -> eventDeadLettersService.redeliverGroupEvents(parseGroup(request))) + .asRoute(taskManager); } @GET @@ -293,10 +291,9 @@ public class EventDeadLettersRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = INTERNAL_SERVER_ERROR) }) public Route performActionOnSingleEvent() { - return TaskFactory.builder() - .register(RE_DELIVER, + return TaskFactory.of(RE_DELIVER, request -> eventDeadLettersService.redeliverSingleEvent(parseGroup(request), parseInsertionId(request))) - .buildAsRoute(taskManager); + .asRoute(taskManager); } private Group parseGroup(Request request) { diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java index 4b3f123..0b00416 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java +++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java @@ -445,9 +445,8 @@ public class MailRepositoriesRoutes implements Routes { }) public void defineReprocessAll() { service.patch(MAIL_REPOSITORIES + "/:encodedPath/mails", - TaskFactory.builder() - .register(REPROCESS_ACTION, this::reprocessAll) - .buildAsRoute(taskManager), + TaskFactory.of(REPROCESS_ACTION, this::reprocessAll) + .asRoute(taskManager), jsonTransformer); } @@ -496,9 +495,8 @@ public class MailRepositoriesRoutes implements Routes { }) public void defineReprocessOne() { service.patch(MAIL_REPOSITORIES + "/:encodedPath/mails/:key", - TaskFactory.builder() - .register(REPROCESS_ACTION, this::reprocessOne) - .buildAsRoute(taskManager), + TaskFactory.of(REPROCESS_ACTION, this::reprocessOne) + .asRoute(taskManager), jsonTransformer); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
