UNOMI-637 : do not create mapping for property type if not necessary (#469)
* UNOMI-637 : do not create mapping for property type if not necessary
diff --git a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
index cd51832..27bdd35 100644
--- a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
+++ b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
@@ -1438,13 +1438,19 @@
public void setPropertyMapping(final PropertyType property, final String itemType) {
try {
+ Map<String, Object> propertyMapping = createPropertyMapping(property);
+ if (propertyMapping.isEmpty()) {
+ return;
+ }
+
Map<String, Map<String, Object>> mappings = getPropertiesMapping(itemType);
if (mappings == null) {
mappings = new HashMap<>();
}
Map<String, Object> subMappings = mappings.computeIfAbsent("properties", k -> new HashMap<>());
Map<String, Object> subSubMappings = (Map<String, Object>) subMappings.computeIfAbsent("properties", k -> new HashMap<>());
- mergePropertiesMapping(subSubMappings, createPropertyMapping(property));
+
+ mergePropertiesMapping(subSubMappings, propertyMapping);
Map<String, Object> mappingsWrapper = new HashMap<>();
mappingsWrapper.put("properties", mappings);
@@ -1461,8 +1467,8 @@
final HashMap<String, Object> definition = new HashMap<>();
if (esType == null) {
- logger.warn("No predefined type found for property[" + property.getValueTypeId() + "], letting ES decide");
- // we don't have a fixed type for that property so let ES decide it
+ logger.warn("No predefined type found for property[{}], no mapping will be created", property.getValueTypeId());
+ return Collections.emptyMap();
} else {
definition.put("type", esType);
if ("text".equals(esType)) {
@@ -1479,7 +1485,10 @@
if ("set".equals(property.getValueTypeId())) {
Map<String, Object> childProperties = new HashMap<>();
property.getChildPropertyTypes().forEach(childType -> {
- mergePropertiesMapping(childProperties, createPropertyMapping(childType));
+ Map<String, Object> propertyMapping = createPropertyMapping(childType);
+ if (!propertyMapping.isEmpty()) {
+ mergePropertiesMapping(childProperties, propertyMapping);
+ }
});
definition.put("properties", childProperties);
}
