This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c03d99957f2acfa8989ae1efb09f4f08ee43939f Author: Benoit Tellier <[email protected]> AuthorDate: Tue Feb 4 09:14:55 2020 +0700 [REFACTORING] Split JMXQuotaProbe from QuotaProbeImpl --- .../src/main/java/org/apache/james/cli/ServerCmd.java | 5 ++--- .../org/apache/james/cli/probe/impl/JmxQuotaProbe.java | 16 +--------------- .../test/java/org/apache/james/cli/ServerCmdTest.java | 6 +++--- 3 files changed, 6 insertions(+), 21 deletions(-) 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 d4617ca..a7c77c4 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 @@ -51,7 +51,6 @@ import org.apache.james.core.quota.QuotaSizeLimit; import org.apache.james.core.quota.QuotaSizeUsage; import org.apache.james.mailbox.model.SerializableQuota; import org.apache.james.mailbox.model.SerializableQuotaLimitValue; -import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.Mappings; import org.apache.james.util.Port; @@ -128,10 +127,10 @@ public class ServerCmd { private final JmxDataProbe probe; private final JmxMailboxProbe mailboxProbe; - private final QuotaProbe quotaProbe; + private final JmxQuotaProbe quotaProbe; private final SieveProbe sieveProbe; - public ServerCmd(JmxDataProbe probe, JmxMailboxProbe mailboxProbe, QuotaProbe quotaProbe, SieveProbe sieveProbe) { + public ServerCmd(JmxDataProbe probe, JmxMailboxProbe mailboxProbe, JmxQuotaProbe quotaProbe, SieveProbe sieveProbe) { this.probe = probe; this.mailboxProbe = mailboxProbe; this.quotaProbe = quotaProbe; 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 6f73f3a..9edfcef 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 @@ -31,14 +31,12 @@ import org.apache.james.core.quota.QuotaSizeUsage; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.SerializableQuota; import org.apache.james.mailbox.model.SerializableQuotaLimitValue; -import org.apache.james.mailbox.probe.QuotaProbe; -public class JmxQuotaProbe implements QuotaProbe, JmxProbe { +public class JmxQuotaProbe implements JmxProbe { private static final String QUOTAMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=quotamanagerbean"; private QuotaManagementMBean quotaManagement; - @Override public JmxQuotaProbe connect(JmxConnection jmxc) throws IOException { try { quotaManagement = jmxc.retrieveBean(QuotaManagementMBean.class, QUOTAMANAGER_OBJECT_NAME); @@ -48,59 +46,47 @@ public class JmxQuotaProbe implements QuotaProbe, JmxProbe { return this; } - @Override public String getQuotaRoot(String namespace, String user, String name) throws MailboxException { return quotaManagement.getQuotaRoot(namespace, user, name); } - @Override public SerializableQuota<QuotaCountLimit, QuotaCountUsage> getMessageCountQuota(String quotaRoot) throws MailboxException { return quotaManagement.getMessageCountQuota(quotaRoot); } - @Override public SerializableQuota<QuotaSizeLimit, QuotaSizeUsage> getStorageQuota(String quotaRoot) throws MailboxException { return quotaManagement.getStorageQuota(quotaRoot); } - @Override public SerializableQuotaLimitValue<QuotaCountLimit> getMaxMessageCount(String quotaRoot) throws MailboxException { return quotaManagement.getMaxMessageCount(quotaRoot); } - @Override public SerializableQuotaLimitValue<QuotaSizeLimit> getMaxStorage(String quotaRoot) throws MailboxException { return quotaManagement.getMaxStorage(quotaRoot); } - @Override public SerializableQuotaLimitValue<QuotaCountLimit> getGlobalMaxMessageCount() throws MailboxException { return quotaManagement.getGlobalMaxMessageCount(); } - @Override public SerializableQuotaLimitValue<QuotaSizeLimit> getGlobalMaxStorage() throws MailboxException { return quotaManagement.getGlobalMaxStorage(); } - @Override public void setMaxMessageCount(String quotaRoot, SerializableQuotaLimitValue<QuotaCountLimit> maxMessageCount) throws MailboxException { quotaManagement.setMaxMessageCount(quotaRoot, maxMessageCount); } - @Override public void setMaxStorage(String quotaRoot, SerializableQuotaLimitValue<QuotaSizeLimit> maxSize) throws MailboxException { quotaManagement.setMaxStorage(quotaRoot, maxSize); } - @Override public void setGlobalMaxMessageCount(SerializableQuotaLimitValue<QuotaCountLimit> maxGlobalMessageCount) throws MailboxException { quotaManagement.setGlobalMaxMessageCount(maxGlobalMessageCount); } - @Override public void setGlobalMaxStorage(SerializableQuotaLimitValue<QuotaSizeLimit> maxGlobalSize) throws MailboxException { quotaManagement.setGlobalMaxStorage(maxGlobalSize); } - } \ No newline at end of file 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 46b3195..c9bdb30 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 @@ -35,6 +35,7 @@ import org.apache.james.cli.exceptions.MissingCommandException; import org.apache.james.cli.exceptions.UnrecognizedCommandException; import org.apache.james.cli.probe.impl.JmxDataProbe; import org.apache.james.cli.probe.impl.JmxMailboxProbe; +import org.apache.james.cli.probe.impl.JmxQuotaProbe; import org.apache.james.cli.type.CmdType; import org.apache.james.core.quota.QuotaCountLimit; import org.apache.james.core.quota.QuotaCountUsage; @@ -43,7 +44,6 @@ import org.apache.james.core.quota.QuotaSizeUsage; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.SerializableQuota; import org.apache.james.mailbox.model.SerializableQuotaLimitValue; -import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.MappingsImpl; import org.junit.Before; @@ -57,7 +57,7 @@ public class ServerCmdTest { private JmxDataProbe dataProbe; private JmxMailboxProbe mailboxProbe; - private QuotaProbe quotaProbe; + private JmxQuotaProbe quotaProbe; private SieveProbe sieveProbe; private ServerCmd testee; @@ -66,7 +66,7 @@ public class ServerCmdTest { public void setup() { dataProbe = mock(JmxDataProbe.class); mailboxProbe = mock(JmxMailboxProbe.class); - quotaProbe = mock(QuotaProbe.class); + quotaProbe = mock(JmxQuotaProbe.class); sieveProbe = mock(SieveProbe.class); testee = new ServerCmd(dataProbe, mailboxProbe, quotaProbe, sieveProbe); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
