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 e31ee4e6adb92cc8b32f559650a4cda99d52bc20 Author: Benoit Tellier <[email protected]> AuthorDate: Wed Mar 13 18:04:09 2019 +0700 JAMES-2684 Rename JamesServerExtensionBuilder to JamesServerBuilder --- .../java/org/apache/james/CassandraJamesServerTest.java | 2 +- .../org/apache/james/CassandraJmapJamesServerTest.java | 2 +- .../james/CassandraMailRepositoryIntegrationTest.java | 2 +- .../james/CassandraMessageIdManagerInjectionTest.java | 2 +- .../test/java/org/apache/james/CassandraNodeConfTest.java | 6 +++--- .../org/apache/james/CassandraVersionCheckingTest.java | 2 +- .../test/java/org/apache/james/CassandraWithTikaTest.java | 2 +- .../org/apache/james/DefaultCassandraJamesServerTest.java | 2 +- .../src/test/java/org/apache/james/ESReporterTest.java | 2 +- .../test/java/org/apache/james/FixingGhostMailboxTest.java | 2 +- .../java/org/apache/james/JamesCapabilitiesServerTest.java | 2 +- .../apache/james/JamesServerWithRetryConnectionTest.java | 2 +- .../org/apache/james/CassandraLdapJamesServerTest.java | 2 +- .../org/apache/james/CassandraLdapJmapJamesServerTest.java | 2 +- .../org/apache/james/CassandraRabbitMQJamesServerTest.java | 6 +++--- .../james/CassandraRabbitMQLdapJmapJamesServerTest.java | 4 ++-- ...ServerExtensionBuilder.java => JamesServerBuilder.java} | 14 +++++++------- .../src/test/java/org/apache/james/JPAJamesServerTest.java | 2 +- ...esServerWithAuthenticatedDatabaseSqlValidationTest.java | 2 +- ...rWithNoDatabaseAuthenticaticationSqlValidationTest.java | 2 +- .../java/org/apache/james/JamesCapabilitiesServerTest.java | 2 +- .../org/apache/james/DefaultMemoryJamesServerTest.java | 2 +- .../test/java/org/apache/james/GuiceJamesServerTest.java | 4 ++-- .../org/apache/james/GuiceLifecycleHeathCheckTest.java | 4 ++-- .../test/java/org/apache/james/MemoryJamesServerTest.java | 2 +- .../java/org/apache/james/MemoryJmapJamesServerTest.java | 2 +- .../james/jmap/cassandra/CassandraSendMDNMethodTest.java | 4 ++-- .../jmap/cassandra/CassandraSpamAssassinContractTest.java | 4 ++-- .../apache/james/jmap/memory/MemorySendMDNMethodTest.java | 4 ++-- .../james/jmap/memory/MemorySpamAssassinContractTest.java | 4 ++-- .../james/jmap/rabbitmq/RabbitMQSendMDNMethodTest.java | 4 ++-- .../jmap/rabbitmq/RabbitMQSpamAssassinContractTest.java | 4 ++-- 32 files changed, 51 insertions(+), 51 deletions(-) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java index c368cd7..3982605 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java @@ -33,7 +33,7 @@ class CassandraJamesServerTest implements JamesServerContract { private static final int LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java index f85f1d4..92ec06f 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJmapJamesServerTest.java @@ -30,7 +30,7 @@ class CassandraJmapJamesServerTest implements JmapJamesServerContract { private static final int LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java index 0c3797a..ffc378f 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraMailRepositoryIntegrationTest.java @@ -52,7 +52,7 @@ class CassandraMailRepositoryIntegrationTest { private SMTPMessageSender smtpMessageSender = new SMTPMessageSender("other.com"); @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) 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 849d634..f245a65 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 @@ -42,7 +42,7 @@ class CassandraMessageIdManagerInjectionTest { private static final int LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java index bfaf593..6b0047a 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraNodeConfTest.java @@ -65,7 +65,7 @@ class CassandraNodeConfTest { @Nested class NormalBehaviour { @RegisterExtension - JamesServerExtension testExtension = new JamesServerExtensionBuilder() + JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) @@ -88,7 +88,7 @@ class CassandraNodeConfTest { private final DockerCassandraRule cassandra = new DockerCassandraRule(); @RegisterExtension - JamesServerExtension testExtension = new JamesServerExtensionBuilder() + JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension(cassandra)) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) @@ -113,7 +113,7 @@ class CassandraNodeConfTest { private final DockerCassandraRule cassandra = new DockerCassandraRule(); @RegisterExtension - JamesServerExtension testExtension = new JamesServerExtensionBuilder() + JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension(cassandra)) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraVersionCheckingTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraVersionCheckingTest.java index 0b0e335..6dab649 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraVersionCheckingTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraVersionCheckingTest.java @@ -54,7 +54,7 @@ class CassandraVersionCheckingTest { private static CassandraSchemaVersionDAO versionDAO = mock(CassandraSchemaVersionDAO.class); @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java index d82e6ee..c967b68 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraWithTikaTest.java @@ -29,7 +29,7 @@ class CassandraWithTikaTest implements JamesServerContract { @RegisterExtension static JamesServerExtension testExtension = - new JamesServerExtensionBuilder() + new JamesServerBuilder() .extension(new CassandraExtension()) .extension(new TikaExtension()) .extension(new EmbeddedElasticSearchExtension()) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java index 65495b5..362d929 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java @@ -36,7 +36,7 @@ class DefaultCassandraJamesServerTest { private static final int LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java index ecd37a2..65392fd 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java @@ -64,7 +64,7 @@ class ESReporterTest { static final EmbeddedElasticSearchExtension embeddedElasticSearchExtension = new EmbeddedElasticSearchExtension(); @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(embeddedElasticSearchExtension) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java index 51e1e7d..0076501 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java @@ -95,7 +95,7 @@ public class FixingGhostMailboxTest { public static final DockerCassandraRule cassandra = new DockerCassandraRule(); @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension(cassandra)) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index c1ba326..089f6ec 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -38,7 +38,7 @@ class JamesCapabilitiesServerTest { private static final int LIMIT_MAX_MESSAGES = 10; @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java index 1126bed..685f89a 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java @@ -55,7 +55,7 @@ class JamesServerWithRetryConnectionTest { private static final DockerCassandraRule cassandraRule = new DockerCassandraRule(); @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new DockerElasticSearchExtension(elasticSearchContainer)) .extension(new CassandraExtension(cassandraRule)) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java index 61f11c6..dcc156e 100644 --- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java +++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJamesServerTest.java @@ -54,7 +54,7 @@ class CassandraLdapJamesServerTest implements JamesServerContract { SMTPMessageSender messageSender = new SMTPMessageSender(Domain.LOCALHOST.asString()); @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .extension(new LdapTestExtension()) diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java index 853603a..0d79356 100644 --- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java +++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/CassandraLdapJmapJamesServerTest.java @@ -26,7 +26,7 @@ class CassandraLdapJmapJamesServerTest implements JmapJamesServerContract { private static final int LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .extension(new LdapTestExtension()) diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java index b5ddbed..ae2a724 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/CassandraRabbitMQJamesServerTest.java @@ -84,7 +84,7 @@ class CassandraRabbitMQJamesServerTest { .and().pollDelay(ONE_HUNDRED_MILLISECONDS) .await(); - private static final JamesServerExtensionBuilder.ServerProvider CONFIGURATION_BUILDER = + private static final JamesServerBuilder.ServerProvider CONFIGURATION_BUILDER = configuration -> GuiceJamesServer .forConfiguration(configuration) .combineWith(CassandraRabbitMQJamesServerMain.MODULES) @@ -135,8 +135,8 @@ class CassandraRabbitMQJamesServerTest { JamesServerExtension testExtension = baseExtensionBuilder().build(); } - private static JamesServerExtensionBuilder baseExtensionBuilder() { - return new JamesServerExtensionBuilder() + private static JamesServerBuilder baseExtensionBuilder() { + return new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .extension(new RabbitMQExtension()) diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java index 7fdb315..41f0438 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java @@ -73,8 +73,8 @@ class CassandraRabbitMQLdapJmapJamesServerTest { .build(); } - JamesServerExtensionBuilder baseJamesServerExtensionBuilder() { - return new JamesServerExtensionBuilder() + JamesServerBuilder baseJamesServerExtensionBuilder() { + return new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .extension(new RabbitMQExtension()) diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerExtensionBuilder.java b/server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerBuilder.java similarity index 89% rename from server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerExtensionBuilder.java rename to server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerBuilder.java index 1dbee14..8f38e5b 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerExtensionBuilder.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerBuilder.java @@ -30,7 +30,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.inject.Module; -public class JamesServerExtensionBuilder { +public class JamesServerBuilder { private static final boolean DEFAULT_AUTO_START = true; @FunctionalInterface @@ -49,33 +49,33 @@ public class JamesServerExtensionBuilder { private Optional<ConfigurationProvider> configuration; private Optional<Boolean> autoStart; - public JamesServerExtensionBuilder() { + public JamesServerBuilder() { configuration = Optional.empty(); extensions = ImmutableList.builder(); folderRegistrableExtension = new TemporaryFolderRegistrableExtension(); autoStart = Optional.empty(); } - public JamesServerExtensionBuilder extensions(GuiceModuleTestExtension... extensions) { + public JamesServerBuilder extensions(GuiceModuleTestExtension... extensions) { this.extensions.add(extensions); return this; } - public JamesServerExtensionBuilder extension(GuiceModuleTestExtension extension) { + public JamesServerBuilder extension(GuiceModuleTestExtension extension) { return this.extensions(extension); } - public JamesServerExtensionBuilder configuration(ConfigurationProvider configuration) throws UncheckedIOException { + public JamesServerBuilder configuration(ConfigurationProvider configuration) throws UncheckedIOException { this.configuration = Optional.of(configuration); return this; } - public JamesServerExtensionBuilder server(ServerProvider server) { + public JamesServerBuilder server(ServerProvider server) { this.server = server; return this; } - public JamesServerExtensionBuilder disableAutoStart() { + public JamesServerBuilder disableAutoStart() { this.autoStart = Optional.of(false); return this; } diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java index 21dc93f..7efb399 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java @@ -41,7 +41,7 @@ import com.google.common.base.Strings; class JPAJamesServerTest implements JamesServerContract { @RegisterExtension - static JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(JPAJamesServerMain.JPA_MODULE_AGGREGATE) .overrideWith(new TestJPAConfigurationModule(), DOMAIN_LIST_CONFIGURATION_MODULE)) diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java index 863d22d..63e950b 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; class JPAJamesServerWithAuthenticatedDatabaseSqlValidationTest extends JPAJamesServerWithSqlValidationTest { @RegisterExtension - static JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(JPAJamesServerMain.JPA_MODULE_AGGREGATE) .overrideWith(new TestJPAConfigurationModuleWithSqlValidation.WithDatabaseAuthentication(), DOMAIN_LIST_CONFIGURATION_MODULE)) diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java index 4f1b4c1..2f4a70d 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; class JPAJamesServerWithNoDatabaseAuthenticaticationSqlValidationTest extends JPAJamesServerWithSqlValidationTest { @RegisterExtension - static JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(JPAJamesServerMain.JPA_MODULE_AGGREGATE) .overrideWith(new TestJPAConfigurationModuleWithSqlValidation.NoDatabaseAuthentication(), DOMAIN_LIST_CONFIGURATION_MODULE)) diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 5876c11..4da401b 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -40,7 +40,7 @@ class JamesCapabilitiesServerTest { } @RegisterExtension - static JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(JPAJamesServerMain.JPA_MODULE_AGGREGATE) .overrideWith(new TestJPAConfigurationModule()) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java index 47a8d19..c1ad2eb 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java @@ -35,7 +35,7 @@ class DefaultMemoryJamesServerTest { private static final int LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - static JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) 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 b3b5a97..7c9831a 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 @@ -27,7 +27,7 @@ class GuiceJamesServerTest { @Nested class NormalBehaviour { @RegisterExtension - JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) @@ -72,7 +72,7 @@ class GuiceJamesServerTest { }; @RegisterExtension - JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java index 86576bd..aeff8dd 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceLifecycleHeathCheckTest.java @@ -64,7 +64,7 @@ class GuiceLifecycleHeathCheckTest { @Nested class Healthy { @RegisterExtension - JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) @@ -108,7 +108,7 @@ class GuiceLifecycleHeathCheckTest { CountDownLatch latch = new CountDownLatch(1); @RegisterExtension - JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java index 3874851..db9be8e 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java @@ -28,7 +28,7 @@ class MemoryJamesServerTest implements JamesServerContract { private static final int LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - static JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java index a1d551d..47afa30 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapJamesServerTest.java @@ -28,7 +28,7 @@ class MemoryJmapJamesServerTest implements JmapJamesServerContract { private static final int LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - static JamesServerExtension jamesServerExtension = new JamesServerExtensionBuilder() + static JamesServerExtension jamesServerExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java index 13d414d..31798fe 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java @@ -24,8 +24,8 @@ import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MO import org.apache.james.CassandraExtension; import org.apache.james.EmbeddedElasticSearchExtension; import org.apache.james.GuiceJamesServer; +import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; -import org.apache.james.JamesServerExtensionBuilder; import org.apache.james.jmap.methods.integration.SendMDNMethodTest; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.extractor.TextExtractor; @@ -39,7 +39,7 @@ public class CassandraSendMDNMethodTest extends SendMDNMethodTest { private static final long LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - JamesServerExtension testExtension = new JamesServerExtensionBuilder() + JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java index 610d0d3..7d8ad0c 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSpamAssassinContractTest.java @@ -23,8 +23,8 @@ import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MO import org.apache.james.CassandraExtension; import org.apache.james.EmbeddedElasticSearchExtension; import org.apache.james.GuiceJamesServer; +import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; -import org.apache.james.JamesServerExtensionBuilder; import org.apache.james.jmap.methods.integration.SpamAssassinContract; import org.apache.james.jmap.methods.integration.SpamAssassinModuleExtension; import org.apache.james.mailbox.extractor.TextExtractor; @@ -38,7 +38,7 @@ class CassandraSpamAssassinContractTest implements SpamAssassinContract { private static final SpamAssassinModuleExtension spamAssassinExtension = new SpamAssassinModuleExtension(); @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .extension(spamAssassinExtension) diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java index a8f3d6f..7728735 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySendMDNMethodTest.java @@ -24,8 +24,8 @@ import java.util.Random; import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.james.GuiceJamesServer; +import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; -import org.apache.james.JamesServerExtensionBuilder; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.SendMDNMethodTest; import org.apache.james.mailbox.extractor.TextExtractor; @@ -42,7 +42,7 @@ public class MemorySendMDNMethodTest extends SendMDNMethodTest { private static final long LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - JamesServerExtension testExtension = new JamesServerExtensionBuilder() + JamesServerExtension testExtension = new JamesServerBuilder() .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java index 5d1ab3e..3463118 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySpamAssassinContractTest.java @@ -21,8 +21,8 @@ package org.apache.james.jmap.memory; import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.james.GuiceJamesServer; +import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; -import org.apache.james.JamesServerExtensionBuilder; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.SpamAssassinContract; import org.apache.james.jmap.methods.integration.SpamAssassinModuleExtension; @@ -39,7 +39,7 @@ class MemorySpamAssassinContractTest implements SpamAssassinContract { private static final SpamAssassinModuleExtension spamAssassinExtension = new SpamAssassinModuleExtension(); @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(spamAssassinExtension) .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSendMDNMethodTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSendMDNMethodTest.java index 10fe8d2..a4351cd 100644 --- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSendMDNMethodTest.java @@ -23,8 +23,8 @@ import org.apache.james.CassandraExtension; import org.apache.james.CassandraRabbitMQJamesServerMain; import org.apache.james.EmbeddedElasticSearchExtension; import org.apache.james.GuiceJamesServer; +import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; -import org.apache.james.JamesServerExtensionBuilder; import org.apache.james.jmap.methods.integration.SendMDNMethodTest; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.extractor.TextExtractor; @@ -40,7 +40,7 @@ public class RabbitMQSendMDNMethodTest extends SendMDNMethodTest { private static final long LIMIT_TO_10_MESSAGES = 10; @RegisterExtension - JamesServerExtension testExtension = new JamesServerExtensionBuilder() + JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .extension(new SwiftBlobStoreExtension()) diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSpamAssassinContractTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSpamAssassinContractTest.java index c74dedf..a72a6a9 100644 --- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSpamAssassinContractTest.java +++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQSpamAssassinContractTest.java @@ -22,8 +22,8 @@ import org.apache.james.CassandraExtension; import org.apache.james.CassandraRabbitMQJamesServerMain; import org.apache.james.EmbeddedElasticSearchExtension; import org.apache.james.GuiceJamesServer; +import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; -import org.apache.james.JamesServerExtensionBuilder; import org.apache.james.jmap.methods.integration.SpamAssassinContract; import org.apache.james.jmap.methods.integration.SpamAssassinModuleExtension; import org.apache.james.mailbox.extractor.TextExtractor; @@ -39,7 +39,7 @@ class RabbitMQSpamAssassinContractTest implements SpamAssassinContract { private static final SpamAssassinModuleExtension spamAssassinExtension = new SpamAssassinModuleExtension(); @RegisterExtension - static JamesServerExtension testExtension = new JamesServerExtensionBuilder() + static JamesServerExtension testExtension = new JamesServerBuilder() .extension(new EmbeddedElasticSearchExtension()) .extension(new CassandraExtension()) .extension(new RabbitMQExtension()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
