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 bt...@apache.org on 2018/06/14 08:35:20 UTC
[02/13] james-project git commit: JAMES-2423 Webadmin should list the
mails in a mail repository in the correct format
JAMES-2423 Webadmin should list the mails in a mail repository in the correct format
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b3d27f87
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b3d27f87
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b3d27f87
Branch: refs/heads/master
Commit: b3d27f878167d9218d35d0b60026ea6ccb60dfe1
Parents: 7b6bfb8
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Tue Jun 12 16:19:40 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Thu Jun 14 15:14:24 2018 +0700
----------------------------------------------------------------------
.../main/java/org/apache/james/webadmin/dto/MailKeyDTO.java | 3 +++
.../james/webadmin/routes/MailRepositoriesRoutesTest.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d27f87/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/dto/MailKeyDTO.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/dto/MailKeyDTO.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/dto/MailKeyDTO.java
index 64d4504..fa75fc4 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/dto/MailKeyDTO.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/dto/MailKeyDTO.java
@@ -23,6 +23,8 @@ import java.util.Objects;
import org.apache.james.mailrepository.api.MailKey;
+import com.fasterxml.jackson.annotation.JsonValue;
+
public class MailKeyDTO {
private final MailKey mailKey;
@@ -31,6 +33,7 @@ public class MailKeyDTO {
this.mailKey = mailKey;
}
+ @JsonValue
public String getMailKey() {
return mailKey.asString();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/b3d27f87/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index ae90244..73f8539 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -258,7 +258,7 @@ public class MailRepositoriesRoutesTest {
.then()
.statusCode(HttpStatus.OK_200)
.body("", hasSize(2))
- .body("mailKey", containsInAnyOrder("name1", "name2"));
+ .body("", containsInAnyOrder("name1", "name2"));
}
@Test
@@ -283,7 +283,7 @@ public class MailRepositoriesRoutesTest {
.then()
.statusCode(HttpStatus.OK_200)
.body("", hasSize(1))
- .body("mailKey", contains("name2"));
+ .body("", contains("name2"));
}
@Test
@@ -394,7 +394,7 @@ public class MailRepositoriesRoutesTest {
.then()
.statusCode(HttpStatus.OK_200)
.body("", hasSize(2))
- .body("mailKey", containsInAnyOrder(NAME_1, NAME_2));
+ .body("", containsInAnyOrder(NAME_1, NAME_2));
}
@Test
@@ -596,7 +596,7 @@ public class MailRepositoriesRoutesTest {
.then()
.statusCode(HttpStatus.OK_200)
.body("", hasSize(1))
- .body("mailKey", contains(NAME_2));
+ .body("", contains(NAME_2));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org