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 d2359f45fbf842574e336a8e37beb6cbe7dc9056 Author: Benoit Tellier <[email protected]> AuthorDate: Tue Feb 4 09:57:29 2020 +0700 [REFACTORING] QuotaProbe no longer need to be serializable --- .../org/apache/james/mailbox/probe/QuotaProbe.java | 25 +++++----- .../james/cli/QuotaCommandsIntegrationTest.java | 10 ++-- .../java/org/apache/james/JPAJamesServerTest.java | 3 +- .../org/apache/james/modules/QuotaProbesImpl.java | 57 +++++++++------------- .../integration/GetMailboxesMethodTest.java | 10 ++-- .../methods/integration/QuotaMailingTest.java | 5 +- .../methods/integration/SendMDNMethodTest.java | 4 +- .../methods/integration/SetMessagesMethodTest.java | 8 ++- 8 files changed, 53 insertions(+), 69 deletions(-) diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/probe/QuotaProbe.java b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/QuotaProbe.java index 1a223a7..617fa07 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/probe/QuotaProbe.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/QuotaProbe.java @@ -19,36 +19,37 @@ package org.apache.james.mailbox.probe; +import java.util.Optional; + import org.apache.james.core.quota.QuotaCountLimit; import org.apache.james.core.quota.QuotaCountUsage; import org.apache.james.core.quota.QuotaSizeLimit; import org.apache.james.core.quota.QuotaSizeUsage; import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.model.SerializableQuota; -import org.apache.james.mailbox.model.SerializableQuotaLimitValue; +import org.apache.james.mailbox.model.Quota; public interface QuotaProbe { String getQuotaRoot(String namespace, String user, String name) throws MailboxException; - SerializableQuota<QuotaCountLimit, QuotaCountUsage> getMessageCountQuota(String quotaRoot) throws MailboxException; + Quota<QuotaCountLimit, QuotaCountUsage> getMessageCountQuota(String quotaRoot) throws MailboxException; - SerializableQuota<QuotaSizeLimit, QuotaSizeUsage> getStorageQuota(String quotaRoot) throws MailboxException; + Quota<QuotaSizeLimit, QuotaSizeUsage> getStorageQuota(String quotaRoot) throws MailboxException; - SerializableQuotaLimitValue<QuotaCountLimit> getMaxMessageCount(String quotaRoot) throws MailboxException; + Optional<QuotaCountLimit> getMaxMessageCount(String quotaRoot) throws MailboxException; - SerializableQuotaLimitValue<QuotaSizeLimit> getMaxStorage(String quotaRoot) throws MailboxException; + Optional<QuotaSizeLimit> getMaxStorage(String quotaRoot) throws MailboxException; - SerializableQuotaLimitValue<QuotaCountLimit> getGlobalMaxMessageCount() throws MailboxException; + Optional<QuotaCountLimit> getGlobalMaxMessageCount() throws MailboxException; - SerializableQuotaLimitValue<QuotaSizeLimit> getGlobalMaxStorage() throws MailboxException; + Optional<QuotaSizeLimit> getGlobalMaxStorage() throws MailboxException; - void setMaxMessageCount(String quotaRoot, SerializableQuotaLimitValue<QuotaCountLimit> maxMessageCount) throws MailboxException; + void setMaxMessageCount(String quotaRoot, QuotaCountLimit maxMessageCount) throws MailboxException; - void setMaxStorage(String quotaRoot, SerializableQuotaLimitValue<QuotaSizeLimit> maxSize) throws MailboxException; + void setMaxStorage(String quotaRoot, QuotaSizeLimit maxSize) throws MailboxException; - void setGlobalMaxMessageCount(SerializableQuotaLimitValue<QuotaCountLimit> maxGlobalMessageCount) throws MailboxException; + void setGlobalMaxMessageCount(QuotaCountLimit maxGlobalMessageCount) throws MailboxException; - void setGlobalMaxStorage(SerializableQuotaLimitValue<QuotaSizeLimit> maxGlobalSize) throws MailboxException; + void setGlobalMaxStorage(QuotaSizeLimit maxGlobalSize) throws MailboxException; } \ No newline at end of file diff --git a/server/container/cli-integration/src/test/java/org/apache/james/cli/QuotaCommandsIntegrationTest.java b/server/container/cli-integration/src/test/java/org/apache/james/cli/QuotaCommandsIntegrationTest.java index 4898871..07ca0ee 100644 --- a/server/container/cli-integration/src/test/java/org/apache/james/cli/QuotaCommandsIntegrationTest.java +++ b/server/container/cli-integration/src/test/java/org/apache/james/cli/QuotaCommandsIntegrationTest.java @@ -27,6 +27,8 @@ import java.util.Optional; import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.cli.util.OutputCapture; +import org.apache.james.core.quota.QuotaCountLimit; +import org.apache.james.core.quota.QuotaSizeLimit; import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex; import org.apache.james.modules.QuotaProbesImpl; @@ -64,7 +66,7 @@ public class QuotaCommandsIntegrationTest { public void setGlobalMaxStorageShouldWork() throws Exception { ServerCmd.doMain(new String[] {"-h", "127.0.0.1", "-p", "9999", "setglobalmaxstoragequota", "36"}); - assertThat(quotaProbe.getGlobalMaxStorage().encodeAsLong()).isEqualTo(36); + assertThat(quotaProbe.getGlobalMaxStorage().map(QuotaSizeLimit::asLong)).contains(36L); } @Test @@ -82,7 +84,7 @@ public class QuotaCommandsIntegrationTest { public void setGlobalMaxMessageCountShouldWork() throws Exception { ServerCmd.doMain(new String[] {"-h", "127.0.0.1", "-p", "9999", "setglobalmaxmessagecountquota", "36"}); - assertThat(quotaProbe.getGlobalMaxMessageCount().encodeAsLong()).isEqualTo(36); + assertThat(quotaProbe.getGlobalMaxMessageCount().map(QuotaCountLimit::asLong)).contains(36L); } @Test @@ -100,7 +102,7 @@ public class QuotaCommandsIntegrationTest { public void setMaxStorageShouldWork() throws Exception { ServerCmd.doMain(new String[] {"-h", "127.0.0.1", "-p", "9999", "setmaxstoragequota", QUOTA_ROOT.getValue(), "36"}); - assertThat(quotaProbe.getMaxStorage(QUOTA_ROOT.getValue()).encodeAsLong()).isEqualTo(36); + assertThat(quotaProbe.getMaxStorage(QUOTA_ROOT.getValue()).map(QuotaSizeLimit::asLong)).contains(36L); } @Test @@ -118,7 +120,7 @@ public class QuotaCommandsIntegrationTest { public void setMaxMessageCountShouldWork() throws Exception { ServerCmd.doMain(new String[] {"-h", "127.0.0.1", "-p", "9999", "setmaxmessagecountquota", QUOTA_ROOT.getValue(), "36"}); - assertThat(quotaProbe.getMaxMessageCount(QUOTA_ROOT.getValue()).encodeAsLong()).isEqualTo(36); + assertThat(quotaProbe.getMaxMessageCount(QUOTA_ROOT.getValue()).map(QuotaCountLimit::asLong)).contains(36L); } @Test diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java index 08edc58..26dd344 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java @@ -22,7 +22,6 @@ package org.apache.james; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.core.quota.QuotaSizeLimit; -import org.apache.james.mailbox.model.SerializableQuotaLimitValue; import org.apache.james.modules.QuotaProbesImpl; import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.modules.protocols.SmtpGuiceProbe; @@ -70,7 +69,7 @@ class JPAJamesServerTest implements JamesServerContract { .fluent() .addDomain(DOMAIN) .addUser(USER, PASSWORD); - jamesServer.getProbe(QuotaProbesImpl.class).setGlobalMaxStorage(new SerializableQuotaLimitValue<>(QuotaSizeLimit.size(50 * 1024))); + jamesServer.getProbe(QuotaProbesImpl.class).setGlobalMaxStorage(QuotaSizeLimit.size(50 * 1024)); // ~ 12 KB email int imapPort = jamesServer.getProbe(ImapGuiceProbe.class).getImapPort(); diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java index 6b163e6..7adf9f2 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java @@ -19,6 +19,8 @@ package org.apache.james.modules; +import java.util.Optional; + import javax.inject.Inject; import org.apache.james.core.Username; @@ -28,16 +30,13 @@ import org.apache.james.core.quota.QuotaSizeLimit; import org.apache.james.core.quota.QuotaSizeUsage; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.model.SerializableQuota; -import org.apache.james.mailbox.model.SerializableQuotaLimitValue; +import org.apache.james.mailbox.model.Quota; import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.mailbox.quota.MaxQuotaManager; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.quota.QuotaRootResolver; import org.apache.james.utils.GuiceProbe; -import com.github.fge.lambdas.Throwing; - public class QuotaProbesImpl implements QuotaProbe, GuiceProbe { private final MaxQuotaManager maxQuotaManager; @@ -57,62 +56,52 @@ public class QuotaProbesImpl implements QuotaProbe, GuiceProbe { } @Override - public SerializableQuota<QuotaCountLimit, QuotaCountUsage> getMessageCountQuota(String quotaRoot) throws MailboxException { - return SerializableQuota.newInstance(quotaManager.getMessageQuota(quotaRootResolver.fromString(quotaRoot))); + public Quota<QuotaCountLimit, QuotaCountUsage> getMessageCountQuota(String quotaRoot) throws MailboxException { + return quotaManager.getMessageQuota(quotaRootResolver.fromString(quotaRoot)); } @Override - public SerializableQuota<QuotaSizeLimit, QuotaSizeUsage> getStorageQuota(String quotaRoot) throws MailboxException { - return SerializableQuota.newInstance(quotaManager.getStorageQuota(quotaRootResolver.fromString(quotaRoot))); + public Quota<QuotaSizeLimit, QuotaSizeUsage> getStorageQuota(String quotaRoot) throws MailboxException { + return quotaManager.getStorageQuota(quotaRootResolver.fromString(quotaRoot)); } @Override - public SerializableQuotaLimitValue<QuotaCountLimit> getMaxMessageCount(String quotaRoot) throws MailboxException { - return SerializableQuotaLimitValue.valueOf(maxQuotaManager.getMaxMessage(quotaRootResolver.fromString(quotaRoot))); + public Optional<QuotaCountLimit> getMaxMessageCount(String quotaRoot) throws MailboxException { + return maxQuotaManager.getMaxMessage(quotaRootResolver.fromString(quotaRoot)); } @Override - public SerializableQuotaLimitValue<QuotaSizeLimit> getMaxStorage(String quotaRoot) throws MailboxException { - return SerializableQuotaLimitValue.valueOf(maxQuotaManager.getMaxStorage(quotaRootResolver.fromString(quotaRoot))); + public Optional<QuotaSizeLimit> getMaxStorage(String quotaRoot) throws MailboxException { + return maxQuotaManager.getMaxStorage(quotaRootResolver.fromString(quotaRoot)); } @Override - public SerializableQuotaLimitValue<QuotaCountLimit> getGlobalMaxMessageCount() throws MailboxException { - return SerializableQuotaLimitValue.valueOf(maxQuotaManager.getGlobalMaxMessage()); + public Optional<QuotaCountLimit> getGlobalMaxMessageCount() throws MailboxException { + return maxQuotaManager.getGlobalMaxMessage(); } @Override - public SerializableQuotaLimitValue<QuotaSizeLimit> getGlobalMaxStorage() throws MailboxException { - return SerializableQuotaLimitValue.valueOf(maxQuotaManager.getGlobalMaxStorage()); + public Optional<QuotaSizeLimit> getGlobalMaxStorage() throws MailboxException { + return maxQuotaManager.getGlobalMaxStorage(); } @Override - public void setMaxMessageCount(String quotaRoot, SerializableQuotaLimitValue<QuotaCountLimit> maxMessageCount) throws MailboxException { - maxMessageCount.toValue(QuotaCountLimit::count, QuotaCountLimit.unlimited()) - .ifPresent( - Throwing.consumer( - (QuotaCountLimit value) -> maxQuotaManager.setMaxMessage(quotaRootResolver.fromString(quotaRoot), value)) - .sneakyThrow()); + public void setMaxMessageCount(String quotaRoot, QuotaCountLimit maxMessageCount) throws MailboxException { + maxQuotaManager.setMaxMessage(quotaRootResolver.fromString(quotaRoot), maxMessageCount); } @Override - public void setMaxStorage(String quotaRoot, SerializableQuotaLimitValue<QuotaSizeLimit> maxSize) throws MailboxException { - maxSize.toValue(QuotaSizeLimit::size, QuotaSizeLimit.unlimited()) - .ifPresent( - Throwing.consumer( - (QuotaSizeLimit value) -> maxQuotaManager.setMaxStorage(quotaRootResolver.fromString(quotaRoot), value)) - .sneakyThrow()); + public void setMaxStorage(String quotaRoot, QuotaSizeLimit maxSize) throws MailboxException { + maxQuotaManager.setMaxStorage(quotaRootResolver.fromString(quotaRoot), maxSize); } @Override - public void setGlobalMaxMessageCount(SerializableQuotaLimitValue<QuotaCountLimit> maxGlobalMessageCount) throws MailboxException { - maxGlobalMessageCount.toValue(QuotaCountLimit::count, QuotaCountLimit.unlimited()) - .ifPresent(Throwing.consumer(maxQuotaManager::setGlobalMaxMessage).sneakyThrow()); + public void setGlobalMaxMessageCount(QuotaCountLimit maxGlobalMessageCount) throws MailboxException { + maxQuotaManager.setGlobalMaxMessage(maxGlobalMessageCount); } @Override - public void setGlobalMaxStorage(SerializableQuotaLimitValue<QuotaSizeLimit> maxGlobalSize) throws MailboxException { - maxGlobalSize.toValue(QuotaSizeLimit::size, QuotaSizeLimit.unlimited()) - .ifPresent(Throwing.consumer(maxQuotaManager::setGlobalMaxStorage).sneakyThrow()); + public void setGlobalMaxStorage(QuotaSizeLimit maxGlobalSize) throws MailboxException { + maxQuotaManager.setGlobalMaxStorage(maxGlobalSize); } } diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java index 3465065..bedb01e 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java @@ -52,7 +52,6 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Optional; import org.apache.james.GuiceJamesServer; import org.apache.james.core.quota.QuotaCountLimit; @@ -68,7 +67,6 @@ import org.apache.james.mailbox.model.MailboxACL.Right; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.model.SerializableQuotaLimitValue; import org.apache.james.mailbox.probe.ACLProbe; import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.mime4j.dom.Message; @@ -788,7 +786,7 @@ public abstract class GetMailboxesMethodTest { @Category(BasicFeature.class) @Test public void getMailboxesShouldReturnMaxStorageQuotasForInboxWhenSet() throws Exception { - quotaProbe.setGlobalMaxStorage(SerializableQuotaLimitValue.valueOf(Optional.of(QuotaSizeLimit.size(42)))); + quotaProbe.setGlobalMaxStorage(QuotaSizeLimit.size(42)); String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize(); given() @@ -805,7 +803,7 @@ public abstract class GetMailboxesMethodTest { @Test public void getMailboxesShouldReturnMaxMessageQuotasForInboxWhenSet() throws Exception { - quotaProbe.setGlobalMaxMessageCount(SerializableQuotaLimitValue.valueOf(Optional.of(QuotaCountLimit.count(43)))); + quotaProbe.setGlobalMaxMessageCount(QuotaCountLimit.count(43)); String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, ALICE.asString(), DefaultMailboxes.INBOX).serialize(); given() @@ -829,8 +827,8 @@ public abstract class GetMailboxesMethodTest { MailboxPath bobMailboxPath = MailboxPath.forUser(BOB, sharedMailboxName); aclProbe.replaceRights(bobMailboxPath, ALICE.asString(), new Rfc4314Rights(Right.Lookup, Right.Read)); - quotaProbe.setMaxMessageCount("#private&[email protected]", SerializableQuotaLimitValue.valueOf(Optional.of(QuotaCountLimit.count(42)))); - quotaProbe.setMaxMessageCount("#private&[email protected]", SerializableQuotaLimitValue.valueOf(Optional.of(QuotaCountLimit.count(43)))); + quotaProbe.setMaxMessageCount("#private&[email protected]", QuotaCountLimit.count(42)); + quotaProbe.setMaxMessageCount("#private&[email protected]", QuotaCountLimit.count(43)); given() .header("Authorization", accessToken.asString()) diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java index 1b9289d..b990feb 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java @@ -44,7 +44,6 @@ import org.apache.james.jmap.draft.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; -import org.apache.james.mailbox.model.SerializableQuotaLimitValue; import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.modules.QuotaProbesImpl; @@ -105,7 +104,7 @@ public abstract class QuotaMailingTest { public void shouldSendANoticeWhenThresholdExceeded() throws Exception { jmapServer.getProbe(QuotaProbesImpl.class) .setMaxStorage(MailboxConstants.USER_NAMESPACE + "&" + HOMER.asString(), - new SerializableQuotaLimitValue<>(QuotaSizeLimit.size(100 * 1000))); + QuotaSizeLimit.size(100 * 1000)); bartSendMessageToHomer(); // Homer receives a mail big enough to trigger a configured threshold @@ -131,7 +130,7 @@ public abstract class QuotaMailingTest { public void configurationShouldBeWellLoaded() throws Exception { jmapServer.getProbe(QuotaProbesImpl.class) .setMaxStorage(MailboxConstants.USER_NAMESPACE + "&" + HOMER.asString(), - new SerializableQuotaLimitValue<>(QuotaSizeLimit.size(100 * 1000))); + QuotaSizeLimit.size(100 * 1000)); bartSendMessageToHomer(); // Homer receives a mail big enough to trigger a 10% configured threshold diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java index 5321469..2b2b855 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java @@ -42,7 +42,6 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; import java.util.List; -import java.util.Optional; import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; @@ -55,7 +54,6 @@ import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MessageId; -import org.apache.james.mailbox.model.SerializableQuotaLimitValue; import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.modules.MailboxProbeImpl; @@ -406,7 +404,7 @@ public abstract class SendMDNMethodTest { QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class); String inboxQuotaRoot = quotaProbe.getQuotaRoot("#private", HOMER.asString(), DefaultMailboxes.INBOX); - quotaProbe.setMaxStorage(inboxQuotaRoot, SerializableQuotaLimitValue.valueOf(Optional.of(QuotaSizeLimit.size(100)))); + quotaProbe.setMaxStorage(inboxQuotaRoot, QuotaSizeLimit.size(100)); MessageAppender.fillMailbox(jmapServer.getProbe(MailboxProbeImpl.class), HOMER.asString(), MailboxConstants.INBOX); diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java index c584864..79a7c69 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java @@ -63,7 +63,6 @@ import java.time.ZonedDateTime; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -95,7 +94,6 @@ import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.MessageResult; -import org.apache.james.mailbox.model.SerializableQuotaLimitValue; import org.apache.james.mailbox.probe.ACLProbe; import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.mailbox.probe.QuotaProbe; @@ -1328,7 +1326,7 @@ public abstract class SetMessagesMethodTest { public void setMessagesShouldNotAllowDraftCreationWhenOverQuota() throws MailboxException { QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class); String inboxQuotaRoot = quotaProbe.getQuotaRoot("#private", USERNAME.asString(), DefaultMailboxes.INBOX); - quotaProbe.setMaxStorage(inboxQuotaRoot, SerializableQuotaLimitValue.valueOf(Optional.of(QuotaSizeLimit.size(100)))); + quotaProbe.setMaxStorage(inboxQuotaRoot, QuotaSizeLimit.size(100)); MessageAppender.fillMailbox(mailboxProbe, USERNAME.asString(), MailboxConstants.INBOX); @@ -1445,7 +1443,7 @@ public abstract class SetMessagesMethodTest { public void setMessagesShouldNotAllowCopyWhenOverQuota() throws MailboxException { QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class); String inboxQuotaRoot = quotaProbe.getQuotaRoot("#private", USERNAME.asString(), DefaultMailboxes.INBOX); - quotaProbe.setMaxStorage(inboxQuotaRoot, SerializableQuotaLimitValue.valueOf(Optional.of(QuotaSizeLimit.size(100)))); + quotaProbe.setMaxStorage(inboxQuotaRoot, QuotaSizeLimit.size(100)); List<ComposedMessageId> composedMessageIds = MessageAppender.fillMailbox(mailboxProbe, USERNAME.asString(), MailboxConstants.INBOX); @@ -2775,7 +2773,7 @@ public abstract class SetMessagesMethodTest { public void setMessagesShouldTriggerMaxQuotaReachedWhenTryingToSendMessageAndQuotaReached() throws Exception { QuotaProbe quotaProbe = jmapServer.getProbe(QuotaProbesImpl.class); String inboxQuotaRoot = quotaProbe.getQuotaRoot("#private", USERNAME.asString(), DefaultMailboxes.INBOX); - quotaProbe.setMaxStorage(inboxQuotaRoot, SerializableQuotaLimitValue.valueOf(Optional.of(QuotaSizeLimit.size(100)))); + quotaProbe.setMaxStorage(inboxQuotaRoot, QuotaSizeLimit.size(100)); MessageAppender.fillMailbox(mailboxProbe, USERNAME.asString(), MailboxConstants.INBOX); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
