http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java b/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java index f937857..51fd07c 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java @@ -293,17 +293,17 @@ public class ServerCmd { case SETMAXMESSAGECOUNTQUOTA: quotaProbe.setMaxMessageCount(arguments[1], parseQuotaCount(arguments[2])); break; - case SETDEFAULTMAXSTORAGEQUOTA: - quotaProbe.setDefaultMaxStorage(parseQuotaSize(arguments[1])); + case SETGLOBALMAXSTORAGEQUOTA: + quotaProbe.setGlobalMaxStorage(parseQuotaSize(arguments[1])); break; - case SETDEFAULTMAXMESSAGECOUNTQUOTA: - quotaProbe.setDefaultMaxMessageCount(parseQuotaCount(arguments[1])); + case SETGLOBALMAXMESSAGECOUNTQUOTA: + quotaProbe.setGlobalMaxMessageCount(parseQuotaCount(arguments[1])); break; - case GETDEFAULTMAXSTORAGEQUOTA: - printStream.println("Default Maximum Storage Quota: " + formatStorageValue(quotaProbe.getDefaultMaxStorage())); + case GETGLOBALMAXSTORAGEQUOTA: + printStream.println("Global Maximum Storage Quota: " + formatStorageValue(quotaProbe.getGlobalMaxStorage())); break; - case GETDEFAULTMAXMESSAGECOUNTQUOTA: - printStream.println("Default Maximum message count Quota: " + formatMessageValue(quotaProbe.getDefaultMaxMessageCount())); + case GETGLOBALMAXMESSAGECOUNTQUOTA: + printStream.println("Global Maximum message count Quota: " + formatMessageValue(quotaProbe.getGlobalMaxMessageCount())); break; case REINDEXMAILBOX: mailboxProbe.reIndexMailbox(arguments[1], arguments[2], arguments[3]);
http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java index ff27f48..227bf1f 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java @@ -71,13 +71,13 @@ public class JmxQuotaProbe implements QuotaProbe, JmxProbe { } @Override - public SerializableQuotaValue<QuotaCount> getDefaultMaxMessageCount() throws MailboxException { - return quotaManagement.getDefaultMaxMessageCount(); + public SerializableQuotaValue<QuotaCount> getGlobalMaxMessageCount() throws MailboxException { + return quotaManagement.getGlobalMaxMessageCount(); } @Override - public SerializableQuotaValue<QuotaSize> getDefaultMaxStorage() throws MailboxException { - return quotaManagement.getDefaultMaxStorage(); + public SerializableQuotaValue<QuotaSize> getGlobalMaxStorage() throws MailboxException { + return quotaManagement.getGlobalMaxStorage(); } @Override @@ -91,13 +91,13 @@ public class JmxQuotaProbe implements QuotaProbe, JmxProbe { } @Override - public void setDefaultMaxMessageCount(SerializableQuotaValue<QuotaCount> maxDefaultMessageCount) throws MailboxException { - quotaManagement.setDefaultMaxMessageCount(maxDefaultMessageCount); + public void setGlobalMaxMessageCount(SerializableQuotaValue<QuotaCount> maxGlobalMessageCount) throws MailboxException { + quotaManagement.setGlobalMaxMessageCount(maxGlobalMessageCount); } @Override - public void setDefaultMaxStorage(SerializableQuotaValue<QuotaSize> maxDefaultSize) throws MailboxException { - quotaManagement.setDefaultMaxStorage(maxDefaultSize); + public void setGlobalMaxStorage(SerializableQuotaValue<QuotaSize> maxGlobalSize) throws MailboxException { + quotaManagement.setGlobalMaxStorage(maxGlobalSize); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java b/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java index 5871619..02c0928 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/type/CmdType.java @@ -51,10 +51,10 @@ public enum CmdType { GETMAXMESSAGECOUNTQUOTA("GetMaxMessageCountQuota", "quotaroot"), SETMAXSTORAGEQUOTA("SetMaxStorageQuota", "quotaroot", "maxMessageCount"), SETMAXMESSAGECOUNTQUOTA("SetMaxMessageCountQuota", "quotaroot", "maxStorage"), - SETDEFAULTMAXSTORAGEQUOTA("SetDefaultMaxStorageQuota", "maxStorage"), - SETDEFAULTMAXMESSAGECOUNTQUOTA("SetDefaultMaxMessageCountQuota", "maxMessageCount"), - GETDEFAULTMAXSTORAGEQUOTA("GetDefaultMaxStorageQuota"), - GETDEFAULTMAXMESSAGECOUNTQUOTA("GetDefaultMaxMessageCountQuota"), + SETGLOBALMAXSTORAGEQUOTA("SetGlobalMaxStorageQuota", "maxStorage"), + SETGLOBALMAXMESSAGECOUNTQUOTA("SetGlobalMaxMessageCountQuota", "maxMessageCount"), + GETGLOBALMAXSTORAGEQUOTA("GetGlobalMaxStorageQuota"), + GETGLOBALMAXMESSAGECOUNTQUOTA("GetGlobalMaxMessageCountQuota"), REINDEXMAILBOX("ReindexMailbox", "namespace", "user", "name"), REINDEXALL("ReindexAll"), GETSIEVEQUOTA("GetSieveQuota"), http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java index 6792f17..b94b40e 100644 --- a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java +++ b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java @@ -55,7 +55,6 @@ public class ServerCmdTest { public static final String ADDITIONAL_ARGUMENT = "additionalArgument"; private IMocksControl control; - private DataProbe dataProbe; private MailboxProbe mailboxProbe; private QuotaProbe quotaProbe; @@ -379,11 +378,11 @@ public class ServerCmdTest { } @Test - public void getDefaultMaxMessageCountCommandShouldWork() throws Exception { - String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.GETDEFAULTMAXMESSAGECOUNTQUOTA.getCommand()}; + public void getGlobalMaxMessageCountCommandShouldWork() throws Exception { + String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.GETGLOBALMAXMESSAGECOUNTQUOTA.getCommand()}; CommandLine commandLine = ServerCmd.parseCommandLine(arguments); - expect(quotaProbe.getDefaultMaxMessageCount()).andReturn(new SerializableQuotaValue<>(QuotaCount.count(1024L * 1024L))); + expect(quotaProbe.getGlobalMaxMessageCount()).andReturn(new SerializableQuotaValue<>(QuotaCount.count(1024L * 1024L))); control.replay(); testee.executeCommandLine(commandLine); @@ -391,11 +390,11 @@ public class ServerCmdTest { } @Test - public void getDefaultMaxStorageCommandShouldWork() throws Exception { - String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.GETDEFAULTMAXSTORAGEQUOTA.getCommand()}; + public void getGlobalMaxStorageCommandShouldWork() throws Exception { + String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.GETGLOBALMAXSTORAGEQUOTA.getCommand()}; CommandLine commandLine = ServerCmd.parseCommandLine(arguments); - expect(quotaProbe.getDefaultMaxStorage()).andReturn(new SerializableQuotaValue<>(QuotaSize.size(1024L * 1024L * 1024L))); + expect(quotaProbe.getGlobalMaxStorage()).andReturn(new SerializableQuotaValue<>(QuotaSize.size(1024L * 1024L * 1024L))); control.replay(); testee.executeCommandLine(commandLine); @@ -403,11 +402,11 @@ public class ServerCmdTest { } @Test - public void setDefaultMaxMessageCountCommandShouldWork() throws Exception { - String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.SETDEFAULTMAXMESSAGECOUNTQUOTA.getCommand(), "1054"}; + public void setGlobalMaxMessageCountCommandShouldWork() throws Exception { + String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.SETGLOBALMAXMESSAGECOUNTQUOTA.getCommand(), "1054"}; CommandLine commandLine = ServerCmd.parseCommandLine(arguments); - quotaProbe.setDefaultMaxMessageCount(new SerializableQuotaValue<>(QuotaCount.count(1054))); + quotaProbe.setGlobalMaxMessageCount(new SerializableQuotaValue<>(QuotaCount.count(1054))); expectLastCall(); control.replay(); @@ -416,11 +415,11 @@ public class ServerCmdTest { } @Test - public void setDefaultMaxMessageCountCommandShouldWorkWhenUnlimited() throws Exception { - String[] arguments = { "-h", "127.0.0.1", "-p", "9999", "--", CmdType.SETDEFAULTMAXMESSAGECOUNTQUOTA.getCommand(), "-1"}; + public void setGlobalMaxMessageCountCommandShouldWorkWhenUnlimited() throws Exception { + String[] arguments = { "-h", "127.0.0.1", "-p", "9999", "--", CmdType.SETGLOBALMAXMESSAGECOUNTQUOTA.getCommand(), "-1"}; CommandLine commandLine = ServerCmd.parseCommandLine(arguments); - quotaProbe.setDefaultMaxMessageCount(new SerializableQuotaValue<>(QuotaCount.unlimited())); + quotaProbe.setGlobalMaxMessageCount(new SerializableQuotaValue<>(QuotaCount.unlimited())); expectLastCall(); control.replay(); @@ -429,19 +428,19 @@ public class ServerCmdTest { } @Test(expected = IllegalArgumentException.class) - public void setDefaultMaxMessageCountCommandShouldThrowWhenNegativeAndNotUnlimited() throws Exception { - String[] arguments = { "-h", "127.0.0.1", "-p", "9999", "--", CmdType.SETDEFAULTMAXMESSAGECOUNTQUOTA.getCommand(), "-2"}; + public void setGlobalMaxMessageCountCommandShouldThrowWhenNegativeAndNotUnlimited() throws Exception { + String[] arguments = { "-h", "127.0.0.1", "-p", "9999", "--", CmdType.SETGLOBALMAXMESSAGECOUNTQUOTA.getCommand(), "-2"}; CommandLine commandLine = ServerCmd.parseCommandLine(arguments); testee.executeCommandLine(commandLine); } @Test - public void setDefaultMaxStorageCommandShouldWork() throws Exception { - String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.SETDEFAULTMAXSTORAGEQUOTA.getCommand(), "1G"}; + public void setGlobalMaxStorageCommandShouldWork() throws Exception { + String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.SETGLOBALMAXSTORAGEQUOTA.getCommand(), "1G"}; CommandLine commandLine = ServerCmd.parseCommandLine(arguments); - quotaProbe.setDefaultMaxStorage(new SerializableQuotaValue<>(QuotaSize.size(1024 * 1024 * 1024))); + quotaProbe.setGlobalMaxStorage(new SerializableQuotaValue<>(QuotaSize.size(1024 * 1024 * 1024))); expectLastCall(); control.replay(); @@ -450,11 +449,11 @@ public class ServerCmdTest { } @Test - public void setDefaultMaxStorageCommandShouldWorkWhenUnlimited() throws Exception { - String[] arguments = { "-h", "127.0.0.1", "-p", "9999", "--", CmdType.SETDEFAULTMAXSTORAGEQUOTA.getCommand(), "-1"}; + public void setGlobalMaxStorageCommandShouldWorkWhenUnlimited() throws Exception { + String[] arguments = { "-h", "127.0.0.1", "-p", "9999", "--", CmdType.SETGLOBALMAXSTORAGEQUOTA.getCommand(), "-1"}; CommandLine commandLine = ServerCmd.parseCommandLine(arguments); - quotaProbe.setDefaultMaxStorage(new SerializableQuotaValue<>(QuotaSize.unlimited())); + quotaProbe.setGlobalMaxStorage(new SerializableQuotaValue<>(QuotaSize.unlimited())); expectLastCall(); control.replay(); @@ -463,8 +462,8 @@ public class ServerCmdTest { } @Test(expected = IllegalArgumentException.class) - public void setDefaultMaxStorageCommandShouldThrowWhenNegativeAndNotUnlimited() throws Exception { - String[] arguments = { "-h", "127.0.0.1", "-p", "9999", "--", CmdType.SETDEFAULTMAXSTORAGEQUOTA.getCommand(), "-2"}; + public void setGlobalMaxStorageCommandShouldThrowWhenNegativeAndNotUnlimited() throws Exception { + String[] arguments = { "-h", "127.0.0.1", "-p", "9999", "--", CmdType.SETGLOBALMAXSTORAGEQUOTA.getCommand(), "-2"}; CommandLine commandLine = ServerCmd.parseCommandLine(arguments); testee.executeCommandLine(commandLine); http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/cli/src/test/java/org/apache/james/cli/type/CmdTypeTest.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/test/java/org/apache/james/cli/type/CmdTypeTest.java b/server/container/cli/src/test/java/org/apache/james/cli/type/CmdTypeTest.java index 39b8d85..0b16133 100644 --- a/server/container/cli/src/test/java/org/apache/james/cli/type/CmdTypeTest.java +++ b/server/container/cli/src/test/java/org/apache/james/cli/type/CmdTypeTest.java @@ -145,23 +145,23 @@ public class CmdTypeTest { } @Test - public void lookupSetDefaultMaxStorageQuotaShouldReturnEnumValue() { - assertThat(CmdType.lookup("setdefaultmaxstoragequota")).isEqualTo(CmdType.SETDEFAULTMAXSTORAGEQUOTA); + public void lookupSetGlobalMaxStorageQuotaShouldReturnEnumValue() { + assertThat(CmdType.lookup("setglobalmaxstoragequota")).isEqualTo(CmdType.SETGLOBALMAXSTORAGEQUOTA); } @Test - public void lookupSetDefaultMaxMessageCountQuotaShouldReturnEnumValue() { - assertThat(CmdType.lookup("setdefaultmaxmessagecountquota")).isEqualTo(CmdType.SETDEFAULTMAXMESSAGECOUNTQUOTA); + public void lookupSetGlobalMaxMessageCountQuotaShouldReturnEnumValue() { + assertThat(CmdType.lookup("setglobalmaxmessagecountquota")).isEqualTo(CmdType.SETGLOBALMAXMESSAGECOUNTQUOTA); } @Test - public void lookupGetDefaultMaxStorageQuotaShouldReturnEnumValue() { - assertThat(CmdType.lookup("getdefaultmaxstoragequota")).isEqualTo(CmdType.GETDEFAULTMAXSTORAGEQUOTA); + public void lookupGetGlobalMaxStorageQuotaShouldReturnEnumValue() { + assertThat(CmdType.lookup("getglobalmaxstoragequota")).isEqualTo(CmdType.GETGLOBALMAXSTORAGEQUOTA); } @Test - public void lookupGetDefaultMaxMessageCountQuotaShouldReturnEnumValue() { - assertThat(CmdType.lookup("getdefaultmaxmessagecountquota")).isEqualTo(CmdType.GETDEFAULTMAXMESSAGECOUNTQUOTA); + public void lookupGetGlobalMaxMessageCountQuotaShouldReturnEnumValue() { + assertThat(CmdType.lookup("getglobalmaxmessagecountquota")).isEqualTo(CmdType.GETGLOBALMAXMESSAGECOUNTQUOTA); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraQuotaModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraQuotaModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraQuotaModule.java index 9ef5286..5b70b54 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraQuotaModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraQuotaModule.java @@ -21,7 +21,7 @@ package org.apache.james.modules.mailbox; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.mailbox.cassandra.quota.CassandraCurrentQuotaManager; -import org.apache.james.mailbox.cassandra.quota.CassandraDefaultMaxQuotaDao; +import org.apache.james.mailbox.cassandra.quota.CassandraGlobalMaxQuotaDao; import org.apache.james.mailbox.cassandra.quota.CassandraPerDomainMaxQuotaDao; import org.apache.james.mailbox.cassandra.quota.CassandraPerUserMaxQuotaDao; import org.apache.james.mailbox.cassandra.quota.CassandraPerUserMaxQuotaManager; @@ -43,7 +43,7 @@ public class CassandraQuotaModule extends AbstractModule { @Override protected void configure() { bind(CassandraCurrentQuotaManager.class).in(Scopes.SINGLETON); - bind(CassandraDefaultMaxQuotaDao.class).in(Scopes.SINGLETON); + bind(CassandraGlobalMaxQuotaDao.class).in(Scopes.SINGLETON); bind(CassandraPerDomainMaxQuotaDao.class).in(Scopes.SINGLETON); bind(CassandraPerUserMaxQuotaDao.class).in(Scopes.SINGLETON); bind(CassandraPerUserMaxQuotaManager.class).in(Scopes.SINGLETON); http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/guice/jpa-guice/src/main/resources/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/main/resources/META-INF/persistence.xml b/server/container/guice/jpa-guice/src/main/resources/META-INF/persistence.xml index 25a8596..180c26a 100644 --- a/server/container/guice/jpa-guice/src/main/resources/META-INF/persistence.xml +++ b/server/container/guice/jpa-guice/src/main/resources/META-INF/persistence.xml @@ -35,8 +35,8 @@ <class>org.apache.james.user.jpa.model.JPAUser</class> <class>org.apache.james.rrt.jpa.model.JPARecipientRewrite</class> - <class>org.apache.james.mailbox.jpa.quota.model.MaxDefaultMessageCount</class> - <class>org.apache.james.mailbox.jpa.quota.model.MaxDefaultStorage</class> + <class>org.apache.james.mailbox.jpa.quota.model.MaxGlobalMessageCount</class> + <class>org.apache.james.mailbox.jpa.quota.model.MaxGlobalStorage</class> <class>org.apache.james.mailbox.jpa.quota.model.MaxUserMessageCount</class> <class>org.apache.james.mailbox.jpa.quota.model.MaxUserStorage</class> <class>org.apache.james.mailbox.jpa.quota.model.JpaCurrentQuota</class> http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java ---------------------------------------------------------------------- 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 35bcd5c..4f123cc 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 @@ -74,13 +74,13 @@ public class QuotaProbesImpl implements QuotaProbe, GuiceProbe { } @Override - public SerializableQuotaValue<QuotaCount> getDefaultMaxMessageCount() throws MailboxException { - return SerializableQuotaValue.valueOf(maxQuotaManager.getDefaultMaxMessage()); + public SerializableQuotaValue<QuotaCount> getGlobalMaxMessageCount() throws MailboxException { + return SerializableQuotaValue.valueOf(maxQuotaManager.getGlobalMaxMessage()); } @Override - public SerializableQuotaValue<QuotaSize> getDefaultMaxStorage() throws MailboxException { - return SerializableQuotaValue.valueOf(maxQuotaManager.getDefaultMaxStorage()); + public SerializableQuotaValue<QuotaSize> getGlobalMaxStorage() throws MailboxException { + return SerializableQuotaValue.valueOf(maxQuotaManager.getGlobalMaxStorage()); } @Override @@ -102,14 +102,14 @@ public class QuotaProbesImpl implements QuotaProbe, GuiceProbe { } @Override - public void setDefaultMaxMessageCount(SerializableQuotaValue<QuotaCount> maxDefaultMessageCount) throws MailboxException { - maxDefaultMessageCount.toValue(QuotaCount::count, QuotaCount.unlimited()) - .ifPresent(Throwing.consumer(maxQuotaManager::setDefaultMaxMessage).sneakyThrow()); + public void setGlobalMaxMessageCount(SerializableQuotaValue<QuotaCount> maxGlobalMessageCount) throws MailboxException { + maxGlobalMessageCount.toValue(QuotaCount::count, QuotaCount.unlimited()) + .ifPresent(Throwing.consumer(maxQuotaManager::setGlobalMaxMessage).sneakyThrow()); } @Override - public void setDefaultMaxStorage(SerializableQuotaValue<QuotaSize> maxDefaultSize) throws MailboxException { - maxDefaultSize.toValue(QuotaSize::size, QuotaSize.unlimited()) - .ifPresent(Throwing.consumer(maxQuotaManager::setDefaultMaxStorage).sneakyThrow()); + public void setGlobalMaxStorage(SerializableQuotaValue<QuotaSize> maxGlobalSize) throws MailboxException { + maxGlobalSize.toValue(QuotaSize::size, QuotaSize.unlimited()) + .ifPresent(Throwing.consumer(maxQuotaManager::setGlobalMaxStorage).sneakyThrow()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java index 0e05d8c..4e296f4 100644 --- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java +++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java @@ -91,26 +91,26 @@ public class QuotaManagement implements QuotaManagementMBean { } @Override - public SerializableQuotaValue<QuotaCount> getDefaultMaxMessageCount() throws MailboxException { + public SerializableQuotaValue<QuotaCount> getGlobalMaxMessageCount() throws MailboxException { try (Closeable closeable = MDCBuilder.create() .addContext(MDCBuilder.PROTOCOL, "CLI") - .addContext(MDCBuilder.ACTION, "getDefaultMaxMessageCount") + .addContext(MDCBuilder.ACTION, "getGlobalMaxMessageCount") .build()) { - return SerializableQuotaValue.valueOf(maxQuotaManager.getDefaultMaxMessage()); + return SerializableQuotaValue.valueOf(maxQuotaManager.getGlobalMaxMessage()); } catch (IOException e) { throw Throwables.propagate(e); } } @Override - public SerializableQuotaValue<QuotaSize> getDefaultMaxStorage() throws MailboxException { + public SerializableQuotaValue<QuotaSize> getGlobalMaxStorage() throws MailboxException { try (Closeable closeable = MDCBuilder.create() .addContext(MDCBuilder.PROTOCOL, "CLI") - .addContext(MDCBuilder.ACTION, "getDefaultMaxStorage") + .addContext(MDCBuilder.ACTION, "getGlobalMaxStorage") .build()) { - return SerializableQuotaValue.valueOf(maxQuotaManager.getDefaultMaxStorage()); + return SerializableQuotaValue.valueOf(maxQuotaManager.getGlobalMaxStorage()); } catch (IOException e) { throw Throwables.propagate(e); } @@ -151,30 +151,30 @@ public class QuotaManagement implements QuotaManagementMBean { } @Override - public void setDefaultMaxMessageCount(SerializableQuotaValue<QuotaCount> maxDefaultMessageCount) { + public void setGlobalMaxMessageCount(SerializableQuotaValue<QuotaCount> maxGlobalMessageCount) { try (Closeable closeable = MDCBuilder.create() .addContext(MDCBuilder.PROTOCOL, "CLI") - .addContext(MDCBuilder.ACTION, "setDefaultMaxMessageCount") + .addContext(MDCBuilder.ACTION, "setGlobalMaxMessageCount") .build()) { - maxDefaultMessageCount + maxGlobalMessageCount .toValue(QuotaCount::count, QuotaCount.unlimited()) - .ifPresent(Throwing.consumer(maxQuotaManager::setDefaultMaxMessage).sneakyThrow()); + .ifPresent(Throwing.consumer(maxQuotaManager::setGlobalMaxMessage).sneakyThrow()); } catch (IOException e) { throw Throwables.propagate(e); } } @Override - public void setDefaultMaxStorage(SerializableQuotaValue<QuotaSize> maxDefaultSize) { + public void setGlobalMaxStorage(SerializableQuotaValue<QuotaSize> maxGlobalSize) { try (Closeable closeable = MDCBuilder.create() .addContext(MDCBuilder.PROTOCOL, "CLI") - .addContext(MDCBuilder.ACTION, "setDefaultMaxStorage") + .addContext(MDCBuilder.ACTION, "setGlobalMaxStorage") .build()) { - maxDefaultSize + maxGlobalSize .toValue(QuotaSize::size, QuotaSize.unlimited()) - .ifPresent(Throwing.consumer(maxQuotaManager::setDefaultMaxStorage).sneakyThrow()); + .ifPresent(Throwing.consumer(maxQuotaManager::setGlobalMaxStorage).sneakyThrow()); } catch (IOException e) { throw Throwables.propagate(e); } http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagementMBean.java ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagementMBean.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagementMBean.java index 664f05c..57f1615 100644 --- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagementMBean.java +++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagementMBean.java @@ -36,15 +36,15 @@ public interface QuotaManagementMBean { SerializableQuotaValue<QuotaSize> getMaxStorage(String quotaRoot) throws MailboxException; - SerializableQuotaValue<QuotaCount> getDefaultMaxMessageCount() throws MailboxException; + SerializableQuotaValue<QuotaCount> getGlobalMaxMessageCount() throws MailboxException; - SerializableQuotaValue<QuotaSize> getDefaultMaxStorage() throws MailboxException; + SerializableQuotaValue<QuotaSize> getGlobalMaxStorage() throws MailboxException; void setMaxMessageCount(String quotaRoot, SerializableQuotaValue<QuotaCount> maxMessageCount) throws MailboxException; void setMaxStorage(String quotaRoot, SerializableQuotaValue<QuotaSize> maxSize) throws MailboxException; - void setDefaultMaxMessageCount(SerializableQuotaValue<QuotaCount> maxDefaultMessageCount) throws MailboxException; + void setGlobalMaxMessageCount(SerializableQuotaValue<QuotaCount> maxGlobalMessageCount) throws MailboxException; - void setDefaultMaxStorage(SerializableQuotaValue<QuotaSize> maxDefaultSize) throws MailboxException; + void setGlobalMaxStorage(SerializableQuotaValue<QuotaSize> maxGlobalSize) throws MailboxException; } http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java index 20be525..b5888d5 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java @@ -45,12 +45,12 @@ public class MaxQuotaConfigurationReader implements Configurable { @Override public void configure(HierarchicalConfiguration config) throws ConfigurationException { - Long defaultMaxMessage = config.configurationAt("maxQuotaManager").getLong("defaultMaxMessage", null); - Long defaultMaxStorage = config.configurationAt("maxQuotaManager").getLong("defaultMaxStorage", null); + Long globalMaxMessage = config.configurationAt("maxQuotaManager").getLong("globalMaxMessage", null); + Long globalMaxStorage = config.configurationAt("maxQuotaManager").getLong("globalMaxStorage", null); Map<String, Long> maxMessage = parseMaxMessageConfiguration(config, "maxMessage"); Map<String, Long> maxStorage = parseMaxMessageConfiguration(config, "maxStorage"); try { - configureDefaultValues(defaultMaxMessage, defaultMaxStorage); + configureGlobalValues(globalMaxMessage, globalMaxStorage); configureQuotaRootSpecificValues(maxMessage, maxStorage); } catch (MailboxException e) { throw new ConfigurationException("Exception caught while configuring max quota manager", e); @@ -66,12 +66,12 @@ public class MaxQuotaConfigurationReader implements Configurable { return result; } - private void configureDefaultValues(Long defaultMaxMessage, Long defaultMaxStorage) throws MailboxException { - if (defaultMaxMessage != null) { - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(defaultMaxMessage)); + private void configureGlobalValues(Long globalMaxMessage, Long globalMaxStorage) throws MailboxException { + if (globalMaxMessage != null) { + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(globalMaxMessage)); } - if (defaultMaxStorage != null) { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(defaultMaxStorage)); + if (globalMaxStorage != null) { + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(globalMaxStorage)); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/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 ae80229..018c00f 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 @@ -86,7 +86,7 @@ public class IsOverQuotaTest { @Test public void matchShouldKeepAddressesWithTooBigSize() throws Exception { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(100)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(100)); FakeMail fakeMail = FakeMail.builder() .recipient(MailAddressFixture.ANY_AT_JAMES) @@ -99,7 +99,7 @@ public class IsOverQuotaTest { @Test public void matchShouldReturnEmptyAtSizeQuotaLimit() throws Exception { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(1000)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(1000)); FakeMail fakeMail = FakeMail.builder() .recipient(MailAddressFixture.ANY_AT_JAMES) @@ -112,7 +112,7 @@ public class IsOverQuotaTest { @Test public void matchShouldKeepAddressesWithTooMuchMessages() throws Exception { - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(0)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(0)); FakeMail fakeMail = FakeMail.builder() .recipient(MailAddressFixture.ANY_AT_JAMES) @@ -124,7 +124,7 @@ public class IsOverQuotaTest { @Test public void matchShouldReturnEmptyOnMessageLimit() throws Exception { - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(1)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(1)); FakeMail fakeMail = FakeMail.builder() .recipient(MailAddressFixture.ANY_AT_JAMES) http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/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 4c6a24a..a91c6e5 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 @@ -794,7 +794,7 @@ public abstract class GetMailboxesMethodTest { @Test public void getMailboxesShouldReturnMaxStorageQuotasForInboxWhenSet() throws Exception { - quotaProbe.setDefaultMaxStorage(SerializableQuotaValue.valueOf(Optional.of(QuotaSize.size(42)))); + quotaProbe.setGlobalMaxStorage(SerializableQuotaValue.valueOf(Optional.of(QuotaSize.size(42)))); String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize(); given() @@ -811,7 +811,7 @@ public abstract class GetMailboxesMethodTest { @Test public void getMailboxesShouldReturnMaxMessageQuotasForInboxWhenSet() throws Exception { - quotaProbe.setDefaultMaxMessageCount(SerializableQuotaValue.valueOf(Optional.of(QuotaCount.count(43)))); + quotaProbe.setGlobalMaxMessageCount(SerializableQuotaValue.valueOf(Optional.of(QuotaCount.count(43)))); String mailboxId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, DefaultMailboxes.INBOX).serialize(); given() http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/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 06b986d..5619429 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 @@ -40,48 +40,48 @@ public class GlobalQuotaService { public void defineQuota(QuotaDTO quota) throws MailboxException { Optional<QuotaCount> count = quota.getCount(); if (count.isPresent()) { - maxQuotaManager.setDefaultMaxMessage(count.get()); + maxQuotaManager.setGlobalMaxMessage(count.get()); } else { - maxQuotaManager.removeDefaultMaxMessage(); + maxQuotaManager.removeGlobalMaxMessage(); } Optional<QuotaSize> size = quota.getSize(); if (size.isPresent()) { - maxQuotaManager.setDefaultMaxStorage(size.get()); + maxQuotaManager.setGlobalMaxStorage(size.get()); } else { - maxQuotaManager.removeDefaultMaxStorage(); + maxQuotaManager.removeGlobalMaxStorage(); } } public QuotaDTO getQuota() throws MailboxException { return QuotaDTO .builder() - .count(maxQuotaManager.getDefaultMaxMessage()) - .size(maxQuotaManager.getDefaultMaxStorage()) + .count(maxQuotaManager.getGlobalMaxMessage()) + .size(maxQuotaManager.getGlobalMaxStorage()) .build(); } public Optional<QuotaSize> getMaxSizeQuota() throws MailboxException { - return maxQuotaManager.getDefaultMaxStorage(); + return maxQuotaManager.getGlobalMaxStorage(); } public void defineMaxSizeQuota(QuotaSize quotaRequest) throws MailboxException { - maxQuotaManager.setDefaultMaxStorage(quotaRequest); + maxQuotaManager.setGlobalMaxStorage(quotaRequest); } public void deleteMaxSizeQuota() throws MailboxException { - maxQuotaManager.removeDefaultMaxStorage(); + maxQuotaManager.removeGlobalMaxStorage(); } public Optional<QuotaCount> getMaxCountQuota() throws MailboxException { - return maxQuotaManager.getDefaultMaxMessage(); + return maxQuotaManager.getGlobalMaxMessage(); } public void defineMaxCountQuota(QuotaCount value) throws MailboxException { - maxQuotaManager.setDefaultMaxMessage(value); + maxQuotaManager.setGlobalMaxMessage(value); } public void deleteMaxCountQuota() throws MailboxException { - maxQuotaManager.removeDefaultMaxMessage(); + maxQuotaManager.removeGlobalMaxMessage(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/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 68dd0fa..8400558 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 @@ -80,7 +80,7 @@ public class GlobalQuotaRoutesTest { @Test public void getCountShouldReturnStoredValue() throws Exception { int value = 42; - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(value)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(value)); Long actual = when() @@ -147,7 +147,7 @@ public class GlobalQuotaRoutesTest { .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxMessage()).contains(QuotaCount.unlimited()); + assertThat(maxQuotaManager.getGlobalMaxMessage()).contains(QuotaCount.unlimited()); } @@ -160,19 +160,19 @@ public class GlobalQuotaRoutesTest { .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxMessage()).contains(QuotaCount.count(42)); + assertThat(maxQuotaManager.getGlobalMaxMessage()).contains(QuotaCount.count(42)); } @Test public void deleteCountShouldSetQuotaToUnlimited() throws Exception { - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(42)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(42)); when() .delete("/quota/count") .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxMessage()).isEmpty(); + assertThat(maxQuotaManager.getGlobalMaxMessage()).isEmpty(); } @Test @@ -186,7 +186,7 @@ public class GlobalQuotaRoutesTest { @Test public void getSizeShouldReturnStoredValue() throws Exception { long value = 42; - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(value)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(value)); long quota = @@ -233,7 +233,7 @@ public class GlobalQuotaRoutesTest { .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxStorage()).contains(QuotaSize.unlimited()); + assertThat(maxQuotaManager.getGlobalMaxStorage()).contains(QuotaSize.unlimited()); } @Test @@ -267,27 +267,27 @@ public class GlobalQuotaRoutesTest { .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxStorage()).contains(QuotaSize.size(42)); + assertThat(maxQuotaManager.getGlobalMaxStorage()).contains(QuotaSize.size(42)); } @Test public void deleteSizeShouldSetQuotaToUnlimited() throws Exception { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(42)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(42)); when() .delete("/quota/count") .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxMessage()).isEmpty(); + assertThat(maxQuotaManager.getGlobalMaxMessage()).isEmpty(); } @Test public void getQuotaShouldReturnBothWhenValueSpecified() throws Exception { int maxStorage = 42; int maxMessage = 52; - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(maxStorage)); - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(maxMessage)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(maxStorage)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(maxMessage)); JsonPath jsonPath = when() @@ -323,7 +323,7 @@ public class GlobalQuotaRoutesTest { @Test public void getQuotaShouldReturnOnlySizeWhenNoCount() throws Exception { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(42)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(42)); JsonPath jsonPath = when() @@ -343,7 +343,7 @@ public class GlobalQuotaRoutesTest { @Test public void getQuotaShouldReturnOnlyCountWhenNoSize() throws Exception { int maxMessage = 42; - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(maxMessage)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(maxMessage)); JsonPath jsonPath = @@ -371,8 +371,8 @@ public class GlobalQuotaRoutesTest { .statusCode(HttpStatus.NO_CONTENT_204); SoftAssertions softly = new SoftAssertions(); - softly.assertThat(maxQuotaManager.getDefaultMaxMessage()).contains(QuotaCount.count(52)); - softly.assertThat(maxQuotaManager.getDefaultMaxStorage()).contains(QuotaSize.size(42)); + softly.assertThat(maxQuotaManager.getGlobalMaxMessage()).contains(QuotaCount.count(52)); + softly.assertThat(maxQuotaManager.getGlobalMaxStorage()).contains(QuotaSize.size(42)); } @Test @@ -385,13 +385,13 @@ public class GlobalQuotaRoutesTest { .statusCode(HttpStatus.NO_CONTENT_204); SoftAssertions softly = new SoftAssertions(); - softly.assertThat(maxQuotaManager.getDefaultMaxMessage()).contains(QuotaCount.unlimited()); - softly.assertThat(maxQuotaManager.getDefaultMaxStorage()).contains(QuotaSize.unlimited()); + softly.assertThat(maxQuotaManager.getGlobalMaxMessage()).contains(QuotaCount.unlimited()); + softly.assertThat(maxQuotaManager.getGlobalMaxStorage()).contains(QuotaSize.unlimited()); } @Test public void putQuotaShouldUnsetCountWhenNull() throws Exception { - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(42)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(42)); given() .body("{\"count\":null,\"size\":43}") .when() @@ -399,12 +399,12 @@ public class GlobalQuotaRoutesTest { .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxMessage()).isEmpty(); + assertThat(maxQuotaManager.getGlobalMaxMessage()).isEmpty(); } @Test public void putQuotaShouldUnsetSizeWhenNull() throws Exception { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(44)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(44)); given() .body("{\"count\":45,\"size\":null}") .when() @@ -412,12 +412,12 @@ public class GlobalQuotaRoutesTest { .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxStorage()).isEmpty(); + assertThat(maxQuotaManager.getGlobalMaxStorage()).isEmpty(); } @Test public void putQuotaShouldUnsetCountWhenAbsent() throws Exception { - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(42)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(42)); given() .body("{\"size\":43}") .when() @@ -425,12 +425,12 @@ public class GlobalQuotaRoutesTest { .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxMessage()).isEmpty(); + assertThat(maxQuotaManager.getGlobalMaxMessage()).isEmpty(); } @Test public void putQuotaShouldUnsetSizeWhenAbsent() throws Exception { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(44)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(44)); given() .body("{\"count\":45}") .when() @@ -438,7 +438,7 @@ public class GlobalQuotaRoutesTest { .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(maxQuotaManager.getDefaultMaxStorage()).isEmpty(); + assertThat(maxQuotaManager.getGlobalMaxStorage()).isEmpty(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/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 0d84759..fce8c95 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 @@ -393,8 +393,8 @@ public class UserQuotaRoutesTest { @Test public void getQuotaShouldReturnBothWhenValueSpecified() throws Exception { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(1111)); - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(22)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(1111)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(22)); maxQuotaManager.setMaxStorage(userQuotaRootResolver.forUser(BOB), QuotaSize.size(42)); maxQuotaManager.setMaxMessage(userQuotaRootResolver.forUser(BOB), QuotaCount.count(52)); @@ -418,7 +418,7 @@ public class UserQuotaRoutesTest { @Test public void getQuotaShouldReturnOnlySpecifiedValues() throws Exception { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(1111)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(1111)); maxQuotaManager.setMaxMessage(userQuotaRootResolver.forUser(BOB), QuotaCount.count(52)); JsonPath jsonPath = @@ -441,8 +441,8 @@ public class UserQuotaRoutesTest { @Test public void getQuotaShouldReturnGlobalValuesWhenNoUserValuesDefined() throws Exception { - maxQuotaManager.setDefaultMaxStorage(QuotaSize.size(1111)); - maxQuotaManager.setDefaultMaxMessage(QuotaCount.count(12)); + maxQuotaManager.setGlobalMaxStorage(QuotaSize.size(1111)); + maxQuotaManager.setGlobalMaxMessage(QuotaCount.count(12)); JsonPath jsonPath = given() http://git-wip-us.apache.org/repos/asf/james-project/blob/28a108f8/src/site/markdown/server/manage-cli.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/server/manage-cli.md b/src/site/markdown/server/manage-cli.md index e528edf..fcb318f 100644 --- a/src/site/markdown/server/manage-cli.md +++ b/src/site/markdown/server/manage-cli.md @@ -249,13 +249,13 @@ With value being an integer. Please note the use of units for storage (K, M, G). {cli} SetMaxStorageQuota [email protected] 4G ``` -Moreover, James allows to specify defaults maximum values, at the server level. Note: syntax is similar to what was exposed previously. +Moreover, James allows to specify global maximum values, at the server level. Note: syntax is similar to what was exposed previously. ``` -{cli} SetDefaultMaxMessageCountQuota value -{cli} GetDefaultMaxMessageCountQuota -{cli} SetDefaultMaxStorageQuota value -{cli} GetDefaultMaxStorageQuota +{cli} SetGlobalMaxMessageCountQuota value +{cli} GetGlobalMaxMessageCountQuota +{cli} SetGlobalMaxStorageQuota value +{cli} GetGlobalMaxStorageQuota ``` ## Re-indexing --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
