MAILBOX-294 Fix 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/d8e844e3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d8e844e3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d8e844e3 Branch: refs/heads/master Commit: d8e844e3cce6e3b89c259ac77edddced896a1534 Parents: f60dfe3 Author: Antoine Duprat <adup...@linagora.com> Authored: Mon Apr 24 09:59:54 2017 +0200 Committer: Antoine Duprat <adup...@linagora.com> Committed: Tue Apr 25 08:47:53 2017 +0200 ---------------------------------------------------------------------- .../store/mail/model/MessageIdMapperTest.java | 1 - .../mailbox/ElasticSearchMailboxModule.java | 3 +-- .../apache/james/DockerElasticSearchRule.java | 6 ++--- .../JamesServerWithRetryConnectionTest.java | 19 ++++++-------- .../apache/james/utils/RetryExecutorUtil.java | 2 +- .../utils/FileConfigurationProviderTest.java | 1 - .../james/utils/RetryExecutorUtilTest.java | 26 ++++++++++++-------- .../apache/james/modules/server/JMXServer.java | 1 - .../java/org/apache/james/jmap/JMAPModule.java | 1 - 9 files changed, 28 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d8e844e3/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java index bbac7ad..e9089e7 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java @@ -31,7 +31,6 @@ import javax.mail.Flags.Flag; import javax.mail.util.SharedByteArrayInputStream; import org.apache.james.mailbox.FlagsBuilder; -import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.MessageManager.FlagsUpdateMode; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; http://git-wip-us.apache.org/repos/asf/james-project/blob/d8e844e3/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java index d1b124b..e4a1011 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java @@ -32,7 +32,6 @@ import org.apache.james.backends.es.IndexCreationFactory; import org.apache.james.backends.es.IndexName; import org.apache.james.backends.es.NodeMappingFactory; import org.apache.james.backends.es.TypeName; -import org.apache.james.filesystem.api.FileSystem; import org.apache.james.mailbox.elasticsearch.IndexAttachments; import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; import org.apache.james.mailbox.elasticsearch.MailboxMappingFactory; @@ -41,8 +40,8 @@ import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex; import org.apache.james.mailbox.store.search.MessageSearchIndex; import org.apache.james.mailbox.tika.extractor.TikaTextExtractor; -import org.apache.james.utils.RetryExecutorUtil; import org.apache.james.utils.PropertiesProvider; +import org.apache.james.utils.RetryExecutorUtil; import org.elasticsearch.client.Client; import org.elasticsearch.client.transport.NoNodeAvailableException; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/d8e844e3/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java index 3dd19c2..3598b4f 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java @@ -19,9 +19,9 @@ package org.apache.james; -import com.google.inject.Module; +import java.util.Arrays; + import org.apache.commons.configuration.PropertiesConfiguration; -import org.apache.james.modules.mailbox.CassandraSessionConfiguration; import org.apache.james.modules.mailbox.ElasticSearchConfiguration; import org.apache.james.util.streams.SwarmGenericContainer; import org.junit.runner.Description; @@ -29,7 +29,7 @@ import org.junit.runners.model.Statement; import org.testcontainers.shaded.com.github.dockerjava.api.model.ExposedPort; import org.testcontainers.shaded.com.github.dockerjava.api.model.Ports.Binding; -import java.util.Arrays; +import com.google.inject.Module; public class DockerElasticSearchRule implements GuiceModuleTestRule { http://git-wip-us.apache.org/repos/asf/james-project/blob/d8e844e3/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java index 018bda1..ce18ad9 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java @@ -19,13 +19,7 @@ package org.apache.james; -import org.apache.james.util.streams.SwarmGenericContainer; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.testcontainers.DockerClientFactory; -import org.testcontainers.shaded.com.google.common.base.Throwables; +import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import java.net.InetSocketAddress; @@ -36,16 +30,17 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import static org.assertj.core.api.Assertions.assertThat; +import org.apache.james.util.streams.SwarmGenericContainer; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.testcontainers.shaded.com.google.common.base.Throwables; public class JamesServerWithRetryConnectionTest { private static final int IMAP_PORT = 1143; private static final long WAITING_TIME = TimeUnit.MILLISECONDS.convert(10, TimeUnit.SECONDS); - private static String getDockerHostIp() { - return DockerClientFactory.instance().dockerHostIpAddress(); - } - private final DockerCassandraRule dockerCassandraRule = new DockerCassandraRule(); private final DockerElasticSearchRule dockerElasticSearchRule = new DockerElasticSearchRule(); http://git-wip-us.apache.org/repos/asf/james-project/blob/d8e844e3/server/container/guice/guice-common/src/main/java/org/apache/james/utils/RetryExecutorUtil.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/RetryExecutorUtil.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/RetryExecutorUtil.java index 32b807e..8737ffe 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/RetryExecutorUtil.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/RetryExecutorUtil.java @@ -26,7 +26,7 @@ public class RetryExecutorUtil { public static final int INITIAL_DELAY_MILLIS = 500; public static final int MULTIPLIER = 2; - public static AsyncRetryExecutor retryOnExceptions(AsyncRetryExecutor executor, int maxRetries, int minDelay, Class<? extends Throwable>... clazz) { + public static AsyncRetryExecutor retryOnExceptions(AsyncRetryExecutor executor, int maxRetries, int minDelay, Class<? extends Throwable> clazz) { return executor .retryOn(clazz) .withExponentialBackoff(INITIAL_DELAY_MILLIS, MULTIPLIER) http://git-wip-us.apache.org/repos/asf/james-project/blob/d8e844e3/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java index 04562f2..6318fc7 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java @@ -21,7 +21,6 @@ package org.apache.james.utils; import static org.assertj.core.api.Assertions.assertThat; -import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.core.JamesServerResourceLoader; import org.apache.james.core.filesystem.FileSystemImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/d8e844e3/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java index 32477ab..a9354f4 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/RetryExecutorUtilTest.java @@ -19,22 +19,23 @@ package org.apache.james.utils; -import com.nurkiewicz.asyncretry.AsyncRetryExecutor; -import com.nurkiewicz.asyncretry.RetryExecutor; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.BDDMockito.given; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.BDDMockito.given; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import com.nurkiewicz.asyncretry.AsyncRetryExecutor; +import com.nurkiewicz.asyncretry.RetryExecutor; public class RetryExecutorUtilTest { private static final int MAX_RETRIES = 3; @@ -57,6 +58,7 @@ public class RetryExecutorUtilTest { } @Test + @SuppressWarnings("unchecked") public void retryOnExceptionsAndExecuteShouldRethrowWhenScheduledServiceAlwaysThrowException() throws Exception { given(serviceMock.faultyService()) .willThrow(IllegalArgumentException.class) @@ -72,6 +74,7 @@ public class RetryExecutorUtilTest { } @Test + @SuppressWarnings("unchecked") public void retryOnExceptionsAndExecuteShouldRetryWhenMatchExceptionAndSuccess() throws Exception { given(serviceMock.faultyService()) .willThrow(IllegalArgumentException.class) @@ -84,6 +87,7 @@ public class RetryExecutorUtilTest { } @Test + @SuppressWarnings("unchecked") public void retryOnExceptionsAndExecuteShouldNotRetryWhenDoesNotMatchException() throws Exception { given(serviceMock.faultyService()) .willThrow(IllegalStateException.class) @@ -97,6 +101,7 @@ public class RetryExecutorUtilTest { } @Test + @SuppressWarnings("unchecked") public void retryOnExceptionsAndExecuteShouldRetryWithMaxTimesAndReturnValue() throws Exception { given(serviceMock.faultyService()) .willThrow(IllegalStateException.class, IllegalStateException.class, IllegalStateException.class) @@ -110,6 +115,7 @@ public class RetryExecutorUtilTest { } @Test + @SuppressWarnings("unchecked") public void retryOnExceptionsAndExecuteShouldFailIfFailMoreThanMaxRetry() throws Exception { given(serviceMock.faultyService()). willThrow(IllegalStateException.class, IllegalStateException.class, IllegalStateException.class, IllegalStateException.class). http://git-wip-us.apache.org/repos/asf/james-project/blob/d8e844e3/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java index 8be9f76..49b0893 100644 --- a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java +++ b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServer.java @@ -37,7 +37,6 @@ import javax.management.remote.JMXServiceURL; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; -import org.apache.james.filesystem.api.FileSystem; import org.apache.james.util.RestrictingRMISocketFactory; import org.apache.james.utils.PropertiesProvider; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/d8e844e3/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java index 73ef2f5..a43b0d6 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Optional; import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.io.FileUtils; import org.apache.james.filesystem.api.FileSystem; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
