JAMES-1842: Rename GuiceJamesServer to GuiceJmapJamesServer
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b9a94026 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b9a94026 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b9a94026 Branch: refs/heads/master Commit: b9a94026675405de38e3e298b217e9a8f66baa6f Parents: 91be31f Author: Quynh Nguyen <qngu...@linagora.com> Authored: Fri Oct 28 16:43:45 2016 +0700 Committer: Quynh Nguyen <qngu...@linagora.com> Committed: Fri Nov 18 09:25:34 2016 +0700 ---------------------------------------------------------------------- .../smtp/host/CassandraJamesSmtpHostSystem.java | 8 +- .../apache/james/CassandraJamesServerMain.java | 2 +- .../apache/james/CassandraJamesServerTest.java | 4 +- .../james/JamesCapabilitiesServerTest.java | 6 +- .../java/org/apache/james/GuiceJamesServer.java | 114 ------------------- .../org/apache/james/GuiceJmapJamesServer.java | 114 +++++++++++++++++++ .../apache/james/AbstractJamesServerTest.java | 4 +- .../org/apache/james/MemoryJamesServerMain.java | 2 +- .../org/apache/james/MemoryJamesServerTest.java | 4 +- .../james/mailets/TemporaryJamesServer.java | 6 +- .../CassandraGetMailboxesMethodTest.java | 6 +- .../CassandraGetMessageListMethodTest.java | 6 +- .../CassandraGetVacationResponseTest.java | 6 +- .../CassandraJmapAuthenticationTest.java | 6 +- .../CassandraSetMailboxesMethodTest.java | 6 +- .../CassandraSetMessagesMethodTest.java | 6 +- .../CassandraSetVacationResponseTest.java | 6 +- .../CassandraVacationIntegrationTest.java | 6 +- .../cassandra/cucumber/CassandraStepdefs.java | 4 +- .../james/jmap/JMAPAuthenticationTest.java | 6 +- .../james/jmap/VacationIntegrationTest.java | 6 +- .../integration/GetMailboxesMethodTest.java | 6 +- .../integration/GetMessageListMethodTest.java | 6 +- .../integration/GetVacationResponseTest.java | 6 +- .../integration/SetMailboxesMethodTest.java | 6 +- .../integration/SetMessagesMethodTest.java | 6 +- .../integration/SetVacationResponseTest.java | 6 +- .../integration/cucumber/MainStepdefs.java | 4 +- .../memory/MemoryGetMailboxesMethodTest.java | 6 +- .../memory/MemoryGetMessageListMethodTest.java | 6 +- .../MemoryGetVacationResponseMethodTest.java | 6 +- .../memory/MemoryJmapAuthenticationTest.java | 6 +- .../memory/MemorySetMailboxesMethodTest.java | 6 +- .../memory/MemorySetMessagesMethodTest.java | 6 +- .../MemorySetVacationResponseMethodTest.java | 6 +- .../memory/MemoryVacationIntegrationTest.java | 6 +- .../jmap/memory/cucumber/MemoryStepdefs.java | 4 +- .../WebAdminServerIntegrationTest.java | 6 +- 38 files changed, 213 insertions(+), 213 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java index 4949765..836e4e5 100644 --- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java +++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java @@ -22,7 +22,7 @@ package org.apache.james.mpt.smtp.host; import java.util.Iterator; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; @@ -42,7 +42,7 @@ public class CassandraJamesSmtpHostSystem extends ExternalSessionFactory impleme private EmbeddedCassandra embeddedCassandra; private EmbeddedElasticSearch embeddedElasticSearch; - private GuiceJamesServer jamesServer; + private GuiceJmapJamesServer jamesServer; private InMemoryDNSService inMemoryDNSService; @@ -104,8 +104,8 @@ public class CassandraJamesSmtpHostSystem extends ExternalSessionFactory impleme return inMemoryDNSService; } - protected GuiceJamesServer createJamesServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJamesServer() { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(folder::getRoot, embeddedElasticSearch, embeddedCassandra), (binder) -> binder.bind(DNSService.class).toInstance(inMemoryDNSService)); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java index 766b902..12e163c 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java @@ -50,7 +50,7 @@ public class CassandraJamesServerMain { public static void main(String[] args) throws Exception { - GuiceJamesServer server = new GuiceJamesServer() + GuiceJmapJamesServer server = new GuiceJmapJamesServer() .combineWith(cassandraServerModule, new JMXServerModule()); server.start(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java ---------------------------------------------------------------------- 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 3870b42..41187a1 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 @@ -45,8 +45,8 @@ public class CassandraJamesServerTest extends AbstractJamesServerTest { public RuleChain chain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); @Override - protected GuiceJamesServer createJamesServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJamesServer() { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new TestElasticSearchModule(embeddedElasticSearch), new TestFilesystemModule(temporaryFolder), http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java ---------------------------------------------------------------------- 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 e866369..06d7872 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 @@ -46,7 +46,7 @@ import com.google.inject.Singleton; public class JamesCapabilitiesServerTest { - private GuiceJamesServer server; + private GuiceJmapJamesServer server; private TemporaryFolder temporaryFolder = new TemporaryFolder(); private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); @@ -58,10 +58,10 @@ public class JamesCapabilitiesServerTest { server.stop(); } - private GuiceJamesServer createCassandraJamesServer(final MailboxManager mailboxManager) { + private GuiceJmapJamesServer createCassandraJamesServer(final MailboxManager mailboxManager) { Module mockMailboxManager = (binder) -> binder.bind(MailboxManager.class).toInstance(mailboxManager); - return new GuiceJamesServer() + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new TestElasticSearchModule(embeddedElasticSearch), new TestFilesystemModule(temporaryFolder), http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java deleted file mode 100644 index 6d0209d..0000000 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java +++ /dev/null @@ -1,114 +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; - -import java.util.Arrays; -import java.util.Optional; - -import javax.annotation.PreDestroy; - -import org.apache.james.jmap.JMAPServer; -import org.apache.james.modules.CommonServicesModule; -import org.apache.james.modules.MailetProcessingModule; -import org.apache.james.modules.ProtocolsModule; -import org.apache.james.onami.lifecycle.Stager; -import org.apache.james.utils.ConfigurationsPerformer; -import org.apache.james.utils.ExtendedJmapServerProbe; -import org.apache.james.utils.JmapGuiceServerProbe; -import org.apache.james.webadmin.Port; -import org.apache.james.webadmin.WebAdminServer; - -import com.google.common.collect.Iterables; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Module; -import com.google.inject.TypeLiteral; -import com.google.inject.util.Modules; - -public class GuiceJamesServer { - - private final Module module; - private Stager<PreDestroy> preDestroy; - private JmapGuiceServerProbe serverProbe; - private Optional<Integer> jmapPort; - private Optional<Port> webadminPort; - - public GuiceJamesServer() { - this(Modules.combine( - new CommonServicesModule(), - new ProtocolsModule(), - new MailetProcessingModule())); - } - - public GuiceJamesServer(Module module) { - this.module = module; - } - - public GuiceJamesServer combineWith(Module... modules) { - return new GuiceJamesServer(Modules.combine(Iterables.concat(Arrays.asList(module), Arrays.asList(modules)))); - } - - public GuiceJamesServer overrideWith(Module... overrides) { - return new GuiceJamesServer(Modules.override(module).with(overrides)); - } - - public void start() throws Exception { - Injector injector = Guice.createInjector(module); - preDestroy = injector.getInstance(Key.get(new TypeLiteral<Stager<PreDestroy>>() {})); - injector.getInstance(ConfigurationsPerformer.class).initModules(); - serverProbe = injector.getInstance(JmapGuiceServerProbe.class); - jmapPort = locateJMAPPort(injector); - webadminPort =locateWebAdminPort(injector); - } - - private Optional<Integer> locateJMAPPort(Injector injector) { - try { - return Optional.of(injector.getInstance(JMAPServer.class).getPort()); - } catch(Exception e) { - return Optional.empty(); - } - } - - private Optional<Port> locateWebAdminPort(Injector injector) { - try { - return Optional.of(injector.getInstance(WebAdminServer.class).getPort()); - } catch(Exception e) { - return Optional.empty(); - } - } - - public void stop() { - if (preDestroy != null) { - preDestroy.stage(); - } - } - - public ExtendedJmapServerProbe serverProbe() { - return serverProbe; - } - - public Optional<Integer> getJmapPort() { - return jmapPort; - } - - public Optional<Port> getWebadminPort() { - return webadminPort; - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJmapJamesServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJmapJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJmapJamesServer.java new file mode 100644 index 0000000..d137fdf --- /dev/null +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJmapJamesServer.java @@ -0,0 +1,114 @@ +/**************************************************************** + * 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; + +import java.util.Arrays; +import java.util.Optional; + +import javax.annotation.PreDestroy; + +import org.apache.james.jmap.JMAPServer; +import org.apache.james.modules.CommonServicesModule; +import org.apache.james.modules.MailetProcessingModule; +import org.apache.james.modules.ProtocolsModule; +import org.apache.james.onami.lifecycle.Stager; +import org.apache.james.utils.ConfigurationsPerformer; +import org.apache.james.utils.ExtendedJmapServerProbe; +import org.apache.james.utils.JmapGuiceServerProbe; +import org.apache.james.webadmin.Port; +import org.apache.james.webadmin.WebAdminServer; + +import com.google.common.collect.Iterables; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Module; +import com.google.inject.TypeLiteral; +import com.google.inject.util.Modules; + +public class GuiceJmapJamesServer { + + private final Module module; + private Stager<PreDestroy> preDestroy; + private JmapGuiceServerProbe serverProbe; + private Optional<Integer> jmapPort; + private Optional<Port> webadminPort; + + public GuiceJmapJamesServer() { + this(Modules.combine( + new CommonServicesModule(), + new ProtocolsModule(), + new MailetProcessingModule())); + } + + public GuiceJmapJamesServer(Module module) { + this.module = module; + } + + public GuiceJmapJamesServer combineWith(Module... modules) { + return new GuiceJmapJamesServer(Modules.combine(Iterables.concat(Arrays.asList(module), Arrays.asList(modules)))); + } + + public GuiceJmapJamesServer overrideWith(Module... overrides) { + return new GuiceJmapJamesServer(Modules.override(module).with(overrides)); + } + + public void start() throws Exception { + Injector injector = Guice.createInjector(module); + preDestroy = injector.getInstance(Key.get(new TypeLiteral<Stager<PreDestroy>>() {})); + injector.getInstance(ConfigurationsPerformer.class).initModules(); + serverProbe = injector.getInstance(JmapGuiceServerProbe.class); + jmapPort = locateJMAPPort(injector); + webadminPort =locateWebAdminPort(injector); + } + + private Optional<Integer> locateJMAPPort(Injector injector) { + try { + return Optional.of(injector.getInstance(JMAPServer.class).getPort()); + } catch(Exception e) { + return Optional.empty(); + } + } + + private Optional<Port> locateWebAdminPort(Injector injector) { + try { + return Optional.of(injector.getInstance(WebAdminServer.class).getPort()); + } catch(Exception e) { + return Optional.empty(); + } + } + + public void stop() { + if (preDestroy != null) { + preDestroy.stage(); + } + } + + public ExtendedJmapServerProbe serverProbe() { + return serverProbe; + } + + public Optional<Integer> getJmapPort() { + return jmapPort; + } + + public Optional<Port> getWebadminPort() { + return webadminPort; + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java index 11fc881..bdeeeff 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java @@ -49,7 +49,7 @@ public abstract class AbstractJamesServerTest { private static final int LMTP_PORT = 1024; private static final int JMAP_PORT = 1080; - private GuiceJamesServer server; + private GuiceJmapJamesServer server; private SocketChannel socketChannel; @Before @@ -67,7 +67,7 @@ public abstract class AbstractJamesServerTest { .build(); } - protected abstract GuiceJamesServer createJamesServer(); + protected abstract GuiceJmapJamesServer createJamesServer(); protected abstract void clean(); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 4fc14d3..43d6532 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 @@ -39,7 +39,7 @@ public class MemoryJamesServerMain { new MemoryMailQueueModule()); public static void main(String[] args) throws Exception { - new GuiceJamesServer() + new GuiceJmapJamesServer() .combineWith(inMemoryServerModule, new JMXServerModule()) .start(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 4dc6fae..70adef1 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 @@ -31,8 +31,8 @@ public class MemoryJamesServerTest extends AbstractJamesServerTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJamesServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJamesServer() { + return new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new TestFilesystemModule(temporaryFolder), new TestJMAPServerModule(GetMessageListMethod.DEFAULT_MAXIMUM_LIMIT)); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 531fec4..e440250 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 @@ -28,7 +28,7 @@ import java.util.Arrays; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.io.IOUtils; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.modules.TestJMAPServerModule; @@ -44,13 +44,13 @@ public class TemporaryJamesServer { private static final int LIMIT_TO_3_MESSAGES = 3; - private final GuiceJamesServer jamesServer; + private final GuiceJmapJamesServer jamesServer; public TemporaryJamesServer(TemporaryFolder temporaryFolder, MailetContainer mailetContainer, Module... additionalModules) throws Exception { appendMailetConfigurations(temporaryFolder, mailetContainer); - jamesServer = new GuiceJamesServer() + jamesServer = new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(ImmutableList.<Module>builder().addAll(Arrays.asList(additionalModules)) .add(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)) http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 c3caa2c..c9c4207 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 @@ -20,7 +20,7 @@ package org.apache.james.jmap.cassandra; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.methods.integration.GetMailboxesMethodTest; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; @@ -42,8 +42,8 @@ public class CassandraGetMailboxesMethodTest extends GetMailboxesMethodTest { .around(embeddedElasticSearch); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 efe5e37..387c801 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 @@ -20,7 +20,7 @@ package org.apache.james.jmap.cassandra; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.methods.integration.GetMessageListMethodTest; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; @@ -41,8 +41,8 @@ public class CassandraGetMessageListMethodTest extends GetMessageListMethodTest .around(embeddedElasticSearch); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 66f1687..3aeca25 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 @@ -20,7 +20,7 @@ package org.apache.james.jmap.cassandra; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.methods.integration.GetVacationResponseTest; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; @@ -42,8 +42,8 @@ public class CassandraGetVacationResponseTest extends GetVacationResponseTest { .around(embeddedElasticSearch); @Override - protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra), binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 790fe30..510876c 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 @@ -19,7 +19,7 @@ package org.apache.james.jmap.cassandra; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.FixedDateZonedDateTimeProvider; import org.apache.james.jmap.JMAPAuthenticationTest; @@ -42,8 +42,8 @@ public class CassandraJmapAuthenticationTest extends JMAPAuthenticationTest { .around(embeddedElasticSearch); @Override - protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra), (binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 e6ffe4f..443f48b 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 @@ -20,7 +20,7 @@ package org.apache.james.jmap.cassandra; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; @@ -41,8 +41,8 @@ public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest { .around(embeddedElasticSearch); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 446d41a..a244fa3 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 @@ -20,7 +20,7 @@ package org.apache.james.jmap.cassandra; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.methods.integration.SetMessagesMethodTest; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; @@ -41,8 +41,8 @@ public class CassandraSetMessagesMethodTest extends SetMessagesMethodTest { .around(embeddedElasticSearch); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 e4efd42..7bb2370 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 @@ -20,7 +20,7 @@ package org.apache.james.jmap.cassandra; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.methods.integration.SetVacationResponseTest; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; @@ -41,8 +41,8 @@ public class CassandraSetVacationResponseTest extends SetVacationResponseTest { .around(embeddedElasticSearch); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 b5a383d..1540198 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 @@ -20,7 +20,7 @@ package org.apache.james.jmap.cassandra; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.VacationIntegrationTest; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; @@ -42,8 +42,8 @@ public class CassandraVacationIntegrationTest extends VacationIntegrationTest { .around(embeddedElasticSearch); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 0ba38d1..322f781 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 @@ -24,7 +24,7 @@ import java.util.Arrays; import javax.inject.Inject; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; @@ -54,7 +54,7 @@ public class CassandraStepdefs { public void init() throws Exception { temporaryFolder.create(); embeddedElasticSearch.before(); - mainStepdefs.jmapServer = new GuiceJamesServer() + mainStepdefs.jmapServer = new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra)); mainStepdefs.awaitMethod = () -> embeddedElasticSearch.awaitForElasticSearch(); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 12e6a1a..7fd0c4a 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 @@ -32,7 +32,7 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.UUID; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.jmap.model.ContinuationToken; import org.junit.After; import org.junit.Before; @@ -49,11 +49,11 @@ 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 GuiceJmapJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider); private UserCredentials userCredentials; private FixedDateZonedDateTimeProvider zonedDateTimeProvider; - private GuiceJamesServer jmapServer; + private GuiceJmapJamesServer jmapServer; @Before public void setup() throws Throwable { http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 653bfe0..927885c 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 @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.VacationPatch; @@ -62,9 +62,9 @@ public abstract class VacationIntegrationTest { public static final String ORIGINAL_MESSAGE_TEXT_BODY = "Hello someone, and thank you for joining example.com!"; private ConditionFactory calmlyAwait; - private GuiceJamesServer guiceJamesServer; + private GuiceJmapJamesServer guiceJamesServer; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJmapJamesServer createJmapServer(); protected abstract void await(); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 d77362b..53cd799 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 @@ -35,7 +35,7 @@ import java.util.Date; import javax.mail.Flags; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.jmap.JmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.model.MailboxConstants; @@ -54,11 +54,11 @@ public abstract class GetMailboxesMethodTest { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJmapJamesServer createJmapServer(); private AccessToken accessToken; private String username; - private GuiceJamesServer jmapServer; + private GuiceJmapJamesServer jmapServer; @Before public void setup() throws Throwable { http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 b05fc07..69d72c8 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 @@ -36,7 +36,7 @@ import java.util.List; import javax.mail.Flags; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.jmap.JmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.model.MailboxConstants; @@ -56,14 +56,14 @@ public abstract class GetMessageListMethodTest { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJmapJamesServer createJmapServer(); protected abstract void await(); private AccessToken accessToken; private String username; private String domain; - private GuiceJamesServer jmapServer; + private GuiceJmapJamesServer jmapServer; @Before public void setup() throws Throwable { http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 a6f5604..8fce0ee 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 @@ -28,7 +28,7 @@ import static org.hamcrest.core.IsNull.nullValue; import java.time.ZonedDateTime; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.jmap.FixedDateZonedDateTimeProvider; import org.apache.james.jmap.JmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; @@ -56,12 +56,12 @@ public abstract class GetVacationResponseTest { public static final ZonedDateTime DATE_2014 = ZonedDateTime.parse("2014-09-30T14:10:00+02:00"); public static final ZonedDateTime DATE_2016 = ZonedDateTime.parse("2016-04-15T11:56:32.224+07:00[Asia/Vientiane]"); - protected abstract GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider); + protected abstract GuiceJmapJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider); protected abstract void await(); private AccessToken accessToken; - private GuiceJamesServer jmapServer; + private GuiceJmapJamesServer jmapServer; private FixedDateZonedDateTimeProvider fixedDateZonedDateTimeProvider; @Before http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 29fffdc..ba0b30e 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 @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.collection.IsMapWithSize.aMapWithSize; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.jmap.JmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.model.MailboxConstants; @@ -58,13 +58,13 @@ public abstract class SetMailboxesMethodTest { private static final String ARGUMENTS = "[0][1]"; private static final String USERS_DOMAIN = "domain.tld"; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJmapJamesServer createJmapServer(); protected abstract void await(); private AccessToken accessToken; private String username; - private GuiceJamesServer jmapServer; + private GuiceJmapJamesServer jmapServer; @Before public void setup() throws Throwable { http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 ba864b1..959ed44 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 @@ -50,7 +50,7 @@ import javax.mail.Flags; import com.google.common.collect.ImmutableList; import org.apache.commons.io.IOUtils; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.jmap.JmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.model.mailbox.Role; @@ -90,13 +90,13 @@ public abstract class SetMessagesMethodTest { private ConditionFactory calmlyAwait; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJmapJamesServer createJmapServer(); protected abstract void await(); private AccessToken accessToken; private String username; - private GuiceJamesServer jmapServer; + private GuiceJmapJamesServer jmapServer; @Before public void setup() throws Throwable { http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 2e90360..23a35e9 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 @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; import java.time.ZonedDateTime; import java.util.Optional; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.jmap.JmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.api.vacation.AccountId; @@ -53,12 +53,12 @@ public abstract class SetVacationResponseTest { public static final String PASSWORD = "password"; public static final String SUBJECT = "subject"; - protected abstract GuiceJamesServer createJmapServer(); + protected abstract GuiceJmapJamesServer createJmapServer(); protected abstract void await(); private AccessToken accessToken; - private GuiceJamesServer jmapServer; + private GuiceJmapJamesServer jmapServer; @Before public void setup() throws Throwable { http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java index ed36491..3d91cf2 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java @@ -20,7 +20,7 @@ package org.apache.james.jmap.methods.integration.cucumber; import org.apache.http.client.utils.URIBuilder; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import com.google.common.base.Charsets; @@ -29,7 +29,7 @@ import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped public class MainStepdefs { - public GuiceJamesServer jmapServer; + public GuiceJmapJamesServer jmapServer; public Runnable awaitMethod = () -> {}; public void init() throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 b929d53..f352177 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,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.GetMailboxesMethodTest; import org.apache.james.jmap.servers.MemoryJmapServerModule; @@ -32,8 +32,8 @@ public class MemoryGetMailboxesMethodTest extends GetMailboxesMethodTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/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 10991ad..3c22d03 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,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.GetMessageListMethodTest; import org.apache.james.jmap.servers.MemoryJmapServerModule; @@ -32,8 +32,8 @@ public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java index c2c3a92..14bdfbf 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetVacationResponseMethodTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.GetVacationResponseTest; import org.apache.james.jmap.servers.MemoryJmapServerModule; @@ -33,8 +33,8 @@ public class MemoryGetVacationResponseMethodTest extends GetVacationResponseTest public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer(ZonedDateTimeProvider zonedDateTimeProvider) { + return new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder), binder -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java index b66eb89..50880f0 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapAuthenticationTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.FixedDateZonedDateTimeProvider; import org.apache.james.jmap.JMAPAuthenticationTest; @@ -34,8 +34,8 @@ public class MemoryJmapAuthenticationTest extends JMAPAuthenticationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) { + return new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder), (binder) -> binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider)); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java index 474a492..c8ebc7a 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMailboxesMethodTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest; import org.apache.james.jmap.servers.MemoryJmapServerModule; @@ -32,8 +32,8 @@ public class MemorySetMailboxesMethodTest extends SetMailboxesMethodTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java index 2d0b43d..5b5e3d2 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetMessagesMethodTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.SetMessagesMethodTest; import org.apache.james.jmap.servers.MemoryJmapServerModule; @@ -32,8 +32,8 @@ public class MemorySetMessagesMethodTest extends SetMessagesMethodTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java index bcd5a85..3524510 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemorySetVacationResponseMethodTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.SetVacationResponseTest; import org.apache.james.jmap.servers.MemoryJmapServerModule; @@ -32,8 +32,8 @@ public class MemorySetVacationResponseMethodTest extends SetVacationResponseTest public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java index de4eb41..e238e01 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryVacationIntegrationTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.memory; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.VacationIntegrationTest; import org.apache.james.jmap.servers.MemoryJmapServerModule; @@ -32,8 +32,8 @@ public class MemoryVacationIntegrationTest extends VacationIntegrationTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJmapServer() { - return new GuiceJamesServer() + protected GuiceJmapJamesServer createJmapServer() { + return new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java index 2aa16b1..66fe90c 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java @@ -21,7 +21,7 @@ package org.apache.james.jmap.memory.cucumber; import javax.inject.Inject; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs; import org.apache.james.jmap.servers.MemoryJmapServerModule; @@ -46,7 +46,7 @@ public class MemoryStepdefs { @Before public void init() throws Exception { temporaryFolder.create(); - mainStepdefs.jmapServer = new GuiceJamesServer() + mainStepdefs.jmapServer = new GuiceJmapJamesServer() .combineWith(MemoryJamesServerMain.inMemoryServerModule) .overrideWith(new MemoryJmapServerModule(temporaryFolder)); mainStepdefs.init(); http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java index 1477090..84ebdb1 100644 --- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; import org.apache.james.modules.CassandraJmapServerModule; @@ -65,11 +65,11 @@ public class WebAdminServerIntegrationTest { .outerRule(temporaryFolder) .around(embeddedElasticSearch); - private GuiceJamesServer guiceJamesServer; + private GuiceJmapJamesServer guiceJamesServer; @Before public void setUp() throws Exception { - guiceJamesServer = new GuiceJamesServer() + guiceJamesServer = new GuiceJmapJamesServer() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra), new WebAdminConfigurationModule()); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
