OAK-9287: bump elastic version to 7.10.0
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1883840 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/oak-search-elastic/pom.xml b/oak-search-elastic/pom.xml
index dad0a3f..dbe5bec 100644
--- a/oak-search-elastic/pom.xml
+++ b/oak-search-elastic/pom.xml
@@ -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>
diff --git a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticBulkProcessorHandler.java b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticBulkProcessorHandler.java
index ef182da..374261a 100644
--- a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticBulkProcessorHandler.java
+++ b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticBulkProcessorHandler.java
@@ -111,8 +111,6 @@
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
diff --git a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java
index 5d1978b..1f81ada 100644
--- a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java
+++ b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java
@@ -90,7 +90,7 @@
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));
}
diff --git a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java
index 32e1f0e..9674786 100644
--- a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java
+++ b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java
@@ -55,17 +55,6 @@
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);
}
