(jackrabbit-oak) branch trunk updated: OAK-10661: oak-search-elastic: remove workaround for elasticsearch-java#404 (#1316)

[fortino]

This is an automated email from the ASF dual-hosted git repository.

fortino pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new aa66f4b008 OAK-10661: oak-search-elastic: remove workaround for 
elasticsearch-java#404 (#1316)
aa66f4b008 is described below

commit aa66f4b008dbe4d2319916fcc756228448347b16
Author: Fabrizio Fortino <fabrizio.fort...@gmail.com>
AuthorDate: Mon Feb 26 10:02:06 2024 +0100

    OAK-10661: oak-search-elastic: remove workaround for elasticsearch-java#404 
(#1316)
    
    * OAK-10661: oak-search-elastic: remove workaround for 
elastic/elasticsearch-java/issues/404
    
    * OAK-10661: (minor) avoid use of deprecated Query.SQL
---
 .../oak/plugins/index/elastic/query/ElasticRequestHandler.java     | 7 -------
 .../oak/plugins/index/elastic/ElasticSpellcheckCommonTest.java     | 7 +++----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git 
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticRequestHandler.java
 
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticRequestHandler.java
index 5b24c71ca8..9a3dee6ea8 100644
--- 
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticRequestHandler.java
+++ 
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticRequestHandler.java
@@ -456,13 +456,6 @@ public class ElasticRequestHandler {
         return PhraseSuggester.of(ps -> ps
                 .field(FieldNames.SPELLCHECK)
                 .size(10)
-                // The Elasticsearch Java client fails parsing a response to 
suggest queries if the highlight is not set.
-                // Caused by: 
co.elastic.clients.util.MissingRequiredPropertyException: Missing required 
property 'PhraseSuggestOption.highlighted'
-                //     at 
co.elastic.clients.util.ApiTypeHelper.requireNonNull(ApiTypeHelper.java:76)
-                //     at 
co.elastic.clients.elasticsearch.core.search.PhraseSuggestOption.<init>(PhraseSuggestOption.java:64)
-                // Happens with Elasticsearch server 8.4.2 and client 7.17.6
-                // https://github.com/elastic/elasticsearch-java/issues/404
-                .highlight(f -> f.preTag("").postTag(""))
                 .directGenerator(d -> 
d.field(FieldNames.SPELLCHECK).suggestMode(SuggestMode.Missing).size(10))
                 .collate(c -> c.query(q -> q.source(queryString.toString())))
         );
diff --git 
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticSpellcheckCommonTest.java
 
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticSpellcheckCommonTest.java
index d930103931..523d0a9610 100644
--- 
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticSpellcheckCommonTest.java
+++ 
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticSpellcheckCommonTest.java
@@ -61,13 +61,12 @@ public class ElasticSpellcheckCommonTest extends 
SpellcheckCommonTest {
         n1.setProperty("foo", "descent");
         adminSession.save();
 
-        String sql = "EXPLAIN SELECT [rep:spellcheck()] FROM nt:base WHERE 
SPELLCHECK('desent')";
+        String sql = "EXPLAIN SELECT [rep:spellcheck()] FROM [nt:base] WHERE 
SPELLCHECK('desent')";
         String expected = 
"{\"suggest\":{\"oak:suggestion\":{\"phrase\":{\"field\":\":spellcheck\",\"size\":10,\"collate\":"
 +
                 
"{\"query\":{\"source\":\"{\\\"bool\\\":{\\\"must\\\":[{\\\"match_phrase\\\":{\\\":spellcheck\\\":{\\\"query\\\":\\\"{{suggestion}}\\\"}}}]}}\"}},"
 +
-                
"\"direct_generator\":[{\"field\":\":spellcheck\",\"size\":10,\"suggest_mode\":\"missing\"}],"
 +
-                
"\"highlight\":{\"post_tag\":\"\",\"pre_tag\":\"\"}}},\"text\":\"desent\"}}";
+                
"\"direct_generator\":[{\"field\":\":spellcheck\",\"size\":10,\"suggest_mode\":\"missing\"}]}},\"text\":\"desent\"}}";
 
-        Query q = qm.createQuery(sql, Query.SQL);
+        Query q = qm.createQuery(sql, Query.JCR_SQL2);
         Row row = q.execute().getRows().nextRow();
         MatcherAssert.assertThat(row.getValue("plan").getString(), 
CoreMatchers.containsString(expected));
     }