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 ad...@apache.org on 2019/04/18 07:00:16 UTC
[james-project] 01/11: JAMES-2710 Rename VaultAction to support
purge action
This is an automated email from the ASF dual-hosted git repository.
aduprat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6189ecd1d3f3738d0cad775355a6405afbf24ab9
Author: datph <dp...@linagora.com>
AuthorDate: Thu Apr 4 11:07:22 2019 +0700
JAMES-2710 Rename VaultAction to support purge action
---
.../vault/routes/DeletedMessagesVaultRoutes.java | 22 +++++++++++-----------
.../routes/DeletedMessagesVaultRoutesTest.java | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
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 7c1fa72..c38bcda 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
@@ -72,11 +72,11 @@ import spark.Service;
@Produces(Constants.JSON_CONTENT_TYPE)
public class DeletedMessagesVaultRoutes implements Routes {
- enum UserVaultAction {
+ enum VaultAction {
RESTORE("restore"),
EXPORT("export");
- static Optional<UserVaultAction> getAction(String value) {
+ static Optional<VaultAction> getAction(String value) {
Preconditions.checkNotNull(value, "action cannot be null");
Preconditions.checkArgument(StringUtils.isNotBlank(value), "action cannot be empty or blank");
@@ -87,13 +87,13 @@ public class DeletedMessagesVaultRoutes implements Routes {
private static List<String> plainValues() {
return Stream.of(values())
- .map(UserVaultAction::getValue)
+ .map(VaultAction::getValue)
.collect(Guavate.toImmutableList());
}
private final String value;
- UserVaultAction(String value) {
+ VaultAction(String value) {
this.value = value;
}
@@ -173,14 +173,14 @@ public class DeletedMessagesVaultRoutes implements Routes {
@ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "Internal server error - Something went bad on the server side.")
})
private TaskIdDto userActions(Request request, Response response) throws JsonExtractException {
- UserVaultAction requestedAction = extractUserVaultAction(request);
+ VaultAction requestedAction = extractVaultAction(request);
Task requestedTask = generateTask(requestedAction, request);
TaskId taskId = taskManager.submit(requestedTask);
return TaskIdDto.respond(response, taskId);
}
- private Task generateTask(UserVaultAction requestedAction, Request request) throws JsonExtractException {
+ private Task generateTask(VaultAction requestedAction, Request request) throws JsonExtractException {
User user = extractUser(request);
validateUserExist(user);
Query query = translate(jsonExtractor.parse(request.body()));
@@ -264,17 +264,17 @@ public class DeletedMessagesVaultRoutes implements Routes {
}
}
- private UserVaultAction extractUserVaultAction(Request request) {
+ private VaultAction extractVaultAction(Request request) {
String actionParam = request.queryParams(ACTION_QUERY_PARAM);
return Optional.ofNullable(actionParam)
- .map(this::getUserVaultAction)
+ .map(this::getVaultAction)
.orElseThrow(() -> new IllegalArgumentException("action parameter is missing"));
}
- private UserVaultAction getUserVaultAction(String actionString) {
- return UserVaultAction.getAction(actionString)
+ private VaultAction getVaultAction(String actionString) {
+ return VaultAction.getAction(actionString)
.orElseThrow(() -> new IllegalArgumentException(String.format("'%s' is not a valid action. Supported values are: (%s)",
actionString,
- Joiner.on(",").join(UserVaultAction.plainValues()))));
+ Joiner.on(",").join(VaultAction.plainValues()))));
}
}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index 7989b31..713ddc9 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -201,7 +201,7 @@ class DeletedMessagesVaultRoutesTest {
}
@Nested
- class UserVaultActionsValidationTest {
+ class VaultActionsValidationTest {
@Test
void userVaultAPIShouldReturnInvalidWhenActionIsMissing() {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org