JAMES-1869 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/7426bb62 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7426bb62 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7426bb62 Branch: refs/heads/master Commit: 7426bb6243867deacd55b05e4993f3eddb146aef Parents: ff2dbc6 Author: Antoine Duprat <[email protected]> Authored: Thu Jan 26 13:03:17 2017 +0100 Committer: Antoine Duprat <[email protected]> Committed: Thu Jan 26 13:03:17 2017 +0100 ---------------------------------------------------------------------- .../org/apache/james/mailbox/store/StoreMailboxManager.java | 2 -- .../james/jmap/methods/integration/SetMessagesMethodTest.java | 1 - .../james/jmap/methods/SetMailboxesDestructionProcessor.java | 1 - .../apache/james/jmap/methods/SetMessagesUpdateProcessor.java | 4 ---- .../org/apache/james/jmap/methods/GetMessagesMethodTest.java | 6 ------ .../james/jmap/methods/SetMessagesCreationProcessorTest.java | 1 - .../james/jmap/methods/SetMessagesUpdateProcessorTest.java | 7 +++---- .../james/jmap/utils/SystemMailboxesProviderImplTest.java | 5 +++-- 8 files changed, 6 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/7426bb62/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java index 376c99e..b4d83b4 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java @@ -46,9 +46,7 @@ import org.apache.james.mailbox.exception.AnnotationException; import org.apache.james.mailbox.exception.BadCredentialsException; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxExistsException; -import org.apache.james.mailbox.exception.MailboxNameException; import org.apache.james.mailbox.exception.MailboxNotFoundException; -import org.apache.james.mailbox.exception.TooLongMailboxNameException; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxAnnotation; import org.apache.james.mailbox.model.MailboxAnnotationKey; http://git-wip-us.apache.org/repos/asf/james-project/blob/7426bb62/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 671f299..f958fe2 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 @@ -24,7 +24,6 @@ import static com.jayway.restassured.RestAssured.with; import static com.jayway.restassured.config.EncoderConfig.encoderConfig; import static com.jayway.restassured.config.RestAssuredConfig.newConfig; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.notIn; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; http://git-wip-us.apache.org/repos/asf/james-project/blob/7426bb62/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java index cbf5108..cd6e402 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesDestructionProcessor.java @@ -41,7 +41,6 @@ import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.SubscriptionManager; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.TooLongMailboxNameException; -import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/7426bb62/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java index aaae397..90aa5ff 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java @@ -37,7 +37,6 @@ import org.apache.james.jmap.model.SetMessagesResponse; import org.apache.james.jmap.model.UpdateMessagePatch; import org.apache.james.jmap.model.mailbox.Role; import org.apache.james.jmap.utils.SystemMailboxesProvider; -import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageManager; @@ -63,7 +62,6 @@ public class SetMessagesUpdateProcessor implements SetMessagesProcessor { private final UpdateMessagePatchConverter updatePatchConverter; private final MessageIdManager messageIdManager; private final Factory mailboxIdFactory; - private final MailboxManager mailboxManager; private final SystemMailboxesProvider systemMailboxesProvider; @Inject @@ -71,12 +69,10 @@ public class SetMessagesUpdateProcessor implements SetMessagesProcessor { UpdateMessagePatchConverter updatePatchConverter, MessageIdManager messageIdManager, Factory mailboxIdFactory, - MailboxManager mailboxManager, SystemMailboxesProvider systemMailboxesProvider) { this.updatePatchConverter = updatePatchConverter; this.messageIdManager = messageIdManager; this.mailboxIdFactory = mailboxIdFactory; - this.mailboxManager = mailboxManager; this.systemMailboxesProvider = systemMailboxesProvider; } http://git-wip-us.apache.org/repos/asf/james-project/blob/7426bb62/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java index dbd34ec..d690d78 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; -import java.time.ZonedDateTime; import java.util.Date; import java.util.List; import java.util.Locale; @@ -54,13 +53,8 @@ import org.apache.james.mailbox.inmemory.InMemoryMessageIdManager; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; import org.apache.james.mailbox.mock.MockMailboxSession; import org.apache.james.mailbox.model.ComposedMessageId; -import org.apache.james.mailbox.model.FetchGroupImpl; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.model.MessageRange; -import org.apache.james.mailbox.model.MessageResult; -import org.apache.james.mailbox.store.MessageResultImpl; -import org.apache.james.mailbox.store.mail.MessageIdMapper; import org.assertj.core.api.Condition; import org.assertj.core.data.MapEntry; import org.assertj.core.groups.Tuple; http://git-wip-us.apache.org/repos/asf/james-project/blob/7426bb62/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java index b5605bc..10ba230 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java @@ -36,7 +36,6 @@ import java.util.stream.Stream; import javax.mail.Flags; import org.apache.james.jmap.exceptions.AttachmentsNotFoundException; -import org.apache.james.jmap.exceptions.MailboxRoleNotFoundException; import org.apache.james.jmap.methods.ValueWithId.CreationMessageEntry; import org.apache.james.jmap.model.Attachment; import org.apache.james.jmap.model.BlobId; http://git-wip-us.apache.org/repos/asf/james-project/blob/7426bb62/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java index 5b0387a..0c7ea1b 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java @@ -19,12 +19,11 @@ package org.apache.james.jmap.methods; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.assertj.core.api.Assertions.assertThat; - import org.apache.james.jmap.model.MessageProperties; import org.apache.james.jmap.model.SetMessagesRequest; import org.apache.james.jmap.model.SetMessagesResponse; @@ -42,7 +41,7 @@ public class SetMessagesUpdateProcessorTest { @Test public void processShouldReturnEmptyUpdatedWhenRequestHasEmptyUpdate() { - SetMessagesUpdateProcessor sut = new SetMessagesUpdateProcessor(null, null, null, null, null); + SetMessagesUpdateProcessor sut = new SetMessagesUpdateProcessor(null, null, null, null); SetMessagesRequest requestWithEmptyUpdate = SetMessagesRequest.builder().build(); SetMessagesResponse result = sut.process(requestWithEmptyUpdate, null); @@ -66,7 +65,7 @@ public class SetMessagesUpdateProcessorTest { when(mockConverter.fromJsonNode(any(ObjectNode.class))) .thenReturn(mockInvalidPatch); - SetMessagesUpdateProcessor sut = new SetMessagesUpdateProcessor(mockConverter, null, null, null, null); + SetMessagesUpdateProcessor sut = new SetMessagesUpdateProcessor(mockConverter, null, null, null); MessageId requestMessageId = TestMessageId.of(1); SetMessagesRequest requestWithInvalidUpdate = SetMessagesRequest.builder() .update(ImmutableMap.of(requestMessageId, JsonNodeFactory.instance.objectNode())) http://git-wip-us.apache.org/repos/asf/james-project/blob/7426bb62/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java index 1d40c41..59633e8 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SystemMailboxesProviderImplTest.java @@ -66,7 +66,6 @@ public class SystemMailboxesProviderImplTest { private MailboxManager mailboxManager; private MessageManager inboxMessageManager; - private MessageManager outboxMessageManager; @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -75,7 +74,6 @@ public class SystemMailboxesProviderImplTest { public void setUp() throws Exception { mailboxManager = mock(MailboxManager.class); inboxMessageManager = mock(MessageManager.class); - outboxMessageManager = mock(MessageManager.class); systemMailboxProvider = new SystemMailboxesProviderImpl(mailboxManager); } @@ -98,6 +96,7 @@ public class SystemMailboxesProviderImplTest { } @Test + @SuppressWarnings("unchecked") public void findMailboxesShouldThrowWhenMailboxManagerHasErrorWhenSearching() throws Exception { expectedException.expect(MailboxException.class); @@ -107,6 +106,7 @@ public class SystemMailboxesProviderImplTest { } @Test + @SuppressWarnings("unchecked") public void findMailboxesShouldBeEmptyWhenMailboxManagerCanNotGetMailbox() throws Exception { expectedException.expect(MailboxException.class); @@ -117,6 +117,7 @@ public class SystemMailboxesProviderImplTest { } @Test + @SuppressWarnings("unchecked") public void findMailboxesShouldReturnWhenMailboxManagerCanNotGetMailboxOfNonFilterMailbox() throws Exception { when(mailboxManager.search(any(MailboxQuery.class), eq(mailboxSession))).thenReturn(ImmutableList.of(inboxMetadata, outboxMetadata)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
