You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/08/20 10:26:18 UTC
[james-project] 12/16: JAMES-2854 Component initialization is not
necessary linked to configuration
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 b3968415bbb97099001213cbbdccb53de10c4290
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat Aug 10 12:58:16 2019 +0200
JAMES-2854 Component initialization is not necessary linked to configuration
This history inherited wording is confusing thus harmful...
---
.../modules/data/CassandraDomainListModule.java | 8 +++----
.../data/CassandraRecipientRewriteTableModule.java | 6 ++---
.../data/CassandraUsersRepositoryModule.java | 8 +++----
.../mailbox/ElasticSearchMailboxModule.java | 6 ++---
.../mailbox/ElasticSearchQuotaSearcherModule.java | 6 ++---
.../modules/metrics/CassandraMetricsModule.java | 6 ++---
.../CassandraMessageIdManagerInjectionTest.java | 6 ++---
.../james/data/LdapUsersRepositoryModule.java | 8 +++----
.../modules/event/RabbitMQEventBusModule.java | 6 ++---
...Performer.java => InitialisationOperation.java} | 4 ++--
.../server/ElasticSearchMetricReporterModule.java | 6 ++---
.../java/org/apache/james/GuiceJamesServer.java | 4 ++--
.../james/modules/server/DNSServiceModule.java | 10 ++++-----
.../modules/server/DropWizardMetricsModule.java | 10 ++++-----
.../modules/server/MailStoreRepositoryModule.java | 8 +++----
...erformer.java => InitializationOperations.java} | 24 ++++++++++----------
...Test.java => InitializationOperationsTest.java} | 20 ++++++++---------
.../james/modules/server/JMXServerModule.java | 26 +++++++++++-----------
.../james/modules/data/JPADomainListModule.java | 8 +++----
.../data/JPARecipientRewriteTableModule.java | 6 ++---
.../modules/data/JPAUsersRepositoryModule.java | 8 +++----
.../james/modules/mailbox/DefaultEventModule.java | 6 ++---
.../modules/server/CamelMailetContainerModule.java | 26 +++++++++++-----------
.../james/modules/data/MemoryDataModule.java | 16 ++++++-------
.../org/apache/james/GuiceJamesServerTest.java | 8 +++----
.../james/modules/protocols/IMAPServerModule.java | 8 +++----
.../james/modules/protocols/JMAPServerModule.java | 8 +++----
.../james/modules/protocols/LMTPServerModule.java | 8 +++----
.../modules/protocols/ManageSieveServerModule.java | 8 +++----
.../james/modules/protocols/POP3ServerModule.java | 8 +++----
.../james/modules/protocols/SMTPServerModule.java | 12 +++++-----
.../james/modules/server/WebAdminServerModule.java | 8 +++----
32 files changed, 155 insertions(+), 155 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 cf4769d..ac43f0e 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
@@ -25,7 +25,7 @@ import org.apache.james.domainlist.cassandra.CassandraDomainList;
import org.apache.james.domainlist.lib.DomainListConfiguration;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.server.core.configuration.ConfigurationProvider;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -41,7 +41,7 @@ public class CassandraDomainListModule extends AbstractModule {
bind(CassandraDomainList.class).in(Scopes.SINGLETON);
bind(DomainList.class).to(CassandraDomainList.class);
Multibinder.newSetBinder(binder(), CassandraModule.class).addBinding().toInstance(org.apache.james.domainlist.cassandra.CassandraDomainListModule.MODULE);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(CassandraDomainListConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(CassandraDomainListInitialisationOperation.class);
}
@Provides
@@ -55,12 +55,12 @@ public class CassandraDomainListModule extends AbstractModule {
}
@Singleton
- public static class CassandraDomainListConfigurationPerformer implements ConfigurationPerformer {
+ public static class CassandraDomainListInitialisationOperation implements InitialisationOperation {
private final DomainListConfiguration configuration;
private final CassandraDomainList cassandraDomainList;
@Inject
- public CassandraDomainListConfigurationPerformer(DomainListConfiguration configuration, CassandraDomainList cassandraDomainList) {
+ public CassandraDomainListInitialisationOperation(DomainListConfiguration configuration, CassandraDomainList cassandraDomainList) {
this.configuration = configuration;
this.cassandraDomainList = cassandraDomainList;
}
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 469e5d9..437b1ef 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
@@ -26,7 +26,7 @@ import org.apache.james.rrt.cassandra.CassandraRRTModule;
import org.apache.james.rrt.cassandra.CassandraRecipientRewriteTable;
import org.apache.james.rrt.cassandra.CassandraRecipientRewriteTableDAO;
import org.apache.james.server.core.configuration.ConfigurationProvider;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -44,11 +44,11 @@ public class CassandraRecipientRewriteTableModule extends AbstractModule {
bind(RecipientRewriteTable.class).to(CassandraRecipientRewriteTable.class);
Multibinder<CassandraModule> cassandraDataDefinitions = Multibinder.newSetBinder(binder(), CassandraModule.class);
cassandraDataDefinitions.addBinding().toInstance(CassandraRRTModule.MODULE);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(CassandraRecipientRewriteTablePerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(CassandraRecipientRewriteTablePerformer.class);
}
@Singleton
- public static class CassandraRecipientRewriteTablePerformer implements ConfigurationPerformer {
+ public static class CassandraRecipientRewriteTablePerformer implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final CassandraRecipientRewriteTable recipientRewriteTable;
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 5daa4af..fd2451f 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
@@ -23,7 +23,7 @@ import org.apache.james.lifecycle.api.Startable;
import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.cassandra.CassandraUsersRepository;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -39,17 +39,17 @@ public class CassandraUsersRepositoryModule extends AbstractModule {
Multibinder<CassandraModule> cassandraDataDefinitions = Multibinder.newSetBinder(binder(), CassandraModule.class);
cassandraDataDefinitions.addBinding().toInstance(org.apache.james.user.cassandra.CassandraUsersRepositoryModule.MODULE);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(CassandraUsersRepositoryConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(CassandraUsersRepositoryInitialisationOperation.class);
}
@Singleton
- public static class CassandraUsersRepositoryConfigurationPerformer implements ConfigurationPerformer {
+ public static class CassandraUsersRepositoryInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final CassandraUsersRepository usersRepository;
@Inject
- public CassandraUsersRepositoryConfigurationPerformer(ConfigurationProvider configurationProvider, CassandraUsersRepository usersRepository) {
+ public CassandraUsersRepositoryInitialisationOperation(ConfigurationProvider configurationProvider, CassandraUsersRepository usersRepository) {
this.configurationProvider = configurationProvider;
this.usersRepository = usersRepository;
}
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 252f3c0..5ac76f8 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
@@ -46,7 +46,7 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.PropertiesProvider;
import org.elasticsearch.client.RestHighLevelClient;
import org.slf4j.Logger;
@@ -83,7 +83,7 @@ public class ElasticSearchMailboxModule extends AbstractModule {
}
}
- static class ElasticSearchMailboxIndexCreationPerformer implements ConfigurationPerformer {
+ static class ElasticSearchMailboxIndexCreationPerformer implements InitialisationOperation {
private final MailboxIndexCreator mailboxIndexCreator;
@Inject
@@ -118,7 +118,7 @@ public class ElasticSearchMailboxModule extends AbstractModule {
.addBinding()
.to(ElasticSearchListeningMessageSearchIndex.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class)
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class)
.addBinding()
.to(ElasticSearchMailboxIndexCreationPerformer.class);
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 99c7c76..a6903f9 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
@@ -38,7 +38,7 @@ import org.apache.james.quota.search.elasticsearch.ElasticSearchQuotaSearcher;
import org.apache.james.quota.search.elasticsearch.QuotaSearchIndexCreationUtil;
import org.apache.james.quota.search.elasticsearch.events.ElasticSearchQuotaMailboxListener;
import org.apache.james.quota.search.elasticsearch.json.QuotaRatioToElasticSearchJson;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.PropertiesProvider;
import org.elasticsearch.client.RestHighLevelClient;
import org.slf4j.Logger;
@@ -74,7 +74,7 @@ public class ElasticSearchQuotaSearcherModule extends AbstractModule {
}
}
- static class ElasticSearchQuotaIndexCreationPerformer implements ConfigurationPerformer {
+ static class ElasticSearchQuotaIndexCreationPerformer implements InitialisationOperation {
private final ElasticSearchQuotaIndexCreator indexCreator;
@Inject
@@ -101,7 +101,7 @@ public class ElasticSearchQuotaSearcherModule extends AbstractModule {
.addBinding()
.to(ElasticSearchQuotaMailboxListener.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class)
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class)
.addBinding()
.to(ElasticSearchQuotaIndexCreationPerformer.class);
}
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/metrics/CassandraMetricsModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/metrics/CassandraMetricsModule.java
index 8f728e2..b49fc8b 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/metrics/CassandraMetricsModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/metrics/CassandraMetricsModule.java
@@ -20,7 +20,7 @@
package org.apache.james.modules.metrics;
import org.apache.james.lifecycle.api.Startable;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.codahale.metrics.MetricRegistry;
import com.datastax.driver.core.Session;
@@ -36,12 +36,12 @@ public class CassandraMetricsModule extends AbstractModule {
bind(CassandraMetricsInjector.class)
.in(Scopes.SINGLETON);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class)
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class)
.addBinding()
.to(CassandraMetricsInjector.class);
}
- public static class CassandraMetricsInjector implements ConfigurationPerformer, Startable {
+ public static class CassandraMetricsInjector implements InitialisationOperation, Startable {
private final MetricRegistry metricRegistry;
private final Session session;
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java
index 53701eb..c8aa695 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMessageIdManagerInjectionTest.java
@@ -29,7 +29,7 @@ import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.extractor.TextExtractor;
import org.apache.james.mailbox.store.search.PDFTextExtractor;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -46,7 +46,7 @@ class CassandraMessageIdManagerInjectionTest {
.combineWith(ALL_BUT_JMX_CASSANDRA_MODULE)
.overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class))
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
- .overrideWith(binder -> Multibinder.newSetBinder(binder, ConfigurationPerformer.class)
+ .overrideWith(binder -> Multibinder.newSetBinder(binder, InitialisationOperation.class)
.addBinding()
.to(CallMe.class)))
.disableAutoStart()
@@ -57,7 +57,7 @@ class CassandraMessageIdManagerInjectionTest {
assertThatCode(server::start).doesNotThrowAnyException();
}
- public static class CallMe implements ConfigurationPerformer, Startable {
+ public static class CallMe implements InitialisationOperation, Startable {
@Inject
public CallMe(MessageIdManager messageIdManager) {
}
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 409d729..b580b67 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
@@ -24,7 +24,7 @@ import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.ldap.LdapRepositoryConfiguration;
import org.apache.james.user.ldap.ReadOnlyUsersLDAPRepository;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -40,7 +40,7 @@ public class LdapUsersRepositoryModule extends AbstractModule {
bind(ReadOnlyUsersLDAPRepository.class).in(Scopes.SINGLETON);
bind(UsersRepository.class).to(ReadOnlyUsersLDAPRepository.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(LdapUsersRepositoryConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(LdapUsersRepositoryInitialisationOperation.class);
}
@Provides
@@ -51,12 +51,12 @@ public class LdapUsersRepositoryModule extends AbstractModule {
}
@Singleton
- public static class LdapUsersRepositoryConfigurationPerformer implements ConfigurationPerformer {
+ public static class LdapUsersRepositoryInitialisationOperation implements InitialisationOperation {
private final LdapRepositoryConfiguration configuration;
private final ReadOnlyUsersLDAPRepository usersRepository;
@Inject
- public LdapUsersRepositoryConfigurationPerformer(LdapRepositoryConfiguration configuration, ReadOnlyUsersLDAPRepository usersRepository) {
+ public LdapUsersRepositoryInitialisationOperation(LdapRepositoryConfiguration configuration, ReadOnlyUsersLDAPRepository usersRepository) {
this.configuration = configuration;
this.usersRepository = usersRepository;
}
diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/event/RabbitMQEventBusModule.java b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/event/RabbitMQEventBusModule.java
index b064112..1756b0a 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/event/RabbitMQEventBusModule.java
+++ b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/event/RabbitMQEventBusModule.java
@@ -26,7 +26,7 @@ import org.apache.james.mailbox.events.MailboxIdRegistrationKey;
import org.apache.james.mailbox.events.RabbitMQEventBus;
import org.apache.james.mailbox.events.RegistrationKey;
import org.apache.james.mailbox.events.RetryBackoffConfiguration;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -45,13 +45,13 @@ public class RabbitMQEventBusModule extends AbstractModule {
Multibinder.newSetBinder(binder(), RegistrationKey.Factory.class)
.addBinding().to(MailboxIdRegistrationKey.Factory.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class)
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class)
.addBinding().to(RabbitMQEventBusInitializer.class);
bind(RetryBackoffConfiguration.class).toInstance(RetryBackoffConfiguration.DEFAULT);
}
- static class RabbitMQEventBusInitializer implements ConfigurationPerformer {
+ static class RabbitMQEventBusInitializer implements InitialisationOperation {
private final RabbitMQEventBus rabbitMQEventBus;
@Inject
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/InitialisationOperation.java
similarity index 93%
rename from server/container/guice/configuration/src/main/java/org/apache/james/utils/ConfigurationPerformer.java
rename to server/container/guice/configuration/src/main/java/org/apache/james/utils/InitialisationOperation.java
index 19930c2..ba3f1bf 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/InitialisationOperation.java
@@ -21,13 +21,13 @@ package org.apache.james.utils;
import org.apache.james.lifecycle.api.Startable;
-public interface ConfigurationPerformer {
+public interface InitialisationOperation {
void initModule() throws Exception;
/**
* In order to initialize components in the right order, every
- * {@link ConfigurationPerformer} is supposed to declare which
+ * {@link InitialisationOperation} is supposed to declare which
* class it will initialize.
*
* @return the Class that this object will initialize.
diff --git a/server/container/guice/es-metric-reporter/src/main/java/org/apache/james/modules/server/ElasticSearchMetricReporterModule.java b/server/container/guice/es-metric-reporter/src/main/java/org/apache/james/modules/server/ElasticSearchMetricReporterModule.java
index 343f839..28e59cb 100644
--- a/server/container/guice/es-metric-reporter/src/main/java/org/apache/james/modules/server/ElasticSearchMetricReporterModule.java
+++ b/server/container/guice/es-metric-reporter/src/main/java/org/apache/james/modules/server/ElasticSearchMetricReporterModule.java
@@ -26,7 +26,7 @@ import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.metrics.es.ESMetricReporter;
import org.apache.james.metrics.es.ESReporterConfiguration;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.PropertiesProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +48,7 @@ public class ElasticSearchMetricReporterModule extends AbstractModule {
@Override
protected void configure() {
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(ESMetricReporterStarter.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(ESMetricReporterStarter.class);
}
@Provides
@@ -84,7 +84,7 @@ public class ElasticSearchMetricReporterModule extends AbstractModule {
}
@Singleton
- public static class ESMetricReporterStarter implements ConfigurationPerformer {
+ public static class ESMetricReporterStarter implements InitialisationOperation {
private final ESMetricReporter esMetricReporter;
@Inject
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
index d1d5eed..76d59ad 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
@@ -28,7 +28,7 @@ import org.apache.james.modules.IsStartedProbeModule;
import org.apache.james.modules.MailetProcessingModule;
import org.apache.james.onami.lifecycle.Stager;
import org.apache.james.server.core.configuration.Configuration;
-import org.apache.james.utils.ConfigurationsPerformer;
+import org.apache.james.utils.InitializationOperations;
import org.apache.james.utils.GuiceProbe;
import org.apache.james.utils.GuiceProbeProvider;
@@ -80,7 +80,7 @@ public class GuiceJamesServer {
preDestroy = injector.getInstance(Key.get(new TypeLiteral<Stager<PreDestroy>>() {}));
injector.getInstance(StartUpChecksPerformer.class)
.performCheck();
- injector.getInstance(ConfigurationsPerformer.class).initModules();
+ injector.getInstance(InitializationOperations.class).initModules();
guiceProbeProvider = injector.getInstance(GuiceProbeProvider.class);
isStartedProbe.notifyStarted();
}
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 563b208..7a57cf3 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
@@ -22,7 +22,7 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.dnsjava.DNSJavaService;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.server.core.configuration.ConfigurationProvider;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -36,17 +36,17 @@ public class DNSServiceModule extends AbstractModule {
protected void configure() {
bind(DNSJavaService.class).in(Scopes.SINGLETON);
bind(DNSService.class).to(DNSJavaService.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(DNSServiceConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(DNSServiceInitialisationOperation.class);
}
@Singleton
- public static class DNSServiceConfigurationPerformer implements ConfigurationPerformer {
+ public static class DNSServiceInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final DNSJavaService dnsService;
@Inject
- public DNSServiceConfigurationPerformer(ConfigurationProvider configurationProvider,
- DNSJavaService dnsService) {
+ public DNSServiceInitialisationOperation(ConfigurationProvider configurationProvider,
+ DNSJavaService dnsService) {
this.configurationProvider = configurationProvider;
this.dnsService = dnsService;
}
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java
index 047b783..f705396 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java
@@ -25,7 +25,7 @@ import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.metrics.dropwizard.DropWizardGaugeRegistry;
import org.apache.james.metrics.dropwizard.DropWizardJVMMetrics;
import org.apache.james.metrics.dropwizard.DropWizardMetricFactory;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.codahale.metrics.MetricRegistry;
import com.google.inject.AbstractModule;
@@ -46,16 +46,16 @@ public class DropWizardMetricsModule extends AbstractModule {
bind(GaugeRegistry.class).to(DropWizardGaugeRegistry.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(DropWizardConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(DropWizardInitialisationOperation.class);
}
@Singleton
- public static class DropWizardConfigurationPerformer implements ConfigurationPerformer, Startable {
+ public static class DropWizardInitialisationOperation implements InitialisationOperation, Startable {
private final DropWizardMetricFactory dropWizardMetricFactory;
private final DropWizardJVMMetrics dropWizardJVMMetrics;
@Inject
- public DropWizardConfigurationPerformer(DropWizardMetricFactory dropWizardMetricFactory, DropWizardJVMMetrics dropWizardJVMMetrics) {
+ public DropWizardInitialisationOperation(DropWizardMetricFactory dropWizardMetricFactory, DropWizardJVMMetrics dropWizardJVMMetrics) {
this.dropWizardMetricFactory = dropWizardMetricFactory;
this.dropWizardJVMMetrics = dropWizardJVMMetrics;
}
@@ -68,7 +68,7 @@ public class DropWizardMetricsModule extends AbstractModule {
@Override
public Class<? extends Startable> forClass() {
- return DropWizardConfigurationPerformer.class;
+ return DropWizardInitialisationOperation.class;
}
}
}
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 891b3ea..701bb70 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
@@ -30,7 +30,7 @@ import org.apache.james.mailrepository.file.FileMailRepositoryProvider;
import org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryStore;
import org.apache.james.server.core.configuration.ConfigurationProvider;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.GuiceProbe;
import org.apache.james.utils.MailRepositoryProbeImpl;
import org.slf4j.Logger;
@@ -56,7 +56,7 @@ public class MailStoreRepositoryModule extends AbstractModule {
Multibinder<MailRepositoryProvider> multibinder = Multibinder.newSetBinder(binder(), MailRepositoryProvider.class);
multibinder.addBinding().to(FileMailRepositoryProvider.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(MailRepositoryStoreModuleConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(MailRepositoryStoreModuleInitialisationOperation.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(MailRepositoryProbeImpl.class);
}
@@ -73,11 +73,11 @@ public class MailStoreRepositoryModule extends AbstractModule {
}
@Singleton
- public static class MailRepositoryStoreModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class MailRepositoryStoreModuleInitialisationOperation implements InitialisationOperation {
private final MemoryMailRepositoryStore javaMailRepositoryStore;
@Inject
- public MailRepositoryStoreModuleConfigurationPerformer(MemoryMailRepositoryStore javaMailRepositoryStore) {
+ public MailRepositoryStoreModuleInitialisationOperation(MemoryMailRepositoryStore javaMailRepositoryStore) {
this.javaMailRepositoryStore = javaMailRepositoryStore;
}
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/InitializationOperations.java
similarity index 68%
rename from server/container/guice/guice-common/src/main/java/org/apache/james/utils/ConfigurationsPerformer.java
rename to server/container/guice/guice-common/src/main/java/org/apache/james/utils/InitializationOperations.java
index 227f5f7..7988349 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/InitializationOperations.java
@@ -28,39 +28,39 @@ import org.apache.james.lifecycle.api.Startable;
import com.github.fge.lambdas.Throwing;
import com.google.inject.Inject;
-public class ConfigurationsPerformer {
+public class InitializationOperations {
- private final Set<ConfigurationPerformer> configurationPerformers;
+ private final Set<InitialisationOperation> initialisationOperations;
private final Startables configurables;
@Inject
- public ConfigurationsPerformer(Set<ConfigurationPerformer> configurationPerformers, Startables configurables) {
- this.configurationPerformers = configurationPerformers;
+ public InitializationOperations(Set<InitialisationOperation> initialisationOperations, Startables configurables) {
+ this.initialisationOperations = initialisationOperations;
this.configurables = configurables;
}
public void initModules() throws Exception {
- Set<ConfigurationPerformer> processed = processConfigurables();
+ Set<InitialisationOperation> processed = processConfigurables();
processOthers(processed);
}
- private Set<ConfigurationPerformer> processConfigurables() {
+ private Set<InitialisationOperation> processConfigurables() {
return configurables.get().stream()
.flatMap(this::configurationPerformerFor)
.distinct()
- .peek(Throwing.consumer(ConfigurationPerformer::initModule).sneakyThrow())
+ .peek(Throwing.consumer(InitialisationOperation::initModule).sneakyThrow())
.collect(Collectors.toSet());
}
- private Stream<ConfigurationPerformer> configurationPerformerFor(Class<? extends Startable> configurable) {
- return configurationPerformers.stream()
+ private Stream<InitialisationOperation> configurationPerformerFor(Class<? extends Startable> configurable) {
+ return initialisationOperations.stream()
.filter(x -> x.forClass().equals(configurable));
}
- private void processOthers(Set<ConfigurationPerformer> processed) {
- configurationPerformers.stream()
+ private void processOthers(Set<InitialisationOperation> processed) {
+ initialisationOperations.stream()
.filter(x -> !processed.contains(x))
- .forEach(Throwing.consumer(ConfigurationPerformer::initModule).sneakyThrow());
+ .forEach(Throwing.consumer(InitialisationOperation::initModule).sneakyThrow());
}
}
diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/modules/ConfigurationsPerformerTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java
similarity index 85%
rename from server/container/guice/guice-common/src/test/java/org/apache/james/modules/ConfigurationsPerformerTest.java
rename to server/container/guice/guice-common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java
index 1228f51..e443b97 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/modules/ConfigurationsPerformerTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java
@@ -27,8 +27,8 @@ import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lifecycle.api.Startable;
-import org.apache.james.utils.ConfigurationPerformer;
-import org.apache.james.utils.ConfigurationsPerformer;
+import org.apache.james.utils.InitialisationOperation;
+import org.apache.james.utils.InitializationOperations;
import org.junit.Test;
import com.google.inject.Guice;
@@ -36,14 +36,14 @@ import com.google.inject.Injector;
import com.google.inject.Scopes;
import com.google.inject.multibindings.Multibinder;
-public class ConfigurationsPerformerTest {
+public class InitializationOperationsTest {
@Test
public void initModulesShouldNotFailWhenBindingsInWrongOrder() throws Exception {
Injector injector = Guice.createInjector(new StartablesModule(),
new UnorderedBindingsModule());
- injector.getInstance(ConfigurationsPerformer.class).initModules();
+ injector.getInstance(InitializationOperations.class).initModules();
assertThat(injector.getInstance(A.class).isConfigured()).isTrue();
assertThat(injector.getInstance(B.class).isConfigured()).isTrue();
@@ -57,16 +57,16 @@ public class ConfigurationsPerformerTest {
bind(A.class).in(Scopes.SINGLETON);
bind(C.class).in(Scopes.SINGLETON);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(BConfigurationPerformer.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(AConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(BInitialisationOperation.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(AInitialisationOperation.class);
}
}
- private static class AConfigurationPerformer implements ConfigurationPerformer {
+ private static class AInitialisationOperation implements InitialisationOperation {
private final A a;
@Inject
- private AConfigurationPerformer(A a) {
+ private AInitialisationOperation(A a) {
this.a = a;
}
@@ -85,11 +85,11 @@ public class ConfigurationsPerformerTest {
}
}
- private static class BConfigurationPerformer implements ConfigurationPerformer {
+ private static class BInitialisationOperation implements InitialisationOperation {
private final B b;
@Inject
- private BConfigurationPerformer(B b) {
+ private BInitialisationOperation(B b) {
this.b = b;
}
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 e6b1c14..692931a 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
@@ -45,7 +45,7 @@ import org.apache.james.sieverepository.api.SieveRepositoryManagementMBean;
import org.apache.james.sieverepository.lib.SieveRepositoryManagement;
import org.apache.james.user.api.UsersRepositoryManagementMBean;
import org.apache.james.user.lib.UsersRepositoryManagement;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.GuiceMailboxManagerResolver;
import org.apache.james.utils.PropertiesProvider;
import org.apache.mailbox.tools.indexer.ReIndexerImpl;
@@ -96,8 +96,8 @@ public class JMXServerModule extends AbstractModule {
bind(ReIndexerManagementMBean.class).to(ReIndexerManagement.class);
bind(QuotaManagementMBean.class).to(QuotaManagement.class);
bind(SieveRepositoryManagementMBean.class).to(SieveRepositoryManagement.class);
- Multibinder<ConfigurationPerformer> configurationMultibinder = Multibinder.newSetBinder(binder(), ConfigurationPerformer.class);
- configurationMultibinder.addBinding().to(JMXModuleConfigurationPerformer.class);
+ Multibinder<InitialisationOperation> configurationMultibinder = Multibinder.newSetBinder(binder(), InitialisationOperation.class);
+ configurationMultibinder.addBinding().to(JMXModuleInitialisationOperation.class);
}
@Provides
@@ -112,7 +112,7 @@ public class JMXServerModule extends AbstractModule {
}
@Singleton
- public static class JMXModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class JMXModuleInitialisationOperation implements InitialisationOperation {
private final JMXServer jmxServer;
private final DomainListManagementMBean domainListManagementMBean;
@@ -125,15 +125,15 @@ public class JMXServerModule extends AbstractModule {
private final SieveRepositoryManagementMBean sieveRepositoryManagementMBean;
@Inject
- public JMXModuleConfigurationPerformer(JMXServer jmxServer,
- DomainListManagementMBean domainListManagementMBean,
- UsersRepositoryManagementMBean usersRepositoryManagementMBean,
- RecipientRewriteTableManagementMBean recipientRewriteTableManagementMBean,
- MailboxManagerManagementMBean mailboxManagerManagementMBean,
- MailboxCopierManagementMBean mailboxCopierManagementMBean,
- ReIndexerManagementMBean reIndexerManagementMBean,
- QuotaManagementMBean quotaManagementMBean,
- SieveRepositoryManagementMBean sieveRepositoryManagementMBean) {
+ public JMXModuleInitialisationOperation(JMXServer jmxServer,
+ DomainListManagementMBean domainListManagementMBean,
+ UsersRepositoryManagementMBean usersRepositoryManagementMBean,
+ RecipientRewriteTableManagementMBean recipientRewriteTableManagementMBean,
+ MailboxManagerManagementMBean mailboxManagerManagementMBean,
+ MailboxCopierManagementMBean mailboxCopierManagementMBean,
+ ReIndexerManagementMBean reIndexerManagementMBean,
+ QuotaManagementMBean quotaManagementMBean,
+ SieveRepositoryManagementMBean sieveRepositoryManagementMBean) {
this.jmxServer = jmxServer;
this.domainListManagementMBean = domainListManagementMBean;
this.usersRepositoryManagementMBean = usersRepositoryManagementMBean;
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 970d182..07bfe5c 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
@@ -24,7 +24,7 @@ import org.apache.james.domainlist.jpa.JPADomainList;
import org.apache.james.domainlist.lib.DomainListConfiguration;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.server.core.configuration.ConfigurationProvider;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -39,7 +39,7 @@ public class JPADomainListModule extends AbstractModule {
public void configure() {
bind(JPADomainList.class).in(Scopes.SINGLETON);
bind(DomainList.class).to(JPADomainList.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(JPADomainListConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(JPADomainListInitialisationOperation.class);
}
@Provides
@@ -53,12 +53,12 @@ public class JPADomainListModule extends AbstractModule {
}
@Singleton
- public static class JPADomainListConfigurationPerformer implements ConfigurationPerformer {
+ public static class JPADomainListInitialisationOperation implements InitialisationOperation {
private final DomainListConfiguration configuration;
private final JPADomainList jpaDomainList;
@Inject
- public JPADomainListConfigurationPerformer(DomainListConfiguration configuration, JPADomainList jpaDomainList) {
+ public JPADomainListInitialisationOperation(DomainListConfiguration configuration, JPADomainList jpaDomainList) {
this.configuration = configuration;
this.jpaDomainList = jpaDomainList;
}
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 ea39108..47c0737 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
@@ -22,7 +22,7 @@ import org.apache.james.lifecycle.api.Startable;
import org.apache.james.rrt.api.RecipientRewriteTable;
import org.apache.james.rrt.jpa.JPARecipientRewriteTable;
import org.apache.james.server.core.configuration.ConfigurationProvider;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -36,11 +36,11 @@ public class JPARecipientRewriteTableModule extends AbstractModule {
public void configure() {
bind(JPARecipientRewriteTable.class).in(Scopes.SINGLETON);
bind(RecipientRewriteTable.class).to(JPARecipientRewriteTable.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(JPARecipientRewriteTablePerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(JPARecipientRewriteTablePerformer.class);
}
@Singleton
- public static class JPARecipientRewriteTablePerformer implements ConfigurationPerformer {
+ public static class JPARecipientRewriteTablePerformer implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final JPARecipientRewriteTable recipientRewriteTable;
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 9ab96da..75f5aa2 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
@@ -22,7 +22,7 @@ import org.apache.james.lifecycle.api.Startable;
import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.jpa.JPAUsersRepository;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
@@ -36,16 +36,16 @@ public class JPAUsersRepositoryModule extends AbstractModule {
bind(JPAUsersRepository.class).in(Scopes.SINGLETON);
bind(UsersRepository.class).to(JPAUsersRepository.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(JPAUsersRepositoryConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(JPAUsersRepositoryInitialisationOperation.class);
}
@Singleton
- public static class JPAUsersRepositoryConfigurationPerformer implements ConfigurationPerformer {
+ public static class JPAUsersRepositoryInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final JPAUsersRepository usersRepository;
@Inject
- public JPAUsersRepositoryConfigurationPerformer(ConfigurationProvider configurationProvider, JPAUsersRepository usersRepository) {
+ public JPAUsersRepositoryInitialisationOperation(ConfigurationProvider configurationProvider, JPAUsersRepository usersRepository) {
this.configurationProvider = configurationProvider;
this.usersRepository = usersRepository;
}
diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java
index 3d32d08..4d6eafd 100644
--- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java
+++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java
@@ -32,7 +32,7 @@ import org.apache.james.mailbox.events.RetryBackoffConfiguration;
import org.apache.james.mailbox.events.delivery.EventDelivery;
import org.apache.james.mailbox.events.delivery.InVmEventDelivery;
import org.apache.james.server.core.configuration.ConfigurationProvider;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
@@ -43,7 +43,7 @@ import com.google.inject.multibindings.Multibinder;
public class DefaultEventModule extends AbstractModule {
@Override
protected void configure() {
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(ListenerRegistrationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(ListenerRegistrationPerformer.class);
bind(MailboxListenerFactory.class).in(Scopes.SINGLETON);
bind(MailboxListenersLoaderImpl.class).in(Scopes.SINGLETON);
@@ -68,7 +68,7 @@ public class DefaultEventModule extends AbstractModule {
}
@Singleton
- public static class ListenerRegistrationPerformer implements ConfigurationPerformer {
+ public static class ListenerRegistrationPerformer implements InitialisationOperation {
private final MailboxListenersLoaderImpl listeners;
private final ListenersConfiguration configuration;
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 d3f075b..3878944 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
@@ -42,7 +42,7 @@ import org.apache.james.mailetcontainer.impl.camel.CamelMailetProcessor;
import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.transport.mailets.RemoveMimeHeader;
import org.apache.james.transport.matchers.All;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.GuiceMailetLoader;
import org.apache.james.utils.GuiceMatcherLoader;
import org.apache.james.utils.GuiceProbe;
@@ -88,10 +88,10 @@ public class CamelMailetContainerModule extends AbstractModule {
Multibinder.newSetBinder(binder(), MailetConfigurationOverride.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(SpoolerProbe.class);
- Multibinder<ConfigurationPerformer> configurationPerformers = Multibinder.newSetBinder(binder(), ConfigurationPerformer.class);
- configurationPerformers.addBinding().to(MailetModuleConfigurationPerformer.class);
- configurationPerformers.addBinding().to(SpoolerStarter.class);
- configurationPerformers.addBinding().to(MailetContextConfigurationPerformer.class);
+ Multibinder<InitialisationOperation> initialisationOperations = Multibinder.newSetBinder(binder(), InitialisationOperation.class);
+ initialisationOperations.addBinding().to(MailetModuleInitialisationOperation.class);
+ initialisationOperations.addBinding().to(SpoolerStarter.class);
+ initialisationOperations.addBinding().to(MailetContextInitialisationOperation.class);
Multibinder<CamelMailetContainerModule.TransportProcessorCheck> transportProcessorChecks = Multibinder.newSetBinder(binder(), CamelMailetContainerModule.TransportProcessorCheck.class);
transportProcessorChecks.addBinding().toInstance(BCC_Check);
@@ -107,7 +107,7 @@ public class CamelMailetContainerModule extends AbstractModule {
}
@Singleton
- public static class SpoolerStarter implements ConfigurationPerformer {
+ public static class SpoolerStarter implements InitialisationOperation {
private final CamelCompositeProcessor camelCompositeProcessor;
private final JamesMailSpooler jamesMailSpooler;
private final ConfigurationProvider configurationProvider;
@@ -143,12 +143,12 @@ public class CamelMailetContainerModule extends AbstractModule {
}
@Singleton
- public static class MailetContextConfigurationPerformer implements ConfigurationPerformer {
+ public static class MailetContextInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final JamesMailetContext mailetContext;
@Inject
- public MailetContextConfigurationPerformer(ConfigurationProvider configurationProvider, JamesMailetContext mailetContext) {
+ public MailetContextInitialisationOperation(ConfigurationProvider configurationProvider, JamesMailetContext mailetContext) {
this.configurationProvider = configurationProvider;
this.mailetContext = mailetContext;
}
@@ -175,7 +175,7 @@ public class CamelMailetContainerModule extends AbstractModule {
}
@Singleton
- public static class MailetModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class MailetModuleInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final CamelCompositeProcessor camelCompositeProcessor;
private final DefaultProcessorsConfigurationSupplier defaultProcessorsConfigurationSupplier;
@@ -183,10 +183,10 @@ public class CamelMailetContainerModule extends AbstractModule {
private final DefaultCamelContext camelContext;
@Inject
- public MailetModuleConfigurationPerformer(ConfigurationProvider configurationProvider,
- CamelCompositeProcessor camelCompositeProcessor,
- Set<TransportProcessorCheck> transportProcessorCheckSet,
- DefaultProcessorsConfigurationSupplier defaultProcessorsConfigurationSupplier, DefaultCamelContext camelContext) {
+ public MailetModuleInitialisationOperation(ConfigurationProvider configurationProvider,
+ CamelCompositeProcessor camelCompositeProcessor,
+ Set<TransportProcessorCheck> transportProcessorCheckSet,
+ DefaultProcessorsConfigurationSupplier defaultProcessorsConfigurationSupplier, DefaultCamelContext camelContext) {
this.configurationProvider = configurationProvider;
this.camelCompositeProcessor = camelCompositeProcessor;
this.transportProcessorCheckSet = transportProcessorCheckSet;
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 f47f983..2b09793 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
@@ -40,7 +40,7 @@ import org.apache.james.rrt.memory.MemoryRecipientRewriteTable;
import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.memory.MemoryUsersRepository;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import com.google.common.collect.ImmutableList;
import com.google.inject.AbstractModule;
@@ -78,9 +78,9 @@ public class MemoryDataModule extends AbstractModule {
bind(EventSourcingDLPConfigurationStore.class).in(Scopes.SINGLETON);
bind(DLPConfigurationStore.class).to(EventSourcingDLPConfigurationStore.class);
- Multibinder<ConfigurationPerformer> configurationPerformers = Multibinder.newSetBinder(binder(), ConfigurationPerformer.class);
- configurationPerformers.addBinding().to(MemoryRRTConfigurationPerformer.class);
- configurationPerformers.addBinding().to(MemoryDomainListConfigurationPerformer.class);
+ Multibinder<InitialisationOperation> initialisationOperations = Multibinder.newSetBinder(binder(), InitialisationOperation.class);
+ initialisationOperations.addBinding().to(MemoryRRTInitialisationOperation.class);
+ initialisationOperations.addBinding().to(MemoryDomainListInitialisationOperation.class);
bind(MailStoreRepositoryModule.DefaultItemSupplier.class).toInstance(() -> MEMORY_MAILREPOSITORY_DEFAULT_DECLARATION);
@@ -99,12 +99,12 @@ public class MemoryDataModule extends AbstractModule {
}
@Singleton
- public static class MemoryDomainListConfigurationPerformer implements ConfigurationPerformer {
+ public static class MemoryDomainListInitialisationOperation implements InitialisationOperation {
private final DomainListConfiguration domainListConfiguration;
private final MemoryDomainList memoryDomainList;
@Inject
- public MemoryDomainListConfigurationPerformer(DomainListConfiguration domainListConfiguration, MemoryDomainList memoryDomainList) {
+ public MemoryDomainListInitialisationOperation(DomainListConfiguration domainListConfiguration, MemoryDomainList memoryDomainList) {
this.domainListConfiguration = domainListConfiguration;
this.memoryDomainList = memoryDomainList;
}
@@ -121,12 +121,12 @@ public class MemoryDataModule extends AbstractModule {
}
@Singleton
- public static class MemoryRRTConfigurationPerformer implements ConfigurationPerformer {
+ public static class MemoryRRTInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final MemoryRecipientRewriteTable memoryRecipientRewriteTable;
@Inject
- public MemoryRRTConfigurationPerformer(ConfigurationProvider configurationProvider, MemoryRecipientRewriteTable memoryRecipientRewriteTable) {
+ public MemoryRRTInitialisationOperation(ConfigurationProvider configurationProvider, MemoryRecipientRewriteTable memoryRecipientRewriteTable) {
this.configurationProvider = configurationProvider;
this.memoryRecipientRewriteTable = memoryRecipientRewriteTable;
}
diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java
index 51201ce..3297fa1 100644
--- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java
+++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java
@@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.modules.TestJMAPServerModule;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -56,7 +56,7 @@ class GuiceJamesServerTest {
@Nested
class InitFailed {
- private final ConfigurationPerformer throwingConfigurationPerformer = new ConfigurationPerformer() {
+ private final InitialisationOperation throwingInitialisationOperation = new InitialisationOperation() {
@Override
public void initModule() {
throw new RuntimeException();
@@ -70,9 +70,9 @@ class GuiceJamesServerTest {
@RegisterExtension
JamesServerExtension jamesServerExtension = extensionBuilder()
- .overrideServerModule(binder -> Multibinder.newSetBinder(binder, ConfigurationPerformer.class)
+ .overrideServerModule(binder -> Multibinder.newSetBinder(binder, InitialisationOperation.class)
.addBinding()
- .toInstance(throwingConfigurationPerformer))
+ .toInstance(throwingInitialisationOperation))
.build();
@Test
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 2f14973..c4fdd03 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
@@ -34,7 +34,7 @@ import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.server.core.configuration.ConfigurationProvider;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.GuiceProbe;
import com.google.inject.AbstractModule;
@@ -51,7 +51,7 @@ public class IMAPServerModule extends AbstractModule {
bind(IMAPServerFactory.class).in(Scopes.SINGLETON);
bind(OioIMAPServerFactory.class).in(Scopes.SINGLETON);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(IMAPModuleConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(IMAPModuleInitialisationOperation.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(ImapGuiceProbe.class);
}
@@ -86,13 +86,13 @@ public class IMAPServerModule extends AbstractModule {
}
@Singleton
- public static class IMAPModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class IMAPModuleInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final IMAPServerFactory imapServerFactory;
@Inject
- public IMAPModuleConfigurationPerformer(ConfigurationProvider configurationProvider, IMAPServerFactory imapServerFactory) {
+ public IMAPModuleInitialisationOperation(ConfigurationProvider configurationProvider, IMAPServerFactory imapServerFactory) {
this.configurationProvider = configurationProvider;
this.imapServerFactory = imapServerFactory;
}
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 88f9767..2edac9f 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
@@ -26,7 +26,7 @@ import org.apache.james.jmap.JMAPModule;
import org.apache.james.jmap.JMAPServer;
import org.apache.james.jmap.crypto.JamesSignatureHandler;
import org.apache.james.lifecycle.api.Startable;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.GuiceProbe;
import org.apache.james.utils.JmapGuiceProbe;
import org.apache.james.utils.MessageIdProbe;
@@ -42,19 +42,19 @@ public class JMAPServerModule extends AbstractModule {
@Override
protected void configure() {
install(new JMAPModule());
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(JMAPModuleConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(JMAPModuleInitialisationOperation.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(JmapGuiceProbe.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(MessageIdProbe.class);
}
@Singleton
- public static class JMAPModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class JMAPModuleInitialisationOperation implements InitialisationOperation {
private final JMAPServer server;
private final JamesSignatureHandler signatureHandler;
private final JMAPConfiguration jmapConfiguration;
@Inject
- public JMAPModuleConfigurationPerformer(JMAPServer server, JamesSignatureHandler signatureHandler, JMAPConfiguration jmapConfiguration) {
+ public JMAPModuleInitialisationOperation(JMAPServer server, JamesSignatureHandler signatureHandler, JMAPConfiguration jmapConfiguration) {
this.server = server;
this.signatureHandler = signatureHandler;
this.jmapConfiguration = jmapConfiguration;
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 7426bde..631490e 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
@@ -24,7 +24,7 @@ import org.apache.james.lmtpserver.netty.LMTPServerFactory;
import org.apache.james.lmtpserver.netty.OioLMTPServerFactory;
import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.util.LoggingLevel;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.GuiceProbe;
import com.google.inject.AbstractModule;
@@ -40,18 +40,18 @@ public class LMTPServerModule extends AbstractModule {
bind(LMTPServerFactory.class).in(Scopes.SINGLETON);
bind(OioLMTPServerFactory.class).in(Scopes.SINGLETON);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(LMTPModuleConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(LMTPModuleInitialisationOperation.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(LmtpGuiceProbe.class);
}
@Singleton
- public static class LMTPModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class LMTPModuleInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final LMTPServerFactory lmtpServerFactory;
@Inject
- public LMTPModuleConfigurationPerformer(ConfigurationProvider configurationProvider, LMTPServerFactory lmtpServerFactory) {
+ public LMTPModuleInitialisationOperation(ConfigurationProvider configurationProvider, LMTPServerFactory lmtpServerFactory) {
this.configurationProvider = configurationProvider;
this.lmtpServerFactory = lmtpServerFactory;
}
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 228ed85..a055a76 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
@@ -24,7 +24,7 @@ import org.apache.james.managesieve.core.CoreProcessor;
import org.apache.james.managesieveserver.netty.ManageSieveServerFactory;
import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.util.LoggingLevel;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.GuiceProbe;
import com.google.inject.AbstractModule;
@@ -37,17 +37,17 @@ public class ManageSieveServerModule extends AbstractModule {
@Override
protected void configure() {
bind(CoreCommands.class).to(CoreProcessor.class);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(ManageSieveModuleConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(ManageSieveModuleInitialisationOperation.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(SieveProbeImpl.class);
}
@Singleton
- public static class ManageSieveModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class ManageSieveModuleInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final ManageSieveServerFactory manageSieveServerFactory;
@Inject
- public ManageSieveModuleConfigurationPerformer(ConfigurationProvider configurationProvider, ManageSieveServerFactory manageSieveServerFactory) {
+ public ManageSieveModuleInitialisationOperation(ConfigurationProvider configurationProvider, ManageSieveServerFactory manageSieveServerFactory) {
this.configurationProvider = configurationProvider;
this.manageSieveServerFactory = manageSieveServerFactory;
}
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 3c1c2b1..c5d4a38 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
@@ -23,7 +23,7 @@ import org.apache.james.lifecycle.api.Startable;
import org.apache.james.pop3server.netty.OioPOP3ServerFactory;
import org.apache.james.pop3server.netty.POP3ServerFactory;
import org.apache.james.server.core.configuration.ConfigurationProvider;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.GuiceProbe;
import com.google.inject.AbstractModule;
@@ -39,17 +39,17 @@ public class POP3ServerModule extends AbstractModule {
bind(POP3ServerFactory.class).in(Scopes.SINGLETON);
bind(OioPOP3ServerFactory.class).in(Scopes.SINGLETON);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(POP3ModuleConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(POP3ModuleInitialisationOperation.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(Pop3GuiceProbe.class);
}
@Singleton
- public static class POP3ModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class POP3ModuleInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final POP3ServerFactory pop3ServerFactory;
@Inject
- public POP3ModuleConfigurationPerformer(ConfigurationProvider configurationProvider, POP3ServerFactory pop3ServerFactory) {
+ public POP3ModuleInitialisationOperation(ConfigurationProvider configurationProvider, POP3ServerFactory pop3ServerFactory) {
this.configurationProvider = configurationProvider;
this.pop3ServerFactory = pop3ServerFactory;
}
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 3a9438f..4d530ce 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
@@ -24,7 +24,7 @@ import org.apache.james.server.core.configuration.ConfigurationProvider;
import org.apache.james.smtpserver.SendMailHandler;
import org.apache.james.smtpserver.netty.OioSMTPServerFactory;
import org.apache.james.smtpserver.netty.SMTPServerFactory;
-import org.apache.james.utils.ConfigurationPerformer;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.GuiceProbe;
import com.google.inject.AbstractModule;
@@ -41,21 +41,21 @@ public class SMTPServerModule extends AbstractModule {
bind(SMTPServerFactory.class).in(Scopes.SINGLETON);
bind(OioSMTPServerFactory.class).in(Scopes.SINGLETON);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(SMTPModuleConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(SMTPModuleInitialisationOperation.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(SmtpGuiceProbe.class);
}
@Singleton
- public static class SMTPModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class SMTPModuleInitialisationOperation implements InitialisationOperation {
private final ConfigurationProvider configurationProvider;
private final SMTPServerFactory smtpServerFactory;
private final SendMailHandler sendMailHandler;
@Inject
- public SMTPModuleConfigurationPerformer(ConfigurationProvider configurationProvider,
- SMTPServerFactory smtpServerFactory,
- SendMailHandler sendMailHandler) {
+ public SMTPModuleInitialisationOperation(ConfigurationProvider configurationProvider,
+ SMTPServerFactory smtpServerFactory,
+ SendMailHandler sendMailHandler) {
this.configurationProvider = configurationProvider;
this.smtpServerFactory = smtpServerFactory;
this.sendMailHandler = sendMailHandler;
diff --git a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java
index b333cec..372bd75 100644
--- a/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java
+++ b/server/container/guice/protocols/webadmin/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java
@@ -27,8 +27,8 @@ import java.util.Optional;
import org.apache.commons.configuration2.Configuration;
import org.apache.james.jwt.JwtTokenVerifier;
import org.apache.james.lifecycle.api.Startable;
-import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.GuiceProbe;
+import org.apache.james.utils.InitialisationOperation;
import org.apache.james.utils.PropertiesProvider;
import org.apache.james.utils.WebAdminGuiceProbe;
import org.apache.james.webadmin.FixedPortSupplier;
@@ -71,7 +71,7 @@ public class WebAdminServerModule extends AbstractModule {
bind(JsonTransformer.class).in(Scopes.SINGLETON);
bind(WebAdminServer.class).in(Scopes.SINGLETON);
- Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(WebAdminServerModuleConfigurationPerformer.class);
+ Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(WebAdminServerModuleInitialisationOperation.class);
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(WebAdminGuiceProbe.class);
Multibinder.newSetBinder(binder(), JsonTransformerModule.class);
}
@@ -124,11 +124,11 @@ public class WebAdminServerModule extends AbstractModule {
}
@Singleton
- public static class WebAdminServerModuleConfigurationPerformer implements ConfigurationPerformer {
+ public static class WebAdminServerModuleInitialisationOperation implements InitialisationOperation {
private final WebAdminServer webAdminServer;
@Inject
- public WebAdminServerModuleConfigurationPerformer(WebAdminServer webAdminServer) {
+ public WebAdminServerModuleInitialisationOperation(WebAdminServer webAdminServer) {
this.webAdminServer = webAdminServer;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org