MAILBOX-307 Use more appropriate naming for MailboxManager right setting methods
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/58c84a2e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/58c84a2e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/58c84a2e Branch: refs/heads/master Commit: 58c84a2ebc9fdb8d467abae34c23efe098fa227b Parents: a797e67 Author: benwa <btell...@linagora.com> Authored: Wed Sep 27 10:53:45 2017 +0700 Committer: Matthieu Baechler <matth...@apache.org> Committed: Fri Sep 29 09:20:40 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/james/mailbox/MailboxManager.java | 4 ++-- .../org/apache/james/mailbox/caching/CachingMailboxMapper.java | 2 +- .../james/mailbox/cassandra/mail/CassandraACLMapper.java | 2 +- .../james/mailbox/cassandra/mail/CassandraMailboxMapper.java | 4 ++-- .../apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java | 2 +- .../org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java | 2 +- .../org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java | 2 +- .../james/mailbox/jpa/mail/TransactionalMailboxMapper.java | 4 ++-- .../james/mailbox/maildir/mail/MaildirMailboxMapper.java | 2 +- .../james/mailbox/inmemory/mail/InMemoryMailboxMapper.java | 2 +- .../org/apache/james/mailbox/store/StoreMailboxManager.java | 6 +++--- .../org/apache/james/mailbox/store/mail/MailboxMapper.java | 2 +- .../james/mailbox/store/TestMailboxSessionMapperFactory.java | 2 +- .../james/mailbox/store/mail/model/MailboxMapperACLTest.java | 4 ++-- .../org/apache/james/imap/processor/DeleteACLProcessor.java | 2 +- .../java/org/apache/james/imap/processor/SetACLProcessor.java | 2 +- .../apache/james/imap/processor/DeleteACLProcessorTest.java | 2 +- .../org/apache/james/imap/processor/SetACLProcessorTest.java | 2 +- .../james/imap/processor/base/MailboxEventAnalyserTest.java | 6 +++--- .../jmap/DefaultMailboxesProvisioningFilterThreadTest.java | 4 ++-- 20 files changed, 29 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java index 3ef58b7..093219a 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java @@ -392,7 +392,7 @@ public interface MailboxManager extends RequestAware, MailboxListenerSupport { * @param mailboxACLCommand Update to perform. * @throws UnsupportedRightException */ - void setRights(MailboxPath mailboxPath, MailboxACL.ACLCommand mailboxACLCommand, MailboxSession session) throws MailboxException; + void applyRightsCommand(MailboxPath mailboxPath, MailboxACL.ACLCommand mailboxACLCommand, MailboxSession session) throws MailboxException; /** @@ -401,7 +401,7 @@ public interface MailboxManager extends RequestAware, MailboxListenerSupport { * @param mailboxACL New ACL value * @throws UnsupportedRightException */ - void resetRights(MailboxPath mailboxPath, MailboxACL mailboxACL, MailboxSession session) throws MailboxException; + void setRights(MailboxPath mailboxPath, MailboxACL mailboxACL, MailboxSession session) throws MailboxException; /** * Return a unmodifiable {@link List} of {@link MailboxPath} objects http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxMapper.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxMapper.java index fe96f6a..8a6179a 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxMapper.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxMapper.java @@ -112,7 +112,7 @@ public class CachingMailboxMapper implements MailboxMapper { } @Override - public void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { + public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { mailbox.setACL(mailboxACL); } http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java index ac98402..98d46c7 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapper.java @@ -138,7 +138,7 @@ public class CassandraACLMapper { } } - public void resetACL(CassandraId cassandraId, MailboxACL mailboxACL) { + public void setACL(CassandraId cassandraId, MailboxACL mailboxACL) { try { executor.executeVoid( insertStatement.bind() http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java index 0fedc18..1b6d2f8 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java @@ -222,9 +222,9 @@ public class CassandraMailboxMapper implements MailboxMapper { } @Override - public void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { + public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { CassandraId cassandraId = (CassandraId) mailbox.getMailboxId(); - cassandraACLMapper.resetACL(cassandraId, mailboxACL); + cassandraACLMapper.setACL(cassandraId, mailboxACL); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java index 65833b7..326bf77 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java @@ -419,7 +419,7 @@ public class HBaseMailboxMapper extends HBaseNonTransactionalMapper implements M } @Override - public void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { + public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { mailbox.setACL(mailboxACL); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java index 589b758..3bf7cfe 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java @@ -256,7 +256,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo } @Override - public void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { + public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { mailbox.setACL(mailboxACL); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java index 9401ec2..30826ca 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java @@ -226,7 +226,7 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM } @Override - public void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { + public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { mailbox.setACL(mailboxACL); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java index 7f9419f..e88c0a9 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java @@ -84,8 +84,8 @@ public class TransactionalMailboxMapper implements MailboxMapper { } @Override - public void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { - wrapped.resetACL(mailbox, mailboxACL); + public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { + wrapped.setACL(mailbox, mailboxACL); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java index d459f88..4ccc892 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java @@ -341,7 +341,7 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail } @Override - public void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { + public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { MaildirFolder folder = maildirStore.createMaildirFolder(mailbox); folder.setACL(session, mailboxACL); mailbox.setACL(mailboxACL); http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java index 1db5a33..8c635e4 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java @@ -160,7 +160,7 @@ public class InMemoryMailboxMapper implements MailboxMapper { } @Override - public void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { + public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { mailboxesByPath.get(mailbox.generateAssociatedPath()).setACL(mailboxACL); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java index c3c07e7..2655ac8 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java @@ -816,17 +816,17 @@ public class StoreMailboxManager implements MailboxManager { } @Override - public void setRights(MailboxPath mailboxPath, MailboxACL.ACLCommand mailboxACLCommand, MailboxSession session) throws MailboxException { + public void applyRightsCommand(MailboxPath mailboxPath, MailboxACL.ACLCommand mailboxACLCommand, MailboxSession session) throws MailboxException { MailboxMapper mapper = mailboxSessionMapperFactory.getMailboxMapper(session); Mailbox mailbox = mapper.findMailboxByPath(mailboxPath); mapper.execute(Mapper.toTransaction(() -> mapper.updateACL(mailbox, mailboxACLCommand))); } @Override - public void resetRights(MailboxPath mailboxPath, MailboxACL mailboxACL, MailboxSession session) throws MailboxException { + public void setRights(MailboxPath mailboxPath, MailboxACL mailboxACL, MailboxSession session) throws MailboxException { MailboxMapper mapper = mailboxSessionMapperFactory.getMailboxMapper(session); Mailbox mailbox = mapper.findMailboxByPath(mailboxPath); - mapper.execute(Mapper.toTransaction(() -> mapper.resetACL(mailbox, mailboxACL))); + mapper.execute(Mapper.toTransaction(() -> mapper.setACL(mailbox, mailboxACL))); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java index 1922555..da96db2 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java @@ -110,7 +110,7 @@ public interface MailboxMapper extends Mapper { * @param mailbox Mailbox for whom we want to update ACL * @param mailboxACL New value of the ACL for this mailbox */ - void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException; + void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException; /** * Return a unmodifable {@link List} of all {@link Mailbox} http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java index 85c979a..e7cdb71 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java @@ -144,7 +144,7 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory } @Override - public void resetACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { + public void setACL(Mailbox mailbox, MailboxACL mailboxACL) throws MailboxException { throw new NotImplementedException(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java index 6c78b81..adf7dba 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperACLTest.java @@ -258,7 +258,7 @@ public abstract class MailboxMapperACLTest { new MailboxACL.ACLCommand(key, MailboxACL.EditMode.REPLACE, rights)); - mailboxMapper.resetACL(benwaInboxMailbox, + mailboxMapper.setACL(benwaInboxMailbox, new MailboxACL(ImmutableMap.of(key, newRights))); assertThat( @@ -273,7 +273,7 @@ public abstract class MailboxMapperACLTest { public void resetAclShouldInitializeStoredAcl() throws MailboxException { EntryKey key = new EntryKey("user", NameType.user, NEGATIVE); Rfc4314Rights rights = new Rfc4314Rights(Right.WriteSeenFlag, Right.CreateMailbox, Right.Administer, Right.PerformExpunge, Right.DeleteMessages); - mailboxMapper.resetACL(benwaInboxMailbox, + mailboxMapper.setACL(benwaInboxMailbox, new MailboxACL(ImmutableMap.of(key, rights))); assertThat( http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java index 358d680..36286f1 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java @@ -112,7 +112,7 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques // Note that Section 6 recommends additional identifierâs verification // steps. - mailboxManager.setRights(mailboxPath, + mailboxManager.applyRightsCommand(mailboxPath, new MailboxACL.ACLCommand(key, EditMode.REPLACE, null), mailboxSession); okComplete(command, tag, responder); http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java index 5f39de3..64ebe70 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java @@ -129,7 +129,7 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp // Note that Section 6 recommends additional identifierâs verification // steps. - mailboxManager.setRights(mailboxPath, + mailboxManager.applyRightsCommand(mailboxPath, new MailboxACL.ACLCommand(key, editMode, mailboxAclRights), mailboxSession); okComplete(command, tag, responder); http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java index 93b0600..b6c79cb 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java @@ -199,7 +199,7 @@ public class DeleteACLProcessorTest { expectations.allowing(mailboxManagerStub).hasRight(expectations.with(path), expectations.with(Expectations.equal(MailboxACL.Right.Administer)), expectations.with(Expectations.same(mailboxSessionStub))); expectations.will(Expectations.returnValue(true)); - expectations.allowing(mailboxManagerStub).setRights(expectations.with(path), expectations.with(new MailboxACL.ACLCommand(user1Key, EditMode.REPLACE, null)), expectations.with(mailboxSessionStub)); + expectations.allowing(mailboxManagerStub).applyRightsCommand(expectations.with(path), expectations.with(new MailboxACL.ACLCommand(user1Key, EditMode.REPLACE, null)), expectations.with(mailboxSessionStub)); expectations.allowing(metaDataStub).getACL(); expectations.will(Expectations.returnValue(acl)); http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java index 02a9c25..09ac72c 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java @@ -229,7 +229,7 @@ public class SetACLProcessorTest { expectations.allowing(mailboxManagerStub).hasRight(expectations.with(path), expectations.with(Expectations.equal(MailboxACL.Right.Administer)), expectations.with(Expectations.same(mailboxSessionStub))); expectations.will(Expectations.returnValue(true)); - expectations.allowing(mailboxManagerStub).setRights(expectations.with(path), expectations.with(Expectations.equal(new MailboxACL.ACLCommand(user1Key, editMode, setRights))), expectations.with(mailboxSessionStub)); + expectations.allowing(mailboxManagerStub).applyRightsCommand(expectations.with(path), expectations.with(Expectations.equal(new MailboxACL.ACLCommand(user1Key, editMode, setRights))), expectations.with(mailboxSessionStub)); expectations.allowing(metaDataStub).getACL(); expectations.will(Expectations.returnValue(acl)); http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java index 0826418..7aecb0d 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java @@ -375,14 +375,14 @@ public class MailboxEventAnalyserTest { throw new NotImplementedException("Not implemented"); } - public void setRights(MailboxPath mailboxPath, - ACLCommand mailboxACLCommand, MailboxSession session) + public void applyRightsCommand(MailboxPath mailboxPath, + ACLCommand mailboxACLCommand, MailboxSession session) throws MailboxException { throw new NotImplementedException("Not implemented"); } @Override - public void resetRights(MailboxPath mailboxPath, MailboxACL mailboxACL, MailboxSession session) throws MailboxException { + public void setRights(MailboxPath mailboxPath, MailboxACL mailboxACL, MailboxSession session) throws MailboxException { throw new NotImplementedException("Not implemented"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/58c84a2e/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java index c046746..764bd35 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java @@ -204,11 +204,11 @@ public class DefaultMailboxesProvisioningFilterThreadTest { } @Override - public void setRights(MailboxPath mailboxPath, MailboxACL.ACLCommand mailboxACLCommand, MailboxSession session) throws MailboxException { + public void applyRightsCommand(MailboxPath mailboxPath, MailboxACL.ACLCommand mailboxACLCommand, MailboxSession session) throws MailboxException { } @Override - public void resetRights(MailboxPath mailboxPath, MailboxACL mailboxACL, MailboxSession session) throws MailboxException { + public void setRights(MailboxPath mailboxPath, MailboxACL mailboxACL, MailboxSession session) throws MailboxException { } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
