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 85cfd171fc94fd85483d86f4a710c219ad863a6a
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Mon Mar 18 14:28:32 2019 +0700
JAMES-2685 revise user vault api path
From `.../user/...` to `.../users/...`
---
.../james/jmap/methods/integration/DeletedMessagesVaultTest.java | 2 +-
.../james/webadmin/vault/routes/DeletedMessagesVaultRoutes.java | 3 +--
src/site/markdown/server/manage-webadmin.md | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
index 67f91a9..109fa2b 100644
---
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
+++
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
@@ -489,7 +489,7 @@ public abstract class DeletedMessagesVaultTest {
private void restoreMessagesFor(String user, String criteria) {
String taskId = webAdminApi.with()
.body(criteria)
- .post("/deletedMessages/user/" + user + "?action=restore")
+ .post("/deletedMessages/users/" + user + "?action=restore")
.jsonPath()
.get("taskId");
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 ba8864c..940e3a8 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
@@ -63,7 +63,6 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import spark.HaltException;
import spark.Request;
import spark.Response;
import spark.Service;
@@ -103,7 +102,7 @@ public class DeletedMessagesVaultRoutes implements Routes {
}
}
- public static final String ROOT_PATH = "deletedMessages/user";
+ public static final String ROOT_PATH = "deletedMessages/users";
private static final String USER_PATH_PARAM = "user";
private static final String RESTORE_PATH = ROOT_PATH + SEPARATOR + ":" +
USER_PATH_PARAM;
private static final String ACTION_QUERY_PARAM = "action";
diff --git a/src/site/markdown/server/manage-webadmin.md
b/src/site/markdown/server/manage-webadmin.md
index 55e6e41..56d8bc0 100644
--- a/src/site/markdown/server/manage-webadmin.md
+++ b/src/site/markdown/server/manage-webadmin.md
@@ -2561,7 +2561,7 @@ Here are the following actions available on the 'Deleted
Messages Vault'
Deleted messages of a specific user can be restored by calling the following
endpoint:
```
-curl -XPOST
http://ip:port/deletedMessages/user/usertorest...@domain.ext?action=restore
+curl -XPOST
http://ip:port/deletedMessages/users/usertorest...@domain.ext?action=restore
{"
"combinator": "and",
@@ -2692,7 +2692,7 @@ while:
Retrieve deleted messages matched with requested query from an user then share
the content to a targeted mail address (exportTo)
```
-curl -XPOST
http://ip:port/deletedMessages/user/userexportf...@domain.ext?action=export&exportTo=userreceiv...@domain.ext
+curl -XPOST
http://ip:port/deletedMessages/users/userexportf...@domain.ext?action=export&exportTo=userreceiv...@domain.ext
BODY: is the json query has the same structure with Restore Deleted Messages
section
```
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
