Skip to content

Commit 5ed655e

Browse files
authored
Fix recative mapping creation.
Original Pull Request #1821
1 parent 0836411 commit 5ed655e

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java

+1
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ protected Document buildMapping(Class<?> clazz) {
210210

211211
// load mapping specified in Mapping annotation if present
212212
Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
213+
213214
if (mappingAnnotation != null) {
214215
String mappingPath = mappingAnnotation.mappingPath();
215216

src/main/java/org/springframework/data/elasticsearch/core/DefaultReactiveIndexOperations.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,11 @@ public Mono<Document> createMapping(Class<?> clazz) {
183183
Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
184184

185185
if (mappingAnnotation != null) {
186-
return loadDocument(mappingAnnotation.mappingPath(), "@Mapping");
186+
String mappingPath = mappingAnnotation.mappingPath();
187+
188+
if (hasText(mappingPath)) {
189+
return loadDocument(mappingAnnotation.mappingPath(), "@Mapping");
190+
}
187191
}
188192

189193
String mapping = new MappingBuilder(converter).buildPropertyMapping(clazz);

0 commit comments

Comments
 (0)