JAMES-1842: Rename GuiceJamesServer to GuiceJamesServerImpl

apache · Nov 18, 2016 · 932f16c · 932f16c
1 parent 95e1120
commit 932f16c
Show file tree

Hide file tree

Showing 22 changed files with 48 additions and 48 deletions.
diff --git a/.../cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java b/.../cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
@@ -22,7 +22,7 @@
 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 InMemoryDNSService getInMemoryDnsService() {
         return inMemoryDNSService;
     }
 
-    protected GuiceJamesServer createJamesServer() {
+    protected GuiceJamesServerImpl createJamesServer() {
-        return new GuiceJamesServer()
+        return new GuiceJamesServerImpl()
             .combineWith(CassandraJamesServerMain.cassandraServerModule)
             .overrideWith(new CassandraJmapServerModule(folder::getRoot, embeddedElasticSearch, embeddedCassandra),
                 (binder) -> binder.bind(DNSService.class).toInstance(inMemoryDNSService));

diff --git a/.../container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java b/.../container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
@@ -27,7 +27,7 @@
 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();

diff --git a/...tainer/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java b/...tainer/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();
     }

diff --git a/...ner/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/...ner/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
@@ -46,7 +46,7 @@
 
 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 void teardown() {
         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),

diff --git a/...va/org/apache/james/GuiceJamesServer.java → ...rg/apache/james/GuiceJamesServerImpl.java b/...va/org/apache/james/GuiceJamesServer.java → ...rg/apache/james/GuiceJamesServerImpl.java
@@ -38,28 +38,28 @@
 import com.google.inject.TypeLiteral;
 import com.google.inject.util.Modules;
 
-public class GuiceJamesServer {
+public class GuiceJamesServerImpl {
     protected final Module module;
     private Stager<PreDestroy> preDestroy;
     private GuiceProbeProvider guiceProbeProvider;
 
-    public GuiceJamesServer() {
+    public GuiceJamesServerImpl() {
         this(Modules.combine(
                         new CommonServicesModule(),
                         new ProtocolsModule(),
                         new MailetProcessingModule()));
     }
 
-    protected GuiceJamesServer(Module module) {
+    protected GuiceJamesServerImpl(Module module) {
         this.module = module;
     }
 
-    public GuiceJamesServer combineWith(Module... modules) {
+    public GuiceJamesServerImpl combineWith(Module... modules) {
-        return new GuiceJamesServer(Modules.combine(Iterables.concat(Arrays.asList(module), Arrays.asList(modules))));
+        return new GuiceJamesServerImpl(Modules.combine(Iterables.concat(Arrays.asList(module), Arrays.asList(modules))));
     }
 
-    public GuiceJamesServer overrideWith(Module... overrides) {
+    public GuiceJamesServerImpl overrideWith(Module... overrides) {
-        return new GuiceJamesServer(Modules.override(module).with(overrides));
+        return new GuiceJamesServerImpl(Modules.override(module).with(overrides));
     }
 
     public void start() throws Exception {

diff --git a/.../container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java b/.../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 void setup() throws Exception {
         server.start();
     }
 
-    protected abstract GuiceJamesServer createJamesServer();
+    protected abstract GuiceJamesServerImpl createJamesServer();
 
     protected abstract void clean();
 

diff --git a/...tainer/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java b/...tainer/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
@@ -39,7 +39,7 @@
 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;

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
@@ -27,7 +27,7 @@
 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();
     }

diff --git a/...ntegration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/...ntegration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
@@ -32,7 +32,7 @@
 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.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);

diff --git a/...tegration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/...tegration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
@@ -31,7 +31,7 @@
 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.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]";

diff --git a/...ommon/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/...ommon/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
@@ -35,7 +35,7 @@
 
 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.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]";
 

diff --git a/...mon/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/...mon/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
@@ -36,7 +36,7 @@
 
 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.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]";
 

diff --git a/...mmon/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/...mmon/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -28,7 +28,7 @@
 
 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.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]";

diff --git a/...ommon/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/...ommon/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -36,7 +36,7 @@
 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.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]";

diff --git a/...common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/...common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -49,7 +49,7 @@
 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.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]";

diff --git a/...mmon/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/...mmon/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
@@ -28,7 +28,7 @@
 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.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]";

diff --git a/...on/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java b/...on/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
@@ -37,7 +37,7 @@
 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.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_"

diff --git a/...st/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/...st/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
@@ -38,7 +38,7 @@
 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.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]";

diff --git a/...common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java b/...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 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 = () -> {};

diff --git a/...t/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java b/...t/java/org/apache/james/jmap/methods/integration/cucumber/SetMailboxesMethodStepdefs.java
@@ -32,7 +32,7 @@
 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.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]";

diff --git a/...mmon/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java b/...mmon/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
@@ -32,7 +32,7 @@
 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.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;

diff --git a/...common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java b/...common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
@@ -27,7 +27,7 @@
 
 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.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;