Review ++

This commit is contained in:
Jim Ferenczi 2015-12-10 14:19:19 +01:00
parent 437488ae64
commit 176a4fc8da
2 changed files with 31 additions and 31 deletions

View File

@ -2471,7 +2471,7 @@ public class HighlighterSearchIT extends ESIntegTestCase {
logger.info("--> highlighting and searching on field1"); logger.info("--> highlighting and searching on field1");
SearchSourceBuilder source = searchSource().query(boolQuery() SearchSourceBuilder source = searchSource().query(boolQuery()
.should(boolQuery().mustNot(constantScoreQuery(QueryBuilders.existsQuery("field1")))) .should(boolQuery().mustNot(QueryBuilders.existsQuery("field1")))
.should(matchQuery("field1", "test")) .should(matchQuery("field1", "test"))
.should(constantScoreQuery(queryStringQuery("field1:photo*")))) .should(constantScoreQuery(queryStringQuery("field1:photo*"))))
.highlighter(highlight().field("field1")); .highlighter(highlight().field("field1"));

View File

@ -57,44 +57,44 @@ public class ExistsIT extends ESIntegTestCase {
public void testExists() throws Exception { public void testExists() throws Exception {
XContentBuilder mapping = XContentBuilder.builder(JsonXContent.jsonXContent) XContentBuilder mapping = XContentBuilder.builder(JsonXContent.jsonXContent)
.startObject() .startObject()
.startObject("type") .startObject("type")
.startObject(FieldNamesFieldMapper.NAME) .startObject(FieldNamesFieldMapper.NAME)
.field("enabled", randomBoolean()) .field("enabled", randomBoolean())
.endObject()
.startObject("properties")
.startObject("foo")
.field("type", "string")
.endObject()
.startObject("bar")
.field("type", "object")
.startObject("properties")
.startObject("foo")
.field("type", "string")
.endObject()
.startObject("bar")
.field("type", "object")
.startObject("properties")
.startObject("bar")
.field("type", "string")
.endObject()
.endObject()
.endObject()
.startObject("baz")
.field("type", "long")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject() .endObject()
.startObject("properties") .endObject();
.startObject("foo")
.field("type", "string")
.endObject()
.startObject("bar")
.field("type", "object")
.startObject("properties")
.startObject("foo")
.field("type", "string")
.endObject()
.startObject("bar")
.field("type", "object")
.startObject("properties")
.startObject("bar")
.field("type", "string")
.endObject()
.endObject()
.endObject()
.startObject("baz")
.field("type", "long")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject();
assertAcked(client().admin().indices().prepareCreate("idx").addMapping("type", mapping)); assertAcked(client().admin().indices().prepareCreate("idx").addMapping("type", mapping));
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, Object> barObject = new HashMap<>(); Map<String, Object> barObject = new HashMap<>();
barObject.put("foo", "bar"); barObject.put("foo", "bar");
barObject.put("bar", singletonMap("bar", "foo")); barObject.put("bar", singletonMap("bar", "foo"));
final Map<String, Object>[] sources = new Map[]{ final Map<String, Object>[] sources = new Map[] {
// simple property // simple property
singletonMap("foo", "bar"), singletonMap("foo", "bar"),
// object fields // object fields