This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 474e9f57975839a8dea8a0b87ac944a5617dfa46 Author: Rene Cordier <[email protected]> AuthorDate: Thu Feb 20 13:36:22 2020 +0700 JAMES-3057 Remove the old create(Mailbox) method from MailboxMapper --- .../cassandra/mail/CassandraMailboxMapper.java | 12 -------- .../james/mailbox/jpa/mail/JPAMailboxMapper.java | 20 ------------- .../jpa/mail/TransactionalMailboxMapper.java | 5 ---- .../mailbox/maildir/mail/MaildirMailboxMapper.java | 35 ---------------------- .../inmemory/mail/InMemoryMailboxMapper.java | 12 -------- .../james/mailbox/store/mail/MailboxMapper.java | 5 ---- 6 files changed, 89 deletions(-) diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java index 344a50e..a1c2271 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java @@ -167,18 +167,6 @@ public class CassandraMailboxMapper implements MailboxMapper { } @Override - public MailboxId create(Mailbox mailbox) throws MailboxException { - Preconditions.checkArgument(mailbox.getMailboxId() == null, "A mailbox we want to create should not have a mailboxId set already"); - - CassandraId cassandraId = CassandraId.timeBased(); - mailbox.setMailboxId(cassandraId); - if (!tryCreate(mailbox, cassandraId).block()) { - throw new MailboxExistsException(mailbox.generateAssociatedPath().asString()); - } - return cassandraId; - } - - @Override public Mailbox create(MailboxPath mailboxPath, long uidValidity) throws MailboxException { CassandraId cassandraId = CassandraId.timeBased(); Mailbox mailbox = new Mailbox(mailboxPath, uidValidity, cassandraId); 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 d8d78ef..5ba8264 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 @@ -82,26 +82,6 @@ public class JPAMailboxMapper extends JPATransactionalMapper implements MailboxM throw new MailboxException("Commit of transaction failed", e); } } - - @Override - public MailboxId create(Mailbox mailbox) throws MailboxException { - Preconditions.checkArgument(mailbox.getMailboxId() == null, "A mailbox we want to create should not have a mailboxId set already"); - - try { - if (isPathAlreadyUsedByAnotherMailbox(mailbox.generateAssociatedPath())) { - throw new MailboxExistsException(mailbox.getName()); - } - - this.lastMailboxName = mailbox.getName(); - JPAMailbox persistedMailbox = JPAMailbox.from(mailbox); - - getEntityManager().persist(persistedMailbox); - mailbox.setMailboxId(persistedMailbox.getMailboxId()); - return persistedMailbox.getMailboxId(); - } catch (PersistenceException e) { - throw new MailboxException("Save of mailbox " + mailbox.getName() + " failed", e); - } - } @Override public Mailbox create(MailboxPath mailboxPath, long uidValidity) throws MailboxException { 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 e1f5736..cce5fdc 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 @@ -53,11 +53,6 @@ public class TransactionalMailboxMapper implements MailboxMapper { } @Override - public MailboxId create(Mailbox mailbox) throws MailboxException { - return wrapped.execute(() -> wrapped.create(mailbox)); - } - - @Override public Mailbox create(MailboxPath mailboxPath, long uidValidity) throws MailboxException { return wrapped.execute(() -> wrapped.create(mailboxPath, uidValidity)); } diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java index 0b0e730..16fc17b 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java @@ -51,7 +51,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.github.steveash.guavate.Guavate; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; public class MaildirMailboxMapper extends NonTransactionalMapper implements MailboxMapper { @@ -159,40 +158,6 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail } @Override - public MailboxId create(Mailbox mailbox) throws MailboxException { - Preconditions.checkArgument(mailbox.getMailboxId() == null, "A mailbox we want to create should not have a mailboxId set already"); - - MaildirId maildirId = MaildirId.random(); - MaildirFolder folder = maildirStore.createMaildirFolder(mailbox); - - if (!folder.exists()) { - boolean folderExist = folder.getRootFile().exists(); - if (!folderExist && !folder.getRootFile().mkdirs()) { - throw new MailboxException("Failed to save Mailbox " + mailbox); - } - - boolean isCreated = folder.getCurFolder().mkdir() - && folder.getNewFolder().mkdir() - && folder.getTmpFolder().mkdir(); - if (!isCreated) { - throw new MailboxException("Failed to save Mailbox " + mailbox, new IOException("Needed folder structure can not be created")); - } - } - - try { - folder.setUidValidity(mailbox.getUidValidity()); - folder.setMailboxId(maildirId); - mailbox.setMailboxId(maildirId); - } catch (IOException ioe) { - throw new MailboxException("Failed to save Mailbox " + mailbox, ioe); - - } - folder.setACL(mailbox.getACL()); - - return maildirId; - } - - @Override public Mailbox create(MailboxPath mailboxPath, long uidValidity) throws MailboxException { MaildirId maildirId = MaildirId.random(); Mailbox mailbox = new Mailbox(mailboxPath, uidValidity, maildirId); diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java index c0cea5b..d284ea4 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java @@ -93,18 +93,6 @@ public class InMemoryMailboxMapper implements MailboxMapper { } @Override - public MailboxId create(Mailbox mailbox) throws MailboxException { - Preconditions.checkArgument(mailbox.getMailboxId() == null, "A mailbox we want to create should not have a mailboxId set already"); - - InMemoryId id = InMemoryId.of(mailboxIdGenerator.incrementAndGet()); - mailbox.setMailboxId(id); - - saveMailbox(mailbox); - - return mailbox.getMailboxId(); - } - - @Override public Mailbox create(MailboxPath mailboxPath, long uidValidity) throws MailboxException { InMemoryId id = InMemoryId.of(mailboxIdGenerator.incrementAndGet()); Mailbox mailbox = new Mailbox(mailboxPath, uidValidity, id); diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java index 37d898a..35885b5 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java @@ -40,11 +40,6 @@ import org.apache.james.mailbox.store.transaction.Mapper; public interface MailboxMapper extends Mapper { /** - * Create the given {@link Mailbox} to the underlying storage - */ - MailboxId create(Mailbox mailbox) throws MailboxException; - - /** * Create a {@link Mailbox} with the given {@link MailboxPath} and uid to the underlying storage */ Mailbox create(MailboxPath mailboxPath, long uidValidity) throws MailboxException; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
