JAMES-2710 Rename VaultAction to support purge action

apache · Apr 18, 2019 · 6189ecd · 6189ecd
1 parent 8d008f5
commit 6189ecd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/...ault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java b/...ault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java
@@ -72,11 +72,11 @@
 @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 @@ static Optional<UserVaultAction> getAction(String value) {
 
         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 void define(Service service) {
         @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 @@ private User extractUser(Request request) {
         }
     }
 
-    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) {
+    private VaultAction getVaultAction(String actionString) {
-        return UserVaultAction.getAction(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/.../src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/.../src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -201,7 +201,7 @@ void afterEach() {
     }
 
     @Nested
-    class UserVaultActionsValidationTest {
+    class VaultActionsValidationTest {
 
         @Test
         void userVaultAPIShouldReturnInvalidWhenActionIsMissing() {