Spring/spring-data-elasticsearch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAES-211 - index analyzer is removed. use analyzer for search and index analyzer or use search analyzer.

Browse Source
This commit is contained in:
Mohsin Husen
2016-02-11 16:42:42 +00:00
parent 61880671a4
commit a05a597123
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java
View File

@@ -30,7 +30,7 @@ public @interface CompletionField {
String searchAnalyzer() default "simple";
String indexAnalyzer() default "simple";
String analyzer() default "simple";
boolean payloads() default false;

2
src/main/java/org/springframework/data/elasticsearch/annotations/Field.java
View File

@@ -48,7 +48,7 @@ public @interface Field {
String searchAnalyzer() default "";
String indexAnalyzer() default "";
String analyzer() default "";
String[] ignoreFields() default {};

10
src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java
View File

@@ -54,7 +54,7 @@ class MappingBuilder {
public static final String FIELD_INDEX = "index";
public static final String FIELD_FORMAT = "format";
public static final String FIELD_SEARCH_ANALYZER = "search_analyzer";
public static final String FIELD_INDEX_ANALYZER = "index_analyzer";
public static final String FIELD_INDEX_ANALYZER = "analyzer";
public static final String FIELD_PROPERTIES = "properties";
public static final String FIELD_PARENT = "_parent";
@@ -217,8 +217,8 @@ class MappingBuilder {
if (isNotBlank(annotation.searchAnalyzer())) {
xContentBuilder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
}
if (isNotBlank(annotation.indexAnalyzer())) {
xContentBuilder.field(FIELD_INDEX_ANALYZER, annotation.indexAnalyzer());
if (isNotBlank(annotation.analyzer())) {
xContentBuilder.field(FIELD_INDEX_ANALYZER, annotation.analyzer());
}
}
xContentBuilder.endObject();
@@ -256,8 +256,8 @@ class MappingBuilder {
if (isNotBlank(fieldAnnotation.searchAnalyzer())) {
xContentBuilder.field(FIELD_SEARCH_ANALYZER, fieldAnnotation.searchAnalyzer());
}
if (isNotBlank(fieldAnnotation.indexAnalyzer())) {
xContentBuilder.field(FIELD_INDEX_ANALYZER, fieldAnnotation.indexAnalyzer());
if (isNotBlank(fieldAnnotation.analyzer())) {
xContentBuilder.field(FIELD_INDEX_ANALYZER, fieldAnnotation.analyzer());
}
xContentBuilder.endObject();
}