Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-05-31 09:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix recative mapping creation.

Browse Source 
Original Pull Request #1821
This commit is contained in:
Peter-Josef Meisch 2021-05-19 23:40:11 +02:00 committed by GitHub
parent 0836411d45
commit 5ed655e0aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java
View File

@ -210,6 +210,7 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
// load mapping specified in Mapping annotation if present // load mapping specified in Mapping annotation if present
Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class); Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
if (mappingAnnotation != null) { if (mappingAnnotation != null) {
String mappingPath = mappingAnnotation.mappingPath(); String mappingPath = mappingAnnotation.mappingPath();

6
src/main/java/org/springframework/data/elasticsearch/core/DefaultReactiveIndexOperations.java
View File

@ -183,7 +183,11 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class); Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
if (mappingAnnotation != null) { if (mappingAnnotation != null) {
return loadDocument(mappingAnnotation.mappingPath(), "@Mapping"); String mappingPath = mappingAnnotation.mappingPath();
if (hasText(mappingPath)) {
return loadDocument(mappingAnnotation.mappingPath(), "@Mapping");
}
} }
String mapping = new MappingBuilder(converter).buildPropertyMapping(clazz); String mapping = new MappingBuilder(converter).buildPropertyMapping(clazz);