This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9e613efa293544499744e2d2041f4a3e49c09da6 Author: Matthieu Baechler <[email protected]> AuthorDate: Fri Feb 21 16:59:24 2020 +0100 [Refactoring] Ensure the type of objects used as keys for generic collections is the expected one --- .../mailbox/inmemory/mail/InMemoryAnnotationMapper.java | 14 +++++++------- .../mailbox/inmemory/mail/InMemoryMailboxMapper.java | 2 +- .../java/org/apache/james/jmap/draft/JMAPModuleTest.java | 16 ++++++++-------- .../james/queue/memory/MemoryMailQueueFactory.java | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAnnotationMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAnnotationMapper.java index ae63cbf..62e8288 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAnnotationMapper.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAnnotationMapper.java @@ -72,19 +72,19 @@ public class InMemoryAnnotationMapper implements AnnotationMapper { @Override public List<MailboxAnnotation> getAllAnnotations(MailboxId mailboxId) { - return ImmutableList.copyOf(retrieveAllAnnotations((InMemoryId)mailboxId)); + return ImmutableList.copyOf(retrieveAllAnnotations((InMemoryId) mailboxId)); } @Override public List<MailboxAnnotation> getAnnotationsByKeys(MailboxId mailboxId, final Set<MailboxAnnotationKey> keys) { return ImmutableList.copyOf( - Iterables.filter(retrieveAllAnnotations((InMemoryId)mailboxId), + Iterables.filter(retrieveAllAnnotations((InMemoryId) mailboxId), input -> keys.contains(input.getKey()))); } @Override public List<MailboxAnnotation> getAnnotationsByKeysWithAllDepth(MailboxId mailboxId, final Set<MailboxAnnotationKey> keys) { - return Iterators.toStream(retrieveAllAnnotations((InMemoryId)mailboxId).iterator()) + return Iterators.toStream(retrieveAllAnnotations((InMemoryId) mailboxId).iterator()) .filter(getPredicateFilterByAll(keys)) .collect(Guavate.toImmutableList()); } @@ -118,7 +118,7 @@ public class InMemoryAnnotationMapper implements AnnotationMapper { Preconditions.checkArgument(!mailboxAnnotation.isNil()); lock.writeLock().lock(); try { - mailboxesAnnotations.put((InMemoryId)mailboxId, mailboxAnnotation.getKey().asString(), mailboxAnnotation.getValue().get()); + mailboxesAnnotations.put((InMemoryId) mailboxId, mailboxAnnotation.getKey().asString(), mailboxAnnotation.getValue().get()); } finally { lock.writeLock().unlock(); } @@ -128,7 +128,7 @@ public class InMemoryAnnotationMapper implements AnnotationMapper { public void deleteAnnotation(MailboxId mailboxId, MailboxAnnotationKey key) { lock.writeLock().lock(); try { - mailboxesAnnotations.remove(mailboxId, key.asString()); + mailboxesAnnotations.remove((InMemoryId) mailboxId, key.asString()); } finally { lock.writeLock().unlock(); } @@ -136,12 +136,12 @@ public class InMemoryAnnotationMapper implements AnnotationMapper { @Override public boolean exist(MailboxId mailboxId, MailboxAnnotation mailboxAnnotation) { - return mailboxesAnnotations.contains((InMemoryId)mailboxId, mailboxAnnotation.getKey().asString()); + return mailboxesAnnotations.contains((InMemoryId) mailboxId, mailboxAnnotation.getKey().asString()); } @Override public int countAnnotations(MailboxId mailboxId) { - return mailboxesAnnotations.row((InMemoryId)mailboxId).size(); + return mailboxesAnnotations.row((InMemoryId) mailboxId).size(); } diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java index d284ea4..9dc6491 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java @@ -74,7 +74,7 @@ public class InMemoryMailboxMapper implements MailboxMapper { @Override public synchronized Mailbox findMailboxById(MailboxId id) throws MailboxException { - InMemoryId mailboxId = (InMemoryId)id; + InMemoryId mailboxId = (InMemoryId) id; for (Mailbox mailbox: mailboxesByPath.values()) { if (mailbox.getMailboxId().equals(mailboxId)) { return new Mailbox(mailbox); diff --git a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java b/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java index cf66534..0375d6e 100644 --- a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java +++ b/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java @@ -60,9 +60,9 @@ class JMAPModuleTest { void checkShouldReturnGoodWhenAllChecksSatisfy() { when(mockMailboxManager.hasCapability(any())) .thenReturn(true); - when(mockMessageCapabilities.contains(any())) + when(mockMessageCapabilities.contains(any(MailboxManager.MessageCapabilities.class))) .thenReturn(true); - when(mockSearchCapabilities.contains(any())) + when(mockSearchCapabilities.contains(any(MailboxManager.SearchCapabilities.class))) .thenReturn(true); assertThat(testee.check().isGood()) @@ -73,9 +73,9 @@ class JMAPModuleTest { void checkShouldReturnBadWhenMailboxManagerDoesntHaveCapabilities() { when(mockMailboxManager.hasCapability(any())) .thenReturn(false); - when(mockMessageCapabilities.contains(any())) + when(mockMessageCapabilities.contains(any(MailboxManager.MessageCapabilities.class))) .thenReturn(true); - when(mockSearchCapabilities.contains(any())) + when(mockSearchCapabilities.contains(any(MailboxManager.SearchCapabilities.class))) .thenReturn(true); assertThat(testee.check().isBad()) @@ -86,9 +86,9 @@ class JMAPModuleTest { void checkShouldReturnBadWhenMailboxManagerDoesntHaveMessagesCapabilities() { when(mockMailboxManager.hasCapability(any())) .thenReturn(true); - when(mockMessageCapabilities.contains(any())) + when(mockMessageCapabilities.contains(any(MailboxManager.MessageCapabilities.class))) .thenReturn(false); - when(mockSearchCapabilities.contains(any())) + when(mockSearchCapabilities.contains(any(MailboxManager.SearchCapabilities.class))) .thenReturn(true); assertThat(testee.check().isBad()) @@ -99,9 +99,9 @@ class JMAPModuleTest { void checkShouldReturnBadWhenMailboxManagerDoesntHaveSearchCapabilities() { when(mockMailboxManager.hasCapability(any())) .thenReturn(true); - when(mockMessageCapabilities.contains(any())) + when(mockMessageCapabilities.contains(any(MailboxManager.MessageCapabilities.class))) .thenReturn(true); - when(mockSearchCapabilities.contains(any())) + when(mockSearchCapabilities.contains(any(MailboxManager.SearchCapabilities.class))) .thenReturn(false); assertThat(testee.check().isBad()) diff --git a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java index 864fc3d..25b80b6 100644 --- a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java +++ b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java @@ -167,7 +167,7 @@ public class MemoryMailQueueFactory implements MailQueueFactory<ManageableMailQu @Override public long flush() throws MailQueueException { int count = 0; - for (MailQueueItem item: mailItems) { + for (MemoryMailQueueItem item: mailItems) { if (mailItems.remove(item)) { enQueue(item.getMail()); count += 1; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
