You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/12/12 10:51:58 UTC
[05/16] james-project git commit: MAILBOX-357 Solve some IntelliJ
warnings
MAILBOX-357 Solve some IntelliJ warnings
In ListeningMessageSearchIndex, in ElasticSearchListeningMessageSearchIndexTest
and remove an unused import in ElasticSearchIndexerTest.
These class will be removed later on.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/57a02129
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/57a02129
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/57a02129
Branch: refs/heads/master
Commit: 57a02129f0d9d8c1eeb6d4db8e42874a15e1204c
Parents: e7048f4
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Dec 10 13:53:40 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Dec 12 17:50:57 2018 +0700
----------------------------------------------------------------------
...icSearchListeningMessageSearchIndexTest.java | 20 ++++++++------------
.../search/ListeningMessageSearchIndex.java | 16 +++++++---------
2 files changed, 15 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/57a02129/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
index 9cba34b..90f012d 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndexTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import java.io.IOException;
import java.util.List;
import java.util.Optional;
@@ -60,14 +59,12 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
public class ElasticSearchListeningMessageSearchIndexTest {
-
-
- public static final long MODSEQ = 18L;
- public static final MessageUid MESSAGE_UID = MessageUid.of(1);
- public static final TestId MAILBOX_ID = TestId.of(12);
- public static final String ELASTIC_SEARCH_ID = "12:1";
- public static final String EXPECTED_JSON_CONTENT = "json content";
- public static final String USERNAME = "username";
+ private static final long MODSEQ = 18L;
+ private static final MessageUid MESSAGE_UID = MessageUid.of(1);
+ private static final TestId MAILBOX_ID = TestId.of(12);
+ private static final String ELASTIC_SEARCH_ID = "12:1";
+ private static final String EXPECTED_JSON_CONTENT = "json content";
+ private static final String USERNAME = "username";
private ElasticSearchIndexer elasticSearchIndexer;
private MessageToElasticSearchJson messageToElasticSearchJson;
@@ -76,8 +73,7 @@ public class ElasticSearchListeningMessageSearchIndexTest {
private List<User> users;
@Before
- public void setup() throws JsonProcessingException {
-
+ public void setup() {
MessageMapperFactory mapperFactory = mock(MessageMapperFactory.class);
messageToElasticSearchJson = mock(MessageToElasticSearchJson.class);
ElasticSearchSearcher elasticSearchSearcher = mock(ElasticSearchSearcher.class);
@@ -131,7 +127,7 @@ public class ElasticSearchListeningMessageSearchIndexTest {
verify(elasticSearchIndexer).index(eq(ELASTIC_SEARCH_ID), eq(EXPECTED_JSON_CONTENT));
}
- private MailboxMessage mockedMessage(MessageUid messageId) throws IOException {
+ private MailboxMessage mockedMessage(MessageUid messageId) {
MailboxMessage message = mock(MailboxMessage.class);
when(message.getUid())
.thenReturn(messageId);
http://git-wip-us.apache.org/repos/asf/james-project/blob/57a02129/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
index aff8454..badfe3f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
public abstract class ListeningMessageSearchIndex implements MessageSearchIndex, MailboxListener {
private static final Logger LOGGER = LoggerFactory.getLogger(ListeningMessageSearchIndex.class);
- public static final int UNLIMITED = -1;
+ private static final int UNLIMITED = -1;
private final MessageMapperFactory factory;
private final MailboxManager mailboxManager;
@@ -66,13 +66,11 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
if (event instanceof MessageEvent) {
if (event instanceof EventFactory.AddedImpl) {
EventFactory.AddedImpl added = (EventFactory.AddedImpl) event;
- final Mailbox mailbox = added.getMailbox();
+ Mailbox mailbox = added.getMailbox();
- for (final MessageUid next : (Iterable<MessageUid>) added.getUids()) {
- Optional<MailboxMessage> mailboxMessage = retrieveMailboxMessage(session, added, mailbox, next);
- if (mailboxMessage.isPresent()) {
- addMessage(session, mailbox, mailboxMessage.get());
- }
+ for (MessageUid uid : added.getUids()) {
+ retrieveMailboxMessage(session, added, mailbox, uid)
+ .ifPresent(mailboxMessage -> addMessage(session, mailbox, mailboxMessage));
}
} else if (event instanceof EventFactory.ExpungedImpl) {
EventFactory.ExpungedImpl expunged = (EventFactory.ExpungedImpl) event;
@@ -83,7 +81,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
}
} else if (event instanceof EventFactory.FlagsUpdatedImpl) {
EventFactory.FlagsUpdatedImpl flagsUpdated = (EventFactory.FlagsUpdatedImpl) event;
- final Mailbox mailbox = flagsUpdated.getMailbox();
+ Mailbox mailbox = flagsUpdated.getMailbox();
try {
update(session, mailbox, flagsUpdated.getUpdatedFlags());
@@ -115,7 +113,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
}
}
- private void addMessage(final MailboxSession session, final Mailbox mailbox, MailboxMessage message) {
+ private void addMessage(MailboxSession session, Mailbox mailbox, MailboxMessage message) {
try {
add(session, mailbox, message);
} catch (MailboxException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org