Repository: james-project Updated Branches: refs/heads/master b1823d38c -> 3aff7a9f6
JAMES-2144 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/3aff7a9f Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3aff7a9f Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3aff7a9f Branch: refs/heads/master Commit: 3aff7a9f6b5e57b919b00593b1b4a0173b2b4423 Parents: 172d3b3 Author: benwa <[email protected]> Authored: Wed Sep 20 09:57:17 2017 +0700 Committer: Antoine Duprat <[email protected]> Committed: Wed Sep 20 14:09:31 2017 +0200 ---------------------------------------------------------------------- .../mail/migration/AttachmentMessageIdCreationTest.java | 2 +- .../java/org/apache/james/mailets/TemporaryJamesServer.java | 3 --- .../org/apache/james/transport/mailets/GroupMappingTest.java | 1 - .../james/jmap/methods/integration/SetMessagesMethodTest.java | 2 +- .../apache/james/jmap/mailet/TextCalendarBodyToAttachment.java | 1 + .../james/jmap/mailet/TextCalendarBodyToAttachmentTest.java | 4 ++-- .../src/main/java/org/apache/james/webadmin/WebAdminServer.java | 5 ----- 7 files changed, 5 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/3aff7a9f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java index 277741c..126c03a 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentMessageIdCreationTest.java @@ -161,7 +161,7 @@ public class AttachmentMessageIdCreationTest { when(cassandraMessageDAO.retrieveAllMessageIdAttachmentIds()) .thenReturn(CompletableFuture.completedFuture(Stream.of(messageIdAttachmentIds))); when(attachmentMessageIdDAO.storeAttachmentForMessageId(any(AttachmentId.class), any(MessageId.class))) - .thenThrow(RuntimeException.class); + .thenThrow(new RuntimeException()); assertThat(migration.run()).isEqualTo(Migration.MigrationResult.PARTIAL); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3aff7a9f/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 e6ad1bf..7ed7d5d 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 @@ -25,7 +25,6 @@ import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Paths; -import java.util.Arrays; import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; @@ -40,8 +39,6 @@ import org.apache.james.webadmin.WebAdminConfiguration; import org.apache.james.webadmin.WebAdminUtils; import org.junit.rules.TemporaryFolder; -import com.google.common.collect.ImmutableList; -import com.google.inject.AbstractModule; import com.google.inject.Module; public class TemporaryJamesServer { http://git-wip-us.apache.org/repos/asf/james-project/blob/3aff7a9f/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java index db99d55..cd2e86d 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java @@ -22,7 +22,6 @@ package org.apache.james.transport.mailets; import static com.jayway.restassured.RestAssured.with; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyOrNullString; import java.net.InetAddress; import java.util.concurrent.TimeUnit; http://git-wip-us.apache.org/repos/asf/james-project/blob/3aff7a9f/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 a9efa83..f22b2de 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 @@ -56,6 +56,7 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.io.IOUtils; import org.apache.http.client.utils.URIBuilder; import org.apache.james.GuiceJamesServer; +import org.apache.james.core.MailAddress; import org.apache.james.jmap.DefaultMailboxes; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; @@ -80,7 +81,6 @@ import org.apache.james.utils.JmapGuiceProbe; import org.apache.james.utils.MessageIdProbe; import org.apache.james.utils.SMTPMessageSender; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.MimeMessageBuilder; import org.hamcrest.Matcher; http://git-wip-us.apache.org/repos/asf/james-project/blob/3aff7a9f/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachment.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachment.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachment.java index e43a941..d474568 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachment.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachment.java @@ -83,6 +83,7 @@ public class TextCalendarBodyToAttachment extends GenericMailet { mimeMessage.saveChanges(); } + @SuppressWarnings("unchecked") private List<Header> getContentHeadersFromMimeMessage(MimeMessage mimeMessage) throws MessagingException { return Collections.list((Enumeration<Header>) mimeMessage.getAllHeaders()) .stream() http://git-wip-us.apache.org/repos/asf/james-project/blob/3aff7a9f/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java index d43fe2a..c9b40b5 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/TextCalendarBodyToAttachmentTest.java @@ -68,7 +68,7 @@ public class TextCalendarBodyToAttachmentTest { expectedException.expect(MessagingException.class); Mail mail = mock(Mail.class); when(mail.getMessage()) - .thenThrow(MessagingException.class); + .thenThrow(new MessagingException()); mailet.service(mail); } @@ -80,7 +80,7 @@ public class TextCalendarBodyToAttachmentTest { MimeMessage message = mock(MimeMessage.class); Mail mail = FakeMail.from(message); - when(message.isMimeType(anyString())).thenThrow(MessagingException.class); + when(message.isMimeType(anyString())).thenThrow(new MessagingException()); mailet.service(mail); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3aff7a9f/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java index 444f5b8..d621d8c 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java @@ -19,7 +19,6 @@ package org.apache.james.webadmin; -import java.io.IOException; import java.util.Set; import javax.annotation.PreDestroy; @@ -30,7 +29,6 @@ import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.webadmin.authentication.AuthenticationFilter; -import org.apache.james.webadmin.authentication.NoAuthenticationFilter; import org.apache.james.webadmin.mdc.MDCCleanupFilter; import org.apache.james.webadmin.mdc.MDCFilter; import org.apache.james.webadmin.metric.MetricPostFilter; @@ -39,9 +37,6 @@ import org.apache.james.webadmin.routes.CORSRoute; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableSet; - import spark.Service; public class WebAdminServer implements Configurable { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
