Skip to content

Commit a343bf7

Browse files
committed
DATAES-353 - Polishing
1 parent 7dba044 commit a343bf7

File tree

2 files changed

+10
-166
lines changed

2 files changed

+10
-166
lines changed

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

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,31 @@
1515
*/
1616
package org.springframework.data.elasticsearch.core;
1717

18-
import static org.apache.commons.lang.StringUtils.*;
19-
import static org.elasticsearch.common.xcontent.XContentFactory.*;
20-
import static org.springframework.util.StringUtils.*;
21-
2218
import java.io.IOException;
2319
import java.util.ArrayList;
2420
import java.util.Arrays;
2521
import java.util.List;
2622
import java.util.Map;
27-
28-
import org.apache.commons.lang.StringUtils;
29-
import org.apache.commons.lang.math.NumberUtils;
3023
import org.elasticsearch.common.xcontent.XContentBuilder;
3124
import org.springframework.core.ResolvableType;
3225
import org.springframework.core.io.ClassPathResource;
3326
import org.springframework.data.annotation.Transient;
34-
import org.springframework.data.elasticsearch.annotations.*;
27+
import org.springframework.data.elasticsearch.annotations.CompletionField;
28+
import org.springframework.data.elasticsearch.annotations.DateFormat;
3529
import org.springframework.data.elasticsearch.annotations.Field;
30+
import org.springframework.data.elasticsearch.annotations.FieldType;
31+
import org.springframework.data.elasticsearch.annotations.GeoPointField;
32+
import org.springframework.data.elasticsearch.annotations.InnerField;
33+
import org.springframework.data.elasticsearch.annotations.Mapping;
34+
import org.springframework.data.elasticsearch.annotations.MultiField;
3635
import org.springframework.data.elasticsearch.core.completion.Completion;
3736
import org.springframework.data.elasticsearch.core.geo.GeoPoint;
3837
import org.springframework.data.mapping.model.SimpleTypeHolder;
3938
import org.springframework.data.util.ClassTypeInformation;
4039
import org.springframework.data.util.TypeInformation;
40+
import static org.apache.commons.lang.StringUtils.*;
41+
import static org.elasticsearch.common.xcontent.XContentFactory.*;
42+
import static org.springframework.util.StringUtils.*;
4143

4244
/**
4345
* @author Rizwan Idrees
@@ -190,21 +192,6 @@ private static boolean isAnnotated(java.lang.reflect.Field field) {
190192
private static void applyGeoPointFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field) throws IOException {
191193
xContentBuilder.startObject(field.getName());
192194
xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_GEO_POINT);
193-
194-
GeoPointField annotation = field.getAnnotation(GeoPointField.class);
195-
// if (annotation != null) {
196-
// if (annotation.geoHashPrefix()) {
197-
// xContentBuilder.field(TYPE_VALUE_GEO_HASH_PREFIX, true);
198-
// if (StringUtils.isNotEmpty(annotation.geoHashPrecision())) {
199-
// if (NumberUtils.isNumber(annotation.geoHashPrecision())) {
200-
// xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, Integer.parseInt(annotation.geoHashPrecision()));
201-
// } else {
202-
// xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, annotation.geoHashPrecision());
203-
// }
204-
// }
205-
// }
206-
// }
207-
208195
xContentBuilder.endObject();
209196
}
210197

src/test/java/org/springframework/data/elasticsearch/core/facet/ElasticsearchTemplateHistogramFacetTests.java

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)