add parent fix

gkozyryatskyy · Dec 7, 2016 · 6375ab6 · 6375ab6
1 parent 0989e60
commit 6375ab6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/com/escli4j/mapping/Mapping.java b/src/main/java/com/escli4j/mapping/Mapping.java
@@ -85,7 +85,8 @@ protected boolean createIndex(String index, Map<String, Class<? extends EsEntity
             Type typeAmmotation = entry.getValue().getAnnotation(Type.class);
             if (typeAmmotation.create()) {
                 execute = true;
-                builder.addMapping(entry.getKey(), MappingUtils.getMappingBuilder(entry.getKey(), entry.getValue()));
+                builder.addMapping(entry.getKey(),
+                        MappingUtils.getMappingBuilder(entry.getKey(), typeAmmotation.parent(), entry.getValue()));
             }
         }
         // not send get request if execute == false
@@ -99,9 +100,10 @@ protected boolean updateIndex(String index, Map<String, Class<? extends EsEntity
             Type typeAmmotation = entry.getValue().getAnnotation(Type.class);
             if (typeAmmotation.update()) {
                 execute = true;
-                result &= client.admin().indices().preparePutMapping(index).setType(entry.getKey())
-                        .setSource(MappingUtils.getMappingBuilder(entry.getKey(), entry.getValue())).get()
-                        .isAcknowledged();
+                result &= client.admin().indices()
+                        .preparePutMapping(index).setType(entry.getKey()).setSource(MappingUtils
+                                .getMappingBuilder(entry.getKey(), typeAmmotation.parent(), entry.getValue()))
+                        .get().isAcknowledged();
             }
         }
         return execute && result;