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

DATAES-362 - Polishing.

Browse Source
This commit is contained in:
Peter-Josef Meisch 2020-12-05 23:20:40 +01:00
parent a42de9b51b
commit 7df6ffb5cd
No known key found for this signature in database
GPG Key ID: DE108246970C7708
2 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
import org.springframework.data.elasticsearch.annotations.Mapping;
@ -44,7 +43,7 @@ import org.springframework.util.StringUtils;
/**
* Base implementation of {@link IndexOperations} common to Transport and Rest based Implementations of IndexOperations.
*
*
* @author Peter-Josef Meisch
* @author Sascha Woo
* @since 4.0
@ -107,13 +106,10 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
Document settings = null;
if (AnnotatedElementUtils.hasAnnotation(clazz, Setting.class)) {
AnnotationAttributes attributes = AnnotatedElementUtils.getMergedAnnotationAttributes(clazz, Setting.class);
Setting setting = AnnotatedElementUtils.findMergedAnnotation(clazz, Setting.class);
if (attributes != null) {
String settingPath = attributes.getString("settingPath");
settings = loadSettings(settingPath);
}
if (setting != null) {
settings = loadSettings(setting.settingPath());
}
if (settings == null) {
@ -230,21 +226,18 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
protected Document buildMapping(Class<?> clazz) {
// load mapping specified in Mapping annotation if present
if (AnnotatedElementUtils.hasAnnotation(clazz, Mapping.class)) {
AnnotationAttributes attributes = AnnotatedElementUtils.getMergedAnnotationAttributes(clazz, Mapping.class);
Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
if (mappingAnnotation != null) {
String mappingPath = mappingAnnotation.mappingPath();
if (attributes != null) {
String mappingPath = attributes.getString("mappingPath");
if (StringUtils.hasText(mappingPath)) {
String mappings = ResourceUtil.readFileFromClasspath(mappingPath);
if (StringUtils.hasText(mappingPath)) {
String mappings = ResourceUtil.readFileFromClasspath(mappingPath);
if (StringUtils.hasText(mappings)) {
return Document.parse(mappings);
}
} else {
LOGGER.info("mappingPath in @Mapping has to be defined. Building mappings using @Field");
if (StringUtils.hasText(mappings)) {
return Document.parse(mappings);
}
} else {
LOGGER.info("mappingPath in @Mapping has to be defined. Building mappings using @Field");
}
}

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

@ -159,14 +159,11 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
@Override
public Mono<Document> createMapping(Class<?> clazz) {
if (AnnotatedElementUtils.hasAnnotation(clazz, Mapping.class)) {
AnnotationAttributes attributes = AnnotatedElementUtils.getMergedAnnotationAttributes(clazz, Mapping.class);
Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
if (attributes != null) {
String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();
return loadDocument(mappingPath, "@Mapping");
}
}
if (mappingAnnotation != null) {
return loadDocument(mappingAnnotation.mappingPath(), "@Mapping");
}
String mapping = new MappingBuilder(converter).buildPropertyMapping(clazz);
return Mono.just(Document.parse(mapping));
@ -204,14 +201,11 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
@Override
public Mono<Document> createSettings(Class<?> clazz) {
if (AnnotatedElementUtils.hasAnnotation(clazz, Setting.class)) {
AnnotationAttributes attributes = AnnotatedElementUtils.getMergedAnnotationAttributes(clazz, Setting.class);
Setting setting = AnnotatedElementUtils.findMergedAnnotation(clazz, Setting.class);
if (attributes != null) {
String settingPath = attributes.getString("settingPath");
return loadDocument(settingPath, "@Setting");
}
}
if (setting != null) {
return loadDocument(setting.settingPath(), "@Setting");
}
return Mono.just(getRequiredPersistentEntity(clazz).getDefaultSettings());
}