JAMES-2521 Don't expose store concept via mailbox probe
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bf6254df Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bf6254df Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bf6254df Branch: refs/heads/master Commit: bf6254dfb5f742ad1d01f9158787c432da39f96b Parents: 1be65de Author: Benoit Tellier <[email protected]> Authored: Tue Aug 14 11:59:19 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Aug 29 10:11:46 2018 +0700 ---------------------------------------------------------------------- .../james/mailbox/store/probe/MailboxProbe.java | 3 +- .../james/cli/probe/impl/JmxMailboxProbe.java | 3 +- .../apache/james/FixingGhostMailboxTest.java | 28 +++++++-------- .../apache/james/modules/MailboxProbeImpl.java | 5 ++- .../integration/GetMailboxesMethodTest.java | 17 +++++---- .../integration/SetMailboxesMethodTest.java | 36 +++++++++----------- .../integration/SetMessagesMethodTest.java | 3 +- .../cucumber/GetMailboxesMethodStepdefs.java | 10 +++--- .../integration/cucumber/MainStepdefs.java | 4 +-- 9 files changed, 49 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/bf6254df/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/MailboxProbe.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/MailboxProbe.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/MailboxProbe.java index 7b29962..739a96e 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/MailboxProbe.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/MailboxProbe.java @@ -29,13 +29,12 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.mail.model.Mailbox; public interface MailboxProbe { MailboxId createMailbox(String namespace, String user, String name); - Mailbox getMailbox(String namespace, String user, String name); + MailboxId getMailboxId(String namespace, String user, String name); Collection<String> listUserMailboxes(String user); http://git-wip-us.apache.org/repos/asf/james-project/blob/bf6254df/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java index 9e0d11f..385f74f 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java @@ -35,7 +35,6 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.probe.MailboxProbe; public class JmxMailboxProbe implements MailboxProbe, JmxProbe { @@ -102,7 +101,7 @@ public class JmxMailboxProbe implements MailboxProbe, JmxProbe { } @Override - public Mailbox getMailbox(String namespace, String user, String name) { + public MailboxId getMailboxId(String namespace, String user, String name) { throw new NotImplementedException("Not implemented"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/bf6254df/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java index 1ebe05f..7bb7c58 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java @@ -50,7 +50,6 @@ import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.probe.ACLProbe; import org.apache.james.mime4j.dom.Message; import org.apache.james.modules.ACLProbeImpl; @@ -73,6 +72,7 @@ import org.junit.Test; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; + import io.restassured.RestAssured; import io.restassured.builder.RequestSpecBuilder; import io.restassured.http.ContentType; @@ -189,18 +189,18 @@ public class FixingGhostMailboxTest { @Test public void ghostMailboxBugShouldChangeMailboxId() throws Exception { - Mailbox newAliceInbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); + MailboxId newAliceInbox = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); - assertThat(aliceGhostInboxId).isNotEqualTo(newAliceInbox.getMailboxId()); + assertThat(aliceGhostInboxId).isNotEqualTo(newAliceInbox); } @Test public void ghostMailboxBugShouldDiscardOldContent() throws Exception { - Mailbox newAliceInbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); + MailboxId newAliceInbox = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); given() .header("Authorization", accessToken.serialize()) - .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + newAliceInbox.getMailboxId().serialize() + "\"]}}, \"#0\"]]") + .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + newAliceInbox.serialize() + "\"]}}, \"#0\"]]") .when() .post("/jmap") .then() @@ -213,13 +213,13 @@ public class FixingGhostMailboxTest { @Test public void webadminCanMergeTwoMailboxes() throws Exception { - Mailbox newAliceInbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); + MailboxId newAliceInbox = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); fixGhostMailboxes(newAliceInbox); given() .header("Authorization", accessToken.serialize()) - .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + newAliceInbox.getMailboxId().serialize() + "\"]}}, \"#0\"]]") + .body("[[\"getMessageList\", {\"filter\":{\"inMailboxes\":[\"" + newAliceInbox.serialize() + "\"]}}, \"#0\"]]") .when() .post("/jmap") .then() @@ -233,14 +233,14 @@ public class FixingGhostMailboxTest { @Test public void webadminCanMergeTwoMailboxesRights() throws Exception { - Mailbox newAliceInbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); + MailboxId newAliceInbox = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); aclProbe.addRights(aliceInboxPath, cedric, MailboxACL.FULL_RIGHTS); fixGhostMailboxes(newAliceInbox); given() .header("Authorization", accessToken.serialize()) - .body("[[\"getMailboxes\", {\"ids\": [\"" + newAliceInbox.getMailboxId().serialize() + "\"]}, \"#0\"]]") + .body("[[\"getMailboxes\", {\"ids\": [\"" + newAliceInbox.serialize() + "\"]}, \"#0\"]]") .when() .post("/jmap") .then() @@ -252,7 +252,7 @@ public class FixingGhostMailboxTest { @Test public void oldGhostedMailboxShouldNoMoreBeAccessible() throws Exception { - Mailbox newAliceInbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); + MailboxId newAliceInbox = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); aclProbe.addRights(aliceInboxPath, cedric, MailboxACL.FULL_RIGHTS); fixGhostMailboxes(newAliceInbox); @@ -270,7 +270,7 @@ public class FixingGhostMailboxTest { @Test public void mergingMailboxTaskShouldBeInformative() { - Mailbox newAliceInbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); + MailboxId newAliceInbox = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, alice, MailboxConstants.INBOX); String taskId = fixGhostMailboxes(newAliceInbox); @@ -283,7 +283,7 @@ public class FixingGhostMailboxTest { .body("status", is(TaskManager.Status.COMPLETED.getValue())) .body("taskId", is(taskId)) .body("additionalInformation.oldMailboxId", is(aliceGhostInboxId.serialize())) - .body("additionalInformation.newMailboxId", is(newAliceInbox.getMailboxId().serialize())) + .body("additionalInformation.newMailboxId", is(newAliceInbox.serialize())) .body("additionalInformation.totalMessageCount", is(1)) .body("additionalInformation.messageMovedCount", is(1)) .body("additionalInformation.messageFailedCount", is(0)) @@ -293,12 +293,12 @@ public class FixingGhostMailboxTest { .body("completedDate", is(not(nullValue()))); } - private String fixGhostMailboxes(Mailbox newAliceInbox) { + private String fixGhostMailboxes(MailboxId newAliceInbox) { String taskId = given() .spec(webadminSpecification) .body("{" + " \"mergeOrigin\":\"" + aliceGhostInboxId.serialize() + "\"," + - " \"mergeDestination\":\"" + newAliceInbox.getMailboxId().serialize() + "\"" + + " \"mergeDestination\":\"" + newAliceInbox.serialize() + "\"" + "}") .post(CassandraMailboxMergingRoutes.BASE) .jsonPath() http://git-wip-us.apache.org/repos/asf/james-project/blob/bf6254df/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java ---------------------------------------------------------------------- diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java index 637d449..961e17c 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java @@ -43,7 +43,6 @@ import org.apache.james.mailbox.model.search.MailboxQuery; import org.apache.james.mailbox.model.search.Wildcard; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; -import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.utils.GuiceProbe; @@ -80,12 +79,12 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe { } @Override - public Mailbox getMailbox(String namespace, String user, String name) { + public MailboxId getMailboxId(String namespace, String user, String name) { MailboxSession mailboxSession = null; try { mailboxSession = mailboxManager.createSystemSession(user); MailboxMapper mailboxMapper = mailboxMapperFactory.getMailboxMapper(mailboxSession); - return mailboxMapper.findMailboxByPath(new MailboxPath(namespace, user, name)); + return mailboxMapper.findMailboxByPath(new MailboxPath(namespace, user, name)).getMailboxId(); } catch (MailboxException e) { throw new RuntimeException(e); } finally { http://git-wip-us.apache.org/repos/asf/james-project/blob/bf6254df/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java index 415f58c..da41588 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java @@ -67,7 +67,6 @@ import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.SerializableQuotaValue; -import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.probe.ACLProbe; import org.apache.james.mailbox.store.probe.QuotaProbe; import org.apache.james.mime4j.dom.Message; @@ -255,9 +254,9 @@ public abstract class GetMailboxesMethodTest { String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName).serialize(); String targetUser1 = "toUser1@" + DOMAIN; String targetUser2 = "toUser2@" + DOMAIN; - Mailbox myMailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName); - aclProbe.replaceRights(myMailbox.generateAssociatedPath(), targetUser1, new Rfc4314Rights(Right.Lookup, Right.Administer)); - aclProbe.replaceRights(myMailbox.generateAssociatedPath(), targetUser2, new Rfc4314Rights(Right.Read, Right.Lookup)); + + aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), targetUser1, new Rfc4314Rights(Right.Lookup, Right.Administer)); + aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), targetUser2, new Rfc4314Rights(Right.Read, Right.Lookup)); given() .header("Authorization", accessToken.serialize()) @@ -277,9 +276,9 @@ public abstract class GetMailboxesMethodTest { String mailboxName = "myMailbox"; String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName).serialize(); String targetUser1 = "toUser1@" + DOMAIN; - Mailbox myMailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName); - aclProbe.replaceRights(myMailbox.generateAssociatedPath(), ALICE, new Rfc4314Rights(Right.Read, Right.Administer)); - aclProbe.replaceRights(myMailbox.generateAssociatedPath(), targetUser1, new Rfc4314Rights(Right.Read, Right.Lookup)); + + aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), ALICE, new Rfc4314Rights(Right.Read, Right.Administer)); + aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), targetUser1, new Rfc4314Rights(Right.Read, Right.Lookup)); given() .header("Authorization", accessToken.serialize()) @@ -315,8 +314,8 @@ public abstract class GetMailboxesMethodTest { String mailboxName = "myMailbox"; String myMailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName).serialize(); String targetUser1 = "toUser1@" + DOMAIN; - Mailbox myMailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, ALICE, mailboxName); - aclProbe.replaceRights(myMailbox.generateAssociatedPath(), targetUser1, new Rfc4314Rights(Right.Lookup, Right.Post)); + + aclProbe.replaceRights(MailboxPath.forUser(ALICE, mailboxName), targetUser1, new Rfc4314Rights(Right.Lookup, Right.Post)); given() .header("Authorization", accessToken.serialize()) http://git-wip-us.apache.org/repos/asf/james-project/blob/bf6254df/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java index d562279..cfb5c75 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java @@ -55,7 +55,6 @@ import org.apache.james.mailbox.model.MailboxACL.Right; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; @@ -272,7 +271,7 @@ public abstract class SetMailboxesMethodTest { @Test public void userShouldBeSubscribedOnCreatedMailboxWhenCreateChildOfInboxMailbox() throws Exception { - MailboxId inboxId = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, username, MailboxConstants.INBOX).getMailboxId(); + MailboxId inboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username, MailboxConstants.INBOX); String requestBody = "[" + @@ -354,8 +353,7 @@ public abstract class SetMailboxesMethodTest { .body(NAME, equalTo("mailboxesSet")) .body(ARGUMENTS + ".created", hasKey("create-id01")); - Mailbox mailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, username, "foo"); - String mailboxId = mailbox.getMailboxId().serialize(); + String mailboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username, "foo").serialize(); requestBody = "[" + @@ -438,13 +436,13 @@ public abstract class SetMailboxesMethodTest { .body(NAME, equalTo("mailboxesSet")) .body(ARGUMENTS + ".created", hasKey("create-id01")); - Mailbox mailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, username, "foo"); + MailboxId mailbox = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username, "foo"); requestBody = "[" + " [ \"setMailboxes\"," + " {" + - " \"destroy\": [\"" + mailbox.getMailboxId().serialize() + "\"]" + + " \"destroy\": [\"" + mailbox.serialize() + "\"]" + " }," + " \"#0\"" + " ]" + @@ -627,7 +625,7 @@ public abstract class SetMailboxesMethodTest { @Test public void setMailboxesShouldCreateMailboxWhenChildOfInboxMailbox() { - MailboxId inboxId = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, username, MailboxConstants.INBOX).getMailboxId(); + MailboxId inboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username, MailboxConstants.INBOX); String requestBody = "[" + @@ -981,8 +979,7 @@ public abstract class SetMailboxesMethodTest { @Test public void setMailboxesShouldReturnNotDestroyedWhenSystemMailbox() { - Mailbox mailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, username, MailboxConstants.INBOX); - String mailboxId = mailbox.getMailboxId().serialize(); + String mailboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username, MailboxConstants.INBOX).serialize(); String requestBody = "[" + " [ \"setMailboxes\"," + @@ -1206,9 +1203,9 @@ public abstract class SetMailboxesMethodTest { @Test public void updateShouldRejectInvalidRights() { - jmapServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox"); - Mailbox mailbox = jmapServer.getProbe(MailboxProbeImpl.class).getMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox"); - String mailboxId = mailbox.getMailboxId().serialize(); + String mailboxId = jmapServer.getProbe(MailboxProbeImpl.class) + .createMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox") + .serialize(); given() .header("Authorization", accessToken.serialize()) @@ -1235,9 +1232,9 @@ public abstract class SetMailboxesMethodTest { @Test public void updateShouldRejectUnhandledRight() { - jmapServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox"); - Mailbox mailbox = jmapServer.getProbe(MailboxProbeImpl.class).getMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox"); - String mailboxId = mailbox.getMailboxId().serialize(); + String mailboxId = jmapServer.getProbe(MailboxProbeImpl.class) + .createMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox") + .serialize(); given() .header("Authorization", accessToken.serialize()) @@ -1264,9 +1261,9 @@ public abstract class SetMailboxesMethodTest { @Test public void updateShouldRejectNonExistingRights() { - jmapServer.getProbe(MailboxProbeImpl.class).createMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox"); - Mailbox mailbox = jmapServer.getProbe(MailboxProbeImpl.class).getMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox"); - String mailboxId = mailbox.getMailboxId().serialize(); + String mailboxId = jmapServer.getProbe(MailboxProbeImpl.class) + .createMailbox(MailboxConstants.USER_NAMESPACE, username, "myBox") + .serialize(); given() .header("Authorization", accessToken.serialize()) @@ -2027,8 +2024,7 @@ public abstract class SetMailboxesMethodTest { @Test public void setMailboxesShouldReturnNotUpdatedWhenRenamingSystemMailbox() { - Mailbox mailbox = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, username, MailboxConstants.INBOX); - String mailboxId = mailbox.getMailboxId().serialize(); + String mailboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, username, MailboxConstants.INBOX).serialize(); String requestBody = "[" + http://git-wip-us.apache.org/repos/asf/james-project/blob/bf6254df/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index ea604ab..9a5d1c2 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -3413,8 +3413,7 @@ public abstract class SetMessagesMethodTest { new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags()); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "any"); - String mailboxId = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "any") - .getMailboxId() + String mailboxId = mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, USERNAME, "any") .serialize(); mailboxProbe.deleteMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "any"); http://git-wip-us.apache.org/repos/asf/james-project/blob/bf6254df/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java index 3a7ee03..1cbc939 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMailboxesMethodStepdefs.java @@ -31,7 +31,7 @@ import java.util.List; import javax.inject.Inject; import org.apache.james.mailbox.model.MailboxConstants; -import org.apache.james.mailbox.store.mail.model.Mailbox; +import org.apache.james.mailbox.model.MailboxId; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; @@ -85,22 +85,22 @@ public class GetMailboxesMethodStepdefs { @Then("^the mailboxes should contain \"([^\"]*)\" in \"([^\"]*)\" namespace, with parent mailbox \"([^\"]*)\" of user \"([^\"]*)\"$") public void assertMailboxesNames(String mailboxName, String namespace, String parentName, String parentOwner) throws Exception { - Mailbox parentMailbox = mainStepdefs.mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, parentOwner, parentName); + MailboxId parentMailbox = mainStepdefs.mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, parentOwner, parentName); assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[*].name")).contains(mailboxName); assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].namespace.type", filter(where("name").is(mailboxName)))) .containsOnly(namespace); assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].parentId", filter(where("name").is(mailboxName)))) - .containsOnly(parentMailbox.getMailboxId().serialize()); + .containsOnly(parentMailbox.serialize()); } @Then("^the mailboxes should not contain \"([^\"]*)\" in \"([^\"]*)\" namespace, with parent mailbox \"([^\"]*)\" of user \"([^\"]*)\"$") public void assertNotMailboxesNames(String mailboxName, String namespace, String parentName, String parentOwner) throws Exception { - Mailbox parentMailbox = mainStepdefs.mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, parentOwner, parentName); + MailboxId parentMailbox = mainStepdefs.mailboxProbe.getMailboxId(MailboxConstants.USER_NAMESPACE, parentOwner, parentName); assertThat(httpClient.jsonPath.<List<String>>read(ARGUMENTS + ".list[?].parentId", filter(where("name").is(mailboxName).and("namespace.type").is(namespace)))) - .doesNotContain(parentMailbox.getMailboxId().serialize()); + .doesNotContain(parentMailbox.serialize()); } @Then("^the mailboxes should contain \"([^\"]*)\" in \"([^\"]*)\" namespace, with no parent mailbox$") http://git-wip-us.apache.org/repos/asf/james-project/blob/bf6254df/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java index 567cd0e..b07907d 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java @@ -68,9 +68,7 @@ public class MainStepdefs { } public MailboxId getMailboxId(String namespace, String username, String mailbox) { - return mailboxProbe - .getMailbox(namespace, username, mailbox) - .getMailboxId(); + return mailboxProbe.getMailboxId(namespace, username, mailbox); } public String getMailboxIds(String username, List<String> mailboxes) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
