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 bt...@apache.org on 2019/11/18 02:51:17 UTC
[james-project] 43/44: [Refactoring] Remove some unused methods in
JPAMailboxMapper
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6cce9bc449f3b1eb626ff179c97dbc5e6979a702
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Nov 12 16:33:38 2019 +0700
[Refactoring] Remove some unused methods in JPAMailboxMapper
---
.../james/mailbox/jpa/mail/JPAMailboxMapper.java | 25 ----------------------
.../james/mailbox/jpa/mail/model/JPAMailbox.java | 2 --
.../model/openjpa/AbstractJPAMailboxMessage.java | 4 ++--
3 files changed, 2 insertions(+), 29 deletions(-)
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 b38874a..723d239 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
@@ -162,15 +162,6 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
}
}
- public boolean exists(MailboxId id) throws MailboxException, MailboxNotFoundException {
- try {
- loadJpaMailbox(id);
- return true;
- } catch (MailboxNotFoundException e) {
- return false;
- }
- }
-
@Override
public void delete(Mailbox mailbox) throws MailboxException {
try {
@@ -204,22 +195,6 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM
.setParameter("namespaceParam", namespace)
.setParameter("userParam", username.asString());
}
-
- public void deleteAllMemberships() throws MailboxException {
- try {
- getEntityManager().createNamedQuery("deleteAllMemberships").executeUpdate();
- } catch (PersistenceException e) {
- throw new MailboxException("Delete of mailboxes failed", e);
- }
- }
-
- public void deleteAllMailboxes() throws MailboxException {
- try {
- getEntityManager().createNamedQuery("deleteAllMailboxes").executeUpdate();
- } catch (PersistenceException e) {
- throw new MailboxException("Delete of mailboxes failed", e);
- }
- }
@Override
public boolean hasChildren(Mailbox mailbox, char delimiter) throws MailboxException, MailboxNotFoundException {
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
index 8ff4992..0b795a2 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
@@ -42,8 +42,6 @@ import org.apache.james.mailbox.model.MailboxPath;
query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name = :nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam"),
@NamedQuery(name = "findMailboxByNameWithUser",
query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name = :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam"),
- @NamedQuery(name = "deleteAllMailboxes",
- query = "DELETE FROM Mailbox mailbox"),
@NamedQuery(name = "findMailboxWithNameLikeWithUser",
query = "SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam"),
@NamedQuery(name = "findMailboxWithNameLike",
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
index 306a436..ebf69f9 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
@@ -91,8 +91,8 @@ import com.google.common.base.Objects;
@NamedQuery(name = "countMessagesInMailbox", query = "SELECT COUNT(message) FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam"),
@NamedQuery(name = "deleteMessages", query = "DELETE FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam"),
@NamedQuery(name = "findLastUidInMailbox", query = "SELECT message.uid FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.uid DESC"),
- @NamedQuery(name = "findHighestModSeqInMailbox", query = "SELECT message.modSeq FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.modSeq DESC"),
- @NamedQuery(name = "deleteAllMemberships", query = "DELETE FROM MailboxMessage message") })
+ @NamedQuery(name = "findHighestModSeqInMailbox", query = "SELECT message.modSeq FROM MailboxMessage message WHERE message.mailbox.mailboxId = :idParam ORDER BY message.modSeq DESC")
+})
@MappedSuperclass
public abstract class AbstractJPAMailboxMessage implements MailboxMessage {
private static final String TOSTRING_SEPARATOR = " ";
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org