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 83a5b96a2ecf544b3dce777912f2f8c951894d7d Author: Benoit Tellier <[email protected]> AuthorDate: Fri Dec 13 05:25:47 2019 +0100 JAMES-3006 s/TaskGenerator/TaskFromRequest --- .../webadmin/routes/CassandraMappingsRoutes.java | 4 +-- .../routes/CassandraMailboxMergingRoutes.java | 8 ++--- .../webadmin/routes/CassandraMigrationRoutes.java | 12 +++---- .../{TaskGenerator.java => TaskFromRequest.java} | 12 +++---- ...skFactory.java => TaskFromRequestRegistry.java} | 38 +++++++++++----------- ...yTest.java => TaskFromRequestRegistryTest.java} | 38 +++++++++++----------- ...GeneratorTest.java => TaskFromRequestTest.java} | 6 ++-- .../vault/routes/DeletedMessagesVaultRoutes.java | 12 +++---- .../webadmin/routes/EventDeadLettersRoutes.java | 8 ++--- .../webadmin/routes/MessageIdReindexingRoutes.java | 4 +-- .../james/webadmin/routes/ReindexingRoutes.java | 14 ++++---- .../james/webadmin/routes/MailQueueRoutes.java | 6 ++-- .../webadmin/routes/MailRepositoriesRoutes.java | 12 +++---- 13 files changed, 87 insertions(+), 87 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 5225f1c..9241953 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 @@ -28,7 +28,7 @@ import org.apache.james.task.TaskManager; import org.apache.james.webadmin.Constants; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.service.CassandraMappingsService; -import org.apache.james.webadmin.tasks.TaskFactory; +import org.apache.james.webadmin.tasks.TaskFromRequestRegistry; import org.apache.james.webadmin.tasks.TaskIdDto; import org.apache.james.webadmin.tasks.TaskRegistrationKey; import org.apache.james.webadmin.utils.JsonTransformer; @@ -97,7 +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.of(SOLVE_INCONSISTENCIES, request -> cassandraMappingsService.solveMappingsSourcesInconsistencies()) + return TaskFromRequestRegistry.of(SOLVE_INCONSISTENCIES, request -> cassandraMappingsService.solveMappingsSourcesInconsistencies()) .asRoute(taskManager); } } diff --git a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMailboxMergingRoutes.java b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMailboxMergingRoutes.java index 38c37b5..17d660f 100644 --- a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMailboxMergingRoutes.java +++ b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMailboxMergingRoutes.java @@ -32,8 +32,8 @@ import org.apache.james.task.Task; import org.apache.james.task.TaskManager; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.dto.MailboxMergingRequest; -import org.apache.james.webadmin.dto.TaskIdDto; -import org.apache.james.webadmin.tasks.TaskGenerator; +import org.apache.james.webadmin.tasks.TaskFromRequest; +import org.apache.james.webadmin.tasks.TaskIdDto; import org.apache.james.webadmin.utils.JsonExtractException; import org.apache.james.webadmin.utils.JsonExtractor; import org.apache.james.webadmin.utils.JsonTransformer; @@ -84,8 +84,8 @@ public class CassandraMailboxMergingRoutes implements Routes { @Override public void define(Service service) { - TaskGenerator taskGenerator = this::mergeMailboxes; - service.post(BASE, taskGenerator.asRoute(taskManager), jsonTransformer); + TaskFromRequest taskFromRequest = this::mergeMailboxes; + service.post(BASE, taskFromRequest.asRoute(taskManager), jsonTransformer); } @POST diff --git a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMigrationRoutes.java b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMigrationRoutes.java index ec1c2f7..a1beae7 100644 --- a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMigrationRoutes.java +++ b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMigrationRoutes.java @@ -31,8 +31,8 @@ import org.apache.james.task.TaskManager; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.dto.CassandraVersionRequest; import org.apache.james.webadmin.dto.CassandraVersionResponse; -import org.apache.james.webadmin.dto.TaskIdDto; -import org.apache.james.webadmin.tasks.TaskGenerator; +import org.apache.james.webadmin.tasks.TaskFromRequest; +import org.apache.james.webadmin.tasks.TaskIdDto; import org.apache.james.webadmin.utils.ErrorResponder; import org.apache.james.webadmin.utils.ErrorResponder.ErrorType; import org.apache.james.webadmin.utils.JsonTransformer; @@ -89,11 +89,11 @@ public class CassandraMigrationRoutes implements Routes { service.get(VERSION_BASE_LATEST, (request, response) -> getCassandraLatestVersion(), jsonTransformer); - TaskGenerator upgradeToVersionTaskGenerator = this::upgradeToVersion; - service.post(VERSION_UPGRADE_BASE, upgradeToVersionTaskGenerator.asRoute(taskManager), jsonTransformer); + TaskFromRequest upgradeToVersionTaskFromRequest = this::upgradeToVersion; + service.post(VERSION_UPGRADE_BASE, upgradeToVersionTaskFromRequest.asRoute(taskManager), jsonTransformer); - TaskGenerator upgradeToLatestTaskGenerator = request -> upgradeToLatest(); - service.post(VERSION_UPGRADE_TO_LATEST_BASE, upgradeToLatestTaskGenerator.asRoute(taskManager), jsonTransformer); + TaskFromRequest upgradeToLatestTaskFromRequest = request -> upgradeToLatest(); + service.post(VERSION_UPGRADE_TO_LATEST_BASE, upgradeToLatestTaskFromRequest.asRoute(taskManager), jsonTransformer); } @POST diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskGenerator.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFromRequest.java similarity index 86% rename from server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskGenerator.java rename to server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFromRequest.java index 913e742..f2560a7 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskGenerator.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFromRequest.java @@ -31,19 +31,19 @@ import spark.Request; import spark.Response; import spark.Route; -public interface TaskGenerator { +public interface TaskFromRequest { class TaskRoute implements Route { - private final TaskGenerator taskGenerator; + private final TaskFromRequest taskFromRequest; private final TaskManager taskManager; - TaskRoute(TaskGenerator taskGenerator, TaskManager taskManager) { - this.taskGenerator = taskGenerator; + TaskRoute(TaskFromRequest taskFromRequest, TaskManager taskManager) { + this.taskFromRequest = taskFromRequest; this.taskManager = taskManager; } @Override public TaskIdDto handle(Request request, Response response) throws Exception { - Task task = taskGenerator.generate(request); + Task task = taskFromRequest.fromRequest(request); TaskId taskId = taskManager.submit(task); response.status(HttpStatus.CREATED_201); response.header(LOCATION.asString(), TasksRoutes.BASE + "/" + taskId.asString()); @@ -51,7 +51,7 @@ public interface TaskGenerator { } } - Task generate(Request request) throws Exception; + Task fromRequest(Request request) throws Exception; default Route asRoute(TaskManager taskManager) { return new TaskRoute(this, 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/TaskFromRequestRegistry.java similarity index 78% rename from server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFactory.java rename to server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskFromRequestRegistry.java index dcacc2f..505e4f1 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/TaskFromRequestRegistry.java @@ -38,12 +38,12 @@ import com.google.common.collect.ImmutableMap; import spark.Request; import spark.Route; -public class TaskFactory implements TaskGenerator { +public class TaskFromRequestRegistry implements TaskFromRequest { private static final String DEFAULT_PARAMETER = "action"; public static class Builder { private Optional<String> taskParameterName; - private ImmutableMap.Builder<TaskRegistrationKey, TaskGenerator> tasks; + private ImmutableMap.Builder<TaskRegistrationKey, TaskFromRequest> tasks; public Builder() { taskParameterName = Optional.empty(); @@ -63,15 +63,15 @@ public class TaskFactory implements TaskGenerator { return this; } - public Builder register(TaskRegistrationKey key, TaskGenerator taskGenerator) { - this.tasks.put(key, taskGenerator); + public Builder register(TaskRegistrationKey key, TaskFromRequest taskFromRequest) { + this.tasks.put(key, taskFromRequest); return this; } - public TaskFactory build() { - ImmutableMap<TaskRegistrationKey, TaskGenerator> registrations = tasks.build(); + public TaskFromRequestRegistry build() { + ImmutableMap<TaskRegistrationKey, TaskFromRequest> registrations = tasks.build(); Preconditions.checkState(!registrations.isEmpty()); - return new TaskFactory( + return new TaskFromRequestRegistry( taskParameterName.orElse(DEFAULT_PARAMETER), registrations); } @@ -81,13 +81,13 @@ public class TaskFactory implements TaskGenerator { } } - public static class TaskRegistration implements TaskGenerator { + public static class TaskRegistration implements TaskFromRequest { private final TaskRegistrationKey taskRegistrationKey; - private final TaskGenerator taskGenerator; + private final TaskFromRequest taskFromRequest; - public TaskRegistration(TaskRegistrationKey taskRegistrationKey, TaskGenerator taskGenerator) { + public TaskRegistration(TaskRegistrationKey taskRegistrationKey, TaskFromRequest taskFromRequest) { this.taskRegistrationKey = taskRegistrationKey; - this.taskGenerator = taskGenerator; + this.taskFromRequest = taskFromRequest; } public TaskRegistrationKey registrationKey() { @@ -95,8 +95,8 @@ public class TaskFactory implements TaskGenerator { } @Override - public Task generate(Request request) throws Exception { - return taskGenerator.generate(request); + public Task fromRequest(Request request) throws Exception { + return taskFromRequest.fromRequest(request); } } @@ -104,25 +104,25 @@ public class TaskFactory implements TaskGenerator { return new Builder(); } - public static TaskFactory of(TaskRegistrationKey key, TaskGenerator generator) { - return TaskFactory.builder() + public static TaskFromRequestRegistry of(TaskRegistrationKey key, TaskFromRequest generator) { + return TaskFromRequestRegistry.builder() .register(key, generator) .build(); } private final String taskParameterName; - private final Map<TaskRegistrationKey, TaskGenerator> taskGenerators; + private final Map<TaskRegistrationKey, TaskFromRequest> taskGenerators; - private TaskFactory(String taskParameterName, Map<TaskRegistrationKey, TaskGenerator> taskGenerators) { + private TaskFromRequestRegistry(String taskParameterName, Map<TaskRegistrationKey, TaskFromRequest> taskGenerators) { this.taskParameterName = taskParameterName; this.taskGenerators = taskGenerators; } @Override - public Task generate(Request request) throws Exception { + public Task fromRequest(Request request) throws Exception { TaskRegistrationKey registrationKey = parseRegistrationKey(request); return Optional.ofNullable(taskGenerators.get(registrationKey)) - .map(Throwing.<TaskGenerator, Task>function(taskGenerator -> taskGenerator.generate(request)).sneakyThrow()) + .map(Throwing.<TaskFromRequest, Task>function(taskGenerator -> taskGenerator.fromRequest(request)).sneakyThrow()) .orElseThrow(() -> new IllegalArgumentException("Invalid value supplied for query parameter '" + taskParameterName + "': " + registrationKey.asString() + ". " + supportedValueMessage())); } 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/TaskFromRequestRegistryTest.java similarity index 78% rename from server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFactoryTest.java rename to server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFromRequestRegistryTest.java index d4a7707..faaebe5 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/TaskFromRequestRegistryTest.java @@ -30,70 +30,70 @@ import org.junit.jupiter.api.Test; import spark.Request; -class TaskFactoryTest { +class TaskFromRequestRegistryTest { static final Task TASK_1 = mock(Task.class); static final Task TASK_2 = mock(Task.class); static final TaskRegistrationKey KEY_1 = TaskRegistrationKey.of("task1"); static final TaskRegistrationKey KEY_2 = TaskRegistrationKey.of("task2"); Request request; - TaskFactory taskFactory; - TaskFactory singleTaskFactory; + TaskFromRequestRegistry taskFromRequestRegistry; + TaskFromRequestRegistry singleTaskFromRequestRegistry; @BeforeEach void setUp() { request = mock(Request.class); - taskFactory = TaskFactory.builder() + taskFromRequestRegistry = TaskFromRequestRegistry.builder() .register(KEY_1, any -> TASK_1) .register(KEY_2, any -> TASK_2) .build(); - singleTaskFactory = TaskFactory.of(KEY_1, any -> TASK_1); + singleTaskFromRequestRegistry = TaskFromRequestRegistry.of(KEY_1, any -> TASK_1); } @Test void buildShouldThrowWhenNoTasks() { - assertThatThrownBy(() -> TaskFactory.builder().build()) + assertThatThrownBy(() -> TaskFromRequestRegistry.builder().build()) .isInstanceOf(IllegalStateException.class); } @Test void generateShouldThrowFormattedMessageWhenNoTaskParamAndSeveralOptions() { - assertThatThrownBy(() -> taskFactory.generate(request)) + assertThatThrownBy(() -> taskFromRequestRegistry.fromRequest(request)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("'action' query parameter is compulsory. Supported values are [task1, task2]"); } @Test void generateShouldThrowFormattedMessageWhenNoTaskParam() { - assertThatThrownBy(() -> singleTaskFactory.generate(request)) + assertThatThrownBy(() -> singleTaskFromRequestRegistry.fromRequest(request)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("'action' query parameter is compulsory. Supported values are [task1]"); } @Test void generateShouldThrowWhenCustomParameterValueIsInvalid() { - TaskFactory taskFactory = TaskFactory.builder() + TaskFromRequestRegistry taskFromRequestRegistry = TaskFromRequestRegistry.builder() .parameterName("custom") .register(KEY_1, any -> TASK_1) .build(); when(request.queryParams("custom")).thenReturn("unknown"); - assertThatThrownBy(() -> taskFactory.generate(request)) + assertThatThrownBy(() -> taskFromRequestRegistry.fromRequest(request)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Invalid value supplied for query parameter 'custom': unknown. Supported values are [task1]"); } @Test void generateShouldThrowWhenCustomParameterNotSpecified() { - TaskFactory taskFactory = TaskFactory.builder() + TaskFromRequestRegistry taskFromRequestRegistry = TaskFromRequestRegistry.builder() .parameterName("custom") .register(KEY_1, any -> TASK_1) .build(); when(request.queryParams("action")).thenReturn("unknown"); - assertThatThrownBy(() -> taskFactory.generate(request)) + assertThatThrownBy(() -> taskFromRequestRegistry.fromRequest(request)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("'custom' query parameter is compulsory. Supported values are [task1]"); } @@ -102,7 +102,7 @@ class TaskFactoryTest { void generateShouldThrowFormattedMessageWhenUnknownTaskParamAndSeveralOptions() { when(request.queryParams("action")).thenReturn("unknown"); - assertThatThrownBy(() -> taskFactory.generate(request)) + assertThatThrownBy(() -> taskFromRequestRegistry.fromRequest(request)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Invalid value supplied for query parameter 'action': unknown. Supported values are [task1, task2]"); } @@ -111,7 +111,7 @@ class TaskFactoryTest { void generateShouldThrowFormattedMessageWhenUnknownTaskParam() { when(request.queryParams("action")).thenReturn("unknown"); - assertThatThrownBy(() -> singleTaskFactory.generate(request)) + assertThatThrownBy(() -> singleTaskFromRequestRegistry.fromRequest(request)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Invalid value supplied for query parameter 'action': unknown. Supported values are [task1]"); } @@ -120,7 +120,7 @@ class TaskFactoryTest { void generateShouldThrowWhenEmptyTaskParam() { when(request.queryParams("action")).thenReturn(""); - assertThatThrownBy(() -> singleTaskFactory.generate(request)) + assertThatThrownBy(() -> singleTaskFromRequestRegistry.fromRequest(request)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("'action' query parameter cannot be empty or blank. Supported values are [task1]"); } @@ -129,7 +129,7 @@ class TaskFactoryTest { void generateShouldThrowWhenBlankTaskParam() { when(request.queryParams("action")).thenReturn(" "); - assertThatThrownBy(() -> singleTaskFactory.generate(request)) + assertThatThrownBy(() -> singleTaskFromRequestRegistry.fromRequest(request)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("'action' query parameter cannot be empty or blank. Supported values are [task1]"); } @@ -138,20 +138,20 @@ class TaskFactoryTest { void generateShouldCreateCorrespondingTask() throws Exception { when(request.queryParams("action")).thenReturn("task1"); - assertThat(singleTaskFactory.generate(request)) + assertThat(singleTaskFromRequestRegistry.fromRequest(request)) .isSameAs(TASK_1); } @Test void generateShouldHandleCustomTaskParameter() throws Exception { - TaskFactory taskFactory = TaskFactory.builder() + TaskFromRequestRegistry taskFromRequestRegistry = TaskFromRequestRegistry.builder() .parameterName("custom") .register(KEY_1, any -> TASK_1) .build(); when(request.queryParams("custom")).thenReturn("task1"); - assertThat(taskFactory.generate(request)) + assertThat(taskFromRequestRegistry.fromRequest(request)) .isSameAs(TASK_1); } } \ No newline at end of file diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskGeneratorTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFromRequestTest.java similarity index 93% rename from server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskGeneratorTest.java rename to server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFromRequestTest.java index a7995b8..4976a5a 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskGeneratorTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskFromRequestTest.java @@ -34,7 +34,7 @@ import org.junit.Test; import spark.Request; import spark.Response; -public class TaskGeneratorTest { +public class TaskFromRequestTest { static final Task TASK = mock(Task.class); static final String UUID_VALUE = "ce5316cb-c924-40eb-9ca0-c5828e276297"; @@ -43,11 +43,11 @@ public class TaskGeneratorTest { Request request = mock(Request.class); Response response = mock(Response.class); - TaskGenerator taskGenerator = any -> TASK; + TaskFromRequest taskFromRequest = any -> TASK; TaskManager taskManager = mock(TaskManager.class); when(taskManager.submit(TASK)).thenReturn(TaskId.fromString(UUID_VALUE)); - taskGenerator.asRoute(taskManager).handle(request, response); + taskFromRequest.asRoute(taskManager).handle(request, response); verify(response).status(HttpStatus.CREATED_201); verify(response).header(LOCATION.asString(), "/tasks/" + UUID_VALUE); diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java index 0197c1d..e7c33a5 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java @@ -44,8 +44,8 @@ import org.apache.james.vault.dto.query.QueryTranslator; import org.apache.james.vault.search.Query; import org.apache.james.webadmin.Constants; import org.apache.james.webadmin.Routes; -import org.apache.james.webadmin.tasks.TaskFactory; -import org.apache.james.webadmin.tasks.TaskGenerator; +import org.apache.james.webadmin.tasks.TaskFromRequest; +import org.apache.james.webadmin.tasks.TaskFromRequestRegistry; import org.apache.james.webadmin.tasks.TaskIdDto; import org.apache.james.webadmin.tasks.TaskRegistrationKey; import org.apache.james.webadmin.utils.ErrorResponder; @@ -120,8 +120,8 @@ public class DeletedMessagesVaultRoutes implements Routes { service.post(USER_PATH, userActions(), jsonTransformer); service.delete(ROOT_PATH, deleteWithScope(), jsonTransformer); - TaskGenerator deleteTaskGenerator = this::deleteMessage; - service.delete(DELETE_PATH, deleteTaskGenerator.asRoute(taskManager), jsonTransformer); + TaskFromRequest deleteTaskFromRequest = this::deleteMessage; + service.delete(DELETE_PATH, deleteTaskFromRequest.asRoute(taskManager), jsonTransformer); } @POST @@ -159,7 +159,7 @@ public class DeletedMessagesVaultRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal server error - Something went bad on the server side.") }) private Route userActions() { - return TaskFactory.builder() + return TaskFromRequestRegistry.builder() .register(EXPORT_REGISTRATION_KEY, this::export) .register(RESTORE_REGISTRATION_KEY, this::restore) .buildAsRoute(taskManager); @@ -194,7 +194,7 @@ public class DeletedMessagesVaultRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal server error - Something went bad on the server side.") }) private Route deleteWithScope() { - return TaskFactory.builder() + return TaskFromRequestRegistry.builder() .parameterName(SCOPE_QUERY_PARAM) .register(EXPIRED_REGISTRATION_KEY, request -> deletedMessageVault.deleteExpiredMessagesTask()) .buildAsRoute(taskManager); 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 cc1a9fe..601db57 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 @@ -35,7 +35,7 @@ import org.apache.james.mailbox.events.Group; import org.apache.james.task.TaskManager; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.service.EventDeadLettersService; -import org.apache.james.webadmin.tasks.TaskFactory; +import org.apache.james.webadmin.tasks.TaskFromRequestRegistry; import org.apache.james.webadmin.tasks.TaskIdDto; import org.apache.james.webadmin.tasks.TaskRegistrationKey; import org.apache.james.webadmin.utils.ErrorResponder; @@ -118,7 +118,7 @@ public class EventDeadLettersRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = INTERNAL_SERVER_ERROR) }) public Route performActionOnAllEvents() { - return TaskFactory.of(RE_DELIVER, request -> eventDeadLettersService.redeliverAllEvents()) + return TaskFromRequestRegistry.of(RE_DELIVER, request -> eventDeadLettersService.redeliverAllEvents()) .asRoute(taskManager); } @@ -184,7 +184,7 @@ public class EventDeadLettersRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = INTERNAL_SERVER_ERROR) }) public Route performActionOnGroupEvents() { - return TaskFactory.of(RE_DELIVER, request -> eventDeadLettersService.redeliverGroupEvents(parseGroup(request))) + return TaskFromRequestRegistry.of(RE_DELIVER, request -> eventDeadLettersService.redeliverGroupEvents(parseGroup(request))) .asRoute(taskManager); } @@ -291,7 +291,7 @@ public class EventDeadLettersRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = INTERNAL_SERVER_ERROR) }) public Route performActionOnSingleEvent() { - return TaskFactory.of(RE_DELIVER, + return TaskFromRequestRegistry.of(RE_DELIVER, request -> eventDeadLettersService.redeliverSingleEvent(parseGroup(request), parseInsertionId(request))) .asRoute(taskManager); } diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/MessageIdReindexingRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/MessageIdReindexingRoutes.java index bc28e9a..a283262 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/MessageIdReindexingRoutes.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/MessageIdReindexingRoutes.java @@ -30,7 +30,7 @@ import org.apache.james.mailbox.indexer.MessageIdReIndexer; import org.apache.james.mailbox.model.MessageId; import org.apache.james.task.TaskManager; import org.apache.james.webadmin.Routes; -import org.apache.james.webadmin.tasks.TaskFactory; +import org.apache.james.webadmin.tasks.TaskFromRequestRegistry; import org.apache.james.webadmin.tasks.TaskIdDto; import org.apache.james.webadmin.utils.ErrorResponder; import org.apache.james.webadmin.utils.JsonTransformer; @@ -103,7 +103,7 @@ public class MessageIdReindexingRoutes implements Routes { @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "Bad request - details in the returned error message") }) private Route reIndexMessage() { - return TaskFactory.builder() + return TaskFromRequestRegistry.builder() .parameterName(TASK_PARAMETER) .register(ReindexingRoutes.RE_INDEX, request -> reIndexer.reIndex(extractMessageId(request))) .buildAsRoute(taskManager); diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/ReindexingRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/ReindexingRoutes.java index 75f0cdd..12dfcd6 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/ReindexingRoutes.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/ReindexingRoutes.java @@ -37,8 +37,8 @@ import org.apache.james.task.TaskManager; import org.apache.james.task.TaskNotFoundException; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.service.PreviousReIndexingService; -import org.apache.james.webadmin.tasks.TaskFactory; -import org.apache.james.webadmin.tasks.TaskGenerator; +import org.apache.james.webadmin.tasks.TaskFromRequest; +import org.apache.james.webadmin.tasks.TaskFromRequestRegistry; import org.apache.james.webadmin.tasks.TaskIdDto; import org.apache.james.webadmin.tasks.TaskRegistrationKey; import org.apache.james.webadmin.utils.ErrorResponder; @@ -135,7 +135,7 @@ public class ReindexingRoutes implements Routes { @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "Bad request - details in the returned error message") }) private Route reIndexAll() { - return TaskFactory.builder() + return TaskFromRequestRegistry.builder() .parameterName(TASK_PARAMETER) .register(RE_INDEX, wrap(this::reIndexAll)) .buildAsRoute(taskManager); @@ -234,7 +234,7 @@ public class ReindexingRoutes implements Routes { @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "Bad request - details in the returned error message") }) private Route reIndexMailbox() { - return TaskFactory.builder() + return TaskFromRequestRegistry.builder() .parameterName(TASK_PARAMETER) .register(RE_INDEX, wrap(request -> reIndexer.reIndex(extractMailboxId(request)))) .buildAsRoute(taskManager); @@ -276,16 +276,16 @@ public class ReindexingRoutes implements Routes { value = "Compulsory. Needs to be a valid UID") }) private Route reIndexMessage() { - return TaskFactory.builder() + return TaskFromRequestRegistry.builder() .parameterName(TASK_PARAMETER) .register(RE_INDEX, wrap(request -> reIndexer.reIndex(extractMailboxId(request), extractUid(request)))) .buildAsRoute(taskManager); } - private TaskGenerator wrap(TaskGenerator toBeWrapped) { + private TaskFromRequest wrap(TaskFromRequest toBeWrapped) { return request -> { try { - return toBeWrapped.generate(request); + return toBeWrapped.fromRequest(request); } catch (MailboxNotFoundException e) { throw ErrorResponder.builder() .statusCode(HttpStatus.NOT_FOUND_404) diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java index 05c5d51..335cd04 100644 --- a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java +++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java @@ -45,7 +45,7 @@ import org.apache.james.webadmin.dto.MailQueueDTO; import org.apache.james.webadmin.dto.MailQueueItemDTO; import org.apache.james.webadmin.service.ClearMailQueueTask; import org.apache.james.webadmin.service.DeleteMailsFromMailQueueTask; -import org.apache.james.webadmin.tasks.TaskGenerator; +import org.apache.james.webadmin.tasks.TaskFromRequest; import org.apache.james.webadmin.utils.ErrorResponder; import org.apache.james.webadmin.utils.ErrorResponder.ErrorType; import org.apache.james.webadmin.utils.JsonExtractException; @@ -296,9 +296,9 @@ public class MailQueueRoutes implements Routes { @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal server error - Something went bad on the server side.") }) public void deleteMails(Service service) { - TaskGenerator taskGenerator = this::deleteMails; + TaskFromRequest taskFromRequest = this::deleteMails; service.delete(BASE_URL + SEPARATOR + MAIL_QUEUE_NAME + MAILS, - taskGenerator.asRoute(taskManager), + taskFromRequest.asRoute(taskManager), jsonTransformer); } 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 0b00416..f200a1d 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 @@ -56,8 +56,8 @@ import org.apache.james.webadmin.service.MailRepositoryStoreService; import org.apache.james.webadmin.service.ReprocessingAllMailsTask; import org.apache.james.webadmin.service.ReprocessingOneMailTask; import org.apache.james.webadmin.service.ReprocessingService; -import org.apache.james.webadmin.tasks.TaskFactory; -import org.apache.james.webadmin.tasks.TaskGenerator; +import org.apache.james.webadmin.tasks.TaskFromRequest; +import org.apache.james.webadmin.tasks.TaskFromRequestRegistry; import org.apache.james.webadmin.tasks.TaskIdDto; import org.apache.james.webadmin.tasks.TaskRegistrationKey; import org.apache.james.webadmin.utils.ErrorResponder; @@ -393,7 +393,7 @@ public class MailRepositoriesRoutes implements Routes { @ApiResponse(code = HttpStatus.BAD_REQUEST_400, message = "Bad request - unknown action") }) public void defineDeleteAll() { - TaskGenerator taskGenerator = request -> { + TaskFromRequest taskFromRequest = request -> { MailRepositoryPath path = decodedRepositoryPath(request); try { return repositoryStoreService.createClearMailRepositoryTask(path); @@ -406,7 +406,7 @@ public class MailRepositoriesRoutes implements Routes { .haltError(); } }; - service.delete(MAIL_REPOSITORIES + "/:encodedPath/mails", taskGenerator.asRoute(taskManager), jsonTransformer); + service.delete(MAIL_REPOSITORIES + "/:encodedPath/mails", taskFromRequest.asRoute(taskManager), jsonTransformer); } @PATCH @@ -445,7 +445,7 @@ public class MailRepositoriesRoutes implements Routes { }) public void defineReprocessAll() { service.patch(MAIL_REPOSITORIES + "/:encodedPath/mails", - TaskFactory.of(REPROCESS_ACTION, this::reprocessAll) + TaskFromRequestRegistry.of(REPROCESS_ACTION, this::reprocessAll) .asRoute(taskManager), jsonTransformer); } @@ -495,7 +495,7 @@ public class MailRepositoriesRoutes implements Routes { }) public void defineReprocessOne() { service.patch(MAIL_REPOSITORIES + "/:encodedPath/mails/:key", - TaskFactory.of(REPROCESS_ACTION, this::reprocessOne) + TaskFromRequestRegistry.of(REPROCESS_ACTION, this::reprocessOne) .asRoute(taskManager), jsonTransformer); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
