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 er...@apache.org on 2011/01/07 14:59:40 UTC
svn commit: r1056320 - in /james/mailbox/trunk:
api/src/main/java/org/apache/james/mailbox/
api/src/test/java/org/apache/james/mailbox/
store/src/main/java/org/apache/james/mailbox/store/
torque/src/main/java/org/apache/james/mailbox/torque/
Author: eric
Date: Fri Jan 7 13:59:39 2011
New Revision: 1056320
URL: http://svn.apache.org/viewvc?rev=1056320&view=rev
Log:
MailboxException MessageRangeException extend java.lang.Exception (MAILBOX-29)
Modified:
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageFlags.java
james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailbox.java
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java?rev=1056320&r1=1056319&r2=1056320&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java Fri Jan 7 13:59:39 2011
@@ -19,19 +19,20 @@
package org.apache.james.mailbox;
-import javax.mail.MessagingException;
-
-
-public class MailboxException extends MessagingException {
+/**
+ * Mailbox services should throw this exception in case of unsuccessfull operation.
+ *
+ */
+public class MailboxException extends Exception {
private static final long serialVersionUID = 4612761817238115904L;
- public MailboxException(final String message) {
- super(message);
+ public MailboxException() {
+ super();
}
-
- public MailboxException() {
+ public MailboxException(final String message) {
+ super(message);
}
public MailboxException(String msg, Exception cause) {
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java?rev=1056320&r1=1056319&r2=1056320&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java Fri Jan 7 13:59:39 2011
@@ -29,12 +29,12 @@ public class MailboxExistsException exte
private final String mailboxName;
public MailboxExistsException(String mailboxName) {
- super("Mailbox Already Exists", new Exception("Mailbox Already Exists"));
+ super("Mailbox with name=" + mailboxName + " already exists.");
this.mailboxName = mailboxName;
}
/**
- * Gets the name of the mailbox which alredy exists.
+ * Gets the name of the mailbox which already exists.
*
* @return the mailboxName, not null
*/
@@ -45,4 +45,5 @@ public class MailboxExistsException exte
public String toString() {
return getMessage();
}
+
}
Modified: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java?rev=1056320&r1=1056319&r2=1056320&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java (original)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java Fri Jan 7 13:59:39 2011
@@ -22,6 +22,9 @@ import junit.framework.Assert;
import org.junit.Test;
+/**
+ * Ensure that {@link MailboxException} construction is correct.
+ */
public class MailboxExceptionTest {
private static final String EXCEPTION_MESSAGE = "this is an exception message";
@@ -30,9 +33,8 @@ public class MailboxExceptionTest {
@Test
public void testMailboxExceptionMessage() {
- MailboxException mbe = new MailboxException();
- // This one fails...
-// Assert.assertEquals(EXCEPTION_MESSAGE, mbe.getMessage());
+ MailboxException mbe = new MailboxException(EXCEPTION_MESSAGE);
+ Assert.assertEquals(EXCEPTION_MESSAGE, mbe.getMessage());
}
@Test
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1056320&r1=1056319&r2=1056320&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java Fri Jan 7 13:59:39 2011
@@ -36,7 +36,6 @@ import java.util.TreeSet;
import javax.mail.Flags;
import javax.mail.Flags.Flag;
-import javax.mail.MessagingException;
import javax.mail.util.SharedFileInputStream;
import org.apache.james.mailbox.MailboxException;
@@ -44,8 +43,8 @@ import org.apache.james.mailbox.MailboxL
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageRange;
import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.SearchQuery;
import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.SearchQuery;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
import org.apache.james.mailbox.store.mail.UidProvider;
@@ -63,6 +62,8 @@ import org.apache.james.mime4j.descripto
import org.apache.james.mime4j.parser.MimeEntityConfig;
import org.apache.james.mime4j.parser.MimeTokenStream;
+import com.sun.mail.imap.protocol.MessageSet;
+
/**
* Abstract base class for {@link org.apache.james.mailbox.MessageManager} implementations. This abstract
* class take care of dispatching events to the registered {@link MailboxListener} and so help
@@ -265,10 +266,10 @@ public abstract class StoreMessageManage
return uid;
} catch (IOException e) {
throw new MailboxException("Unable to parse message", e);
- } catch (MessagingException e) {
- throw new MailboxException("Unable to parse message", e);
} catch (MimeException e) {
throw new MailboxException("Unable to parse message", e);
+ } catch (MailboxException e) {
+ throw new MailboxException("Unable to parse message", e);
} finally {
if (tmpMsgIn != null) {
try {
@@ -443,7 +444,7 @@ public abstract class StoreMessageManage
}
dispatcher.added(uid, session.getSessionId(), new StoreMailboxPath<Id>(toMailbox.getMailboxEntity()));
}
- } catch (MessagingException e) {
+ } catch (MailboxException e) {
throw new MailboxException("Unable to parse message", e);
}
}
@@ -563,7 +564,7 @@ public abstract class StoreMessageManage
}));
}
return copiedRows.iterator();
- } catch (MessagingException e) {
+ } catch (MailboxException e) {
throw new MailboxException("Unable to parse message", e);
}
}
@@ -578,7 +579,7 @@ public abstract class StoreMessageManage
final List<MailboxMembership<Id>> originalRows = messageMapper.findInMailbox(getMailboxEntity(), set);
return to.copy(originalRows, session);
- } catch (MessagingException e) {
+ } catch (MailboxException e) {
throw new MailboxException("Unable to parse message", e);
}
}
Modified: james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageFlags.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageFlags.java?rev=1056320&r1=1056319&r2=1056320&view=diff
==============================================================================
--- james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageFlags.java (original)
+++ james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageFlags.java Fri Jan 7 13:59:39 2011
@@ -25,6 +25,7 @@ import java.util.Iterator;
import javax.mail.Flags;
import javax.mail.MessagingException;
+import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MessageResult;
/**
@@ -44,7 +45,7 @@ public class MessageFlags {
* @throws MessagingException
*/
public static final MessageFlags[] toMessageFlags(Collection messageResults)
- throws MessagingException {
+ throws MailboxException {
final int size = messageResults.size();
final MessageFlags[] results = new MessageFlags[size];
int i = 0;
@@ -59,7 +60,7 @@ public class MessageFlags {
private Flags flags;
- public MessageFlags(final MessageResult result) throws MessagingException {
+ public MessageFlags(final MessageResult result) throws MailboxException {
this(result.getUid(), result.getFlags());
}
Modified: james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailbox.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailbox.java?rev=1056320&r1=1056319&r2=1056320&view=diff
==============================================================================
--- james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailbox.java (original)
+++ james/mailbox/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailbox.java Fri Jan 7 13:59:39 2011
@@ -54,8 +54,8 @@ import org.apache.james.mailbox.MailboxS
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageRange;
import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.SearchQuery;
import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.SearchQuery;
import org.apache.james.mailbox.SearchQuery.Criterion;
import org.apache.james.mailbox.SearchQuery.NumericRange;
import org.apache.james.mailbox.store.MailboxMetaData;
@@ -724,7 +724,7 @@ public class TorqueMailbox implements Me
} catch (TorqueException e) {
throw new MailboxException("save failed");
- } catch (MessagingException e) {
+ } catch (MailboxException e) {
throw new MailboxException("parsing of message failed");
}
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org