+0 −6

SearchRequestBuilder.java

...lasticsearch/action/search/SearchRequestBuilder.java

+10 −0

AbstractQueryBuilder.java

.../elasticsearch/index/query/AbstractQueryBuilder.java

+12 −0

BoolQueryBuilder.java

.../org/elasticsearch/index/query/BoolQueryBuilder.java

+7 −0

BoostingQueryBuilder.java

.../elasticsearch/index/query/BoostingQueryBuilder.java

+6 −0

ConstantScoreQueryBuilder.java

...ticsearch/index/query/ConstantScoreQueryBuilder.java

+14 −10

HasChildQueryBuilder.java

.../elasticsearch/index/query/HasChildQueryBuilder.java

+16 −9

HasParentQueryBuilder.java

...elasticsearch/index/query/HasParentQueryBuilder.java

+150 −96

InnerHitBuilder.java/{ → }

...search/index/query/{support → }/InnerHitBuilder.java

+16 −8

NestedQueryBuilder.java

...rg/elasticsearch/index/query/NestedQueryBuilder.java

+0 −12

QueryShardContext.java

...org/elasticsearch/index/query/QueryShardContext.java

+10 −1

FunctionScoreQueryBuilder.java

...x/query/functionscore/FunctionScoreQueryBuilder.java

+0 −126

InnerHitsBuilder.java

...sticsearch/index/query/support/InnerHitsBuilder.java

+13 −21

SearchService.java

...ain/java/org/elasticsearch/search/SearchService.java

+2 −31

SearchSourceBuilder.java

...lasticsearch/search/builder/SearchSourceBuilder.java

+18 −23

HasChildQueryBuilderTests.java

...ticsearch/index/query/HasChildQueryBuilderTests.java

+14 −9

HasParentQueryBuilderTests.java

...icsearch/index/query/HasParentQueryBuilderTests.java

+145 −43

InnerHitBuilderTests.java/{ → }

...h/index/query/{support → }/InnerHitBuilderTests.java

+52 −11

NestedQueryBuilderTests.java

...asticsearch/index/query/NestedQueryBuilderTests.java

+0 −140

InnerHitsBuilderTests.java

...earch/index/query/support/InnerHitsBuilderTests.java

+1 −30

PercolatorIT.java

.../java/org/elasticsearch/percolator/PercolatorIT.java

+0 −10

SearchSourceBuilderTests.java

...csearch/search/builder/SearchSourceBuilderTests.java

+162 −342

InnerHitsIT.java

.../org/elasticsearch/search/innerhits/InnerHitsIT.java

+3 −2

search.asciidoc

docs/reference/migration/migrate_5_0/search.asciidoc

+1 −75

inner-hits.asciidoc

docs/reference/search/request/inner-hits.asciidoc