http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java index 0ca9a75..fd1d103 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java @@ -21,6 +21,7 @@ package org.apache.james.transport.mailets.managesieve; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -38,9 +39,12 @@ import javax.mail.internet.MimeMultipart; import org.apache.commons.io.IOUtils; import org.apache.james.core.MailAddress; +import org.apache.james.core.User; import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.managesieve.api.SieveParser; import org.apache.james.managesieve.api.SyntaxException; +import org.apache.james.sieverepository.api.ScriptContent; +import org.apache.james.sieverepository.api.ScriptName; import org.apache.james.sieverepository.api.ScriptSummary; import org.apache.james.sieverepository.api.SieveRepository; import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; @@ -56,12 +60,12 @@ import com.google.common.collect.Lists; public class ManageSieveMailetTestCase { - public static final String USER = "test@localhost"; - public static final String SCRIPT_NAME = "scriptName"; - public static final String SCRIPT_CONTENT = "scriptContent"; + public static final User USER = User.fromUsername("test@localhost"); + public static final ScriptName SCRIPT_NAME = new ScriptName("scriptName"); + public static final ScriptContent SCRIPT_CONTENT = new ScriptContent("scriptContent"); public static final String SYNTAX_EXCEPTION = "SyntaxException"; - public static final String OLD_SCRIPT_NAME = "oldScriptName"; - public static final String NEW_SCRIPT_NAME = "newScriptName"; + public static final ScriptName OLD_SCRIPT_NAME = new ScriptName("oldScriptName"); + public static final ScriptName NEW_SCRIPT_NAME = new ScriptName("newScriptName"); public static final String SIEVE_LOCALHOST = "sieve@localhost"; private ManageSieveMailet mailet; @@ -76,7 +80,7 @@ public class ManageSieveMailetTestCase { sieveParser = mock(SieveParser.class); usersRepository = mock(UsersRepository.class); initializeMailet(); - when(usersRepository.contains(USER)).thenReturn(true); + when(usersRepository.contains(USER.asString())).thenReturn(true); } @Test @@ -131,7 +135,7 @@ public class ManageSieveMailetTestCase { @Test public final void testPutScript() throws Exception { - when(sieveParser.parse(SCRIPT_CONTENT)).thenReturn(Lists.newArrayList("warning1", "warning2")); + when(sieveParser.parse(anyString())).thenReturn(Lists.newArrayList("warning1", "warning2")); MimeMessage message = prepareMessageWithAttachment(SCRIPT_CONTENT, "PUTSCRIPT \"" + SCRIPT_NAME + "\" {100+}"); Mail mail = createAuthentificatedMail(message); mailet.service(mail); @@ -189,10 +193,10 @@ public class ManageSieveMailetTestCase { @Test public final void testGetScript() throws Exception { - when(sieveRepository.getScript(USER, SCRIPT_NAME)).thenReturn(new ByteArrayInputStream(SCRIPT_CONTENT.getBytes())); + when(sieveRepository.getScript(USER, SCRIPT_NAME)).thenReturn(new ByteArrayInputStream(SCRIPT_CONTENT.getValue().getBytes())); MimeMessage message = prepareMimeMessage("GETSCRIPT \"" + SCRIPT_NAME + "\""); Mail mail = createUnauthenticatedMail(message); - mail.setAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, USER); + mail.setAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, USER.asString()); mailet.service(mail); ensureResponse("Re: GETSCRIPT \"" + SCRIPT_NAME + "\"", "{13}\r\n" + SCRIPT_CONTENT + "\r\nOK"); } @@ -210,19 +214,19 @@ public class ManageSieveMailetTestCase { doThrow(new ScriptNotFoundException()).when(sieveRepository).getScript(USER, SCRIPT_NAME); MimeMessage message = prepareMimeMessage("GETSCRIPT \"" + SCRIPT_NAME + "\""); Mail mail = createUnauthenticatedMail(message); - mail.setAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, USER); + mail.setAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, USER.asString()); mailet.service(mail); ensureResponse("Re: GETSCRIPT \"" + SCRIPT_NAME + "\"", "NO (NONEXISTENT) \"There is no script by that name\""); } @Test public final void testGetScriptNoScriptName() throws Exception { - String scriptContent = "line1\r\nline2"; + ScriptContent scriptContent = new ScriptContent("line1\r\nline2"); sieveRepository.putScript(USER, SCRIPT_NAME, scriptContent); MimeMessage message = prepareMimeMessage("GETSCRIPT"); Mail mail = createUnauthenticatedMail(message); - mail.setAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, USER); + mail.setAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, USER.asString()); mailet.service(mail); ensureResponse("Re: GETSCRIPT", "NO \"Missing argument: script name\""); } @@ -237,7 +241,7 @@ public class ManageSieveMailetTestCase { @Test public final void testCheckScript() throws Exception { - when(sieveParser.parse(SCRIPT_CONTENT)).thenReturn(Lists.newArrayList("warning1", "warning2")); + when(sieveParser.parse(anyString())).thenReturn(Lists.newArrayList("warning1", "warning2")); MimeMessage message = prepareMessageWithAttachment(SCRIPT_CONTENT, "CHECKSCRIPT {100+}"); Mail mail = createAuthentificatedMail(message); mailet.service(mail); @@ -367,7 +371,7 @@ public class ManageSieveMailetTestCase { @Test public final void testListScripts() throws Exception { - when(sieveRepository.listScripts(USER)).thenReturn(Lists.newArrayList(new ScriptSummary("scriptName2", true), new ScriptSummary("scriptName1", false))); + when(sieveRepository.listScripts(USER)).thenReturn(Lists.newArrayList(new ScriptSummary(new ScriptName("scriptName2"), true), new ScriptSummary(new ScriptName("scriptName1"), false))); MimeMessage message = prepareMimeMessage("LISTSCRIPTS"); Mail mail = createAuthentificatedMail(message); mailet.service(mail); @@ -384,7 +388,7 @@ public class ManageSieveMailetTestCase { @Test public final void testRenameScriptsUnauthorised() throws Exception { - sieveRepository.putScript(USER, OLD_SCRIPT_NAME, NEW_SCRIPT_NAME); + sieveRepository.putScript(USER, OLD_SCRIPT_NAME, SCRIPT_CONTENT); MimeMessage message = prepareMimeMessage("RENAMESCRIPT \"" + OLD_SCRIPT_NAME + "\" \"" + NEW_SCRIPT_NAME + "\""); Mail mail = createUnauthenticatedMail(message); mailet.service(mail); @@ -393,7 +397,7 @@ public class ManageSieveMailetTestCase { @Test public final void testRenameScripts() throws Exception { - sieveRepository.putScript(USER, OLD_SCRIPT_NAME, NEW_SCRIPT_NAME); + sieveRepository.putScript(USER, OLD_SCRIPT_NAME, SCRIPT_CONTENT); MimeMessage message = prepareMimeMessage("RENAMESCRIPT \"" + OLD_SCRIPT_NAME + "\" \"" + NEW_SCRIPT_NAME + "\""); Mail mail = createAuthentificatedMail(message); mailet.service(mail); @@ -402,7 +406,7 @@ public class ManageSieveMailetTestCase { @Test public final void testRenameScriptsExtraArgs() throws Exception { - sieveRepository.putScript(USER, OLD_SCRIPT_NAME, NEW_SCRIPT_NAME); + sieveRepository.putScript(USER, OLD_SCRIPT_NAME, SCRIPT_CONTENT); MimeMessage message = prepareMimeMessage("RENAMESCRIPT \"" + OLD_SCRIPT_NAME + "\" \"" + NEW_SCRIPT_NAME + "\" extra"); Mail mail = createUnauthenticatedMail(message); mailet.service(mail); @@ -411,7 +415,7 @@ public class ManageSieveMailetTestCase { @Test public final void testRenameScriptsNoScriptName() throws Exception { - sieveRepository.putScript(USER, OLD_SCRIPT_NAME, NEW_SCRIPT_NAME); + sieveRepository.putScript(USER, OLD_SCRIPT_NAME, SCRIPT_CONTENT); MimeMessage message = prepareMimeMessage("RENAMESCRIPT"); Mail mail = createUnauthenticatedMail(message); mailet.service(mail); @@ -420,7 +424,7 @@ public class ManageSieveMailetTestCase { @Test public final void testRenameScriptsNoNewScriptName() throws Exception { - sieveRepository.putScript(USER, OLD_SCRIPT_NAME, NEW_SCRIPT_NAME); + sieveRepository.putScript(USER, OLD_SCRIPT_NAME, SCRIPT_CONTENT); MimeMessage message = prepareMimeMessage("RENAMESCRIPT \"" + OLD_SCRIPT_NAME + "\""); Mail mail = createUnauthenticatedMail(message); mailet.service(mail); @@ -503,7 +507,7 @@ public class ManageSieveMailetTestCase { private Mail createUnauthenticatedMail(MimeMessage message) throws Exception { return FakeMail.builder() .mimeMessage(message) - .sender(USER) + .sender(USER.asString()) .recipient(SIEVE_LOCALHOST) .build(); } @@ -518,20 +522,24 @@ public class ManageSieveMailetTestCase { return MimeMessageBuilder.mimeMessageBuilder() .setSubject(subject) .addToRecipient(SIEVE_LOCALHOST) - .setSender(USER) + .setSender(USER.asString()) .build(); } + private MimeMessage prepareMessageWithAttachment(ScriptContent scriptContent, String subject) throws MessagingException, IOException { + return prepareMessageWithAttachment(scriptContent.getValue(), subject); + } + private MimeMessage prepareMessageWithAttachment(String scriptContent, String subject) throws MessagingException, IOException { return MimeMessageBuilder.mimeMessageBuilder() .setSubject(subject) .addToRecipient(SIEVE_LOCALHOST) - .setSender(USER) + .setSender(USER.asString()) .setMultipartWithBodyParts( MimeMessageBuilder.bodyPartBuilder() .data(scriptContent) .disposition(MimeBodyPart.ATTACHMENT) - .filename(SCRIPT_NAME) + .filename(SCRIPT_NAME.getValue()) .addHeader("Content-Type", "application/sieve; charset=UTF-8")) .build(); } @@ -557,14 +565,14 @@ public class ManageSieveMailetTestCase { private MimeMessage verifyHeaders(String subject) throws MessagingException { FakeMailContext.SentMail sentMail = FakeMailContext.sentMailBuilder() - .recipient(new MailAddress(USER)) + .recipient(new MailAddress(USER.asString())) .sender(new MailAddress(SIEVE_LOCALHOST)) .fromMailet() .build(); assertThat(fakeMailContext.getSentMails()).containsOnly(sentMail); MimeMessage result = fakeMailContext.getSentMails().get(0).getMsg(); assertThat(result.getSubject()).isEqualTo(subject); - assertThat(result.getRecipients(RecipientType.TO)).containsOnly(new InternetAddress(USER)); + assertThat(result.getRecipients(RecipientType.TO)).containsOnly(new InternetAddress(USER.asString())); return result; } } \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java index 018c00f..25e021f 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java @@ -26,14 +26,14 @@ import static org.mockito.Mockito.when; import java.util.Collection; import org.apache.james.core.MailAddress; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager; import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.QuotaRoot; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.mailbox.store.StoreMailboxManager; import org.apache.james.mailbox.store.quota.CurrentQuotaCalculator; import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java index 6602882..8348fe2 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java @@ -54,6 +54,8 @@ import java.util.Map; import java.util.Optional; import org.apache.james.GuiceJamesServer; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.model.mailbox.MailboxNamespace; import org.apache.james.mailbox.DefaultMailboxes; @@ -63,8 +65,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.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.SerializableQuotaValue; import org.apache.james.mailbox.store.probe.ACLProbe; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java index 4753add..420a18e 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java @@ -38,10 +38,10 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.apache.james.GuiceJamesServer; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; -import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.mailbox.store.mail.model.SerializableQuotaValue; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java index f7602a5..e272ea7 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java @@ -45,13 +45,13 @@ import java.util.List; import java.util.Optional; import org.apache.james.GuiceJamesServer; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.jmap.MessageAppender; import org.apache.james.jmap.api.access.AccessToken; 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.quota.QuotaSize; import org.apache.james.mailbox.store.mail.model.SerializableQuotaValue; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.mailbox.store.probe.QuotaProbe; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index a886af8..3d5fda6 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -75,6 +75,7 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.io.IOUtils; import org.apache.james.GuiceJamesServer; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.MessageAppender; import org.apache.james.jmap.api.access.AccessToken; @@ -92,7 +93,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.quota.QuotaSize; import org.apache.james.mailbox.store.event.EventFactory; import org.apache.james.mailbox.store.mail.model.SerializableQuotaValue; import org.apache.james.mailbox.store.probe.ACLProbe; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java index afac80c..94310a2 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java @@ -23,6 +23,7 @@ import java.util.Optional; import javax.inject.Inject; +import org.apache.james.core.quota.QuotaValue; import org.apache.james.jmap.model.mailbox.Mailbox; import org.apache.james.jmap.model.mailbox.MailboxNamespace; import org.apache.james.jmap.model.mailbox.Quotas; @@ -44,7 +45,6 @@ import org.apache.james.mailbox.model.Quota; import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.quota.QuotaRootResolver; -import org.apache.james.mailbox.quota.QuotaValue; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Quotas.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Quotas.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Quotas.java index 1579f32..30ae9a2 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Quotas.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Quotas.java @@ -21,11 +21,11 @@ package org.apache.james.jmap.model.mailbox; import java.util.Map; import java.util.Optional; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; +import org.apache.james.core.quota.QuotaValue; import org.apache.james.jmap.model.Number; import org.apache.james.mailbox.model.QuotaRoot; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; -import org.apache.james.mailbox.quota.QuotaValue; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java index 1c779db..c0abc61 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java @@ -28,6 +28,8 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import org.apache.james.core.User; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.sieverepository.api.SieveQuotaRepository; import org.apache.james.sieverepository.api.exception.QuotaNotFoundException; import org.apache.james.webadmin.Constants; @@ -92,9 +94,9 @@ public class SieveQuotaRoutes implements Routes { public void defineGetGlobalSieveQuota(Service service) { service.get(ROOT_PATH, (request, response) -> { try { - long sieveQuota = sieveQuotaRepository.getQuota(); + QuotaSize sieveQuota = sieveQuotaRepository.getQuota(); response.status(HttpStatus.OK_200); - return sieveQuota; + return sieveQuota.asLong(); } catch (QuotaNotFoundException e) { LOGGER.info("Global sieve quota not set", e); throw ErrorResponder.builder() @@ -119,7 +121,7 @@ public class SieveQuotaRoutes implements Routes { public void defineUpdateGlobalSieveQuota(Service service) { service.put(ROOT_PATH, (request, response) -> { try { - Long requestedSize = extractRequestedQuotaSizeFromRequest(request); + QuotaSize requestedSize = extractRequestedQuotaSizeFromRequest(request); sieveQuotaRepository.setQuota(requestedSize); response.status(HttpStatus.NO_CONTENT_204); return Constants.EMPTY_BODY; @@ -171,11 +173,11 @@ public class SieveQuotaRoutes implements Routes { }) public void defineGetPerUserSieveQuota(Service service) { service.get(USER_SIEVE_QUOTA_PATH, (request, response) -> { - String userId = request.params(USER_ID); + User userId = User.fromUsername(request.params(USER_ID)); try { - long userQuota = sieveQuotaRepository.getQuota(userId); + QuotaSize userQuota = sieveQuotaRepository.getQuota(userId); response.status(HttpStatus.OK_200); - return userQuota; + return userQuota.asLong(); } catch (QuotaNotFoundException e) { LOGGER.info("User sieve quota not set", e); throw ErrorResponder.builder() @@ -200,9 +202,9 @@ public class SieveQuotaRoutes implements Routes { }) public void defineUpdatePerUserSieveQuota(Service service) { service.put(USER_SIEVE_QUOTA_PATH, (request, response) -> { - String userId = request.params(USER_ID); + User userId = User.fromUsername(request.params(USER_ID)); try { - Long requestedSize = extractRequestedQuotaSizeFromRequest(request); + QuotaSize requestedSize = extractRequestedQuotaSizeFromRequest(request); sieveQuotaRepository.setQuota(userId, requestedSize); response.status(HttpStatus.NO_CONTENT_204); } catch (JsonExtractException e) { @@ -230,7 +232,7 @@ public class SieveQuotaRoutes implements Routes { }) public void defineRemovePerUserSieveQuota(Service service) { service.delete(USER_SIEVE_QUOTA_PATH, (request, response) -> { - String userId = request.params(USER_ID); + User userId = User.fromUsername(request.params(USER_ID)); try { sieveQuotaRepository.removeQuota(userId); response.status(HttpStatus.NO_CONTENT_204); @@ -246,7 +248,7 @@ public class SieveQuotaRoutes implements Routes { }); } - private Long extractRequestedQuotaSizeFromRequest(Request request) throws JsonExtractException { + private QuotaSize extractRequestedQuotaSizeFromRequest(Request request) throws JsonExtractException { Long requestedSize = jsonExtractor.parse(request.body()); if (requestedSize < 0) { throw ErrorResponder.builder() @@ -255,6 +257,6 @@ public class SieveQuotaRoutes implements Routes { .message("Requested quota size have to be a positive integer") .haltError(); } - return requestedSize; + return QuotaSize.size(requestedSize); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationDTO.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationDTO.java index ca85a37..455de1d 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationDTO.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationDTO.java @@ -19,9 +19,9 @@ package org.apache.james.webadmin.dto; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.model.Quota; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; public class OccupationDTO { public static OccupationDTO from(Quota<QuotaSize> sizeQuota, Quota<QuotaCount> countQuota) { http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationRatioDTO.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationRatioDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationRatioDTO.java index 2189aa2..d3fc923 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationRatioDTO.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/OccupationRatioDTO.java @@ -19,10 +19,10 @@ package org.apache.james.webadmin.dto; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.model.Quota; import org.apache.james.mailbox.model.QuotaRatio; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; public class OccupationRatioDTO { http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java index b48f1f9..9a02cc6 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java @@ -23,8 +23,8 @@ package org.apache.james.webadmin.dto; import java.util.Objects; import java.util.Optional; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDetailsDTO.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDetailsDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDetailsDTO.java index e365ecc..9042122 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDetailsDTO.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDetailsDTO.java @@ -22,9 +22,9 @@ package org.apache.james.webadmin.dto; import java.util.Optional; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.model.Quota; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueDeserializer.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueDeserializer.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueDeserializer.java index 52cef2e..9a2a7e8 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueDeserializer.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueDeserializer.java @@ -21,7 +21,7 @@ package org.apache.james.webadmin.dto; import java.io.IOException; import java.util.function.Function; -import org.apache.james.mailbox.quota.QuotaValue; +import org.apache.james.core.quota.QuotaValue; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueSerializer.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueSerializer.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueSerializer.java index f683558..3c4067b 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueSerializer.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaValueSerializer.java @@ -20,7 +20,7 @@ package org.apache.james.webadmin.dto; import java.io.IOException; -import org.apache.james.mailbox.quota.QuotaValue; +import org.apache.james.core.quota.QuotaValue; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/jackson/QuotaModule.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/jackson/QuotaModule.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/jackson/QuotaModule.java index 2188fd5..003226a 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/jackson/QuotaModule.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/jackson/QuotaModule.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.webadmin.jackson; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.webadmin.dto.QuotaValueDeserializer; import org.apache.james.webadmin.dto.QuotaValueSerializer; import org.apache.james.webadmin.utils.JsonTransformerModule; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java index 7fedff1..5c40253 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java @@ -31,10 +31,10 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import org.apache.james.core.Domain; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.webadmin.Routes; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java index 1054ad4..b96927e 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/GlobalQuotaRoutes.java @@ -28,9 +28,9 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.dto.QuotaDTO; import org.apache.james.webadmin.jackson.QuotaModule; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java index 4b8a310..3024d72 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java @@ -35,8 +35,8 @@ import javax.ws.rs.Produces; import org.apache.james.core.Domain; import org.apache.james.core.User; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.quota.search.Limit; import org.apache.james.quota.search.Offset; import org.apache.james.quota.search.QuotaBoundary; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/DomainQuotaService.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/DomainQuotaService.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/DomainQuotaService.java index c0ad607..525e041 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/DomainQuotaService.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/DomainQuotaService.java @@ -24,10 +24,10 @@ import java.util.Optional; import javax.inject.Inject; import org.apache.james.core.Domain; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.quota.MaxQuotaManager; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.webadmin.dto.QuotaDTO; import com.github.fge.lambdas.Throwing; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/GlobalQuotaService.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/GlobalQuotaService.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/GlobalQuotaService.java index 5619429..83e7a32 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/GlobalQuotaService.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/GlobalQuotaService.java @@ -22,10 +22,10 @@ import java.util.Optional; import javax.inject.Inject; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.quota.MaxQuotaManager; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.webadmin.dto.QuotaDTO; public class GlobalQuotaService { http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserQuotaService.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserQuotaService.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserQuotaService.java index 6fdb9c0..03969b4 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserQuotaService.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserQuotaService.java @@ -27,13 +27,13 @@ import java.util.stream.Collectors; import javax.inject.Inject; import org.apache.james.core.User; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.Quota; import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.quota.MaxQuotaManager; -import org.apache.james.mailbox.quota.QuotaCount; import org.apache.james.mailbox.quota.QuotaManager; -import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.mailbox.quota.UserQuotaRootResolver; import org.apache.james.quota.search.QuotaQuery; import org.apache.james.quota.search.QuotaSearcher; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/validation/Quotas.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/validation/Quotas.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/validation/Quotas.java index b088621..523fbbc 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/validation/Quotas.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/validation/Quotas.java @@ -21,8 +21,8 @@ package org.apache.james.webadmin.validation; import java.util.Optional; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.webadmin.utils.ErrorResponder; import org.eclipse.jetty.http.HttpStatus; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/QuotaValueDeserializerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/QuotaValueDeserializerTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/QuotaValueDeserializerTest.java index e47256a..8cb7f28 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/QuotaValueDeserializerTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/QuotaValueDeserializerTest.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.webadmin.dto; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.webadmin.utils.JsonExtractException; import org.apache.james.webadmin.utils.JsonExtractor; import org.assertj.core.api.Assertions; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/UsersQuotaDetailsDTOTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/UsersQuotaDetailsDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/UsersQuotaDetailsDTOTest.java index d96915d..d6592e2 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/UsersQuotaDetailsDTOTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/UsersQuotaDetailsDTOTest.java @@ -24,9 +24,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import javax.mail.internet.AddressException; import org.apache.james.core.User; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.model.Quota; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.junit.Test; public class UsersQuotaDetailsDTOTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java index b27c0d6..f8548b2 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java @@ -26,9 +26,9 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Map; import org.apache.james.core.Domain; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.quota.MaxQuotaManager; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.eclipse.jetty.http.HttpStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java index cb3380d..25bd32e 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java @@ -25,9 +25,9 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Map; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.quota.MaxQuotaManager; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.assertj.core.api.SoftAssertions; import org.eclipse.jetty.http.HttpStatus; import org.junit.jupiter.api.BeforeEach; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java index 694cea4..a2299ca 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java @@ -35,6 +35,8 @@ import java.util.Map; import org.apache.james.core.Domain; import org.apache.james.core.User; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.apache.james.domainlist.api.DomainList; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; @@ -43,8 +45,6 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.quota.MaxQuotaManager; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.mailbox.quota.UserQuotaRootResolver; import org.apache.james.quota.search.QuotaSearchTestSystem; import org.apache.james.user.api.UsersRepository; http://git-wip-us.apache.org/repos/asf/james-project/blob/3d0a5534/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/validation/QuotaValueTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/validation/QuotaValueTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/validation/QuotaValueTest.java index d38d78a..23f88ce 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/validation/QuotaValueTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/validation/QuotaValueTest.java @@ -22,8 +22,8 @@ package org.apache.james.webadmin.validation; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; import org.junit.jupiter.api.Test; import spark.HaltException; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
