svn commit: r1883840 - in /jackrabbit/oak/trunk/oak-search-elastic: ./ src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/

[fortino]

Author: fortino
Date: Thu Nov 26 14:52:04 2020
New Revision: 1883840

URL: http://svn.apache.org/viewvc?rev=1883840&view=rev
Log:
OAK-9287: bump elastic version to 7.10.0

Modified:
    jackrabbit/oak/trunk/oak-search-elastic/pom.xml
    
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticBulkProcessorHandler.java
    
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java
    
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java

Modified: jackrabbit/oak/trunk/oak-search-elastic/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/pom.xml?rev=1883840&r1=1883839&r2=1883840&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/pom.xml Thu Nov 26 14:52:04 2020
@@ -33,8 +33,8 @@
   <description>Oak Elasticsearch integration subproject</description>
 
   <properties>
-    <elasticsearch.version>7.9.3</elasticsearch.version>
-    <lucene.version>8.6.2</lucene.version>
+    <elasticsearch.version>7.10.0</elasticsearch.version>
+    <lucene.version>8.7.0</lucene.version>
   </properties>
 
   <build>

Modified: 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticBulkProcessorHandler.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticBulkProcessorHandler.java?rev=1883840&r1=1883839&r2=1883840&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticBulkProcessorHandler.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticBulkProcessorHandler.java
 Thu Nov 26 14:52:04 2020
@@ -111,8 +111,6 @@ class ElasticBulkProcessorHandler {
         PropertyState async = 
indexDefinition.getDefinitionNodeState().getProperty("async");
 
         if (async != null) {
-            Iterable<String> opt = async.getValue(Type.STRINGS);
-
             // Check if this indexing call is a part of async cycle or a 
commit hook
             // In case it's from async cycle - commit info will have a 
indexingCheckpointTime key.
             // Otherwise it's part of commit hook based indexing due to async 
property having a value nrt

Modified: 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java?rev=1883840&r1=1883839&r2=1883840&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java
 Thu Nov 26 14:52:04 2020
@@ -90,7 +90,7 @@ class ElasticDocument {
         properties.put(fieldName, value);
     }
 
-    void addSimilarityField(String name, Blob value) throws IOException{
+    void addSimilarityField(String name, Blob value) throws IOException {
         byte[] bytes = new BlobByteSource(value).read();
         similarityFields.put(FieldNames.createSimilarityFieldName(name), 
toDoubles(bytes));
     }

Modified: 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java?rev=1883840&r1=1883839&r2=1883840&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java
 Thu Nov 26 14:52:04 2020
@@ -55,17 +55,6 @@ public class TermQueryBuilderFactory {
         return QueryBuilders.existsQuery(field);
     }
 
-    private static TermQueryBuilder newFulltextQuery(String ft) {
-        return termQuery(FieldNames.FULLTEXT, ft);
-    }
-
-    private static TermQueryBuilder newFulltextQuery(String ft, String field) {
-        if (field == null || "*".equals(field)) {
-            return newFulltextQuery(ft);
-        }
-        return termQuery(field, ft);
-    }
-
     public static PrefixQueryBuilder newPrefixQuery(String field, @NotNull 
String value) {
         return prefixQuery(field, value);
     }