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 2019/05/23 03:37:55 UTC
[james-project] 07/14: JAMES-2764 setNestedPath is deprecated in ES6
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 502ce23ec686ed4188f7d392e1bb34ff07c1db57
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue May 21 10:53:54 2019 +0700
JAMES-2764 setNestedPath is deprecated in ES6
---
.../james/mailbox/elasticsearch/v6/query/SortConverter.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/query/SortConverter.java b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/query/SortConverter.java
index 1a29c77..16a52bc 100644
--- a/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/query/SortConverter.java
+++ b/mailbox/elasticsearch-v6/src/main/java/org/apache/james/mailbox/elasticsearch/v6/query/SortConverter.java
@@ -23,6 +23,7 @@ import org.apache.james.backends.es.v6.NodeMappingFactory;
import org.apache.james.mailbox.elasticsearch.v6.json.JsonMessageConstants;
import org.apache.james.mailbox.model.SearchQuery;
import org.elasticsearch.search.sort.FieldSortBuilder;
+import org.elasticsearch.search.sort.NestedSortBuilder;
import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortMode;
import org.elasticsearch.search.sort.SortOrder;
@@ -43,13 +44,13 @@ public class SortConverter {
return SortBuilders.fieldSort(JsonMessageConstants.DATE);
case MailboxCc :
return SortBuilders.fieldSort(JsonMessageConstants.CC + PATH_SEPARATOR + JsonMessageConstants.EMailer.ADDRESS
- + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedPath(JsonMessageConstants.CC);
+ + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedSort(new NestedSortBuilder(JsonMessageConstants.CC));
case MailboxFrom :
return SortBuilders.fieldSort(JsonMessageConstants.FROM + PATH_SEPARATOR + JsonMessageConstants.EMailer.ADDRESS
- + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedPath(JsonMessageConstants.FROM);
+ + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedSort(new NestedSortBuilder(JsonMessageConstants.FROM));
case MailboxTo :
return SortBuilders.fieldSort(JsonMessageConstants.TO + PATH_SEPARATOR + JsonMessageConstants.EMailer.ADDRESS
- + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedPath(JsonMessageConstants.TO);
+ + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedSort(new NestedSortBuilder(JsonMessageConstants.TO));
case BaseSubject :
return SortBuilders.fieldSort(JsonMessageConstants.SUBJECT + PATH_SEPARATOR + NodeMappingFactory.RAW);
case Size :
@@ -60,10 +61,10 @@ public class SortConverter {
return SortBuilders.fieldSort(JsonMessageConstants.UID);
case DisplayFrom:
return SortBuilders.fieldSort(JsonMessageConstants.FROM + PATH_SEPARATOR + JsonMessageConstants.EMailer.NAME
- + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedPath(JsonMessageConstants.FROM);
+ + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedSort(new NestedSortBuilder(JsonMessageConstants.FROM));
case DisplayTo:
return SortBuilders.fieldSort(JsonMessageConstants.TO + PATH_SEPARATOR + JsonMessageConstants.EMailer.NAME
- + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedPath(JsonMessageConstants.TO);
+ + PATH_SEPARATOR + NodeMappingFactory.RAW).setNestedSort(new NestedSortBuilder(JsonMessageConstants.TO));
case Id:
return SortBuilders.fieldSort(JsonMessageConstants.MESSAGE_ID);
default:
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org