JAMES-1842: Rename GuiceJamesServer to GuiceJamesServerImpl
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/932f16c3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/932f16c3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/932f16c3 Branch: refs/heads/master Commit: 932f16c3a70f81b887fb26022084c8eddaee0815 Parents: 95e1120 Author: Antoine Duprat <adup...@apache.org> Authored: Wed Nov 16 09:58:02 2016 +0100 Committer: Quynh Nguyen <qngu...@linagora.com> Committed: Fri Nov 18 09:33:20 2016 +0700 ---------------------------------------------------------------------- .../smtp/host/CassandraJamesSmtpHostSystem.java | 8 +- .../org/apache/james/CassandraJamesServer.java | 2 +- .../apache/james/CassandraJamesServerMain.java | 2 +- .../james/JamesCapabilitiesServerTest.java | 6 +- .../java/org/apache/james/GuiceJamesServer.java | 85 -------------------- .../org/apache/james/GuiceJamesServerImpl.java | 85 ++++++++++++++++++++ .../apache/james/AbstractJamesServerTest.java | 4 +- .../james/AbstractJmapJamesServerTest.java | 2 +- .../org/apache/james/MemoryJamesServer.java | 2 +- .../james/jmap/JMAPAuthenticationTest.java | 4 +- .../james/jmap/VacationIntegrationTest.java | 4 +- .../integration/GetMailboxesMethodTest.java | 4 +- .../integration/GetMessageListMethodTest.java | 4 +- .../integration/GetVacationResponseTest.java | 4 +- .../integration/SetMailboxesMethodTest.java | 4 +- .../integration/SetMessagesMethodTest.java | 4 +- .../integration/SetVacationResponseTest.java | 4 +- .../integration/cucumber/DownloadStepdefs.java | 4 +- .../cucumber/GetMessagesMethodStepdefs.java | 4 +- .../integration/cucumber/MainStepdefs.java | 4 +- .../cucumber/SetMailboxesMethodStepdefs.java | 4 +- .../integration/cucumber/UploadStepdefs.java | 4 +- .../integration/cucumber/UserStepdefs.java | 4 +- 23 files changed, 126 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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..bc8f678 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.GuiceJamesServerImpl; 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 GuiceJamesServerImpl jamesServer; private InMemoryDNSService inMemoryDNSService; @@ -104,8 +104,8 @@ public class CassandraJamesSmtpHostSystem extends ExternalSessionFactory impleme return inMemoryDNSService; } - protected GuiceJamesServer createJamesServer() { - return new GuiceJamesServer() + protected GuiceJamesServerImpl createJamesServer() { + return new GuiceJamesServerImpl() .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/932f16c3/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java index f1ef305..e4375d4 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java @@ -27,7 +27,7 @@ import com.google.common.collect.Iterables; import com.google.inject.Module; import com.google.inject.util.Modules; -public class CassandraJamesServer extends GuiceJamesServer implements JmapServer, WebAdminServer { +public class CassandraJamesServer extends GuiceJamesServerImpl implements JmapServer, WebAdminServer { public CassandraJamesServer() { super(); http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 87f4a07..c269263 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 @@ -52,7 +52,7 @@ public class CassandraJamesServerMain { public static void main(String[] args) throws Exception { - GuiceJamesServer server = new GuiceJamesServer() + GuiceJamesServerImpl server = new GuiceJamesServerImpl() .combineWith(cassandraServerModule, new JMXServerModule()); server.start(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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..0aef8ad 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 GuiceJamesServerImpl 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 GuiceJamesServerImpl createCassandraJamesServer(final MailboxManager mailboxManager) { Module mockMailboxManager = (binder) -> binder.bind(MailboxManager.class).toInstance(mailboxManager); - return new GuiceJamesServer() + return new GuiceJamesServerImpl() .combineWith(CassandraJamesServerMain.cassandraServerModule) .overrideWith(new TestElasticSearchModule(embeddedElasticSearch), new TestFilesystemModule(temporaryFolder), http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 9fa2efc..0000000 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java +++ /dev/null @@ -1,85 +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 javax.annotation.PreDestroy; - -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.GuiceProbeProvider; -import org.apache.james.utils.GuiceServerProbe; - -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 { - protected final Module module; - private Stager<PreDestroy> preDestroy; - private GuiceProbeProvider guiceProbeProvider; - - public GuiceJamesServer() { - this(Modules.combine( - new CommonServicesModule(), - new ProtocolsModule(), - new MailetProcessingModule())); - } - - protected 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(); - guiceProbeProvider = injector.getInstance(GuiceProbeProvider.class); - } - - public void stop() { - if (preDestroy != null) { - preDestroy.stage(); - } - } - - public GuiceServerProbe serverProbe() { - return guiceProbeProvider.getProbe(GuiceServerProbe.class); - } - - protected GuiceProbeProvider getGuiceProbeProvider() { - return guiceProbeProvider; - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServerImpl.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServerImpl.java b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServerImpl.java new file mode 100644 index 0000000..0ebd7c6 --- /dev/null +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServerImpl.java @@ -0,0 +1,85 @@ +/**************************************************************** + * 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 javax.annotation.PreDestroy; + +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.GuiceProbeProvider; +import org.apache.james.utils.GuiceServerProbe; + +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 GuiceJamesServerImpl { + protected final Module module; + private Stager<PreDestroy> preDestroy; + private GuiceProbeProvider guiceProbeProvider; + + public GuiceJamesServerImpl() { + this(Modules.combine( + new CommonServicesModule(), + new ProtocolsModule(), + new MailetProcessingModule())); + } + + protected GuiceJamesServerImpl(Module module) { + this.module = module; + } + + public GuiceJamesServerImpl combineWith(Module... modules) { + return new GuiceJamesServerImpl(Modules.combine(Iterables.concat(Arrays.asList(module), Arrays.asList(modules)))); + } + + public GuiceJamesServerImpl overrideWith(Module... overrides) { + return new GuiceJamesServerImpl(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(); + guiceProbeProvider = injector.getInstance(GuiceProbeProvider.class); + } + + public void stop() { + if (preDestroy != null) { + preDestroy.stage(); + } + } + + public GuiceServerProbe serverProbe() { + return guiceProbeProvider.getProbe(GuiceServerProbe.class); + } + + protected GuiceProbeProvider getGuiceProbeProvider() { + return guiceProbeProvider; + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 fa85594..58039ea 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 @@ -39,7 +39,7 @@ public abstract class AbstractJamesServerTest { private static final int SMTP_PORT = 1025; private static final int LMTP_PORT = 1024; - private GuiceJamesServer server; + private GuiceJamesServerImpl server; private SocketChannel socketChannel; @Before @@ -49,7 +49,7 @@ public abstract class AbstractJamesServerTest { server.start(); } - protected abstract GuiceJamesServer createJamesServer(); + protected abstract GuiceJamesServerImpl createJamesServer(); protected abstract void clean(); http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java index c67eac8..cdfd301 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java @@ -39,7 +39,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; -public abstract class AbstractJmapJamesServerTest<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public abstract class AbstractJmapJamesServerTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final int IMAP_PORT = 1143; // You need to be root (superuser) to bind to ports under 1024. private static final int IMAP_PORT_SSL = 1993; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java index 7a5e52f..d65aaa0 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java @@ -27,7 +27,7 @@ import com.google.common.collect.Iterables; import com.google.inject.Module; import com.google.inject.util.Modules; -public class MemoryJamesServer extends GuiceJamesServer implements JmapServer, WebAdminServer { +public class MemoryJamesServer extends GuiceJamesServerImpl implements JmapServer, WebAdminServer { public MemoryJamesServer() { super(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 428a20f..8e34206 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.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.model.ContinuationToken; @@ -45,7 +45,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; -public abstract class JMAPAuthenticationTest<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public abstract class JMAPAuthenticationTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final ZonedDateTime oldDate = ZonedDateTime.parse("2011-12-03T10:15:30+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME); private static final ZonedDateTime newDate = ZonedDateTime.parse("2011-12-03T10:16:30+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME); http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 7c6ee22..b039913 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.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.api.access.AccessToken; @@ -51,7 +51,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; -public abstract class VacationIntegrationTest<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public abstract class VacationIntegrationTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final String ARGUMENTS = "[0][1]"; private static final String SECOND_NAME = "[1][0]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 3d99136..011752c 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.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.JmapAuthentication; @@ -52,7 +52,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; -public abstract class GetMailboxesMethodTest<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public abstract class GetMailboxesMethodTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 5d08da4..a9b7a22 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.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.JmapAuthentication; @@ -54,7 +54,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; -public abstract class GetMessageListMethodTest<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public abstract class GetMessageListMethodTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 ec6e5cc..16e2403 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.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.FixedDateZonedDateTimeProvider; @@ -47,7 +47,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; -public abstract class GetVacationResponseTest<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public abstract class GetVacationResponseTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 8087bd5..4f3b19b 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.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.JmapAuthentication; @@ -54,7 +54,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; -public abstract class SetMailboxesMethodTest<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public abstract class SetMailboxesMethodTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 dd5b580..0045e32 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 @@ -49,7 +49,7 @@ import java.util.stream.Collectors; import javax.mail.Flags; import org.apache.commons.io.IOUtils; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.JmapAuthentication; @@ -80,7 +80,7 @@ import com.jayway.restassured.builder.ResponseSpecBuilder; import com.jayway.restassured.http.ContentType; import com.jayway.restassured.specification.ResponseSpecification; -public abstract class SetMessagesMethodTest<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public abstract class SetMessagesMethodTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final int _1MB = 1024*1024; private static final String NAME = "[0][0]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 07a49a5..ab2d265 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.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.JmapAuthentication; @@ -47,7 +47,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; -public abstract class SetVacationResponseTest<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public abstract class SetVacationResponseTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java index 03537ce..50fbe6a 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java @@ -37,7 +37,7 @@ import org.apache.http.HttpResponse; import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Response; import org.apache.http.client.utils.URIBuilder; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.api.access.AccessToken; @@ -59,7 +59,7 @@ import cucumber.api.java.en.When; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class DownloadStepdefs <T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public class DownloadStepdefs <T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final String ONE_ATTACHMENT_EML_ATTACHEMENT_BLOB_ID = "4000c5145f633410b80be368c44e1c394bff9437"; private static final String EXPIRED_ATTACHMENT_TOKEN = "usera@domain.tld_" http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java index 78aec0c..07e28ff 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java @@ -38,7 +38,7 @@ import javax.mail.Flags; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.http.HttpResponse; import org.apache.http.client.fluent.Request; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.methods.integration.cucumber.util.TableRow; @@ -60,7 +60,7 @@ import cucumber.api.java.en.When; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class GetMessagesMethodStepdefs <T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public class GetMessagesMethodStepdefs <T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final Optional<Map<String, String>> NO_HEADERS = Optional.empty(); private static final String NAME = "[0][0]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/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 e8f48f4..e4e4959 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.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; @@ -29,7 +29,7 @@ import com.google.common.base.Charsets; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class MainStepdefs<T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public class MainStepdefs<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { public T jmapServer; public Runnable awaitMethod = () -> {}; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java index 69b79eb..a8dc46e 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java @@ -32,7 +32,7 @@ import javax.mail.Flags; import org.apache.http.HttpResponse; import org.apache.http.client.fluent.Request; import org.apache.http.entity.ContentType; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.mailbox.exception.MailboxException; @@ -50,7 +50,7 @@ import cucumber.api.java.en.When; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class SetMailboxesMethodStepdefs <T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public class SetMailboxesMethodStepdefs <T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java index 0337e6d..d1e26bd 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java @@ -32,7 +32,7 @@ import org.apache.http.HttpResponse; import org.apache.http.client.fluent.Executor; import org.apache.http.client.fluent.Request; import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.api.access.AccessToken; @@ -47,7 +47,7 @@ import cucumber.api.java.en.When; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class UploadStepdefs <T extends GuiceJamesServer & JmapServer & WebAdminServer> { +public class UploadStepdefs <T extends GuiceJamesServerImpl & JmapServer & WebAdminServer>{ private static final String _1M_ZEROED_FILE_BLOB_ID = "3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3"; private static final int _1M = 1024 * 1024; private static final int _10M = 10 * _1M; http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java index 011f4a5..7fae1db 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java @@ -27,7 +27,7 @@ import java.util.Set; import javax.inject.Inject; -import org.apache.james.GuiceJamesServer; +import org.apache.james.GuiceJamesServerImpl; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.HttpJmapAuthentication; @@ -44,7 +44,7 @@ import cucumber.api.java.en.Given; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class UserStepdefs <T extends GuiceJamesServer & JmapServer & WebAdminServer>{ +public class UserStepdefs <T extends GuiceJamesServerImpl & JmapServer & WebAdminServer>{ private final MainStepdefs<T> mainStepdefs; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
