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 no...@apache.org on 2010/09/21 21:14:54 UTC
svn commit: r999551 - in /james/imap/trunk:
jcr/src/main/java/org/apache/james/mailbox/jcr/mail/
jpa/src/main/java/org/apache/james/mailbox/jpa/
jpa/src/main/java/org/apache/james/mailbox/jpa/mail/
maildir/src/main/java/org/apache/james/mailbox/maildir...
Author: norman
Date: Tue Sep 21 19:14:53 2010
New Revision: 999551
URL: http://svn.apache.org/viewvc?rev=999551&view=rev
Log:
Remove methods findMailboxById and deleteAll from MailboxMapper as they methods are never used (IMAP-217). Thx to François-Denis Gonthier for spot it!
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java
james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java?rev=999551&r1=999550&r2=999551&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java Tue Sep 21 19:14:53 2010
@@ -80,37 +80,6 @@ public class JCRMailboxMapper extends Ab
/*
* (non-Javadoc)
- *
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#deleteAll()
- */
- public void deleteAll() throws MailboxException {
- try {
- getSession().getRootNode().getNode(MAILBOXES_PATH).remove();
-
- } catch (PathNotFoundException e) {
- // nothing todo
- } catch (RepositoryException e) {
- throw new MailboxException("Unable to delete all mailboxes", e);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxById(java.lang.Object)
- */
- public Mailbox<String> findMailboxById(String mailboxId) throws MailboxException, MailboxNotFoundException {
- try {
- return new JCRMailbox(getSession().getNodeByIdentifier(mailboxId), getLogger());
- } catch (PathNotFoundException e) {
- throw new MailboxNotFoundException(mailboxId);
- } catch (RepositoryException e) {
- throw new MailboxException("Unable to find mailbox with id " + mailboxId, e);
- }
- }
-
-
- /*
- * (non-Javadoc)
* @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.imap.api.MailboxPath)
*/
public Mailbox<String> findMailboxByPath(MailboxPath path) throws MailboxException, MailboxNotFoundException {
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java?rev=999551&r1=999550&r2=999551&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java Tue Sep 21 19:14:53 2010
@@ -21,6 +21,7 @@ package org.apache.james.mailbox.jpa;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.jpa.mail.JPAMailboxMapper;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
import org.apache.james.mailbox.store.Authenticator;
@@ -60,7 +61,7 @@ public abstract class JPAMailboxManager
* @throws MailboxException
*/
public void deleteEverything(MailboxSession mailboxSession) throws MailboxException {
- final MailboxMapper<Long> mapper = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession);
+ final JPAMailboxMapper mapper = (JPAMailboxMapper) mailboxSessionMapperFactory.getMailboxMapper(mailboxSession);
mapper.execute(new TransactionalMapper.VoidTransaction() {
public void runVoid() throws MailboxException {
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java?rev=999551&r1=999550&r2=999551&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java Tue Sep 21 19:14:53 2010
@@ -129,9 +129,6 @@ public class JPAMailboxMapper extends JP
}
}
- /**
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#deleteAll()
- */
public void deleteAll() throws MailboxException {
try {
getEntityManager().createNamedQuery("deleteAll").executeUpdate();
@@ -140,19 +137,7 @@ public class JPAMailboxMapper extends JP
}
}
- /**
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxById(long)
- */
- public Mailbox<Long> findMailboxById(Long mailboxId) throws MailboxException, MailboxNotFoundException {
- try {
- return (JPAMailbox) getEntityManager().createNamedQuery("findMailboxById").setParameter("idParam", mailboxId).getSingleResult();
- } catch (NoResultException e) {
- throw new MailboxNotFoundException("");
- } catch (PersistenceException e) {
- throw new MailboxException("Search of mailbox with id " + mailboxId + " failed", e);
- }
- }
-
+
/**
* @see org.apache.james.mailbox.store.mail.MailboxMapper#hasChildren(java.lang.String)
*/
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java?rev=999551&r1=999550&r2=999551&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java Tue Sep 21 19:14:53 2010
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.NotImplementedException;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxExistsException;
import org.apache.james.mailbox.MailboxNotFoundException;
@@ -73,25 +72,7 @@ public class MaildirMailboxMapper extend
throw new MailboxNotFoundException(mailbox.getName());
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#deleteAll()
- */
- public void deleteAll() throws MailboxException {
- // not used
- throw new NotImplementedException();
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxById(java.lang.Object)
- */
- public Mailbox<Integer> findMailboxById(Integer mailboxId) throws MailboxException,
- MailboxNotFoundException {
- // not used
- throw new NotImplementedException();
- }
-
+
/*
* (non-Javadoc)
* @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.imap.api.MailboxPath)
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java?rev=999551&r1=999550&r2=999551&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java Tue Sep 21 19:14:53 2010
@@ -50,10 +50,6 @@ public class InMemoryMailboxMapper exten
mailboxesById.remove(mailbox.getMailboxId());
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#deleteAll()
- */
public void deleteAll() throws MailboxException {
mailboxesById.clear();
}
@@ -61,19 +57,6 @@ public class InMemoryMailboxMapper exten
/*
* (non-Javadoc)
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxById(java.lang.Object)
- */
- public Mailbox<Long> findMailboxById(Long mailboxId) throws MailboxException, MailboxNotFoundException {
- Mailbox<Long> mailbox = mailboxesById.get(mailboxesById);
- if (mailbox == null) {
- throw new MailboxNotFoundException(String.valueOf(mailboxId));
- } else {
- return mailbox;
- }
- }
-
- /*
- * (non-Javadoc)
* @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByName(java.lang.String)
*/
public synchronized Mailbox<Long> findMailboxByPath(MailboxPath path) throws MailboxException, MailboxNotFoundException {
Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java?rev=999551&r1=999550&r2=999551&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java Tue Sep 21 19:14:53 2010
@@ -49,13 +49,7 @@ public interface MailboxMapper<Id> exten
*/
public abstract void delete(Mailbox<Id> mailbox) throws MailboxException;
- /**
- * Delete all {@link Mailbox} objects from the underlying storage
- *
- * @throws MailboxException
- */
- public abstract void deleteAll() throws MailboxException;
-
+
/**
* Return the {@link Mailbox} for the given name
*
@@ -78,17 +72,6 @@ public interface MailboxMapper<Id> exten
throws MailboxException;
/**
- * Return the {@link Mailbox} for the given id
- *
- * @param mailboxId
- * @return mailbox
- * @throws MailboxException
- * @throws MailboxNotFoundException
- */
- public abstract Mailbox<Id> findMailboxById(Id mailboxId)
- throws MailboxException, MailboxNotFoundException;
-
- /**
* Return if the given {@link Mailbox} has children
*
* @param mailbox not null
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org