Skip to content

Commit e86a5cf

Browse files
ywelschywelsch
committed
Merge remote-tracking branch 'elastic/master' into enhance/move-tribe-to-plugin
2 parents f290c59 + 7e08753 commit e86a5cf

File tree

352 files changed

+5840
-4554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

352 files changed

+5840
-4554
lines changed

‎Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def provision(config,
272272
installed gradle || {
273273
echo "==> Installing Gradle"
274274
curl -sS -o /tmp/gradle.zip -L https://services.gradle.org/distributions/gradle-3.3-bin.zip
275-
unzip /tmp/gradle.zip -d /opt
275+
unzip -q /tmp/gradle.zip -d /opt
276276
rm -rf /tmp/gradle.zip
277277
ln -s /opt/gradle-3.3/bin/gradle /usr/bin/gradle
278278
# make nfs mounted gradle home dir writeable

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ subprojects {
268268
// the dependency is added.
269269
gradle.projectsEvaluated {
270270
allprojects {
271-
if (project.path == ':test:framework') {
271+
if (project.path == ':test:framework' || project.path == ':client:test') {
272272
// :test:framework:test cannot run before and after :core:test
273273
return
274274
}

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import org.gradle.api.Project
3030
import org.gradle.api.Task
3131
import org.gradle.api.XmlProvider
3232
import org.gradle.api.artifacts.Configuration
33+
import org.gradle.api.artifacts.Dependency
3334
import org.gradle.api.artifacts.ModuleDependency
3435
import org.gradle.api.artifacts.ModuleVersionIdentifier
3536
import org.gradle.api.artifacts.ProjectDependency
@@ -269,8 +270,8 @@ class BuildPlugin implements Plugin<Project> {
269270
})
270271

271272
// force all dependencies added directly to compile/testCompile to be non-transitive, except for ES itself
272-
Closure disableTransitiveDeps = { ModuleDependency dep ->
273-
if (!(dep instanceof ProjectDependency) && dep.group.startsWith('org.elasticsearch') == false) {
273+
Closure disableTransitiveDeps = { Dependency dep ->
274+
if (dep instanceof ModuleDependency && !(dep instanceof ProjectDependency) && dep.group.startsWith('org.elasticsearch') == false) {
274275
dep.transitive = false
275276

276277
// also create a configuration just for this dependency version, so that later

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.groovy

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import org.apache.tools.ant.DefaultLogger;
2626
import org.apache.tools.ant.Project;
2727
import org.elasticsearch.gradle.AntTask;
2828
import org.gradle.api.artifacts.Configuration;
29+
import org.gradle.api.artifacts.FileCollectionDependency;
2930
import org.gradle.api.file.FileCollection;
3031
import org.gradle.api.tasks.Input
3132
import org.gradle.api.tasks.InputFiles
@@ -85,7 +86,11 @@ public class ThirdPartyAuditTask extends AntTask {
8586

8687
// we only want third party dependencies.
8788
jars = configuration.fileCollection({ dependency ->
88-
dependency.group.startsWith("org.elasticsearch") == false
89+
// include SelfResolvingDependency with files in the validation
90+
if (dependency instanceof FileCollectionDependency) {
91+
return true
92+
}
93+
return dependency.group && dependency.group.startsWith("org.elasticsearch") == false
8994
});
9095

9196
// we don't want provided dependencies, which we have already scanned. e.g. don't

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class NodeInfo {
134134
wrapperScript = new File(cwd, "run.bat")
135135
esScript = new File(homeDir, 'bin/elasticsearch.bat')
136136
} else {
137-
executable = 'sh'
137+
executable = 'bash'
138138
wrapperScript = new File(cwd, "run")
139139
esScript = new File(homeDir, 'bin/elasticsearch')
140140
}
@@ -161,8 +161,6 @@ class NodeInfo {
161161
env.put('CONF_DIR', confDir)
162162
if (Version.fromString(nodeVersion).major == 5) {
163163
args.addAll("-E", "path.conf=${confDir}")
164-
} else {
165-
args.addAll("--path.conf", "${confDir}")
166164
}
167165
if (!System.properties.containsKey("tests.es.path.data")) {
168166
args.addAll("-E", "path.data=${-> dataDir.toString()}")

‎buildSrc/src/main/resources/forbidden/http-signatures.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@
1515
# language governing permissions and limitations under the License.
1616

1717
@defaultMessage Explicitly specify the ContentType of HTTP entities when creating
18-
org.apache.http.entity.StringEntity#<init>(java.lang.String)
19-
org.apache.http.entity.StringEntity#<init>(java.lang.String,java.lang.String)
20-
org.apache.http.entity.StringEntity#<init>(java.lang.String,java.nio.charset.Charset)
21-
org.apache.http.entity.ByteArrayEntity#<init>(byte[])
22-
org.apache.http.entity.ByteArrayEntity#<init>(byte[],int,int)
23-
org.apache.http.entity.FileEntity#<init>(java.io.File)
24-
org.apache.http.entity.InputStreamEntity#<init>(java.io.InputStream)
25-
org.apache.http.entity.InputStreamEntity#<init>(java.io.InputStream,long)
26-
org.apache.http.nio.entity.NByteArrayEntity#<init>(byte[])
27-
org.apache.http.nio.entity.NByteArrayEntity#<init>(byte[],int,int)
28-
org.apache.http.nio.entity.NFileEntity#<init>(java.io.File)
29-
org.apache.http.nio.entity.NStringEntity#<init>(java.lang.String)
30-
org.apache.http.nio.entity.NStringEntity#<init>(java.lang.String,java.lang.String)
18+
org.elasticsearch.client.http.entity.StringEntity#<init>(java.lang.String)
19+
org.elasticsearch.client.http.entity.StringEntity#<init>(java.lang.String,java.lang.String)
20+
org.elasticsearch.client.http.entity.StringEntity#<init>(java.lang.String,java.nio.charset.Charset)
21+
org.elasticsearch.client.http.entity.ByteArrayEntity#<init>(byte[])
22+
org.elasticsearch.client.http.entity.ByteArrayEntity#<init>(byte[],int,int)
23+
org.elasticsearch.client.http.entity.FileEntity#<init>(java.io.File)
24+
org.elasticsearch.client.http.entity.InputStreamEntity#<init>(java.io.InputStream)
25+
org.elasticsearch.client.http.entity.InputStreamEntity#<init>(java.io.InputStream,long)
26+
org.elasticsearch.client.http.nio.entity.NByteArrayEntity#<init>(byte[])
27+
org.elasticsearch.client.http.nio.entity.NByteArrayEntity#<init>(byte[],int,int)
28+
org.elasticsearch.client.http.nio.entity.NFileEntity#<init>(java.io.File)
29+
org.elasticsearch.client.http.nio.entity.NStringEntity#<init>(java.lang.String)
30+
org.elasticsearch.client.http.nio.entity.NStringEntity#<init>(java.lang.String,java.lang.String)
3131

3232
@defaultMessage Use non-deprecated constructors
33-
org.apache.http.nio.entity.NFileEntity#<init>(java.io.File,java.lang.String)
34-
org.apache.http.nio.entity.NFileEntity#<init>(java.io.File,java.lang.String,boolean)
35-
org.apache.http.entity.FileEntity#<init>(java.io.File,java.lang.String)
36-
org.apache.http.entity.StringEntity#<init>(java.lang.String,java.lang.String,java.lang.String)
33+
org.elasticsearch.client.http.nio.entity.NFileEntity#<init>(java.io.File,java.lang.String)
34+
org.elasticsearch.client.http.nio.entity.NFileEntity#<init>(java.io.File,java.lang.String,boolean)
35+
org.elasticsearch.client.http.entity.FileEntity#<init>(java.io.File,java.lang.String)
36+
org.elasticsearch.client.http.entity.StringEntity#<init>(java.lang.String,java.lang.String,java.lang.String)
3737

3838
@defaultMessage BasicEntity is easy to mess up and forget to set content type
39-
org.apache.http.entity.BasicHttpEntity#<init>()
39+
org.elasticsearch.client.http.entity.BasicHttpEntity#<init>()
4040

4141
@defaultMessage EntityTemplate is easy to mess up and forget to set content type
42-
org.apache.http.entity.EntityTemplate#<init>(org.apache.http.entity.ContentProducer)
42+
org.elasticsearch.client.http.entity.EntityTemplate#<init>(org.elasticsearch.client.http.entity.ContentProducer)
4343

4444
@defaultMessage SerializableEntity uses java serialization and makes it easy to forget to set content type
45-
org.apache.http.entity.SerializableEntity#<init>(java.io.Serializable)
45+
org.elasticsearch.client.http.entity.SerializableEntity#<init>(java.io.Serializable)

‎client/benchmark/src/main/java/org/elasticsearch/client/benchmark/rest/RestClientBenchmark.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
*/
1919
package org.elasticsearch.client.benchmark.rest;
2020

21-
import org.apache.http.HttpEntity;
22-
import org.apache.http.HttpHeaders;
23-
import org.apache.http.HttpHost;
24-
import org.apache.http.HttpStatus;
25-
import org.apache.http.client.config.RequestConfig;
26-
import org.apache.http.conn.ConnectionKeepAliveStrategy;
27-
import org.apache.http.entity.ContentType;
28-
import org.apache.http.entity.StringEntity;
29-
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
30-
import org.apache.http.message.BasicHeader;
31-
import org.apache.http.nio.entity.NStringEntity;
21+
import org.elasticsearch.client.http.HttpEntity;
22+
import org.elasticsearch.client.http.HttpHeaders;
23+
import org.elasticsearch.client.http.HttpHost;
24+
import org.elasticsearch.client.http.HttpStatus;
25+
import org.elasticsearch.client.http.client.config.RequestConfig;
26+
import org.elasticsearch.client.http.conn.ConnectionKeepAliveStrategy;
27+
import org.elasticsearch.client.http.entity.ContentType;
28+
import org.elasticsearch.client.http.entity.StringEntity;
29+
import org.elasticsearch.client.http.impl.nio.client.HttpAsyncClientBuilder;
30+
import org.elasticsearch.client.http.message.BasicHeader;
31+
import org.elasticsearch.client.http.nio.entity.NStringEntity;
3232
import org.elasticsearch.ElasticsearchException;
3333
import org.elasticsearch.client.Response;
3434
import org.elasticsearch.client.RestClient;

‎client/rest-high-level/src/main/java/org/elasticsearch/client/Request.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
package org.elasticsearch.client;
2121

22-
import org.apache.http.HttpEntity;
23-
import org.apache.http.client.methods.HttpDelete;
24-
import org.apache.http.client.methods.HttpGet;
25-
import org.apache.http.client.methods.HttpHead;
26-
import org.apache.http.client.methods.HttpPost;
27-
import org.apache.http.client.methods.HttpPut;
28-
import org.apache.http.entity.ByteArrayEntity;
29-
import org.apache.http.entity.ContentType;
22+
import org.elasticsearch.client.http.HttpEntity;
23+
import org.elasticsearch.client.http.client.methods.HttpDelete;
24+
import org.elasticsearch.client.http.client.methods.HttpGet;
25+
import org.elasticsearch.client.http.client.methods.HttpHead;
26+
import org.elasticsearch.client.http.client.methods.HttpPost;
27+
import org.elasticsearch.client.http.client.methods.HttpPut;
28+
import org.elasticsearch.client.http.entity.ByteArrayEntity;
29+
import org.elasticsearch.client.http.entity.ContentType;
3030
import org.apache.lucene.util.BytesRef;
3131
import org.elasticsearch.action.DocWriteRequest;
3232
import org.elasticsearch.action.bulk.BulkRequest;

‎client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package org.elasticsearch.client;
2121

22-
import org.apache.http.Header;
23-
import org.apache.http.HttpEntity;
22+
import org.elasticsearch.client.http.Header;
23+
import org.elasticsearch.client.http.HttpEntity;
2424
import org.elasticsearch.ElasticsearchException;
2525
import org.elasticsearch.ElasticsearchStatusException;
2626
import org.elasticsearch.action.ActionListener;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package org.elasticsearch.client;
2121

22-
import org.apache.http.entity.ContentType;
23-
import org.apache.http.entity.StringEntity;
22+
import org.elasticsearch.client.http.entity.ContentType;
23+
import org.elasticsearch.client.http.entity.StringEntity;
2424
import org.elasticsearch.ElasticsearchException;
2525
import org.elasticsearch.ElasticsearchStatusException;
2626
import org.elasticsearch.action.DocWriteRequest;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/CustomRestHighLevelClientTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919

2020
package org.elasticsearch.client;
2121

22-
import org.apache.http.Header;
23-
import org.apache.http.HttpEntity;
24-
import org.apache.http.HttpHost;
25-
import org.apache.http.HttpResponse;
26-
import org.apache.http.ProtocolVersion;
27-
import org.apache.http.RequestLine;
28-
import org.apache.http.client.methods.HttpGet;
29-
import org.apache.http.entity.ByteArrayEntity;
30-
import org.apache.http.entity.ContentType;
31-
import org.apache.http.message.BasicHeader;
32-
import org.apache.http.message.BasicHttpResponse;
33-
import org.apache.http.message.BasicRequestLine;
34-
import org.apache.http.message.BasicStatusLine;
22+
import org.elasticsearch.client.http.Header;
23+
import org.elasticsearch.client.http.HttpEntity;
24+
import org.elasticsearch.client.http.HttpHost;
25+
import org.elasticsearch.client.http.HttpResponse;
26+
import org.elasticsearch.client.http.ProtocolVersion;
27+
import org.elasticsearch.client.http.RequestLine;
28+
import org.elasticsearch.client.http.client.methods.HttpGet;
29+
import org.elasticsearch.client.http.entity.ByteArrayEntity;
30+
import org.elasticsearch.client.http.entity.ContentType;
31+
import org.elasticsearch.client.http.message.BasicHeader;
32+
import org.elasticsearch.client.http.message.BasicHttpResponse;
33+
import org.elasticsearch.client.http.message.BasicRequestLine;
34+
import org.elasticsearch.client.http.message.BasicStatusLine;
3535
import org.apache.lucene.util.BytesRef;
3636
import org.elasticsearch.Build;
3737
import org.elasticsearch.Version;
@@ -178,4 +178,4 @@ MainResponse toResponse(Response response) throws IOException {
178178
return parseEntity(response.getEntity(), MainResponse::fromXContent);
179179
}
180180
}
181-
}
181+
}

‎client/rest-high-level/src/test/java/org/elasticsearch/client/ESRestHighLevelClientTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.elasticsearch.client;
2121

22-
import org.apache.http.Header;
22+
import org.elasticsearch.client.http.Header;
2323
import org.elasticsearch.action.ActionListener;
2424
import org.elasticsearch.action.support.PlainActionFuture;
2525
import org.elasticsearch.test.rest.ESRestTestCase;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/RequestTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package org.elasticsearch.client;
2121

22-
import org.apache.http.HttpEntity;
23-
import org.apache.http.entity.ByteArrayEntity;
24-
import org.apache.http.util.EntityUtils;
22+
import org.elasticsearch.client.http.HttpEntity;
23+
import org.elasticsearch.client.http.entity.ByteArrayEntity;
24+
import org.elasticsearch.client.http.util.EntityUtils;
2525
import org.elasticsearch.action.DocWriteRequest;
2626
import org.elasticsearch.action.bulk.BulkRequest;
2727
import org.elasticsearch.action.bulk.BulkShardRequest;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientExtTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package org.elasticsearch.client;
2121

22-
import org.apache.http.HttpEntity;
23-
import org.apache.http.entity.ContentType;
24-
import org.apache.http.entity.StringEntity;
22+
import org.elasticsearch.client.http.HttpEntity;
23+
import org.elasticsearch.client.http.entity.ContentType;
24+
import org.elasticsearch.client.http.entity.StringEntity;
2525
import org.elasticsearch.common.ParseField;
2626
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
2727
import org.elasticsearch.common.xcontent.XContentParser;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
2020
package org.elasticsearch.client;
2121

2222
import com.fasterxml.jackson.core.JsonParseException;
23-
import org.apache.http.Header;
24-
import org.apache.http.HttpEntity;
25-
import org.apache.http.HttpHost;
26-
import org.apache.http.HttpResponse;
27-
import org.apache.http.ProtocolVersion;
28-
import org.apache.http.RequestLine;
29-
import org.apache.http.StatusLine;
30-
import org.apache.http.entity.ByteArrayEntity;
31-
import org.apache.http.entity.ContentType;
32-
import org.apache.http.entity.StringEntity;
33-
import org.apache.http.message.BasicHttpResponse;
34-
import org.apache.http.message.BasicRequestLine;
35-
import org.apache.http.message.BasicStatusLine;
36-
import org.apache.http.nio.entity.NStringEntity;
23+
import org.elasticsearch.client.http.Header;
24+
import org.elasticsearch.client.http.HttpEntity;
25+
import org.elasticsearch.client.http.HttpHost;
26+
import org.elasticsearch.client.http.HttpResponse;
27+
import org.elasticsearch.client.http.ProtocolVersion;
28+
import org.elasticsearch.client.http.RequestLine;
29+
import org.elasticsearch.client.http.StatusLine;
30+
import org.elasticsearch.client.http.entity.ByteArrayEntity;
31+
import org.elasticsearch.client.http.entity.ContentType;
32+
import org.elasticsearch.client.http.entity.StringEntity;
33+
import org.elasticsearch.client.http.message.BasicHttpResponse;
34+
import org.elasticsearch.client.http.message.BasicRequestLine;
35+
import org.elasticsearch.client.http.message.BasicStatusLine;
36+
import org.elasticsearch.client.http.nio.entity.NStringEntity;
3737
import org.elasticsearch.Build;
3838
import org.elasticsearch.ElasticsearchException;
3939
import org.elasticsearch.Version;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
package org.elasticsearch.client;
2121

22-
import org.apache.http.HttpEntity;
23-
import org.apache.http.entity.ContentType;
24-
import org.apache.http.entity.StringEntity;
25-
import org.apache.http.nio.entity.NStringEntity;
22+
import org.elasticsearch.client.http.HttpEntity;
23+
import org.elasticsearch.client.http.entity.ContentType;
24+
import org.elasticsearch.client.http.entity.StringEntity;
25+
import org.elasticsearch.client.http.nio.entity.NStringEntity;
2626
import org.elasticsearch.ElasticsearchException;
2727
import org.elasticsearch.ElasticsearchStatusException;
2828
import org.elasticsearch.action.search.ClearScrollRequest;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
package org.elasticsearch.client.documentation;
2121

22-
import org.apache.http.HttpEntity;
23-
import org.apache.http.client.methods.HttpPost;
24-
import org.apache.http.entity.ContentType;
25-
import org.apache.http.nio.entity.NStringEntity;
22+
import org.elasticsearch.client.http.HttpEntity;
23+
import org.elasticsearch.client.http.client.methods.HttpPost;
24+
import org.elasticsearch.client.http.entity.ContentType;
25+
import org.elasticsearch.client.http.nio.entity.NStringEntity;
2626
import org.elasticsearch.ElasticsearchException;
2727
import org.elasticsearch.action.ActionListener;
2828
import org.elasticsearch.action.DocWriteRequest;

‎client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void testFunctionScore() {
142142
FilterFunctionBuilder[] functions = {
143143
new FunctionScoreQueryBuilder.FilterFunctionBuilder(
144144
matchQuery("name", "kimchy"), // <1>
145-
randomFunction("ABCDEF")), // <2>
145+
randomFunction()), // <2>
146146
new FunctionScoreQueryBuilder.FilterFunctionBuilder(
147147
exponentialDecayFunction("age", 0L, 1L)) // <3>
148148
};

‎client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import org.elasticsearch.search.builder.SearchSourceBuilder;
5353
import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
5454
import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
55+
import org.elasticsearch.search.sort.FieldSortBuilder;
5556
import org.elasticsearch.search.sort.ScoreSortBuilder;
5657
import org.elasticsearch.search.sort.SortOrder;
5758
import org.elasticsearch.search.suggest.Suggest;
@@ -136,10 +137,24 @@ public void testSearch() throws IOException {
136137
sourceBuilder.query(QueryBuilders.termQuery("user", "kimchy")); // <2>
137138
sourceBuilder.from(0); // <3>
138139
sourceBuilder.size(5); // <4>
139-
sourceBuilder.sort(new ScoreSortBuilder().order(SortOrder.ASC));
140140
sourceBuilder.timeout(new TimeValue(60, TimeUnit.SECONDS)); // <5>
141141
// end::search-source-basics
142142

143+
// tag::search-source-sorting
144+
sourceBuilder.sort(new ScoreSortBuilder().order(SortOrder.DESC)); // <1>
145+
sourceBuilder.sort(new FieldSortBuilder("_uid").order(SortOrder.ASC)); // <2>
146+
// end::search-source-sorting
147+
148+
// tag::search-source-filtering-off
149+
sourceBuilder.fetchSource(false);
150+
// end::search-source-filtering-off
151+
// tag::search-source-filtering-includes
152+
String[] includeFields = new String[] {"title", "user", "innerObject.*"};
153+
String[] excludeFields = new String[] {"_type"};
154+
sourceBuilder.fetchSource(includeFields, excludeFields);
155+
// end::search-source-filtering-includes
156+
sourceBuilder.fetchSource(true);
157+
143158
// tag::search-source-setter
144159
SearchRequest searchRequest = new SearchRequest();
145160
searchRequest.source(sourceBuilder);

0 commit comments

Comments
 (0)