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/04/26 11:51:20 UTC
[11/12] james-project git commit: JAMES-2008 Remove unecessary
exception wrapping leading to failing tests
JAMES-2008 Remove unecessary exception wrapping leading to failing tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a537e119
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a537e119
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a537e119
Branch: refs/heads/master
Commit: a537e1192ca7c2c209b990b85762b75ab2f409a5
Parents: 4f5118a
Author: benwa <bt...@linagora.com>
Authored: Fri Apr 21 16:50:53 2017 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Wed Apr 26 13:50:12 2017 +0200
----------------------------------------------------------------------
.../jpa/mail/TransactionalMailboxMapper.java | 14 ++------------
.../jpa/mail/TransactionalMessageMapper.java | 17 ++++++-----------
2 files changed, 8 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a537e119/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 c01a4f2..36ea643 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
@@ -30,8 +30,6 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import com.google.common.base.Throwables;
-
public class TransactionalMailboxMapper implements MailboxMapper {
private final JPAMailboxMapper wrapped;
@@ -51,30 +49,22 @@ public class TransactionalMailboxMapper implements MailboxMapper {
@Override
public MailboxId save(final Mailbox mailbox) throws MailboxException {
- try {
- return wrapped.execute(new Transaction<MailboxId>() {
+ return wrapped.execute(new Transaction<MailboxId>() {
@Override
public MailboxId run() throws MailboxException {
return wrapped.save(mailbox);
}
});
- } catch (MailboxException e) {
- throw Throwables.propagate(e);
- }
}
@Override
public void delete(final Mailbox mailbox) throws MailboxException {
- try {
- wrapped.execute(new VoidTransaction() {
+ wrapped.execute(new VoidTransaction() {
@Override
public void runVoid() throws MailboxException {
wrapped.delete(mailbox);
}
});
- } catch (MailboxException e) {
- Throwables.propagate(e);
- }
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/a537e119/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
index 6396f9b..b33bcce 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
@@ -38,7 +38,6 @@ import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import com.google.common.base.Optional;
-import com.google.common.base.Throwables;
public class TransactionalMessageMapper implements MessageMapper {
private final JPAMessageMapper messageMapper;
@@ -94,16 +93,12 @@ public class TransactionalMessageMapper implements MessageMapper {
@Override
public void delete(final Mailbox mailbox, final MailboxMessage message) throws MailboxException {
- try {
- messageMapper.execute(new VoidTransaction() {
- @Override
- public void runVoid() throws MailboxException {
- messageMapper.delete(mailbox, message);
- }
- });
- } catch (MailboxException e) {
- Throwables.propagate(e);
- }
+ messageMapper.execute(new VoidTransaction() {
+ @Override
+ public void runVoid() throws MailboxException {
+ messageMapper.delete(mailbox, message);
+ }
+ });
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org