Spring/spring-data-elasticsearch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from stuartstevenson/master

Browse Source 
MappingBuilder circular reference issue
This commit is contained in:
akonczak
2013-10-29 16:49:44 -07:00
parent 3e7e262980 c8861ebf0d
commit 2305fc873e
4 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/elasticsearch/annotations/Field.java
View File

@@ -43,4 +43,6 @@ public @interface Field {
String indexAnalyzer() default "";
String [] ignoreFields() default {};
}

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

@@ -24,6 +24,7 @@ import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.TypeInformation;
import java.io.IOException;
import java.util.Arrays;
import java.util.Map;
import static org.apache.commons.lang.StringUtils.EMPTY;
@@ -71,7 +72,7 @@ class MappingBuilder {
}
for (java.lang.reflect.Field field : fields) {
if (isEntity(field)) {
if (isEntity(field) && !isInIgnoreFields(field)) {
mapEntity(xContentBuilder, field.getType(), false, EMPTY, field.getName());
}
@@ -246,4 +247,13 @@ class MappingBuilder {
private static boolean isIdField(java.lang.reflect.Field field, String idFieldName) {
return idFieldName.equals(field.getName());
}
private static boolean isInIgnoreFields(java.lang.reflect.Field field) {
Field fieldAnnotation = field.getAnnotation(Field.class);
if ( null != fieldAnnotation ) {
String [] ignoreFields = fieldAnnotation.ignoreFields();
return Arrays.asList(ignoreFields).contains(field.getName());
}
return false;
}
}