Support custom classes for dynamic templates.

Signed-off-by: Youssef Aouichaoui <[email protected]>

Author: youssef3wi

Diff for: src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java

@@ -677,13 +677,18 @@ private <R> void populateFieldsUsingDynamicTemplates(ElasticsearchPersistentEnti
 				ElasticsearchPersistentProperty property = targetEntity
 						.getPersistentPropertyWithFieldName(templateEntry.getKey());
 				if (property != null && property.isDynamicFieldMapping()) {
-					targetEntity.getPropertyAccessor(result).setProperty(property,
-							document.entrySet().stream()
-									.filter(fieldKey -> templateEntry.getValue().getMatch().stream()
-											.anyMatch(regex -> simpleMatch(regex, fieldKey.getKey()))
-											&& templateEntry.getValue().getUnmatch().stream()
-													.noneMatch(regex -> simpleMatch(regex, fieldKey.getKey())))
-									.collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
+					// prepare value
+					Map<String, Object> values = new HashMap<>();
+					// TODO: Path match and unmatched
+					document.entrySet().stream()
+							.filter(fieldKey -> templateEntry.getValue().getMatch().stream()
+									.anyMatch(regex -> simpleMatch(regex, fieldKey.getKey()))
+									&& templateEntry.getValue().getUnmatch().stream()
+											.noneMatch(regex -> simpleMatch(regex, fieldKey.getKey())))
+							.forEach(entry -> values.put(entry.getKey(), entry.getValue()));
+
+					// set property
+					targetEntity.getPropertyAccessor(result).setProperty(property, read(property.getType(), Document.from(values)));
 				}
 			}
 		}
@@ -1089,7 +1094,14 @@ protected void writeProperty(ElasticsearchPersistentProperty property, Object va
 
 			addCustomTypeKeyIfNecessary(value, document, TypeInformation.of(property.getRawType()));
 			writeInternal(value, document, entity);
-			sink.set(property, document);
+			if (property.isDynamicFieldMapping()) {
+				// flatten
+				for (Entry<String, Object> entry : document.entrySet()) {
+					sink.set(entry.getKey(), entry.getValue());
+				}
+			} else {
+				sink.set(property, document);
+			}
 		}
 
 		/**

Diff for: src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java

@@ -23,14 +23,7 @@
 
 import java.time.Instant;
 import java.time.LocalDate;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -293,15 +286,24 @@ void shouldMapDynamicFields() {
 
 		DynamicFieldDocument document = new DynamicFieldDocument();
 		document.dynamicFields = Map.of("a_str", randomUUID().toString(), "b_str", randomUUID().toString());
+		document.value = new DynamicFieldDocument.Value(1L, new Date());
 		operations.save(document);
 
 		// When
-		SearchHits<DynamicFieldDocument> results = operations.search(new StringQuery(MATCH_ALL), DynamicFieldDocument.class);
+		SearchHits<DynamicFieldDocument> results = operations.search(new StringQuery(MATCH_ALL),
+				DynamicFieldDocument.class);
 
 		// Then
 		assertThat(results.getTotalHits()).isEqualTo(1);
-		assertThat(results.getSearchHits()).first().extracting(SearchHit::getContent).extracting(doc -> doc.dynamicFields)
+		assertThat(results.getSearchHits()).first()
+				.extracting(SearchHit::getContent)
+				.extracting(doc -> doc.dynamicFields)
 				.isEqualTo(document.dynamicFields);
+		assertThat(results.getSearchHits()).first()
+				.extracting(SearchHit::getContent)
+				.extracting(doc -> doc.value)
+				.isEqualTo(document.value);
+
 		documentOperations.delete();
 	}
 
@@ -966,6 +968,39 @@ private static class DynamicFieldDocument {
 		@Id String id;
 
 		@Field(name = "_str", dynamicTemplate = true) private Map<String, String> dynamicFields = new HashMap<>();
+
+		@Nullable
+		@Field(name = "obj", dynamicTemplate = true) private Value value;
+
+		static class Value {
+			@Nullable
+			@Field(name = "value_sum", type = FieldType.Long)
+			private Long sum;
+
+			@Nullable
+			@Field(name = "value_date", type = FieldType.Long)
+			private Date date;
+
+			public Value() {
+			}
+
+			public Value(Long sum, Date date) {
+				this.sum = sum;
+				this.date = date;
+			}
+
+			@Override
+			public boolean equals(Object o) {
+				if (this == o) return true;
+				if (!(o instanceof Value value)) return false;
+                return Objects.equals(sum, value.sum) && Objects.equals(date, value.date);
+			}
+
+			@Override
+			public int hashCode() {
+				return Objects.hash(sum, date);
+			}
+		}
 	}
 	// endregion
 }

Diff for: src/test/resources/mappings/test-dynamic_templates_mappings_three.json

@@ -7,6 +7,15 @@
           "type": "keyword"
         }
       }
+    },
+    {
+      "obj": {
+        "match": "value_*",
+        "mapping": {
+          "type": "text",
+          "index": false
+        }
+      }
     }
   ]
 }