changes for elasticearch 7.10.1

ptanov · Jan 6, 2021 · bdac066 · bdac066
1 parent 66e6de7
commit bdac066
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 group = org.xbib.elasticsearch
 name = elasticsearch-plugin-bundle
-version = 7.10.0.0
+version = 7.10.1.0
 
-elasticsearch.version = 7.10.0
+elasticsearch.version = 7.10.1
 lucene.version = 8.7.0
 
 icu4j.version = 67.1

diff --git a/...ain/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/reference/ReferenceMapper.java b/...ain/java/org/xbib/elasticsearch/plugin/bundle/index/mapper/reference/ReferenceMapper.java
@@ -2,6 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BoostQuery;
@@ -17,6 +18,9 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
+import org.elasticsearch.index.analysis.AnalyzerScope;
+import org.elasticsearch.index.analysis.IndexAnalyzers;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
@@ -319,11 +323,20 @@ public static class Builder extends FieldMapper.Builder<Builder> {
 
         private List<String> refFields;
 
+        private static final IndexAnalyzers INDEX_ANALYZERS = new IndexAnalyzers(
+            Collections.singletonMap(
+                "default",
+                new NamedAnalyzer("default", AnalyzerScope.INDEX, new StandardAnalyzer())
+            ),
+            Collections.emptyMap(),
+            Collections.emptyMap()
+        );
+
         public Builder(String name, Client client) {
             super(name, FIELD_TYPE);
             this.client = client;
             this.refFields = new LinkedList<>();
-            this.contentBuilder = new TextFieldMapper.Builder(name, () -> Lucene.STANDARD_ANALYZER);
+            this.contentBuilder = new TextFieldMapper.Builder(name, INDEX_ANALYZERS);
         }
 
         public Builder refIndex(String refIndex) {