http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java index 5709c52..743d25c 100644 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java +++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java @@ -44,6 +44,7 @@ import org.apache.james.modules.server.RawPostDequeueDecoratorModule; import org.apache.james.modules.server.SwaggerRoutesModule; import org.apache.james.modules.server.WebAdminServerModule; import org.apache.james.modules.spamassassin.SpamAssassinListenerModule; +import org.apache.james.server.core.configuration.Configuration; import com.google.inject.Module; import com.google.inject.util.Modules; @@ -81,7 +82,8 @@ public class JPAJamesServerMain { new SpamAssassinListenerModule()); public static void main(String[] args) throws Exception { - GuiceJamesServer server = new GuiceJamesServer() + Configuration configuration = Configuration.builder().useWorkingDirectoryEnvProperty().build(); + GuiceJamesServer server = new GuiceJamesServer(configuration) .combineWith(JPA_SERVER_MODULE, PROTOCOLS, new JMXServerModule(), new LuceneSearchMailboxModule());
http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java ---------------------------------------------------------------------- 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 ee2144f..114b060 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 @@ -21,10 +21,12 @@ package org.apache.james; import static org.assertj.core.api.Assertions.assertThat; +import java.io.IOException; + import org.apache.james.mailbox.quota.QuotaSize; import org.apache.james.mailbox.store.mail.model.SerializableQuotaValue; import org.apache.james.modules.QuotaProbesImpl; -import org.apache.james.modules.TestFilesystemModule; +import org.apache.james.server.core.configuration.Configuration; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; @@ -58,11 +60,15 @@ public class JPAJamesServerTest extends AbstractJamesServerTest { public SMTPMessageSender smtpMessageSender = new SMTPMessageSender(DOMAIN); @Override - protected GuiceJamesServer createJamesServer() { - return new GuiceJamesServer() + protected GuiceJamesServer createJamesServer() throws IOException { + Configuration configuration = Configuration.builder() + .workingDirectory(temporaryFolder.newFolder()) + .configurationFromClasspath() + .build(); + + return new GuiceJamesServer(configuration) .combineWith(JPAJamesServerMain.JPA_SERVER_MODULE, JPAJamesServerMain.PROTOCOLS) - .overrideWith(new TestFilesystemModule(temporaryFolder), - new TestJPAConfigurationModule()); + .overrideWith(new TestJPAConfigurationModule()); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java ---------------------------------------------------------------------- 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 9078637..b513fe8 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 @@ -21,10 +21,11 @@ package org.apache.james; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.io.IOException; import java.util.EnumSet; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.modules.TestFilesystemModule; +import org.apache.james.server.core.configuration.Configuration; import org.junit.After; import org.junit.Rule; import org.junit.Test; @@ -46,13 +47,16 @@ public class JamesCapabilitiesServerTest { server.stop(); } - private GuiceJamesServer createJPAJamesServer(final MailboxManager mailboxManager) { + private GuiceJamesServer createJPAJamesServer(final MailboxManager mailboxManager) throws IOException { Module mockMailboxManager = (binder) -> binder.bind(MailboxManager.class).toInstance(mailboxManager); - - return new GuiceJamesServer() + Configuration configuration = Configuration.builder() + .workingDirectory(temporaryFolder.newFolder()) + .configurationFromClasspath() + .build(); + + return new GuiceJamesServer(configuration) .combineWith(JPAJamesServerMain.JPA_SERVER_MODULE) .overrideWith( - new TestFilesystemModule(temporaryFolder), new TestJPAConfigurationModule(), mockMailboxManager); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java index 5346eda..7a329f7 100644 --- a/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java +++ b/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java @@ -33,6 +33,7 @@ import org.apache.james.modules.server.MailRepositoriesRoutesModule; import org.apache.james.modules.server.NoJwtModule; import org.apache.james.modules.server.RawPostDequeueDecoratorModule; import org.apache.james.modules.server.WebAdminServerModule; +import org.apache.james.server.core.configuration.Configuration; import org.apache.openjpa.persistence.OpenJPAPersistence; import com.google.inject.Module; @@ -58,7 +59,8 @@ public class JPAJamesServerMain { new ElasticSearchMetricReporterModule()); public static void main(String[] args) throws Exception { - GuiceJamesServer server = new GuiceJamesServer() + Configuration configuration = Configuration.builder().useWorkingDirectoryEnvProperty().build(); + GuiceJamesServer server = new GuiceJamesServer(configuration) .combineWith(JPA_SERVER_MODULE, PROTOCOLS); server.start(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java index 01e6b36..93a74f1 100644 --- a/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java +++ b/server/container/guice/jpa-smtp/src/test/java/org/apache/james/JPAJamesServerTest.java @@ -31,8 +31,8 @@ import javax.persistence.EntityManagerFactory; import org.apache.james.backends.jpa.JpaTestCluster; import org.apache.james.domainlist.jpa.model.JPADomain; -import org.apache.james.modules.TestFilesystemModule; import org.apache.james.rrt.jpa.model.JPARecipientRewrite; +import org.apache.james.server.core.configuration.Configuration; import org.apache.james.user.jpa.model.JPAUser; import org.junit.After; import org.junit.Before; @@ -55,11 +55,15 @@ public class JPAJamesServerTest { server.stop(); } - private org.apache.james.GuiceJamesServer createJamesServer() { - return new GuiceJamesServer() + private org.apache.james.GuiceJamesServer createJamesServer() throws IOException { + Configuration configuration = Configuration.builder() + .workingDirectory(temporaryFolder.newFolder()) + .configurationFromClasspath() + .build(); + + return new GuiceJamesServer(configuration) .combineWith(JPAJamesServerMain.JPA_SERVER_MODULE, JPAJamesServerMain.PROTOCOLS) .overrideWith( - new TestFilesystemModule(temporaryFolder), new TestJPAConfigurationModule(), (binder) -> binder.bind(EntityManagerFactory.class) .toInstance(JpaTestCluster.create(JPAUser.class, JPADomain.class, JPARecipientRewrite.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java ---------------------------------------------------------------------- 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 e5ee1b3..70c3590 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 @@ -33,8 +33,8 @@ import org.apache.james.mailbox.store.event.MailboxAnnotationListener; import org.apache.james.mailbox.store.event.MailboxListenerRegistry; import org.apache.james.mailbox.store.event.SynchronousEventDelivery; import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater; +import org.apache.james.server.core.configuration.ConfigurationProvider; import org.apache.james.utils.ConfigurationPerformer; -import org.apache.james.utils.ConfigurationProvider; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java ---------------------------------------------------------------------- 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 b58fc16..1f742a8 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 @@ -40,11 +40,11 @@ import org.apache.james.mailetcontainer.impl.MatcherMailetPair; import org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor; import org.apache.james.mailetcontainer.impl.camel.CamelMailetProcessor; import org.apache.james.queue.api.MailQueueFactory; +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.user.api.UsersRepository; import org.apache.james.utils.ConfigurationPerformer; -import org.apache.james.utils.ConfigurationProvider; import org.apache.james.utils.GuiceMailetLoader; import org.apache.james.utils.GuiceMatcherLoader; import org.apache.mailet.MailetContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java index b7b3a1b..7754663 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java @@ -42,6 +42,7 @@ import org.apache.james.modules.server.RawPostDequeueDecoratorModule; import org.apache.james.modules.server.SwaggerRoutesModule; import org.apache.james.modules.server.WebAdminServerModule; import org.apache.james.modules.spamassassin.SpamAssassinListenerModule; +import org.apache.james.server.core.configuration.Configuration; import com.google.inject.Module; import com.google.inject.util.Modules; @@ -95,7 +96,8 @@ public class MemoryJamesServerMain { WEBADMIN); public static void main(String[] args) throws Exception { - new GuiceJamesServer() + Configuration configuration = Configuration.builder().useWorkingDirectoryEnvProperty().build(); + new GuiceJamesServer(configuration) .combineWith(IN_MEMORY_SERVER_AGGREGATE_MODULE, new JMXServerModule()) .start(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java ---------------------------------------------------------------------- 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 7f6ad5c..90b689d 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 @@ -27,10 +27,10 @@ import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.rrt.api.RecipientRewriteTable; 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.ConfigurationProvider; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java ---------------------------------------------------------------------- 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 ec90ac2..9f82501 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 @@ -21,8 +21,10 @@ package org.apache.james; import static org.assertj.core.api.Assertions.assertThat; +import java.io.IOException; + import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.james.utils.ConfigurationProvider; +import org.apache.james.server.core.configuration.ConfigurationProvider; import org.apache.james.utils.FailingPropertiesProvider; import org.apache.james.utils.PropertiesProvider; import org.junit.After; @@ -38,7 +40,7 @@ public class DefaultMemoryJamesServerTest { private GuiceJamesServer guiceJamesServer; @Before - public void setUp() { + public void setUp() throws IOException { guiceJamesServer = memoryJmap.jmapServer() .overrideWith(binder -> binder.bind(PropertiesProvider.class).to(FailingPropertiesProvider.class)) .overrideWith(binder -> binder.bind(ConfigurationProvider.class).toInstance(s -> new HierarchicalConfiguration())); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java ---------------------------------------------------------------------- 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 4bcc2b5..0752504 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 @@ -2,6 +2,7 @@ package org.apache.james; import static org.assertj.core.api.Assertions.assertThat; +import java.io.IOException; import java.util.List; import org.apache.james.lifecycle.api.Configurable; @@ -40,7 +41,7 @@ public class GuiceJamesServerTest { @Before - public void setUp() { + public void setUp() throws IOException { guiceJamesServer = memoryJmapTestRule.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJamesServerTest.java ---------------------------------------------------------------------- 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 3a4f2b9..e4f2410 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 @@ -19,6 +19,8 @@ package org.apache.james; +import java.io.IOException; + import org.junit.Rule; public class MemoryJamesServerTest extends AbstractJmapJamesServerTest { @@ -27,7 +29,7 @@ public class MemoryJamesServerTest extends AbstractJmapJamesServerTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJamesServer() { + protected GuiceJamesServer createJamesServer() throws IOException { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java index c884e84..69762f2 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/MemoryJmapTestRule.java @@ -19,14 +19,16 @@ package org.apache.james; +import java.io.IOException; + import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.MessageSearchIndex; import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex; -import org.apache.james.modules.TestFilesystemModule; import org.apache.james.modules.TestJMAPServerModule; +import org.apache.james.server.core.configuration.Configuration; import org.junit.rules.TemporaryFolder; import org.junit.rules.TestRule; import org.junit.runner.Description; @@ -40,12 +42,15 @@ public class MemoryJmapTestRule implements TestRule { public TemporaryFolder temporaryFolder = new TemporaryFolder(); - public GuiceJamesServer jmapServer(Module... modules) { - return new GuiceJamesServer() + public GuiceJamesServer jmapServer(Module... modules) throws IOException { + Configuration configuration = Configuration.builder() + .workingDirectory(temporaryFolder.newFolder()) + .configurationFromClasspath() + .build(); + return new GuiceJamesServer(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(modules) - .overrideWith(new TestFilesystemModule(temporaryFolder), - new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)) + .overrideWith(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)) .overrideWith(binder -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class)) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(MessageSearchIndex.class).to(SimpleMessageSearchIndex.class)); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java ---------------------------------------------------------------------- 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 3273779..07ae885 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,8 +34,8 @@ 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.modules.Names; +import org.apache.james.server.core.configuration.ConfigurationProvider; import org.apache.james.utils.ConfigurationPerformer; -import org.apache.james.utils.ConfigurationProvider; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java index b5bd236..30227c0 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java @@ -45,9 +45,9 @@ import org.apache.james.mailbox.MailboxManager.SearchCapabilities; import org.apache.james.mailetcontainer.impl.MatcherMailetPair; import org.apache.james.modules.server.CamelMailetContainerModule; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; +import org.apache.james.server.core.configuration.FileConfigurationProvider; import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.utils.ConfigurationPerformer; -import org.apache.james.utils.FileConfigurationProvider; import org.apache.james.utils.PropertiesProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java index 1b1bcb7..27f01eb 100644 --- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java @@ -68,7 +68,7 @@ public abstract class AbstractJmapJamesServerTest { .build(); } - protected abstract GuiceJamesServer createJamesServer(); + protected abstract GuiceJamesServer createJamesServer() throws IOException; protected abstract void clean(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java ---------------------------------------------------------------------- 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 c173643..38eacb5 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 @@ -23,8 +23,8 @@ import java.util.List; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lmtpserver.netty.LMTPServerFactory; +import org.apache.james.server.core.configuration.ConfigurationProvider; import org.apache.james.utils.ConfigurationPerformer; -import org.apache.james.utils.ConfigurationProvider; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java ---------------------------------------------------------------------- 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 789c404..b4d4e51 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,8 +24,8 @@ import org.apache.james.lifecycle.api.Configurable; import org.apache.james.managesieve.api.commands.CoreCommands; 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.utils.ConfigurationPerformer; -import org.apache.james.utils.ConfigurationProvider; import org.apache.james.utils.GuiceProbe; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java ---------------------------------------------------------------------- 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 33afc9d..4fd8b57 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,8 +23,8 @@ import java.util.List; import org.apache.james.lifecycle.api.Configurable; 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.ConfigurationProvider; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java ---------------------------------------------------------------------- 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 5ca76a3..db4bddc 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 @@ -22,10 +22,10 @@ package org.apache.james.modules.protocols; import java.util.List; import org.apache.james.lifecycle.api.Configurable; +import org.apache.james.server.core.configuration.ConfigurationProvider; import org.apache.james.smtpserver.SendMailHandler; import org.apache.james.smtpserver.netty.SMTPServerFactory; import org.apache.james.utils.ConfigurationPerformer; -import org.apache.james.utils.ConfigurationProvider; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java deleted file mode 100644 index 6a38d4d..0000000 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james.mailets; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; -import java.util.function.Supplier; - -import org.apache.commons.io.IOUtils; -import org.apache.james.filesystem.api.FileSystem; -import org.apache.james.filesystem.api.JamesDirectoriesProvider; -import org.apache.james.modules.CommonServicesModule; -import org.apache.james.server.core.JamesServerResourceLoader; -import org.junit.rules.TemporaryFolder; - -import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableList; -import com.google.inject.AbstractModule; -import com.google.inject.name.Names; - -public class TemporaryFilesystemModule extends AbstractModule { - - private static final List<String> CONFIGURATION_FILE_NAMES = ImmutableList.of("dnsservice.xml", - "domainlist.xml", - "imapserver.xml", - "keystore", - "lmtpserver.xml", - "mailrepositorystore.xml", - "managesieveserver.xml", - "pop3server.xml", - "recipientrewritetable.xml", - "usersrepository.xml", - "smime.p12"); - - private final Supplier<File> workingDirectory; - - private static File rootDir(TemporaryFolder temporaryFolder) { - return temporaryFolder.getRoot(); - } - - public TemporaryFilesystemModule(TemporaryFolder temporaryFolder) { - this(() -> TemporaryFilesystemModule.rootDir(temporaryFolder)); - } - - public TemporaryFilesystemModule(Supplier<File> workingDirectory) { - this.workingDirectory = workingDirectory; - } - - @Override - protected void configure() { - try { - bind(JamesDirectoriesProvider.class).toInstance(new JamesServerResourceLoader(workingDirectory.get().getAbsolutePath())); - copyResources(Paths.get(workingDirectory.get().getAbsolutePath(), "conf")); - bindConstant().annotatedWith(Names.named(CommonServicesModule.CONFIGURATION_PATH)).to(FileSystem.FILE_PROTOCOL_AND_CONF); - } catch (IOException e) { - Throwables.propagate(e); - } - } - - private void copyResources(Path resourcesFolder) throws FileNotFoundException, IOException { - CONFIGURATION_FILE_NAMES - .forEach(resourceName -> copyResource(resourcesFolder, resourceName)); - } - - private void copyResource(Path resourcesFolder, String resourceName) { - try (OutputStream outputStream = new FileOutputStream(resourcesFolder.resolve(resourceName).toFile())) { - IOUtils.copy(ClassLoader.getSystemClassLoader().getResource(resourceName).openStream(), outputStream); - } catch (IOException e) { - Throwables.propagate(e); - } - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java index 2a6e737..192986a 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java @@ -20,10 +20,12 @@ package org.apache.james.mailets; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; import java.util.List; @@ -39,10 +41,12 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.SmtpConfiguration; import org.apache.james.modules.TestJMAPServerModule; +import org.apache.james.server.core.configuration.Configuration; import org.apache.james.utils.GuiceProbe; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.rules.TemporaryFolder; +import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.inject.Module; @@ -125,6 +129,18 @@ public class TemporaryJamesServer { private static final String MAILETCONTAINER_CONFIGURATION_FILENAME = "mailetcontainer.xml"; private static final String SMTP_CONFIGURATION_FILENAME = "smtpserver.xml"; + private static final List<String> CONFIGURATION_FILE_NAMES = ImmutableList.of("dnsservice.xml", + "domainlist.xml", + "imapserver.xml", + "keystore", + "lmtpserver.xml", + "mailrepositorystore.xml", + "managesieveserver.xml", + "pop3server.xml", + "recipientrewritetable.xml", + "usersrepository.xml", + "smime.p12"); + private static final int LIMIT_TO_3_MESSAGES = 3; private final GuiceJamesServer jamesServer; @@ -134,17 +150,34 @@ public class TemporaryJamesServer { appendMailetConfigurations(temporaryFolder, mailetContainer); appendSmtpConfigurations(temporaryFolder, smtpConfiguration); - jamesServer = new GuiceJamesServer() + String workingDir = temporaryFolder.getRoot().getAbsolutePath(); + Configuration configuration = Configuration.builder().workingDirectory(workingDir).build(); + copyResources(Paths.get(workingDir, "conf")); + + jamesServer = new GuiceJamesServer(configuration) .combineWith(serverBaseModule) .overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class)) .overrideWith(additionalModules) .overrideWith(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)) - .overrideWith(new TemporaryFilesystemModule(temporaryFolder)) .overrideWith((binder) -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)); jamesServer.start(); } + + private void copyResources(Path resourcesFolder) throws FileNotFoundException, IOException { + CONFIGURATION_FILE_NAMES + .forEach(resourceName -> copyResource(resourcesFolder, resourceName)); + } + + private void copyResource(Path resourcesFolder, String resourceName) { + try (OutputStream outputStream = new FileOutputStream(resourcesFolder.resolve(resourceName).toFile())) { + IOUtils.copy(ClassLoader.getSystemClassLoader().getResource(resourceName).openStream(), outputStream); + } catch (IOException e) { + Throwables.propagate(e); + } + } + private void appendMailetConfigurations(TemporaryFolder temporaryFolder, MailetContainer mailetContainer) throws ConfigurationException, IOException { try (OutputStream outputStream = createMailetConfigurationFile(temporaryFolder)) { IOUtils.write(mailetContainer.serializeAsXml(), outputStream, StandardCharsets.UTF_8); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java index c0e1517..293228a 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraForwardIntegrationTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -43,7 +45,7 @@ public class CassandraForwardIntegrationTest extends ForwardIntegrationTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule(), binder -> binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.TEST_CONFIGURATION)); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java index 41691a7..67a1464 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMailboxesMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -42,7 +44,7 @@ public class CassandraGetMailboxesMethodTest extends GetMailboxesMethodTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java index b4bf8ff..634da89 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetMessageListMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -42,7 +44,7 @@ public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java index 507d3ba..e8593fe 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraGetVacationResponseTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -43,7 +45,7 @@ public class CassandraGetVacationResponseTest extends GetVacationResponseTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) { + protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) throws IOException { return rule.jmapServer(cassandra.getModule()) .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java index 13c442c..64c2e2c 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -43,7 +45,7 @@ public class CassandraJmapAuthenticationTest extends JMAPAuthenticationTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) { + protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) throws IOException { return rule.jmapServer(cassandra.getModule()) .overrideWith(binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java index b1fbf62..c9a8ad2 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJamesServerMain; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -29,8 +31,8 @@ import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestESMetricReporterModule; import org.apache.james.modules.TestElasticSearchModule; -import org.apache.james.modules.TestFilesystemModule; import org.apache.james.modules.TestJMAPServerModule; +import org.apache.james.server.core.configuration.Configuration; import org.apache.james.util.scanner.SpamAssassinExtension; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.AfterEachCallback; @@ -60,14 +62,17 @@ public class CassandraJmapExtension implements BeforeAllCallback, AfterAllCallba this.spamAssassinExtension = new SpamAssassinExtension(); } - private JamesWithSpamAssassin james() { + private JamesWithSpamAssassin james() throws IOException { + Configuration configuration = Configuration.builder() + .workingDirectory(temporaryFolder.newFolder()) + .configurationFromClasspath() + .build(); return new JamesWithSpamAssassin( - new GuiceJamesServer() + new GuiceJamesServer(configuration) .combineWith(CassandraJamesServerMain.CASSANDRA_SERVER_MODULE, CassandraJamesServerMain.PROTOCOLS) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestJMAPServerModule(LIMIT_TO_20_MESSAGES)) .overrideWith(new TestESMetricReporterModule()) - .overrideWith(new TestFilesystemModule(temporaryFolder::getRoot)) .overrideWith(cassandra.getModule()) .overrideWith(new TestElasticSearchModule(elasticSearch)) .overrideWith(new SpamAssassinModule(spamAssassinExtension)), http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraProvisioningTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraProvisioningTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraProvisioningTest.java index c7c3187..5abfdd2 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraProvisioningTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraProvisioningTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -42,7 +44,7 @@ public class CassandraProvisioningTest extends ProvisioningTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSendMDNMethodTest.java ---------------------------------------------------------------------- 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 515d7cc..2e7ddd8 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 @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -44,7 +46,7 @@ public class CassandraSendMDNMethodTest extends SendMDNMethodTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java index 6a39a6a..cd5d011 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -43,7 +45,7 @@ public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java index 9581396..c4ad90a 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMessagesMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -46,7 +48,7 @@ public class CassandraSetMessagesMethodTest extends SetMessagesMethodTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java index b22122b..cb7fbfd 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetVacationResponseTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -42,7 +44,7 @@ public class CassandraSetVacationResponseTest extends SetVacationResponseTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java index e1bddfe..d501807 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationIntegrationTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -42,7 +44,7 @@ public class CassandraVacationIntegrationTest extends VacationIntegrationTest { public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return rule.jmapServer(cassandra.getModule()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java index 4e1139f..71382b5 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraVacationRelayIntegrationTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.cassandra; +import java.io.IOException; + import org.apache.james.CassandraJmapTestRule; import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; @@ -46,7 +48,7 @@ public class CassandraVacationRelayIntegrationTest extends VacationRelayIntegrat public TestRule cassandraLifecycleTestRule = cassandraLifecycleConfiguration.asTestRule(); @Override - protected GuiceJamesServer getJmapServer() { + protected GuiceJamesServer getJmapServer() throws IOException { return rule.jmapServer( cassandra.getModule(), (binder) -> binder.bind(DNSService.class).toInstance(inMemoryDNSService)); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java index 020bf99..d37ab17 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java @@ -34,6 +34,7 @@ import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants; import org.apache.james.modules.CassandraJmapServerModule; +import org.apache.james.server.core.configuration.Configuration; import org.junit.rules.TemporaryFolder; import com.github.fge.lambdas.runnable.ThrowingRunnable; @@ -62,9 +63,14 @@ public class CassandraStepdefs { temporaryFolder.create(); embeddedElasticSearch.before(); mainStepdefs.messageIdFactory = new CassandraMessageId.Factory(); - mainStepdefs.jmapServer = new GuiceJamesServer() + Configuration configuration = Configuration.builder() + .workingDirectory(temporaryFolder.newFolder()) + .configurationFromClasspath() + .build(); + + mainStepdefs.jmapServer = new GuiceJamesServer(configuration) .combineWith(CassandraJamesServerMain.CASSANDRA_SERVER_MODULE, CassandraJamesServerMain.PROTOCOLS) - .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandraServer.getIp(), cassandraServer.getBindingPort())) + .overrideWith(new CassandraJmapServerModule(embeddedElasticSearch, cassandraServer.getIp(), cassandraServer.getBindingPort())) .overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class)); mainStepdefs.awaitMethod = () -> embeddedElasticSearch.awaitForElasticSearch(); mainStepdefs.init(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java index fab854f..1631477 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java @@ -27,6 +27,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.isA; import static org.hamcrest.Matchers.notNullValue; +import java.io.IOException; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.UUID; @@ -48,7 +49,7 @@ public abstract class JMAPAuthenticationTest { private static final ZonedDateTime newDate = ZonedDateTime.parse("2011-12-03T10:16:30+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME); private static final ZonedDateTime afterExpirationDate = ZonedDateTime.parse("2011-12-03T10:30:31+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME); - protected abstract GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider); + protected abstract GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) throws IOException; private UserCredentials userCredentials; private FixedDateZonedDateTimeProvider zonedDateTimeProvider; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java index d3bc3c9..0d05796 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java @@ -29,6 +29,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.hasSize; +import java.io.IOException; import java.util.concurrent.TimeUnit; import org.apache.james.GuiceJamesServer; @@ -50,7 +51,7 @@ public abstract class ProvisioningTest { private static final String USER = "myuser@" + DOMAIN; private static final String PASSWORD = "secret"; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer() throws IOException; private GuiceJamesServer jmapServer; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index ef954df..3148050 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -33,6 +33,7 @@ import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; +import java.io.IOException; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -66,7 +67,7 @@ public abstract class VacationIntegrationTest { private GuiceJamesServer guiceJamesServer; private JmapGuiceProbe jmapGuiceProbe; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer() throws IOException; protected abstract void await(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java index ce1706f..903e47e 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java @@ -26,6 +26,7 @@ import static org.apache.james.jmap.TestingConstants.SMTP_PORT; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.hamcrest.Matchers.equalTo; +import java.io.IOException; import java.util.concurrent.TimeUnit; import org.apache.commons.net.smtp.SMTPClient; @@ -62,7 +63,7 @@ public abstract class VacationRelayIntegrationTest { protected abstract void await(); - protected abstract GuiceJamesServer getJmapServer(); + protected abstract GuiceJamesServer getJmapServer() throws IOException; protected abstract InMemoryDNSService getInMemoryDns(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java index e6bdee2..1b5550f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java @@ -39,6 +39,7 @@ import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; +import java.io.IOException; import java.util.concurrent.TimeUnit; import org.apache.james.GuiceJamesServer; @@ -62,7 +63,7 @@ public abstract class ForwardIntegrationTest { @Rule public SMTPMessageSender messageSender = new SMTPMessageSender(DOMAIN); - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer() throws IOException; private GuiceJamesServer jmapServer; private RequestSpecification webAdminApi; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java index 35c2063..6602882 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java @@ -46,6 +46,7 @@ import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; +import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Locale; @@ -89,7 +90,7 @@ public abstract class GetMailboxesMethodTest { public static final String LOOKUP = String.valueOf(Right.Lookup.asCharacter()); public static final String ADMINISTER = String.valueOf(Right.Administer.asCharacter()); - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer() throws IOException; private AccessToken accessToken; private GuiceJamesServer jmapServer; http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java index d27cdcd..055d1ce 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java @@ -40,6 +40,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.not; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.nio.charset.StandardCharsets; import java.time.LocalDate; import java.time.ZoneId; @@ -82,7 +83,7 @@ public abstract class GetMessageListMethodTest { private static final ZoneId ZONE_ID = ZoneId.of("Europe/Paris"); private ACLProbeImpl aclProbe; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer() throws IOException; protected abstract void await(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java index dacb73d..9c941d2 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java @@ -32,6 +32,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.IsNull.nullValue; +import java.io.IOException; import java.time.ZonedDateTime; import org.apache.james.GuiceJamesServer; @@ -57,7 +58,7 @@ public abstract class GetVacationResponseTest { public static final ZonedDateTime DATE_2016 = ZonedDateTime.parse("2016-04-15T11:56:32.224+07:00[Asia/Vientiane]"); private JmapGuiceProbe jmapGuiceProbe; - protected abstract GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider); + protected abstract GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) throws IOException; protected abstract void await(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java index 65422f5..f7602a5 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java @@ -40,6 +40,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; +import java.io.IOException; import java.util.List; import java.util.Optional; @@ -73,7 +74,7 @@ public abstract class SendMDNMethodTest { private static final String PASSWORD = "password"; private static final String BOB_PASSWORD = "bobPassword"; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer() throws IOException; protected abstract MessageId randomMessageId(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java index e874467..66e61e2 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java @@ -43,6 +43,8 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.collection.IsMapWithSize.aMapWithSize; +import java.io.IOException; + import org.apache.commons.lang3.StringUtils; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.api.access.AccessToken; @@ -76,7 +78,7 @@ public abstract class SetMailboxesMethodTest { private static int MAILBOX_NAME_LENGTH_64K = 65536; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer() throws IOException; protected abstract void await(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index d484a10..18bae0f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -134,7 +134,7 @@ public abstract class SetMessagesMethodTest { private AccessToken bobAccessToken; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer() throws IOException; protected abstract MessageId randomMessageId(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java index 22eacc8..4767e92 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java @@ -29,6 +29,7 @@ import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; +import java.io.IOException; import java.time.ZonedDateTime; import java.util.Optional; @@ -54,7 +55,7 @@ public abstract class SetVacationResponseTest { public static final String SUBJECT = "subject"; private JmapGuiceProbe jmapGuiceProbe; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJamesServer createJmapServer() throws IOException; protected abstract void await(); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java index b1d64ee..7d9ad65 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryForwardIntegrationTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.ForwardIntegrationTest; @@ -31,7 +33,7 @@ public class MemoryForwardIntegrationTest extends ForwardIntegrationTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap .jmapServer(binder -> binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.TEST_CONFIGURATION)); http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java index 32d9ace..9422e21 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMailboxesMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.GetMailboxesMethodTest; @@ -30,7 +32,7 @@ public class MemoryGetMailboxesMethodTest extends GetMailboxesMethodTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/5883efbf/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java index e1817e2..79bc15d 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.GetMessageListMethodTest; @@ -30,7 +32,7 @@ public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest { public MemoryJmapTestRule memoryJmap = new MemoryJmapTestRule(); @Override - protected GuiceJamesServer createJmapServer() { + protected GuiceJamesServer createJmapServer() throws IOException { return memoryJmap.jmapServer(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
