From b949daadeab46e8d9cf3bdc84abe8b3fb1b522ff Mon Sep 17 00:00:00 2001 From: xhaggi Date: Mon, 9 Apr 2018 13:25:41 +0200 Subject: [PATCH] DATAES-438 - get rid of deprecation warning because of invalid mapping for @Id --- .../data/elasticsearch/core/MappingBuilder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 a76aa6420..194f8cda3 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java @@ -50,6 +50,7 @@ import static org.springframework.util.StringUtils.*; * @author Dennis Maaß * @author Pavel Luhin * @author Mark Paluch + * @author Sascha Woo */ class MappingBuilder { @@ -67,8 +68,7 @@ class MappingBuilder { public static final String COMPLETION_PRESERVE_POSITION_INCREMENTS = "preserve_position_increments"; public static final String COMPLETION_MAX_INPUT_LENGTH = "max_input_length"; - public static final String INDEX_VALUE_NOT_ANALYZED = "not_analyzed"; - public static final String TYPE_VALUE_STRING = "text"; + public static final String TYPE_VALUE_KEYWORD = "keyword"; public static final String TYPE_VALUE_GEO_POINT = "geo_point"; public static final String TYPE_VALUE_COMPLETION = "completion"; public static final String TYPE_VALUE_GEO_HASH_PREFIX = "geohash_prefix"; @@ -215,8 +215,8 @@ class MappingBuilder { private static void applyDefaultIdFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field) throws IOException { xContentBuilder.startObject(field.getName()) - .field(FIELD_TYPE, TYPE_VALUE_STRING) - .field(FIELD_INDEX, INDEX_VALUE_NOT_ANALYZED); + .field(FIELD_TYPE, TYPE_VALUE_KEYWORD) + .field(FIELD_INDEX, true); xContentBuilder.endObject(); }