From 6ca5ec986ca3fe63ca43ada71a073a727a85c38a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 17 Nov 2016 23:31:43 +1300 Subject: [PATCH] #881 - Split DocPropertyType.STRING into KEYWORD and TEXT ... for ElasticSearch 5.x support --- .../com/avaje/ebeaninternal/server/deploy/BeanProperty.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java index 332533a25..91be1e4d8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java @@ -1386,12 +1386,12 @@ public class BeanProperty implements ElPropertyValue, Property { public void docStoreMapping(DocMappingBuilder mapping, String prefix) { if (mapping.includesProperty(prefix, name)) { - DocPropertyType type = scalarType.getDocType(); - if (isKeywordType(type, docOptions)) { + DocPropertyOptions options = docOptions.copy(); + if (isKeywordType(type, options)) { type = DocPropertyType.KEYWORD; } - mapping.add(new DocPropertyMapping(name, type, docOptions)); + mapping.add(new DocPropertyMapping(name, type, options)); } }