This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 45b0d88d9d4df523ab0ab3695773e7015c423c0e
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Wed May 22 17:31:20 2019 +0700
JAMES-2764 Fix checkstyle and minor stuff
---
.../ElasticSearchListeningMessageSearchIndex.java | 32 ++++++++++++----------
.../mailbox/elasticsearch/v6/json/EMailer.java | 2 +-
.../mailbox/elasticsearch/v6/json/EMailers.java | 2 +-
.../elasticsearch/v6/json/MessageUpdateJson.java | 2 +-
...{Serializable.java => SerializableMessage.java} | 2 +-
.../mailbox/elasticsearch/v6/json/Subjects.java | 2 +-
.../elasticsearch/v6/query/CriterionConverter.java | 6 ++--
.../v6/search/ElasticSearchSearcher.java | 3 +-
8 files changed, 26 insertions(+), 25 deletions(-)
diff --git
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/events/ElasticSearchListeningMessageSearchIndex.java
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/events/ElasticSearchListeningMessageSearchIndex.java
index 4ef7af2..0847f45 100644
---
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/events/ElasticSearchListeningMessageSearchIndex.java
+++
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/events/ElasticSearchListeningMessageSearchIndex.java
@@ -152,34 +152,36 @@ public class ElasticSearchListeningMessageSearchIndex
extends ListeningMessageSe
@Override
public void delete(MailboxSession session, Mailbox mailbox,
Collection<MessageUid> expungedUids) throws IOException {
- elasticSearchIndexer.delete(expungedUids.stream()
- .map(uid -> indexIdFor(mailbox, uid))
- .collect(Guavate.toImmutableList()));
+ elasticSearchIndexer
+ .delete(expungedUids.stream()
+ .map(uid -> indexIdFor(mailbox, uid))
+ .collect(Guavate.toImmutableList()));
}
@Override
public void deleteAll(MailboxSession session, Mailbox mailbox) {
- elasticSearchIndexer.deleteAllMatchingQuery(
- termQuery(
- JsonMessageConstants.MAILBOX_ID,
- mailbox.getMailboxId().serialize()));
+ elasticSearchIndexer
+ .deleteAllMatchingQuery(
+ termQuery(
+ JsonMessageConstants.MAILBOX_ID,
+ mailbox.getMailboxId().serialize()));
}
@Override
public void update(MailboxSession session, Mailbox mailbox,
List<UpdatedFlags> updatedFlagsList) throws IOException {
- elasticSearchIndexer.update(updatedFlagsList.stream()
- .map(Throwing.<UpdatedFlags, UpdatedRepresentation>function(
- updatedFlags ->
createUpdatedDocumentPartFromUpdatedFlags(mailbox, updatedFlags))
- .sneakyThrow())
- .collect(Guavate.toImmutableList()));
+ elasticSearchIndexer
+ .update(updatedFlagsList.stream()
+ .map(Throwing.<UpdatedFlags,
UpdatedRepresentation>function(
+ updatedFlags ->
createUpdatedDocumentPartFromUpdatedFlags(mailbox, updatedFlags))
+ .sneakyThrow())
+ .collect(Guavate.toImmutableList()));
}
private UpdatedRepresentation
createUpdatedDocumentPartFromUpdatedFlags(Mailbox mailbox, UpdatedFlags
updatedFlags) throws JsonProcessingException {
return new UpdatedRepresentation(
indexIdFor(mailbox, updatedFlags.getUid()),
- messageToElasticSearchJson.getUpdatedJsonMessagePart(
- updatedFlags.getNewFlags(),
- updatedFlags.getModSeq()));
+ messageToElasticSearchJson
+ .getUpdatedJsonMessagePart(updatedFlags.getNewFlags(),
updatedFlags.getModSeq()));
}
private String indexIdFor(Mailbox mailbox, MessageUid uid) {
diff --git
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/EMailer.java
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/EMailer.java
index 83ff556..f827ba0 100644
---
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/EMailer.java
+++
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/EMailer.java
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Joiner;
import com.google.common.base.MoreObjects;
-public class EMailer implements Serializable {
+public class EMailer implements SerializableMessage {
private final String name;
private final String address;
diff --git
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/EMailers.java
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/EMailers.java
index e5e8e65..06a4667 100644
---
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/EMailers.java
+++
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/EMailers.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.base.Preconditions;
-public class EMailers implements Serializable {
+public class EMailers implements SerializableMessage {
public static EMailers from(Set<EMailer> emailers) {
Preconditions.checkNotNull(emailers, "'emailers' is mandatory");
diff --git
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/MessageUpdateJson.java
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/MessageUpdateJson.java
index f8b2510..3e42114 100644
---
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/MessageUpdateJson.java
+++
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/MessageUpdateJson.java
@@ -62,7 +62,7 @@ public class MessageUpdateJson {
@JsonProperty(JsonMessageConstants.IS_UNREAD)
public boolean isUnRead() {
- return ! flags.contains(Flags.Flag.SEEN);
+ return !flags.contains(Flags.Flag.SEEN);
}
diff --git
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/Serializable.java
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/SerializableMessage.java
similarity index 97%
rename from
mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/Serializable.java
rename to
mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/SerializableMessage.java
index 5ad6334..b5d903e 100644
---
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/Serializable.java
+++
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/SerializableMessage.java
@@ -19,7 +19,7 @@
package org.apache.james.mailbox.elasticsearch.v6.json;
-public interface Serializable {
+public interface SerializableMessage {
String serialize();
}
diff --git
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/Subjects.java
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/Subjects.java
index d962932..a6a29f4 100644
---
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/Subjects.java
+++
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/json/Subjects.java
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
-public class Subjects implements Serializable {
+public class Subjects implements SerializableMessage {
public static Subjects from(Set<String> subjects) {
Preconditions.checkNotNull(subjects, "'subjects' is mandatory");
diff --git
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/query/CriterionConverter.java
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/query/CriterionConverter.java
index 7251f27..4e8c44d 100644
---
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/query/CriterionConverter.java
+++
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/query/CriterionConverter.java
@@ -52,8 +52,8 @@ import org.elasticsearch.index.query.QueryBuilders;
public class CriterionConverter {
- private final Map<Class<?>, Function<SearchQuery.Criterion, QueryBuilder>>
criterionConverterMap;
- private final Map<Class<?>, BiFunction<String, SearchQuery.HeaderOperator,
QueryBuilder>> headerOperatorConverterMap;
+ private final Map<Class<?>, Function<Criterion, QueryBuilder>>
criterionConverterMap;
+ private final Map<Class<?>, BiFunction<String, HeaderOperator,
QueryBuilder>> headerOperatorConverterMap;
public CriterionConverter() {
criterionConverterMap = new HashMap<>();
@@ -118,7 +118,7 @@ public class CriterionConverter {
headerOperatorConverterMap.put(type, (BiFunction<String,
HeaderOperator, QueryBuilder>) f);
}
- public QueryBuilder convertCriterion(SearchQuery.Criterion criterion) {
+ public QueryBuilder convertCriterion(Criterion criterion) {
return
criterionConverterMap.get(criterion.getClass()).apply(criterion);
}
diff --git
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/search/ElasticSearchSearcher.java
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/search/ElasticSearchSearcher.java
index f527dd4..16ba761 100644
---
a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/search/ElasticSearchSearcher.java
+++
b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/search/ElasticSearchSearcher.java
@@ -132,9 +132,8 @@ public class ElasticSearchSearcher {
private Optional<DocumentField> retrieveMessageIdField(SearchHit hit) {
if
(hit.getFields().keySet().contains(JsonMessageConstants.MESSAGE_ID)) {
return
Optional.ofNullable(hit.field(JsonMessageConstants.MESSAGE_ID));
- } else {
- return Optional.empty();
}
+ return Optional.empty();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
