JAMES-1842: remove eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/95e11203 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/95e11203 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/95e11203 Branch: refs/heads/master Commit: 95e11203398f889cdf5089b24e5459f9936fad28 Parents: 0aafb2d Author: Quynh Nguyen <qngu...@linagora.com> Authored: Wed Nov 16 09:44:50 2016 +0700 Committer: Quynh Nguyen <qngu...@linagora.com> Committed: Fri Nov 18 09:33:08 2016 +0700 ---------------------------------------------------------------------- .../filesystem/api/AbstractFileSystemTest.java | 1 - .../apache/james/utils/GuiceProbeProvider.java | 2 + .../org/apache/james/utils/JmapGuiceProbe.java | 8 +--- .../james/AbstractJmapJamesServerTest.java | 1 - .../james/utils/GuiceProbeProviderTest.java | 3 +- .../mailbox/LuceneSearchMailboxModule.java | 4 -- .../james/modules/data/MemoryDataModule.java | 2 - .../james/mailets/TemporaryJamesServer.java | 1 - .../CassandraVacationIntegrationTest.java | 1 - .../cassandra/cucumber/CassandraStepdefs.java | 4 +- .../james/jmap/JMAPAuthenticationTest.java | 1 - .../integration/GetMailboxesMethodTest.java | 39 ++++++++++---------- .../integration/GetMessageListMethodTest.java | 1 - .../integration/SetMailboxesMethodTest.java | 1 - .../integration/SetMessagesMethodTest.java | 1 - .../integration/cucumber/DownloadStepdefs.java | 11 ++++-- .../cucumber/GetMessagesMethodStepdefs.java | 11 ++++-- .../integration/cucumber/MainStepdefs.java | 2 +- .../cucumber/SetMailboxesMethodStepdefs.java | 11 ++++-- .../integration/cucumber/UploadStepdefs.java | 15 +++++--- .../integration/cucumber/UserStepdefs.java | 9 +++-- .../jmap/memory/cucumber/MemoryStepdefs.java | 4 +- 22 files changed, 66 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java ---------------------------------------------------------------------- diff --git a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java index df43491..c0f58bf 100644 --- a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java +++ b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java @@ -44,7 +44,6 @@ import com.sun.net.httpserver.HttpServer; import junitparams.JUnitParamsRunner; import junitparams.Parameters; -@SuppressWarnings("restriction") @RunWith(JUnitParamsRunner.class) public abstract class AbstractFileSystemTest { private static final String FAKE_DIRECTORY = "b7b73e3a-5234-11e5-87f2-9b171f273b49/"; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java index 7b98b6f..237c537 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java @@ -30,12 +30,14 @@ import java.util.Set; public class GuiceProbeProvider { private final Map<Class<GuiceProbe>, GuiceProbe> registry; + @SuppressWarnings("unchecked") @Inject public GuiceProbeProvider(Set<GuiceProbe> guiceProbes) { this.registry = guiceProbes.stream() .collect(Guavate.toImmutableMap(guiceProbe -> (Class<GuiceProbe>) guiceProbe.getClass())); } + @SuppressWarnings("unchecked") public <T extends GuiceProbe> T getProbe(Class<T> clazz) { Preconditions.checkNotNull(clazz); return Optional.ofNullable(registry.get(clazz)) http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/server/container/guice/guice-common/src/main/java/org/apache/james/utils/JmapGuiceProbe.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/JmapGuiceProbe.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/JmapGuiceProbe.java index 9d881e0..cfbbbb6 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/JmapGuiceProbe.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/JmapGuiceProbe.java @@ -19,20 +19,16 @@ package org.apache.james.utils; +import javax.inject.Inject; + import org.apache.james.jmap.JMAPServer; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.Vacation; import org.apache.james.jmap.api.vacation.VacationPatch; import org.apache.james.jmap.api.vacation.VacationRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; public class JmapGuiceProbe implements GuiceProbe { - private static final Logger LOGGER = LoggerFactory.getLogger(JmapGuiceProbe.class); - private final VacationRepository vacationRepository; private final JMAPServer jmapServer; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 4de3ba6..c67eac8 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 @@ -30,7 +30,6 @@ import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; import java.nio.charset.Charset; -import org.apache.james.utils.JmapGuiceProbe; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java index f4f73ec..6a54a53 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java @@ -19,13 +19,12 @@ package org.apache.james.utils; import static org.assertj.core.api.Assertions.assertThat; -import com.google.common.collect.ImmutableSet; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.*; +import com.google.common.collect.ImmutableSet; public class GuiceProbeProviderTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/LuceneSearchMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/LuceneSearchMailboxModule.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/LuceneSearchMailboxModule.java index 53cbc01..55996fd 100644 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/LuceneSearchMailboxModule.java +++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/LuceneSearchMailboxModule.java @@ -19,13 +19,9 @@ package org.apache.james.modules.mailbox; -import java.io.File; import java.io.IOException; -import org.apache.james.core.JamesServerResourceLoader; -import org.apache.james.core.filesystem.FileSystemImpl; import org.apache.james.filesystem.api.FileSystem; -import org.apache.james.filesystem.api.JamesDirectoriesProvider; import org.apache.james.mailbox.lucene.search.LuceneMessageSearchIndex; import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex; import org.apache.james.mailbox.store.search.MessageSearchIndex; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java index b809df8..e7799e5 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java @@ -27,8 +27,6 @@ import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.rrt.api.RecipientRewriteTable; import org.apache.james.rrt.memory.MemoryRecipientRewriteTable; -import org.apache.james.sieverepository.api.SieveRepository; -import org.apache.james.sieverepository.file.SieveFileRepository; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.memory.MemoryUsersRepository; import org.apache.james.utils.ConfigurationPerformer; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 a23d552..4b9ba55 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,6 @@ 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.MemoryJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.configuration.MailetContainer; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 5792447..cec5976 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 @@ -21,7 +21,6 @@ package org.apache.james.jmap.cassandra; import org.apache.james.CassandraJamesServer; import org.apache.james.CassandraJamesServerMain; -import org.apache.james.GuiceJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; import org.apache.james.jmap.VacationIntegrationTest; import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 39f4b65..2e3ea82 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 @@ -40,13 +40,13 @@ import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped public class CassandraStepdefs { - private final MainStepdefs mainStepdefs; + private final MainStepdefs<CassandraJamesServer> mainStepdefs; private TemporaryFolder temporaryFolder = new TemporaryFolder(); private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer(); @Inject - private CassandraStepdefs(MainStepdefs mainStepdefs) { + private CassandraStepdefs(MainStepdefs<CassandraJamesServer> mainStepdefs) { this.mainStepdefs = mainStepdefs; } http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 1fa5c87..428a20f 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 @@ -36,7 +36,6 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; import org.apache.james.jmap.model.ContinuationToken; -import org.apache.james.utils.JmapGuiceProbe; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 e1f7622..3d99136 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 @@ -19,10 +19,22 @@ package org.apache.james.jmap.methods.integration; -import com.google.common.base.Charsets; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.builder.RequestSpecBuilder; -import com.jayway.restassured.http.ContentType; +import static com.jayway.restassured.RestAssured.given; +import static com.jayway.restassured.config.EncoderConfig.encoderConfig; +import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; + +import java.io.ByteArrayInputStream; +import java.util.Date; + +import javax.mail.Flags; + import org.apache.james.GuiceJamesServer; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; @@ -31,25 +43,14 @@ import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.james.utils.JmapGuiceProbe; import org.junit.After; import org.junit.Before; import org.junit.Test; -import javax.mail.Flags; -import java.io.ByteArrayInputStream; -import java.util.Date; - -import static com.jayway.restassured.RestAssured.given; -import static com.jayway.restassured.config.EncoderConfig.encoderConfig; -import static com.jayway.restassured.config.RestAssuredConfig.newConfig; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItems; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; +import com.google.common.base.Charsets; +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> { private static final String NAME = "[0][0]"; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 cbb6df7..5d08da4 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 @@ -44,7 +44,6 @@ import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.utils.JmapGuiceProbe; import org.junit.After; import org.junit.Before; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 8b69679..8087bd5 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 @@ -44,7 +44,6 @@ import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.james.utils.JmapGuiceProbe; import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 c45a35b..dd5b580 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 @@ -61,7 +61,6 @@ import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.util.ZeroedInputStream; -import org.apache.james.utils.JmapGuiceProbe; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.junit.After; http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 d000bb3..03537ce 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,6 +37,9 @@ 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.JmapServer; +import org.apache.james.WebAdminServer; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.model.AttachmentAccessToken; import org.apache.james.mailbox.model.MailboxConstants; @@ -56,7 +59,7 @@ import cucumber.api.java.en.When; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class DownloadStepdefs { +public class DownloadStepdefs <T extends GuiceJamesServer & JmapServer & WebAdminServer> { private static final String ONE_ATTACHMENT_EML_ATTACHEMENT_BLOB_ID = "4000c5145f633410b80be368c44e1c394bff9437"; private static final String EXPIRED_ATTACHMENT_TOKEN = "usera@domain.tld_" @@ -67,15 +70,15 @@ public class DownloadStepdefs { + "DiZa0O14MjLWrAA8P6MG35Gt5CBp7mt5U1EH/M++rIoZK7nlGJ4dPW0dvZD7h4m3o5b/Yd8DXU5x2x4+s0HOOKzD7X0RMlsU7JHJMNLvTvRGWF/C+MUyC8Zce7DtnRVPEQX2uAZhL2PBABV07Vpa8kH+NxoS9CL955Bc1Obr4G+KN2JorADlocFQA6ElXryF5YS/HPZSvq1MTC6aJIP0ku8WRpRnbwgwJnn26YpcHXcJjbkCBtd9/BhlMV6xNd2hTBkfZmYdoNo+UKBaXWzLxAlbLuxjpxwvDNJfOEyWFPgHDoRvzP+G7KzhVWjanHAHrhF0GilEa/MKpOI1qHBSwA=="; private static final String UTF8_CONTENT_DIPOSITION_START = "Content-Disposition: attachment; filename*=\""; - private final UserStepdefs userStepdefs; - private final MainStepdefs mainStepdefs; + private final UserStepdefs<T> userStepdefs; + private final MainStepdefs<T> mainStepdefs; private HttpResponse response; private Multimap<String, String> attachmentsByMessageId; private Map<String, String> blobIdByAttachmentId; private Map<AttachmentAccessTokenKey, AttachmentAccessToken> attachmentAccessTokens; @Inject - private DownloadStepdefs(MainStepdefs mainStepdefs, UserStepdefs userStepdefs) { + private DownloadStepdefs(MainStepdefs<T> mainStepdefs, UserStepdefs<T> userStepdefs) { this.mainStepdefs = mainStepdefs; this.userStepdefs = userStepdefs; this.attachmentsByMessageId = ArrayListMultimap.create(); http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 5bbc254..78aec0c 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,6 +38,9 @@ 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.JmapServer; +import org.apache.james.WebAdminServer; import org.apache.james.jmap.methods.integration.cucumber.util.TableRow; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; @@ -57,7 +60,7 @@ import cucumber.api.java.en.When; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class GetMessagesMethodStepdefs { +public class GetMessagesMethodStepdefs <T extends GuiceJamesServer & JmapServer & WebAdminServer> { private static final Optional<Map<String, String>> NO_HEADERS = Optional.empty(); private static final String NAME = "[0][0]"; @@ -68,14 +71,14 @@ public class GetMessagesMethodStepdefs { private static final String SECOND_ATTACHMENT = ATTACHMENTS + "[1]"; - private final MainStepdefs mainStepdefs; - private final UserStepdefs userStepdefs; + private final MainStepdefs<T> mainStepdefs; + private final UserStepdefs<T> userStepdefs; private HttpResponse response; private DocumentContext jsonPath; @Inject - private GetMessagesMethodStepdefs(MainStepdefs mainStepdefs, UserStepdefs userStepdefs) { + private GetMessagesMethodStepdefs(MainStepdefs<T> mainStepdefs, UserStepdefs<T> userStepdefs) { this.mainStepdefs = mainStepdefs; this.userStepdefs = userStepdefs; } http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 525b563..e8f48f4 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 @@ -23,9 +23,9 @@ import org.apache.http.client.utils.URIBuilder; import org.apache.james.GuiceJamesServer; import org.apache.james.JmapServer; import org.apache.james.WebAdminServer; -import org.apache.james.utils.JmapGuiceProbe; import com.google.common.base.Charsets; + import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 b2fed83..69b79eb 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,6 +32,9 @@ 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.JmapServer; +import org.apache.james.WebAdminServer; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxPath; @@ -47,16 +50,16 @@ import cucumber.api.java.en.When; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class SetMailboxesMethodStepdefs { +public class SetMailboxesMethodStepdefs <T extends GuiceJamesServer & JmapServer & WebAdminServer> { private static final String NAME = "[0][0]"; private static final String ARGUMENTS = "[0][1]"; - private final MainStepdefs mainStepdefs; - private final UserStepdefs userStepdefs; + private final MainStepdefs<T> mainStepdefs; + private final UserStepdefs<T> userStepdefs; @Inject - private SetMailboxesMethodStepdefs(MainStepdefs mainStepdefs, UserStepdefs userStepdefs) { + private SetMailboxesMethodStepdefs(MainStepdefs<T> mainStepdefs, UserStepdefs<T> userStepdefs) { this.mainStepdefs = mainStepdefs; this.userStepdefs = userStepdefs; } http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 d05e90d..0337e6d 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 @@ -19,6 +19,8 @@ package org.apache.james.jmap.methods.integration.cucumber; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.BufferedInputStream; import java.net.URI; import java.net.URISyntaxException; @@ -30,6 +32,9 @@ 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.JmapServer; +import org.apache.james.WebAdminServer; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.util.ZeroedInputStream; @@ -37,25 +42,23 @@ import com.google.common.base.Charsets; import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; -import static org.assertj.core.api.Assertions.assertThat; - import cucumber.api.java.en.Then; import cucumber.api.java.en.When; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class UploadStepdefs { +public class UploadStepdefs <T extends GuiceJamesServer & 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; - private final UserStepdefs userStepdefs; - private final MainStepdefs mainStepdefs; + private final UserStepdefs<T> userStepdefs; + private final MainStepdefs<T> mainStepdefs; private final URI uploadUri; private HttpResponse response; @Inject - private UploadStepdefs(UserStepdefs userStepdefs, MainStepdefs mainStepdefs) throws URISyntaxException { + private UploadStepdefs(UserStepdefs<T> userStepdefs, MainStepdefs<T> mainStepdefs) throws URISyntaxException { this.userStepdefs = userStepdefs; this.mainStepdefs = mainStepdefs; uploadUri = mainStepdefs.baseUri().setPath("/upload").build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 c805105..011f4a5 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,6 +27,9 @@ import java.util.Set; import javax.inject.Inject; +import org.apache.james.GuiceJamesServer; +import org.apache.james.JmapServer; +import org.apache.james.WebAdminServer; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.model.MailboxConstants; @@ -41,9 +44,9 @@ import cucumber.api.java.en.Given; import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped -public class UserStepdefs { +public class UserStepdefs <T extends GuiceJamesServer & JmapServer & WebAdminServer>{ - private final MainStepdefs mainStepdefs; + private final MainStepdefs<T> mainStepdefs; protected Map<String, String> passwordByUser; protected Set<String> domains; @@ -51,7 +54,7 @@ public class UserStepdefs { protected String lastConnectedUser; @Inject - private UserStepdefs(MainStepdefs mainStepdefs) { + private UserStepdefs(MainStepdefs<T> mainStepdefs) { this.mainStepdefs = mainStepdefs; this.domains = new HashSet<>(); this.passwordByUser = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/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 fc36fc7..da4c95e 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 @@ -34,11 +34,11 @@ import cucumber.runtime.java.guice.ScenarioScoped; @ScenarioScoped public class MemoryStepdefs { - private final MainStepdefs mainStepdefs; + private final MainStepdefs<MemoryJamesServer> mainStepdefs; private final TemporaryFolder temporaryFolder; @Inject - private MemoryStepdefs(MainStepdefs mainStepdefs) { + private MemoryStepdefs(MainStepdefs<MemoryJamesServer> mainStepdefs) { this.mainStepdefs = mainStepdefs; this.temporaryFolder = new TemporaryFolder(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
