Repository: james-project Updated Branches: refs/heads/master bc079d2f6 -> 0d019f46f
JAMES-2609 Remove user-metadata directory management in JPAHostSystem This directory is not used. A data race could occur during its deletion generating errors and build instability. Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c4c54266 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c4c54266 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c4c54266 Branch: refs/heads/master Commit: c4c54266d3ad2e1098931e7b76de12a6fb01fb07 Parents: bc079d2 Author: Benoit Tellier <btell...@linagora.com> Authored: Tue Nov 27 14:46:55 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Wed Nov 28 17:13:49 2018 +0700 ---------------------------------------------------------------------- .../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 21 ++++---------------- 1 file changed, 4 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c4c54266/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java index d78cbe1..3c78b0a 100644 --- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java +++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java @@ -19,11 +19,8 @@ package org.apache.james.mpt.imapmailbox.jpa.host; -import java.io.File; - import javax.persistence.EntityManagerFactory; -import org.apache.commons.io.FileUtils; import org.apache.james.backends.jpa.JpaTestCluster; import org.apache.james.core.quota.QuotaCount; import org.apache.james.core.quota.QuotaSize; @@ -72,7 +69,6 @@ public class JPAHostSystem extends JamesImapHostSystem { .addAll(JPAMailboxFixture.QUOTA_PERSISTANCE_CLASSES) .build()); - public static final String META_DATA_DIRECTORY = "target/user-meta-data"; private static final ImapFeatures SUPPORTED_FEATURES = ImapFeatures.of(Feature.NAMESPACE_SUPPORT, Feature.USER_FLAGS_SUPPORT, Feature.ANNOTATION_SUPPORT, @@ -80,7 +76,7 @@ public class JPAHostSystem extends JamesImapHostSystem { Feature.MOVE_SUPPORT, Feature.MOD_SEQ_SEARCH); - public static JamesImapHostSystem build() throws Exception { + static JamesImapHostSystem build() { return new JPAHostSystem(); } @@ -121,7 +117,7 @@ public class JPAHostSystem extends JamesImapHostSystem { SubscriptionManager subscriptionManager = new JPASubscriptionManager(mapperFactory); - final ImapProcessor defaultImapProcessorFactory = + ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor( mailboxManager, subscriptionManager, @@ -136,7 +132,6 @@ public class JPAHostSystem extends JamesImapHostSystem { @Override public void afterTest() throws Exception { - resetUserMetaData(); if (mailboxManager != null) { MailboxSession session = mailboxManager.createSystemSession("test"); mailboxManager.startProcessingRequest(session); @@ -145,14 +140,6 @@ public class JPAHostSystem extends JamesImapHostSystem { mailboxManager.logout(session, false); } } - - public void resetUserMetaData() throws Exception { - File dir = new File(META_DATA_DIRECTORY); - if (dir.exists()) { - FileUtils.deleteDirectory(dir); - } - dir.mkdirs(); - } @Override protected MailboxManager getMailboxManager() { @@ -165,13 +152,13 @@ public class JPAHostSystem extends JamesImapHostSystem { } @Override - public void setQuotaLimits(QuotaCount maxMessageQuota, QuotaSize maxStorageQuota) throws Exception { + public void setQuotaLimits(QuotaCount maxMessageQuota, QuotaSize maxStorageQuota) { maxQuotaManager.setGlobalMaxMessage(maxMessageQuota); maxQuotaManager.setGlobalMaxStorage(maxStorageQuota); } @Override - protected void await() throws Exception { + protected void await() { } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
