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 f79135af3e33996f87501c03ccbc48efd4f6716f Author: Benoit Tellier <[email protected]> AuthorDate: Tue Feb 4 10:00:42 2020 +0700 [REFACTORING] Split JMXSieveProbe from SieveProbeImpl --- .../src/main/java/org/apache/james/cli/ServerCmd.java | 5 ++--- .../org/apache/james/cli/probe/impl/JmxSieveProbe.java | 17 +---------------- .../test/java/org/apache/james/cli/ServerCmdTest.java | 6 +++--- .../apache/james/modules/protocols/SieveProbeImpl.java | 12 ------------ .../main/java/org/apache/james/probe/SieveProbe.java | 3 --- 5 files changed, 6 insertions(+), 37 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 a7c77c4..d43d56c 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.probe.SieveProbe; import org.apache.james.rrt.lib.Mappings; import org.apache.james.util.Port; import org.apache.james.util.Size; @@ -128,9 +127,9 @@ public class ServerCmd { private final JmxDataProbe probe; private final JmxMailboxProbe mailboxProbe; private final JmxQuotaProbe quotaProbe; - private final SieveProbe sieveProbe; + private final JmxSieveProbe sieveProbe; - public ServerCmd(JmxDataProbe probe, JmxMailboxProbe mailboxProbe, JmxQuotaProbe quotaProbe, SieveProbe sieveProbe) { + public ServerCmd(JmxDataProbe probe, JmxMailboxProbe mailboxProbe, JmxQuotaProbe quotaProbe, JmxSieveProbe 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/JmxSieveProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java index 85e2a55..41e0793 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java @@ -23,11 +23,9 @@ import java.io.IOException; import javax.management.MalformedObjectNameException; -import org.apache.james.probe.SieveProbe; import org.apache.james.sieverepository.api.SieveRepositoryManagementMBean; -public class JmxSieveProbe implements SieveProbe, JmxProbe { - +public class JmxSieveProbe implements JmxProbe { private static final String SIEVEMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=sievemanagerbean"; private SieveRepositoryManagementMBean sieveRepositoryManagement; @@ -42,44 +40,31 @@ public class JmxSieveProbe implements SieveProbe, JmxProbe { return this; } - @Override public long getSieveQuota() throws Exception { return sieveRepositoryManagement.getQuota(); } - @Override public void setSieveQuota(long quota) throws Exception { sieveRepositoryManagement.setQuota(quota); } - @Override public void removeSieveQuota() throws Exception { sieveRepositoryManagement.removeQuota(); } - @Override public long getSieveQuota(String user) throws Exception { return sieveRepositoryManagement.getQuota(user); } - @Override public void setSieveQuota(String user, long quota) throws Exception { sieveRepositoryManagement.setQuota(user, quota); } - @Override public void removeSieveQuota(String user) throws Exception { sieveRepositoryManagement.removeQuota(user); } - @Override - public void addActiveSieveScript(String user, String name, String script) throws Exception { - sieveRepositoryManagement.addActiveSieveScript(user, name, script); - } - - @Override public void addActiveSieveScriptFromFile(String user, String name, String path) throws Exception { sieveRepositoryManagement.addActiveSieveScriptFromFile(user, name, path); } - } \ 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 c9bdb30..915aab4 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 @@ -36,6 +36,7 @@ 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.probe.impl.JmxSieveProbe; import org.apache.james.cli.type.CmdType; import org.apache.james.core.quota.QuotaCountLimit; import org.apache.james.core.quota.QuotaCountUsage; @@ -44,7 +45,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.probe.SieveProbe; import org.apache.james.rrt.lib.MappingsImpl; import org.junit.Before; import org.junit.Test; @@ -58,7 +58,7 @@ public class ServerCmdTest { private JmxDataProbe dataProbe; private JmxMailboxProbe mailboxProbe; private JmxQuotaProbe quotaProbe; - private SieveProbe sieveProbe; + private JmxSieveProbe sieveProbe; private ServerCmd testee; @@ -67,7 +67,7 @@ public class ServerCmdTest { dataProbe = mock(JmxDataProbe.class); mailboxProbe = mock(JmxMailboxProbe.class); quotaProbe = mock(JmxQuotaProbe.class); - sieveProbe = mock(SieveProbe.class); + sieveProbe = mock(JmxSieveProbe.class); testee = new ServerCmd(dataProbe, mailboxProbe, quotaProbe, sieveProbe); } diff --git a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java index 6713690..57260b8 100644 --- a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java +++ b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java @@ -18,13 +18,8 @@ ****************************************************************/ package org.apache.james.modules.protocols; -import java.io.FileInputStream; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; - import javax.inject.Inject; -import org.apache.commons.io.IOUtils; import org.apache.james.core.Username; import org.apache.james.core.quota.QuotaSizeLimit; import org.apache.james.probe.SieveProbe; @@ -79,11 +74,4 @@ public class SieveProbeImpl implements GuiceProbe, SieveProbe { sieveRepository.putScript(username, new ScriptName(name), new ScriptContent(script)); sieveRepository.setActive(username, new ScriptName(name)); } - - @Override - public void addActiveSieveScriptFromFile(String userName, String name, String path) throws Exception { - try (InputStream scriptFileAsStream = new FileInputStream(path)) { - addActiveSieveScript(userName, name, IOUtils.toString(scriptFileAsStream, StandardCharsets.UTF_8)); - } - } } diff --git a/server/data/data-api/src/main/java/org/apache/james/probe/SieveProbe.java b/server/data/data-api/src/main/java/org/apache/james/probe/SieveProbe.java index d7cb6db..79881cd 100644 --- a/server/data/data-api/src/main/java/org/apache/james/probe/SieveProbe.java +++ b/server/data/data-api/src/main/java/org/apache/james/probe/SieveProbe.java @@ -20,7 +20,6 @@ package org.apache.james.probe; public interface SieveProbe { - long getSieveQuota() throws Exception; void setSieveQuota(long quota) throws Exception; @@ -34,6 +33,4 @@ public interface SieveProbe { void removeSieveQuota(String user) throws Exception; void addActiveSieveScript(String userName, String name, String script) throws Exception; - - void addActiveSieveScriptFromFile(String userName, String name, String path) throws Exception; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
