Skip to content

Commit 1ec8cf1

Browse files
author
EmmanuelDuru
committed
Upgrade ES 6
1 parent 2ae3689 commit 1ec8cf1

17 files changed

+59
-36
lines changed

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/ElasticSearchClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.elasticsearch.client.transport.TransportClient;
1414
import org.elasticsearch.common.network.NetworkModule;
1515
import org.elasticsearch.common.settings.Settings;
16-
import org.elasticsearch.common.transport.InetSocketTransportAddress;
16+
import org.elasticsearch.common.transport.TransportAddress;
1717
import org.elasticsearch.common.unit.TimeValue;
1818
import org.elasticsearch.env.Environment;
1919
import org.elasticsearch.node.MockNode;
@@ -42,7 +42,7 @@ public class ElasticSearchClient {
4242
private Node node;
4343
private boolean isClient;
4444
private boolean isTransportClient;
45-
private List<InetSocketTransportAddress> adresses;
45+
private List<TransportAddress> adresses;
4646
private boolean isLocal;
4747
private String clusterName;
4848
private boolean resetData = false;
@@ -73,7 +73,7 @@ public void initialize() throws Exception {
7373
} else {
7474
transportClient = new PreBuiltTransportClient(settings, SearchGuardSSLPlugin.class);
7575
}
76-
for (InetSocketTransportAddress add : adresses) {
76+
for (TransportAddress add : adresses) {
7777
transportClient.addTransportAddress(add);
7878
}
7979
this.client = transportClient;

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/FieldsMappingBuilder.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public class FieldsMappingBuilder {
4040
*/
4141
@SuppressWarnings("unchecked")
4242
public void parseFieldMappings(Class<?> clazz, Map<String, Object> classDefinitionMap, List<IFacetBuilderHelper> facetFields,
43-
List<IFilterBuilderHelper> filteredFields, Map<String, SourceFetchContext> fetchContexts, String pathPrefix, String nestedPrefix)
43+
List<IFilterBuilderHelper> filteredFields, Map<String, SourceFetchContext> fetchContexts, String pathPrefix, String nestedPrefix, boolean isAll)
4444
throws IntrospectionException {
4545
if (clazz.getSuperclass() != null && clazz.getSuperclass() != Object.class) {
46-
parseFieldMappings(clazz.getSuperclass(), classDefinitionMap, facetFields, filteredFields, fetchContexts, pathPrefix, nestedPrefix);
46+
parseFieldMappings(clazz.getSuperclass(), classDefinitionMap, facetFields, filteredFields, fetchContexts, pathPrefix, nestedPrefix, isAll);
4747
}
4848

4949
List<Indexable> indexables = getIndexables(clazz);
@@ -58,6 +58,11 @@ public void parseFieldMappings(Class<?> clazz, Map<String, Object> classDefiniti
5858
parseFieldMappings(clazz, classDefinitionMap, facetFields, filteredFields, fetchContexts, propertiesDefinitionMap, pathPrefix, nestedPrefix,
5959
indexable);
6060
}
61+
if (isAll) {
62+
Map<String, String> fieldsDefinitionMap = new HashMap<String, String>();
63+
fieldsDefinitionMap.put ("type", "text");
64+
propertiesDefinitionMap.put ("all", fieldsDefinitionMap);
65+
}
6166
}
6267

6368
private void parseFieldMappings(Class<?> clazz, Map<String, Object> classDefinitionMap, List<IFacetBuilderHelper> facetFields,

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/MappingBuilder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ public void parseClassAnnotations(Class<?> clazz, String pathPrefix)
191191

192192
typeDefinitionMap.put(typeNameStr, classDefinitionMap);
193193

194+
/*********************
194195
if (esAll != null) {
195196
classDefinitionMap.put("_all",
196197
MapUtil.getMap(new String[] { "enabled", "analyzer", "store" }, new Object[] { true, esAll.analyser(), esAll.store() }));
@@ -199,8 +200,9 @@ public void parseClassAnnotations(Class<?> clazz, String pathPrefix)
199200
}
200201
classDefinitionMap.put("_source", MapUtil.getMap("enabled", esObject.source()));
201202
//classDefinitionMap.put("_type", MapUtil.getMap(new String[] { "store", "index" }, new Object[] { esObject.store(), esObject.index() }));
203+
****************************/
202204

203-
this.fieldsMappingBuilder.parseFieldMappings(clazz, classDefinitionMap, facetFields, filteredFields, fetchContexts, pathPrefix, null);
205+
this.fieldsMappingBuilder.parseFieldMappings(clazz, classDefinitionMap, facetFields, filteredFields, fetchContexts, pathPrefix, null, true);
204206

205207
ObjectMapper mapper = new ObjectMapper();
206208
if (typeNameStr != null) {

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/QueryHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ private QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient es
244244

245245
protected QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient esClient, int maxExpansions, String searchQuery) {
246246
//this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.prefixQuery("_all", searchQuery));
247-
this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.matchPhrasePrefixQuery("_all", searchQuery).maxExpansions(maxExpansions));
247+
this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.matchPhrasePrefixQuery("all", searchQuery).maxExpansions(maxExpansions));
248248
this.mappingBuilder = mappingBuilder;
249249
this.esClient = esClient;
250250
}
@@ -316,7 +316,7 @@ public SearchResponse count(String[] indices, String... types) {
316316
SearchRequestBuilder countRequestBuilder = esClient.getClient().prepareSearch(indices);
317317
if (types != null && types.length > 0) {
318318
countRequestBuilder.setTypes(types);
319-
}
319+
}
320320
countRequestBuilder.setSize(0).setQuery(this.queryBuilder);
321321
return countRequestBuilder.execute().actionGet();
322322
}

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/BooleanFieldAnnotationParser.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ public void parseAnnotation(BooleanField annotation, Map<String, Object> fieldDe
2828
//fieldDefinition.put("index", annotation.index());
2929
fieldDefinition.put("index", annotation.index() == IndexType.no ? "false" : "true");
3030
fieldDefinition.put("boost", annotation.boost());
31-
fieldDefinition.put("include_in_all", annotation.includeInAll());
31+
//fieldDefinition.put("include_in_all", annotation.includeInAll());
32+
if (annotation.includeInAll()) {
33+
fieldDefinition.put("copy_to", "all");
34+
}
3235
}
3336
}

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/DateFieldAnnotationParser.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ public void parseAnnotation(DateField annotation, Map<String, Object> fieldDefin
3030
fieldDefinition.put("index", annotation.index() == IndexType.no ? "false" : "true");
3131
//fieldDefinition.put("precision_step", annotation.precisionStep());
3232
fieldDefinition.put("boost", annotation.boost());
33-
fieldDefinition.put("include_in_all", annotation.includeInAll());
33+
//fieldDefinition.put("include_in_all", annotation.includeInAll());
34+
if (annotation.includeInAll()) {
35+
fieldDefinition.put("copy_to", "all");
36+
}
3437
fieldDefinition.put("ignore_malformed", annotation.ignoreMalformed());
3538
}
3639
}

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/MapKeyValueAnnotationParser.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ public void parseAnnotation(MapKeyValue annotation, Map<String, Object> fieldDef
8484
keyFieldDefinition.put("search_analyzer", annotation.searchAnalyzer());
8585
}
8686

87-
keyFieldDefinition.put("include_in_all", annotation.includeInAll());
87+
//keyFieldDefinition.put("include_in_all", annotation.includeInAll());
88+
if (annotation.includeInAll()) {
89+
keyFieldDefinition.put("copy_to", "all");
90+
}
8891
if (annotation.ignoreAbove() > 0) {
8992
keyFieldDefinition.put("ignore_above", annotation.ignoreAbove());
9093
}
@@ -98,7 +101,7 @@ public void parseAnnotation(MapKeyValue annotation, Map<String, Object> fieldDef
98101
Map<String, SourceFetchContext> fetchContext = Maps.newHashMap();
99102
try {
100103
this.fieldsMappingBuilder.parseFieldMappings(mapValueType, valueFieldDefinition, facets, filters, fetchContext,
101-
indexable.getName() + ".value.", nestedPrefix);
104+
indexable.getName() + ".value.", nestedPrefix, false);
102105
} catch (IntrospectionException e) {
103106
log.error("Fail to parse object class <" + mapValueType.getName() + ">", e);
104107
}

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/NestedObjectFieldAnnotationParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void parseAnnotation(NestedObject annotation, Map<String, Object> fieldDe
3636
Class<?> replaceClass = annotation.nestedClass().equals(NestedObject.class) ? indexable.getType() : annotation.nestedClass();
3737
try {
3838
this.fieldsMappingBuilder.parseFieldMappings(replaceClass, fieldDefinition, facets, filters, fetchContext, indexable.getName() + ".",
39-
indexable.getName());
39+
indexable.getName(), false);
4040
} catch (IntrospectionException e) {
4141
log.error("Fail to parse nested class <" + replaceClass.getName() + ">", e);
4242
}

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/NumberFieldAnnotationParser.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ public void parseAnnotation(NumberField annotation, Map<String, Object> fieldDef
4141
fieldDefinition.put("index", annotation.index() == IndexType.no ? "false" : "true");
4242
// removed in ES 5 : fieldDefinition.put("precision_step", annotation.precisionStep());
4343
fieldDefinition.put("boost", annotation.boost());
44-
fieldDefinition.put("include_in_all", annotation.includeInAll());
44+
//fieldDefinition.put("include_in_all", annotation.includeInAll());
45+
if (annotation.includeInAll()) {
46+
fieldDefinition.put("copy_to", "all");
47+
}
4548
fieldDefinition.put("ignore_malformed", annotation.ignoreMalformed());
4649
}
4750

‎elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/ObjectFieldAnnotationParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void parseAnnotation(ObjectField annotation, Map<String, Object> fieldDef
4444
Class<?> replaceClass = objectClass.equals(ObjectField.class) ? indexable.getType() : objectClass;
4545
try {
4646
String newPrefix = pathPrefix == null ? indexable.getName() + "." : pathPrefix + indexable.getName() + ".";
47-
this.fieldsMappingBuilder.parseFieldMappings(replaceClass, fieldDefinition, facets, filters, fetchContext, newPrefix, nestedPrefix);
47+
this.fieldsMappingBuilder.parseFieldMappings(replaceClass, fieldDefinition, facets, filters, fetchContext, newPrefix, nestedPrefix, false);
4848
} catch (IntrospectionException e) {
4949
log.error("Fail to parse object class <" + replaceClass.getName() + ">", e);
5050
}

0 commit comments

Comments
 (0)