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 077d74e9ef8ea732d78bdd8c115ad8cc00e22c09 Author: Benoit Tellier <[email protected]> AuthorDate: Tue Feb 4 09:11:26 2020 +0700 [REFACTORING] Split JMXMailboxProbe from MailboxProbeImpl --- .../apache/james/mailbox/probe/MailboxProbe.java | 10 ------ .../main/java/org/apache/james/cli/ServerCmd.java | 5 ++- .../james/cli/probe/impl/JmxMailboxProbe.java | 37 +-------------------- .../java/org/apache/james/cli/ServerCmdTest.java | 6 ++-- .../org/apache/james/modules/MailboxProbeImpl.java | 38 ---------------------- 5 files changed, 6 insertions(+), 90 deletions(-) diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/probe/MailboxProbe.java b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/MailboxProbe.java index fb57c4e..1aefa88 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/probe/MailboxProbe.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/MailboxProbe.java @@ -40,18 +40,8 @@ public interface MailboxProbe { void deleteMailbox(String namespace, String user, String name); - void importEmlFileToMailbox(String namespace, String user, String name, String emlpath) throws Exception; - ComposedMessageId appendMessage(String username, MailboxPath mailboxPath, InputStream message, Date internalDate, boolean isRecent, Flags flags) throws MailboxException; - void copyMailbox(String srcBean, String dstBean) throws Exception; - - void deleteUserMailboxesNames(String user) throws Exception; - - void reIndexMailbox(String namespace, String user, String name) throws Exception; - - void reIndexAll() throws Exception; - Collection<String> listSubscriptions(String user) throws Exception; } \ No newline at end of file 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 27a4aa4..d4617ca 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.MailboxProbe; import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.Mappings; @@ -128,11 +127,11 @@ public class ServerCmd { } private final JmxDataProbe probe; - private final MailboxProbe mailboxProbe; + private final JmxMailboxProbe mailboxProbe; private final QuotaProbe quotaProbe; private final SieveProbe sieveProbe; - public ServerCmd(JmxDataProbe probe, MailboxProbe mailboxProbe, QuotaProbe quotaProbe, SieveProbe sieveProbe) { + public ServerCmd(JmxDataProbe probe, JmxMailboxProbe mailboxProbe, QuotaProbe 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/JmxMailboxProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java index 4edee8c..fe8df9c 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java @@ -20,25 +20,16 @@ package org.apache.james.cli.probe.impl; import java.io.IOException; -import java.io.InputStream; import java.util.Collection; -import java.util.Date; -import javax.mail.Flags; import javax.management.MalformedObjectNameException; -import org.apache.commons.lang3.NotImplementedException; import org.apache.james.adapter.mailbox.MailboxCopierManagementMBean; import org.apache.james.adapter.mailbox.MailboxManagerManagementMBean; import org.apache.james.adapter.mailbox.ReIndexerManagementMBean; -import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.mailbox.model.MailboxId; -import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.probe.MailboxProbe; - -public class JmxMailboxProbe implements MailboxProbe, JmxProbe { +public class JmxMailboxProbe implements JmxProbe { private static final String MAILBOXCOPIER_OBJECT_NAME = "org.apache.james:type=component,name=mailboxcopier"; private static final String MAILBOXMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=mailboxmanagerbean"; private static final String REINDEXER_OBJECT_NAME = "org.apache.james:type=component,name=reindexerbean"; @@ -59,61 +50,35 @@ public class JmxMailboxProbe implements MailboxProbe, JmxProbe { return this; } - - @Override public void copyMailbox(String srcBean, String dstBean) throws Exception { mailboxCopierManagement.copy(srcBean, dstBean); } - @Override public void deleteUserMailboxesNames(String user) throws Exception { mailboxManagerManagement.deleteMailboxes(user); } - @Override public MailboxId createMailbox(String namespace, String user, String name) { return mailboxManagerManagement.createMailbox(namespace, user, name); } - @Override public Collection<String> listUserMailboxes(String user) { return mailboxManagerManagement.listMailboxes(user); } - @Override public void deleteMailbox(String namespace, String user, String name) { mailboxManagerManagement.deleteMailbox(namespace, user, name); } - @Override public void importEmlFileToMailbox(String namespace, String user, String name, String emlpath) { mailboxManagerManagement.importEmlFileToMailbox(namespace, user, name, emlpath); } - @Override public void reIndexMailbox(String namespace, String user, String name) throws Exception { reIndexerManagement.reIndex(namespace, user, name); } - @Override public void reIndexAll() throws Exception { reIndexerManagement.reIndex(); } - - @Override - public MailboxId getMailboxId(String namespace, String user, String name) { - throw new NotImplementedException("Not implemented"); - } - - @Override - public ComposedMessageId appendMessage(String username, MailboxPath mailboxPath, InputStream message, - Date internalDate, boolean isRecent, Flags flags) throws MailboxException { - throw new NotImplementedException("Not implemented"); - } - - - @Override - public Collection<String> listSubscriptions(String user) throws Exception { - throw new NotImplementedException("Not implemented"); - } } \ 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 4dff457..46b3195 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 @@ -34,6 +34,7 @@ import org.apache.james.cli.exceptions.InvalidArgumentNumberException; 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.type.CmdType; import org.apache.james.core.quota.QuotaCountLimit; import org.apache.james.core.quota.QuotaCountUsage; @@ -42,7 +43,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.MailboxProbe; import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.MappingsImpl; @@ -56,7 +56,7 @@ public class ServerCmdTest { private static final String ADDITIONAL_ARGUMENT = "additionalArgument"; private JmxDataProbe dataProbe; - private MailboxProbe mailboxProbe; + private JmxMailboxProbe mailboxProbe; private QuotaProbe quotaProbe; private SieveProbe sieveProbe; @@ -65,7 +65,7 @@ public class ServerCmdTest { @Before public void setup() { dataProbe = mock(JmxDataProbe.class); - mailboxProbe = mock(MailboxProbe.class); + mailboxProbe = mock(JmxMailboxProbe.class); quotaProbe = mock(QuotaProbe.class); sieveProbe = mock(SieveProbe.class); testee = new ServerCmd(dataProbe, mailboxProbe, quotaProbe, sieveProbe); diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java index 18b3458..d8cb4e8 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java @@ -19,7 +19,6 @@ package org.apache.james.modules; -import java.io.FileInputStream; import java.io.InputStream; import java.util.Collection; import java.util.Date; @@ -29,7 +28,6 @@ import java.util.stream.Collectors; import javax.inject.Inject; import javax.mail.Flags; -import org.apache.commons.lang3.NotImplementedException; import org.apache.james.core.Username; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; @@ -144,22 +142,6 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe { } @Override - public void importEmlFileToMailbox(String namespace, String user, String name, String emlPath) throws Exception { - Username username = Username.of(user); - MailboxSession mailboxSession = mailboxManager.createSystemSession(username); - mailboxManager.startProcessingRequest(mailboxSession); - - MessageManager messageManager = mailboxManager.getMailbox(new MailboxPath(namespace, username, name), mailboxSession); - InputStream emlFileAsStream = new FileInputStream(emlPath); - messageManager.appendMessage(MessageManager.AppendCommand.builder() - .recent() - .build(emlFileAsStream), mailboxSession); - - mailboxManager.endProcessingRequest(mailboxSession); - mailboxSession.close(); - } - - @Override public ComposedMessageId appendMessage(String username, MailboxPath mailboxPath, InputStream message, Date internalDate, boolean isRecent, Flags flags) throws MailboxException { @@ -177,26 +159,6 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe { } @Override - public void copyMailbox(String srcBean, String dstBean) throws Exception { - throw new NotImplementedException("not implemented"); - } - - @Override - public void deleteUserMailboxesNames(String user) throws Exception { - throw new NotImplementedException("not implemented"); - } - - @Override - public void reIndexMailbox(String namespace, String user, String name) throws Exception { - throw new NotImplementedException("not implemented"); - } - - @Override - public void reIndexAll() throws Exception { - throw new NotImplementedException("not implemented"); - } - - @Override public Collection<String> listSubscriptions(String user) throws Exception { MailboxSession mailboxSession = mailboxManager.createSystemSession(Username.of(user)); return subscriptionManager.subscriptions(mailboxSession); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
