Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-08 13:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

DynamicMapping annotation should be applicable to any object field.

Browse Source 
Original Pull Request #1779
Closes #1767
This commit is contained in:
Peter-Josef Meisch 2021-04-17 14:53:12 +02:00
parent 776252b4d6
commit dab5dc4ad2
No known key found for this signature in database
GPG Key ID: DE108246970C7708
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java
View File

@ -215,6 +215,7 @@ public class MappingBuilder {
Field fieldAnnotation = property.findAnnotation(Field.class); Field fieldAnnotation = property.findAnnotation(Field.class);
boolean isCompletionProperty = isCompletionProperty(property); boolean isCompletionProperty = isCompletionProperty(property);
boolean isNestedOrObjectProperty = isNestedOrObjectProperty(property); boolean isNestedOrObjectProperty = isNestedOrObjectProperty(property);
DynamicMapping dynamicMapping = property.findAnnotation(DynamicMapping.class);
if (!isCompletionProperty && property.isEntity() && hasRelevantAnnotation(property)) { if (!isCompletionProperty && property.isEntity() && hasRelevantAnnotation(property)) {
@ -228,8 +229,8 @@ public class MappingBuilder {
? elasticsearchConverter.getMappingContext().getPersistentEntity(iterator.next()) ? elasticsearchConverter.getMappingContext().getPersistentEntity(iterator.next())
: null; : null;
mapEntity(builder, persistentEntity, false, property.getFieldName(), isNestedOrObjectProperty, mapEntity(builder, persistentEntity, false, property.getFieldName(), isNestedOrObjectProperty, fieldAnnotation.type(),
fieldAnnotation.type(), fieldAnnotation, property.findAnnotation(DynamicMapping.class)); fieldAnnotation, dynamicMapping);
return; return;
} }
} }
@ -244,9 +245,9 @@ public class MappingBuilder {
if (isRootObject && fieldAnnotation != null && property.isIdProperty()) { if (isRootObject && fieldAnnotation != null && property.isIdProperty()) {
applyDefaultIdFieldMapping(builder, property); applyDefaultIdFieldMapping(builder, property);
} else if (multiField != null) { } else if (multiField != null) {
addMultiFieldMapping(builder, property, multiField, isNestedOrObjectProperty); addMultiFieldMapping(builder, property, multiField, isNestedOrObjectProperty, dynamicMapping);
} else if (fieldAnnotation != null) { } else if (fieldAnnotation != null) {
addSingleFieldMapping(builder, property, fieldAnnotation, isNestedOrObjectProperty); addSingleFieldMapping(builder, property, fieldAnnotation, isNestedOrObjectProperty, dynamicMapping);
} }
} }
@ -320,7 +321,7 @@ public class MappingBuilder {
* @throws IOException * @throws IOException
*/ */
private void addSingleFieldMapping(XContentBuilder builder, ElasticsearchPersistentProperty property, private void addSingleFieldMapping(XContentBuilder builder, ElasticsearchPersistentProperty property,
Field annotation, boolean nestedOrObjectField) throws IOException { Field annotation, boolean nestedOrObjectField, @Nullable DynamicMapping dynamicMapping) throws IOException {
// build the property json, if empty skip it as this is no valid mapping // build the property json, if empty skip it as this is no valid mapping
XContentBuilder propertyBuilder = jsonBuilder().startObject(); XContentBuilder propertyBuilder = jsonBuilder().startObject();
@ -332,6 +333,11 @@ public class MappingBuilder {
} }
builder.startObject(property.getFieldName()); builder.startObject(property.getFieldName());
if (nestedOrObjectField && dynamicMapping != null) {
builder.field(TYPE_DYNAMIC, dynamicMapping.value().name().toLowerCase());
}
addFieldMappingParameters(builder, annotation, nestedOrObjectField); addFieldMappingParameters(builder, annotation, nestedOrObjectField);
builder.endObject(); builder.endObject();
} }
@ -342,10 +348,15 @@ public class MappingBuilder {
* @throws IOException * @throws IOException
*/ */
private void addMultiFieldMapping(XContentBuilder builder, ElasticsearchPersistentProperty property, private void addMultiFieldMapping(XContentBuilder builder, ElasticsearchPersistentProperty property,
MultiField annotation, boolean nestedOrObjectField) throws IOException { MultiField annotation, boolean nestedOrObjectField, @Nullable DynamicMapping dynamicMapping) throws IOException {
// main field // main field
builder.startObject(property.getFieldName()); builder.startObject(property.getFieldName());
if (nestedOrObjectField && dynamicMapping != null) {
builder.field(TYPE_DYNAMIC, dynamicMapping.value().name().toLowerCase());
}
addFieldMappingParameters(builder, annotation.mainField(), nestedOrObjectField); addFieldMappingParameters(builder, annotation.mainField(), nestedOrObjectField);
// inner fields // inner fields

29
src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderTests.java
View File

@ -541,19 +541,28 @@ public class MappingBuilderTests extends MappingContextBaseTests {
assertEquals(expected, mapping, true); assertEquals(expected, mapping, true);
} }
@Test @Test // DATAES-148, #1767
void shouldWriteDynamicMappingSettings() throws JSONException { void shouldWriteDynamicMappingSettings() throws JSONException {
String expected = "{\n" + // String expected = "{\n" + //
" \"dynamic\": \"false\",\n" + // " \"dynamic\": \"false\",\n" + //
" \"properties\": {\n" + // " \"properties\": {\n" + //
" \"author\": {\n" + // " \"author\": {\n" + //
" \"dynamic\": \"strict\",\n" + // " \"type\": \"object\",\n" + //
" \"type\": \"object\",\n" + // " \"dynamic\": \"strict\",\n" + //
" \"properties\": {}\n" + // " \"properties\": {\n" + //
" }\n" + // " }\n" + //
" },\n" + //
" \"objectMap\": {\n" + //
" \"type\": \"object\",\n" + //
" \"dynamic\": \"false\"\n" + //
" },\n" + //
" \"nestedObjectMap\": {\n" + //
" \"type\": \"nested\",\n" + //
" \"dynamic\": \"false\"\n" + //
" }\n" + // " }\n" + //
"}\n"; " }\n" + //
"}"; //
String mapping = getMappingBuilder().buildPropertyMapping(ConfigureDynamicMappingEntity.class); String mapping = getMappingBuilder().buildPropertyMapping(ConfigureDynamicMappingEntity.class);
@ -1058,6 +1067,10 @@ public class MappingBuilderTests extends MappingContextBaseTests {
static class ConfigureDynamicMappingEntity { static class ConfigureDynamicMappingEntity {
@Nullable @DynamicMapping(DynamicMappingValue.Strict) @Field(type = FieldType.Object) private Author author; @Nullable @DynamicMapping(DynamicMappingValue.Strict) @Field(type = FieldType.Object) private Author author;
@Nullable @DynamicMapping(DynamicMappingValue.False) @Field(
type = FieldType.Object) private Map<String, Object> objectMap;
@Nullable @DynamicMapping(DynamicMappingValue.False) @Field(
type = FieldType.Nested) private List<Map<String, Object>> nestedObjectMap;
@Nullable @Nullable
public Author getAuthor() { public Author getAuthor() {