From a05a597123c9460a1b796ca7e906655209da1256 Mon Sep 17 00:00:00 2001 From: Mohsin Husen Date: Thu, 11 Feb 2016 16:42:42 +0000 Subject: [PATCH] DATAES-211 - index analyzer is removed. use analyzer for search and index analyzer or use search analyzer. --- .../elasticsearch/annotations/CompletionField.java | 2 +- .../data/elasticsearch/annotations/Field.java | 2 +- .../data/elasticsearch/core/MappingBuilder.java | 10 +++++----- .../elasticsearch/entities/SampleMappingEntity.java | 2 +- .../elasticsearch/entities/SampleTransientEntity.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java b/src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java index 559ce5508..4d8418fcf 100644 --- a/src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java +++ b/src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java @@ -30,7 +30,7 @@ public @interface CompletionField { String searchAnalyzer() default "simple"; - String indexAnalyzer() default "simple"; + String analyzer() default "simple"; boolean payloads() default false; diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java b/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java index f4cec2b38..29dcdf2f1 100644 --- a/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java +++ b/src/main/java/org/springframework/data/elasticsearch/annotations/Field.java @@ -48,7 +48,7 @@ public @interface Field { String searchAnalyzer() default ""; - String indexAnalyzer() default ""; + String analyzer() default ""; String[] ignoreFields() default {}; diff --git a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java index 581302224..249a5422e 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java @@ -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(); } diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/SampleMappingEntity.java b/src/test/java/org/springframework/data/elasticsearch/entities/SampleMappingEntity.java index 751305b7b..34fd62f70 100644 --- a/src/test/java/org/springframework/data/elasticsearch/entities/SampleMappingEntity.java +++ b/src/test/java/org/springframework/data/elasticsearch/entities/SampleMappingEntity.java @@ -32,7 +32,7 @@ public class SampleMappingEntity { @Id private String id; - @Field(type = String, index = not_analyzed, store = true, searchAnalyzer = "standard", indexAnalyzer = "standard") + @Field(type = String, index = not_analyzed, store = true, analyzer = "standard") private String message; private NestedEntity nested; diff --git a/src/test/java/org/springframework/data/elasticsearch/entities/SampleTransientEntity.java b/src/test/java/org/springframework/data/elasticsearch/entities/SampleTransientEntity.java index 191c43f28..be98fc7c5 100644 --- a/src/test/java/org/springframework/data/elasticsearch/entities/SampleTransientEntity.java +++ b/src/test/java/org/springframework/data/elasticsearch/entities/SampleTransientEntity.java @@ -32,7 +32,7 @@ public class SampleTransientEntity { @Id private String id; - @Field(type = String, index = not_analyzed, store = true, searchAnalyzer = "standard", indexAnalyzer = "standard") + @Field(type = String, index = not_analyzed, store = true, analyzer = "standard") private String message; @Transient