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 857eada2af54c4b672741dd5ecd307491d2cd8ba Author: Benoit Tellier <[email protected]> AuthorDate: Tue Feb 4 09:08:31 2020 +0700 [REFACTORING] Split JMXDataProbe from DataProbeImpl --- .../main/java/org/apache/james/cli/ServerCmd.java | 5 ++- .../apache/james/cli/probe/impl/JmxDataProbe.java | 39 +--------------------- .../java/org/apache/james/cli/ServerCmdTest.java | 6 ++-- .../java/org/apache/james/utils/DataProbeImpl.java | 31 ----------------- .../java/org/apache/james/probe/DataProbe.java | 10 ------ 5 files changed, 6 insertions(+), 85 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 ffceb09..27a4aa4 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 @@ -53,7 +53,6 @@ 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.DataProbe; import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.Mappings; import org.apache.james.util.Port; @@ -128,12 +127,12 @@ public class ServerCmd { stopWatch.stop(); } - private final DataProbe probe; + private final JmxDataProbe probe; private final MailboxProbe mailboxProbe; private final QuotaProbe quotaProbe; private final SieveProbe sieveProbe; - public ServerCmd(DataProbe probe, MailboxProbe mailboxProbe, QuotaProbe quotaProbe, SieveProbe sieveProbe) { + public ServerCmd(JmxDataProbe probe, MailboxProbe 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/JmxDataProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java index 6006916..4fdcf85 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java @@ -27,13 +27,12 @@ import java.util.Map; import javax.management.MalformedObjectNameException; import org.apache.james.domainlist.api.DomainListManagementMBean; -import org.apache.james.probe.DataProbe; import org.apache.james.rrt.api.RecipientRewriteTableManagementMBean; import org.apache.james.rrt.lib.Mappings; import org.apache.james.user.api.UsersRepositoryManagementMBean; import org.apache.james.util.MDCBuilder; -public class JmxDataProbe implements DataProbe, JmxProbe { +public class JmxDataProbe implements JmxProbe { private static final String DOMAINLIST_OBJECT_NAME = "org.apache.james:type=component,name=domainlist"; private static final String VIRTUALUSERTABLE_OBJECT_NAME = "org.apache.james:type=component,name=recipientrewritetable"; @@ -56,7 +55,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { return this; } - @Override public void addUser(String userName, String password) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -68,7 +66,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public void removeUser(String username) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -80,7 +77,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public String[] listUsers() throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -91,7 +87,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public void setPassword(String userName, String password) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -103,7 +98,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public boolean containsDomain(String domain) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -115,18 +109,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override - public String getDefaultDomain() throws Exception { - try (Closeable closeable = - MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, JMX) - .addContext(MDCBuilder.ACTION, "getDefaultDomain") - .build()) { - return domainListProxy.getDefaultDomain(); - } - } - - @Override public void addDomain(String domain) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -138,7 +120,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public void removeDomain(String domain) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -150,7 +131,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public List<String> listDomains() throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -161,7 +141,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public Map<String, Mappings> listMappings() throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -172,7 +151,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public void addAddressMapping(String fromUser, String fromDomain, String toAddress) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -183,7 +161,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public void removeAddressMapping(String fromUser, String fromDomain, String toAddress) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -194,7 +171,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public Mappings listUserDomainMappings(String user, String domain) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -205,7 +181,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public void addRegexMapping(String user, String domain, String regex) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -216,7 +191,6 @@ public class JmxDataProbe implements DataProbe, JmxProbe { } } - @Override public void removeRegexMapping(String user, String domain, String regex) throws Exception { try (Closeable closeable = MDCBuilder.create() @@ -226,15 +200,4 @@ public class JmxDataProbe implements DataProbe, JmxProbe { virtualUserTableProxy.removeRegexMapping(user, domain, regex); } } - - @Override - public void addDomainAliasMapping(String aliasDomain, String deliveryDomain) throws Exception { - try (Closeable closeable = - MDCBuilder.create() - .addContext(MDCBuilder.PROTOCOL, JMX) - .addContext(MDCBuilder.ACTION, "addDomainAliasMapping") - .build()) { - virtualUserTableProxy.addDomainMapping(aliasDomain, deliveryDomain); - } - } } \ 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 ddba90a..4dff457 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 @@ -33,6 +33,7 @@ import org.apache.commons.cli.ParseException; 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.type.CmdType; import org.apache.james.core.quota.QuotaCountLimit; import org.apache.james.core.quota.QuotaCountUsage; @@ -43,7 +44,6 @@ 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.DataProbe; import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.MappingsImpl; import org.junit.Before; @@ -55,7 +55,7 @@ public class ServerCmdTest { private static final String ADDITIONAL_ARGUMENT = "additionalArgument"; - private DataProbe dataProbe; + private JmxDataProbe dataProbe; private MailboxProbe mailboxProbe; private QuotaProbe quotaProbe; private SieveProbe sieveProbe; @@ -64,7 +64,7 @@ public class ServerCmdTest { @Before public void setup() { - dataProbe = mock(DataProbe.class); + dataProbe = mock(JmxDataProbe.class); mailboxProbe = mock(MailboxProbe.class); quotaProbe = mock(QuotaProbe.class); sieveProbe = mock(SieveProbe.class); diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java index 7e7b4c1..7fe0ccf 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java @@ -24,7 +24,6 @@ import java.util.Map; import javax.inject.Inject; -import org.apache.commons.lang3.NotImplementedException; import org.apache.james.core.Domain; import org.apache.james.core.Username; import org.apache.james.domainlist.api.DomainList; @@ -38,7 +37,6 @@ import org.apache.james.util.streams.Iterators; import com.github.steveash.guavate.Guavate; public class DataProbeImpl implements GuiceProbe, DataProbe { - private final DomainList domainList; private final UsersRepository usersRepository; private final RecipientRewriteTable recipientRewriteTable; @@ -64,11 +62,6 @@ public class DataProbeImpl implements GuiceProbe, DataProbe { } @Override - public void setPassword(String userName, String password) { - throw new NotImplementedException("not implemented"); - } - - @Override public String[] listUsers() throws Exception { return Iterators.toStream(usersRepository.list()) .map(Username::asString) @@ -113,36 +106,12 @@ public class DataProbeImpl implements GuiceProbe, DataProbe { } @Override - public Mappings listUserDomainMappings(String user, String domain) { - throw new NotImplementedException("not implemented"); - } - - @Override public void addAddressMapping(String fromUser, String fromDomain, String toAddress) throws Exception { MappingSource source = MappingSource.fromUser(fromUser, fromDomain); recipientRewriteTable.addAddressMapping(source, toAddress); } @Override - public void removeAddressMapping(String fromUser, String fromDomain, String toAddress) throws Exception { - MappingSource source = MappingSource.fromUser(fromUser, fromDomain); - recipientRewriteTable.removeAddressMapping(source, toAddress); - } - - @Override - public void addRegexMapping(String user, String domain, String regex) throws Exception { - MappingSource source = MappingSource.fromUser(user, domain); - recipientRewriteTable.addRegexMapping(source, regex); - } - - - @Override - public void removeRegexMapping(String user, String domain, String regex) throws Exception { - MappingSource source = MappingSource.fromUser(user, domain); - recipientRewriteTable.removeRegexMapping(source, regex); - } - - @Override public void addDomainAliasMapping(String aliasDomain, String deliveryDomain) throws Exception { recipientRewriteTable.addAliasDomainMapping(MappingSource.fromDomain(Domain.of(aliasDomain)), Domain.of(deliveryDomain)); } diff --git a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java index 30d8050..f680340 100644 --- a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java +++ b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java @@ -57,8 +57,6 @@ public interface DataProbe { void removeUser(String username) throws Exception; - void setPassword(String userName, String password) throws Exception; - String[] listUsers() throws Exception; void addDomain(String domain) throws Exception; @@ -73,15 +71,7 @@ public interface DataProbe { Map<String, Mappings> listMappings() throws Exception; - Mappings listUserDomainMappings(String user, String domain) throws Exception; - void addAddressMapping(String fromUser, String fromDomain, String toAddress) throws Exception; - void removeAddressMapping(String fromUser, String fromDomain, String toAddress) throws Exception; - - void addRegexMapping(String user, String domain, String regex) throws Exception; - - void removeRegexMapping(String user, String domain, String regex) throws Exception; - void addDomainAliasMapping(String aliasDomain, String deliveryDomain) throws Exception; } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
