From acecc003cbb7ebe8ccf5bc1a9c74e2a8819ec9c0 Mon Sep 17 00:00:00 2001 From: avolz Date: Wed, 17 Dec 2014 08:05:16 +0000 Subject: [PATCH] DATAES-140 add value "no" in Enum FieldIndex. (cherry picked from commit 1b867cf) --- .../data/elasticsearch/annotations/FieldIndex.java | 4 +++- .../data/elasticsearch/core/MappingBuilder.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/FieldIndex.java b/src/main/java/org/springframework/data/elasticsearch/annotations/FieldIndex.java index 9eee6423b..e5642551a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/annotations/FieldIndex.java +++ b/src/main/java/org/springframework/data/elasticsearch/annotations/FieldIndex.java @@ -18,7 +18,9 @@ package org.springframework.data.elasticsearch.annotations; /** * @author Artur Konczak * @author Mohsin Husen + * @author Alexander Volz + * @author Dennis Maaß */ public enum FieldIndex { - not_analyzed, analyzed + not_analyzed, analyzed, no } 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 afe364019..0f5a9cb55 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java @@ -41,6 +41,8 @@ import org.springframework.data.util.TypeInformation; * @author Mohsin Husen * @author Artur Konczak * @author Kevin Leturc + * @author Alexander Volz + * @author Dennis Maaß */ class MappingBuilder { @@ -208,7 +210,7 @@ class MappingBuilder { ? fieldAnnotation.pattern() : fieldAnnotation.format()); } } - if (FieldIndex.not_analyzed == fieldAnnotation.index()) { + if (FieldIndex.not_analyzed == fieldAnnotation.index() || FieldIndex.no == fieldAnnotation.index()) { xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index().name().toLowerCase()); } if (isNotBlank(fieldAnnotation.searchAnalyzer())) {