This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3e78217ecb85969b86bca8f3e80a4e2181169dc3 Author: Benoit Tellier <[email protected]> AuthorDate: Sat Aug 10 12:50:14 2019 +0200 JAMES-2854 ConfigurationPerformer::initModule should be able to throw Exception - Avoid unnecessary exception forwarding hurting exception readability - This is our "most common" use case, and leveraging it correctly saves lines of code --- .../modules/data/CassandraDomainListModule.java | 8 ++------ .../data/CassandraRecipientRewriteTableModule.java | 9 ++------ .../data/CassandraUsersRepositoryModule.java | 9 ++------ .../mailbox/ElasticSearchMailboxModule.java | 8 ++------ .../mailbox/ElasticSearchQuotaSearcherModule.java | 9 ++------ .../james/data/LdapUsersRepositoryModule.java | 12 +++-------- .../apache/james/utils/ConfigurationPerformer.java | 2 +- .../james/modules/server/DNSServiceModule.java | 11 +++------- .../modules/server/MailStoreRepositoryModule.java | 8 ++------ .../james/utils/ConfigurationsPerformer.java | 6 +++--- .../james/modules/server/JMXServerModule.java | 24 +++++++++------------- .../james/modules/data/JPADomainListModule.java | 8 ++------ .../data/JPARecipientRewriteTableModule.java | 9 ++------ .../modules/data/JPAUsersRepositoryModule.java | 9 ++------ .../modules/server/CamelMailetContainerModule.java | 18 +++++----------- .../james/modules/data/MemoryDataModule.java | 16 ++++----------- .../james/modules/protocols/IMAPServerModule.java | 10 +++------ .../james/modules/protocols/JMAPServerModule.java | 14 +++++-------- .../james/modules/protocols/LMTPServerModule.java | 10 +++------ .../modules/protocols/ManageSieveServerModule.java | 10 +++------ .../james/modules/protocols/POP3ServerModule.java | 10 +++------ .../james/modules/protocols/SMTPServerModule.java | 6 +----- 22 files changed, 65 insertions(+), 161 deletions(-) diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java index 6baa548..cf4769d 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java @@ -66,12 +66,8 @@ public class CassandraDomainListModule extends AbstractModule { } @Override - public void initModule() { - try { - cassandraDomainList.configure(configuration); - } catch (ConfigurationException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + cassandraDomainList.configure(configuration); } @Override diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java index e6634d8..469e5d9 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.modules.data; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.lifecycle.api.Startable; import org.apache.james.rrt.api.RecipientRewriteTable; @@ -60,12 +59,8 @@ public class CassandraRecipientRewriteTableModule extends AbstractModule { } @Override - public void initModule() { - try { - recipientRewriteTable.configure(configurationProvider.getConfiguration("recipientrewritetable")); - } catch (ConfigurationException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + recipientRewriteTable.configure(configurationProvider.getConfiguration("recipientrewritetable")); } @Override diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java index dd2a488..5daa4af 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.modules.data; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.lifecycle.api.Startable; import org.apache.james.server.core.configuration.ConfigurationProvider; @@ -56,12 +55,8 @@ public class CassandraUsersRepositoryModule extends AbstractModule { } @Override - public void initModule() { - try { - usersRepository.configure(configurationProvider.getConfiguration("usersrepository")); - } catch (ConfigurationException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + usersRepository.configure(configurationProvider.getConfiguration("usersrepository")); } @Override diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java index 83358fd..252f3c0 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java @@ -92,12 +92,8 @@ public class ElasticSearchMailboxModule extends AbstractModule { } @Override - public void initModule() { - try { - mailboxIndexCreator.createIndex(); - } catch (IOException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + mailboxIndexCreator.createIndex(); } @Override diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchQuotaSearcherModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchQuotaSearcherModule.java index b21e73d..99c7c76 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchQuotaSearcherModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchQuotaSearcherModule.java @@ -75,7 +75,6 @@ public class ElasticSearchQuotaSearcherModule extends AbstractModule { } static class ElasticSearchQuotaIndexCreationPerformer implements ConfigurationPerformer { - private final ElasticSearchQuotaIndexCreator indexCreator; @Inject @@ -84,12 +83,8 @@ public class ElasticSearchQuotaSearcherModule extends AbstractModule { } @Override - public void initModule() { - try { - indexCreator.createIndex(); - } catch (IOException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + indexCreator.createIndex(); } @Override diff --git a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/data/LdapUsersRepositoryModule.java b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/data/LdapUsersRepositoryModule.java index 6f6a0cd..409d729 100644 --- a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/data/LdapUsersRepositoryModule.java +++ b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/data/LdapUsersRepositoryModule.java @@ -52,7 +52,6 @@ public class LdapUsersRepositoryModule extends AbstractModule { @Singleton public static class LdapUsersRepositoryConfigurationPerformer implements ConfigurationPerformer { - private final LdapRepositoryConfiguration configuration; private final ReadOnlyUsersLDAPRepository usersRepository; @@ -63,13 +62,9 @@ public class LdapUsersRepositoryModule extends AbstractModule { } @Override - public void initModule() { - try { - usersRepository.configure(configuration); - usersRepository.init(); - } catch (Exception e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + usersRepository.configure(configuration); + usersRepository.init(); } @Override @@ -77,5 +72,4 @@ public class LdapUsersRepositoryModule extends AbstractModule { return ReadOnlyUsersLDAPRepository.class; } } - } diff --git a/server/container/guice/configuration/src/main/java/org/apache/james/utils/ConfigurationPerformer.java b/server/container/guice/configuration/src/main/java/org/apache/james/utils/ConfigurationPerformer.java index 9ac4cb3..19930c2 100644 --- a/server/container/guice/configuration/src/main/java/org/apache/james/utils/ConfigurationPerformer.java +++ b/server/container/guice/configuration/src/main/java/org/apache/james/utils/ConfigurationPerformer.java @@ -23,7 +23,7 @@ import org.apache.james.lifecycle.api.Startable; public interface ConfigurationPerformer { - void initModule(); + void initModule() throws Exception; /** * In order to initialize components in the right order, every diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java index 7fb7a68..563b208 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java @@ -41,7 +41,6 @@ public class DNSServiceModule extends AbstractModule { @Singleton public static class DNSServiceConfigurationPerformer implements ConfigurationPerformer { - private final ConfigurationProvider configurationProvider; private final DNSJavaService dnsService; @@ -53,13 +52,9 @@ public class DNSServiceModule extends AbstractModule { } @Override - public void initModule() { - try { - dnsService.configure(configurationProvider.getConfiguration("dnsservice")); - dnsService.init(); - } catch (Exception e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + dnsService.configure(configurationProvider.getConfiguration("dnsservice")); + dnsService.init(); } @Override diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java index 3172285..891b3ea 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java @@ -82,12 +82,8 @@ public class MailStoreRepositoryModule extends AbstractModule { } @Override - public void initModule() { - try { - javaMailRepositoryStore.init(); - } catch (Exception e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + javaMailRepositoryStore.init(); } @Override diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ConfigurationsPerformer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ConfigurationsPerformer.java index 166eda7..227f5f7 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ConfigurationsPerformer.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ConfigurationsPerformer.java @@ -25,6 +25,7 @@ import java.util.stream.Stream; import org.apache.james.lifecycle.api.Startable; +import com.github.fge.lambdas.Throwing; import com.google.inject.Inject; public class ConfigurationsPerformer { @@ -39,7 +40,6 @@ public class ConfigurationsPerformer { } public void initModules() throws Exception { - Set<ConfigurationPerformer> processed = processConfigurables(); processOthers(processed); @@ -49,7 +49,7 @@ public class ConfigurationsPerformer { return configurables.get().stream() .flatMap(this::configurationPerformerFor) .distinct() - .peek(ConfigurationPerformer::initModule) + .peek(Throwing.consumer(ConfigurationPerformer::initModule).sneakyThrow()) .collect(Collectors.toSet()); } @@ -61,6 +61,6 @@ public class ConfigurationsPerformer { private void processOthers(Set<ConfigurationPerformer> processed) { configurationPerformers.stream() .filter(x -> !processed.contains(x)) - .forEach(ConfigurationPerformer::initModule); + .forEach(Throwing.consumer(ConfigurationPerformer::initModule).sneakyThrow()); } } diff --git a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java index ea1f9a5..e6b1c14 100644 --- a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java +++ b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java @@ -146,20 +146,16 @@ public class JMXServerModule extends AbstractModule { } @Override - public void initModule() { - try { - jmxServer.start(); - jmxServer.register(JMX_COMPONENT_DOMAINLIST, domainListManagementMBean); - jmxServer.register(JMX_COMPONENT_USERS_REPOSITORY, usersRepositoryManagementMBean); - jmxServer.register(JMX_COMPONENT_RECIPIENTREWRITETABLE, recipientRewriteTableManagementMBean); - jmxServer.register(JMX_COMPONENT_NAME_MAILBOXMANAGERBEAN, mailboxManagerManagementMBean); - jmxServer.register(JMX_COMPONENT_MAILBOXCOPIER, mailboxCopierManagementMBean); - jmxServer.register(JMX_COMPONENT_REINDEXER, reIndexerManagementMBean); - jmxServer.register(JMX_COMPONENT_QUOTA, quotaManagementMBean); - jmxServer.register(JMX_COMPONENT_SIEVE, sieveRepositoryManagementMBean); - } catch (Exception e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + jmxServer.start(); + jmxServer.register(JMX_COMPONENT_DOMAINLIST, domainListManagementMBean); + jmxServer.register(JMX_COMPONENT_USERS_REPOSITORY, usersRepositoryManagementMBean); + jmxServer.register(JMX_COMPONENT_RECIPIENTREWRITETABLE, recipientRewriteTableManagementMBean); + jmxServer.register(JMX_COMPONENT_NAME_MAILBOXMANAGERBEAN, mailboxManagerManagementMBean); + jmxServer.register(JMX_COMPONENT_MAILBOXCOPIER, mailboxCopierManagementMBean); + jmxServer.register(JMX_COMPONENT_REINDEXER, reIndexerManagementMBean); + jmxServer.register(JMX_COMPONENT_QUOTA, quotaManagementMBean); + jmxServer.register(JMX_COMPONENT_SIEVE, sieveRepositoryManagementMBean); } @Override diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java index 85a2adc..970d182 100644 --- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java +++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java @@ -64,12 +64,8 @@ public class JPADomainListModule extends AbstractModule { } @Override - public void initModule() { - try { - jpaDomainList.configure(configuration); - } catch (ConfigurationException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + jpaDomainList.configure(configuration); } @Override diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPARecipientRewriteTableModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPARecipientRewriteTableModule.java index b9702e2..ea39108 100644 --- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPARecipientRewriteTableModule.java +++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPARecipientRewriteTableModule.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.modules.data; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.lifecycle.api.Startable; import org.apache.james.rrt.api.RecipientRewriteTable; import org.apache.james.rrt.jpa.JPARecipientRewriteTable; @@ -52,12 +51,8 @@ public class JPARecipientRewriteTableModule extends AbstractModule { } @Override - public void initModule() { - try { - recipientRewriteTable.configure(configurationProvider.getConfiguration("recipientrewritetable")); - } catch (ConfigurationException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + recipientRewriteTable.configure(configurationProvider.getConfiguration("recipientrewritetable")); } @Override diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAUsersRepositoryModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAUsersRepositoryModule.java index 69a0675..9ab96da 100644 --- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAUsersRepositoryModule.java +++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAUsersRepositoryModule.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.modules.data; -import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.lifecycle.api.Startable; import org.apache.james.server.core.configuration.ConfigurationProvider; import org.apache.james.user.api.UsersRepository; @@ -52,12 +51,8 @@ public class JPAUsersRepositoryModule extends AbstractModule { } @Override - public void initModule() { - try { - usersRepository.configure(configurationProvider.getConfiguration("usersrepository")); - } catch (ConfigurationException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + usersRepository.configure(configurationProvider.getConfiguration("usersrepository")); } @Override diff --git a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java index 748cc22..d3f075b 100644 --- a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java +++ b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java @@ -154,12 +154,8 @@ public class CamelMailetContainerModule extends AbstractModule { } @Override - public void initModule() { - try { - mailetContext.configure(getMailetContextConfiguration()); - } catch (ConfigurationException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + mailetContext.configure(getMailetContextConfiguration()); } private HierarchicalConfiguration getMailetContextConfiguration() { @@ -199,13 +195,9 @@ public class CamelMailetContainerModule extends AbstractModule { } @Override - public void initModule() { - try { - configureProcessors(camelContext); - checkProcessors(); - } catch (Exception e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + configureProcessors(camelContext); + checkProcessors(); } private void configureProcessors(DefaultCamelContext camelContext) throws Exception { diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java index f4c7666..f47f983 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java @@ -110,12 +110,8 @@ public class MemoryDataModule extends AbstractModule { } @Override - public void initModule() { - try { - memoryDomainList.configure(domainListConfiguration); - } catch (ConfigurationException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + memoryDomainList.configure(domainListConfiguration); } @Override @@ -136,12 +132,8 @@ public class MemoryDataModule extends AbstractModule { } @Override - public void initModule() { - try { - memoryRecipientRewriteTable.configure(configurationProvider.getConfiguration("recipientrewritetable")); - } catch (ConfigurationException e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + memoryRecipientRewriteTable.configure(configurationProvider.getConfiguration("recipientrewritetable")); } @Override diff --git a/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java b/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java index 8af4fba..2f14973 100644 --- a/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java +++ b/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java @@ -98,13 +98,9 @@ public class IMAPServerModule extends AbstractModule { } @Override - public void initModule() { - try { - imapServerFactory.configure(configurationProvider.getConfiguration("imapserver")); - imapServerFactory.init(); - } catch (Exception e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + imapServerFactory.configure(configurationProvider.getConfiguration("imapserver")); + imapServerFactory.init(); } @Override diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java index c57c87b..88f9767 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java @@ -61,15 +61,11 @@ public class JMAPServerModule extends AbstractModule { } @Override - public void initModule() { - try { - if (jmapConfiguration.isEnabled()) { - signatureHandler.init(); - server.start(); - registerPEMWithSecurityProvider(); - } - } catch (Exception e) { - throw new RuntimeException(e); + public void initModule() throws Exception { + if (jmapConfiguration.isEnabled()) { + signatureHandler.init(); + server.start(); + registerPEMWithSecurityProvider(); } } diff --git a/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java b/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java index 8fb9624..7426bde 100644 --- a/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java +++ b/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java @@ -57,13 +57,9 @@ public class LMTPServerModule extends AbstractModule { } @Override - public void initModule() { - try { - lmtpServerFactory.configure(configurationProvider.getConfiguration("lmtpserver", LoggingLevel.INFO)); - lmtpServerFactory.init(); - } catch (Exception e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + lmtpServerFactory.configure(configurationProvider.getConfiguration("lmtpserver", LoggingLevel.INFO)); + lmtpServerFactory.init(); } @Override diff --git a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java index 2c89f94..228ed85 100644 --- a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java +++ b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java @@ -53,13 +53,9 @@ public class ManageSieveServerModule extends AbstractModule { } @Override - public void initModule() { - try { - manageSieveServerFactory.configure(configurationProvider.getConfiguration("managesieveserver", LoggingLevel.INFO)); - manageSieveServerFactory.init(); - } catch (Exception e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + manageSieveServerFactory.configure(configurationProvider.getConfiguration("managesieveserver", LoggingLevel.INFO)); + manageSieveServerFactory.init(); } @Override diff --git a/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java b/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java index 592e740..3c1c2b1 100644 --- a/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java +++ b/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java @@ -55,13 +55,9 @@ public class POP3ServerModule extends AbstractModule { } @Override - public void initModule() { - try { - pop3ServerFactory.configure(configurationProvider.getConfiguration("pop3server")); - pop3ServerFactory.init(); - } catch (Exception e) { - throw new RuntimeException(e); - } + public void initModule() throws Exception { + pop3ServerFactory.configure(configurationProvider.getConfiguration("pop3server")); + pop3ServerFactory.init(); } @Override diff --git a/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java b/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java index 0cc441f..3a9438f 100644 --- a/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java +++ b/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java @@ -62,14 +62,10 @@ public class SMTPServerModule extends AbstractModule { } @Override - public void initModule() { - try { + public void initModule() throws Exception { smtpServerFactory.configure(configurationProvider.getConfiguration("smtpserver")); smtpServerFactory.init(); sendMailHandler.init(null); - } catch (Exception e) { - throw new RuntimeException(e); - } } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
