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 ad...@apache.org on 2017/11/15 08:02:09 UTC
[11/11] james-project git commit: MAILBOX-316 fix typo on listRights
MAILBOX-316 fix typo on listRights
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b539779b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b539779b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b539779b
Branch: refs/heads/master
Commit: b539779b22d757b4034b3409222aa9525d47ac2b
Parents: 21e7ff9
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 17:04:38 2017 +0100
Committer: quynhn <qn...@linagora.com>
Committed: Wed Nov 15 09:37:40 2017 +0700
----------------------------------------------------------------------
.../api/src/main/java/org/apache/james/mailbox/RightManager.java | 2 +-
.../java/org/apache/james/mailbox/store/StoreMailboxManager.java | 4 ++--
.../java/org/apache/james/mailbox/store/StoreRightManager.java | 2 +-
.../org/apache/james/imap/processor/ListRightsProcessor.java | 2 +-
.../org/apache/james/imap/processor/ListRightsProcessorTest.java | 2 +-
.../james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b539779b/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
index c397d29..9ba7f87 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
@@ -76,7 +76,7 @@ public interface RightManager {
* @return result suitable for the LISTRIGHTS IMAP command
* @throws MailboxException in case of unknown mailbox or unsupported right
*/
- MailboxACL.Rfc4314Rights[] listRigths(MailboxPath mailboxPath, MailboxACL.EntryKey identifier, MailboxSession session) throws MailboxException;
+ MailboxACL.Rfc4314Rights[] listRights(MailboxPath mailboxPath, MailboxACL.EntryKey identifier, MailboxSession session) throws MailboxException;
MailboxACL listRights(MailboxPath mailboxPath, MailboxSession session) throws MailboxException;
http://git-wip-us.apache.org/repos/asf/james-project/blob/b539779b/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 2fcb9b7..e76ea91 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
@@ -787,8 +787,8 @@ public class StoreMailboxManager implements MailboxManager {
}
@Override
- public Rfc4314Rights[] listRigths(MailboxPath mailboxPath, MailboxACL.EntryKey key, MailboxSession session) throws MailboxException {
- return storeRightManager.listRigths(mailboxPath, key, session);
+ public Rfc4314Rights[] listRights(MailboxPath mailboxPath, MailboxACL.EntryKey key, MailboxSession session) throws MailboxException {
+ return storeRightManager.listRights(mailboxPath, key, session);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/b539779b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
index 92033f7..f3209d0 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
@@ -113,7 +113,7 @@ public class StoreRightManager implements RightManager {
}
@Override
- public Rfc4314Rights[] listRigths(MailboxPath mailboxPath, EntryKey key, MailboxSession session) throws MailboxException {
+ public Rfc4314Rights[] listRights(MailboxPath mailboxPath, EntryKey key, MailboxSession session) throws MailboxException {
MailboxMapper mapper = mailboxSessionMapperFactory.getMailboxMapper(session);
Mailbox mailbox = mapper.findMailboxByPath(mailboxPath);
http://git-wip-us.apache.org/repos/asf/james-project/blob/b539779b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
index e6e8a12..ebe6c16 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
@@ -112,7 +112,7 @@ public class ListRightsProcessor extends AbstractMailboxProcessor<ListRightsRequ
// Note that Section 6 recommends additional identifier’s verification
// steps.
- Rfc4314Rights[] rights = mailboxManager.listRigths(mailboxPath, key, mailboxSession);
+ Rfc4314Rights[] rights = mailboxManager.listRights(mailboxPath, key, mailboxSession);
ListRightsResponse aclResponse = new ListRightsResponse(mailboxName, identifier, rights);
responder.respond(aclResponse);
okComplete(command, tag, responder);
http://git-wip-us.apache.org/repos/asf/james-project/blob/b539779b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
index f9844db..6ebcb96 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
@@ -171,7 +171,7 @@ public class ListRightsProcessorTest {
.thenReturn(true);
when(metaData.getACL()).thenReturn(acl);
- when(mailboxManager.listRigths(path, user1Key, mailboxSession))
+ when(mailboxManager.listRights(path, user1Key, mailboxSession))
.thenReturn(listRights);
http://git-wip-us.apache.org/repos/asf/james-project/blob/b539779b/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 78430f4..f680e84 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
@@ -210,13 +210,13 @@ public class DefaultMailboxesProvisioningFilterThreadTest {
}
@Override
- public MailboxACL.Rfc4314Rights[] listRigths(MailboxPath mailboxPath, MailboxACL.EntryKey identifier, MailboxSession session) throws MailboxException {
+ public MailboxACL.Rfc4314Rights[] listRights(MailboxPath mailboxPath, MailboxACL.EntryKey identifier, MailboxSession session) throws MailboxException {
throw new NotImplementedException();
}
@Override
public MailboxACL listRights(MailboxPath mailboxPath, MailboxSession session) throws MailboxException {
- return null;
+ throw new NotImplementedException();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org