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 40042e9442e38891cff6306b283d7ba29e5e0bb7 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Dec 12 08:19:41 2019 +0100 JAMES-3006 Move TaskIdDTO in task package + visibility enhancements This enforce the usage of TaskGenerator for returning tasks to the caller --- .../java/org/apache/james/webadmin/tasks/TaskGenerator.java | 1 - .../org/apache/james/webadmin/{dto => tasks}/TaskIdDto.java | 13 ++++--------- .../apache/james/webadmin/{dto => tasks}/TaskIdDtoTest.java | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) 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/TaskGenerator.java index 09d759e..8cd139b 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/TaskGenerator.java @@ -22,7 +22,6 @@ package org.apache.james.webadmin.tasks; import org.apache.james.task.Task; import org.apache.james.task.TaskId; import org.apache.james.task.TaskManager; -import org.apache.james.webadmin.dto.TaskIdDto; import spark.Request; import spark.Response; diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/dto/TaskIdDto.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskIdDto.java similarity index 85% rename from server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/dto/TaskIdDto.java rename to server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskIdDto.java index fbb74f0..ab8a1b2 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/dto/TaskIdDto.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/tasks/TaskIdDto.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.webadmin.dto; +package org.apache.james.webadmin.tasks; import static org.eclipse.jetty.http.HttpHeader.LOCATION; @@ -30,20 +30,15 @@ import org.eclipse.jetty.http.HttpStatus; import spark.Response; public class TaskIdDto { - - public static TaskIdDto respond(Response response, TaskId taskId) { + static TaskIdDto respond(Response response, TaskId taskId) { response.status(HttpStatus.CREATED_201); response.header(LOCATION.asString(), TasksRoutes.BASE + "/" + taskId.asString()); - return TaskIdDto.from(taskId); - } - - public static TaskIdDto from(TaskId id) { - return new TaskIdDto(id.getValue()); + return new TaskIdDto(taskId.getValue()); } private final UUID uuid; - public TaskIdDto(UUID uuid) { + private TaskIdDto(UUID uuid) { this.uuid = uuid; } diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/dto/TaskIdDtoTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskIdDtoTest.java similarity index 97% rename from server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/dto/TaskIdDtoTest.java rename to server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskIdDtoTest.java index 3a593eb..1e41f5e 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/dto/TaskIdDtoTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/tasks/TaskIdDtoTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.webadmin.dto; +package org.apache.james.webadmin.tasks; import static org.eclipse.jetty.http.HttpHeader.LOCATION; import static org.mockito.Mockito.mock; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
