From 9a84cb99f4af8c2a17459ab565ca32380acb8707 Mon Sep 17 00:00:00 2001 From: javanna Date: Fri, 9 Sep 2016 21:24:18 +0200 Subject: [PATCH] remove writeBoolean from searchExtBuilders serialization in SearchSourceBuilder The list is not optional anymore, default is empty list --- .../search/builder/SearchSourceBuilder.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index 8a643fe1075..84fc26fdb2f 100644 --- a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -170,7 +170,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ private List stats; - private List extBuilders; + private List extBuilders = Collections.emptyList(); private boolean profile = false; @@ -224,9 +224,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ timeout = in.readOptionalWriteable(TimeValue::new); trackScores = in.readBoolean(); version = in.readOptionalBoolean(); - if (in.readBoolean()) { - extBuilders = in.readNamedWriteableList(SearchExtBuilder.class); - } + extBuilders = in.readNamedWriteableList(SearchExtBuilder.class); profile = in.readBoolean(); searchAfterBuilder = in.readOptionalWriteable(SearchAfterBuilder::new); sliceBuilder = in.readOptionalWriteable(SliceBuilder::new); @@ -278,12 +276,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ out.writeOptionalWriteable(timeout); out.writeBoolean(trackScores); out.writeOptionalBoolean(version); - if (extBuilders == null) { - out.writeBoolean(false); - } else { - out.writeBoolean(true); - out.writeNamedWriteableList(extBuilders); - } + out.writeNamedWriteableList(extBuilders); out.writeBoolean(profile); out.writeOptionalWriteable(searchAfterBuilder); out.writeOptionalWriteable(sliceBuilder); @@ -862,7 +855,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ } public SearchSourceBuilder ext(List searchExtBuilders) { - this.extBuilders = searchExtBuilders; + this.extBuilders = Objects.requireNonNull(searchExtBuilders, "searchExtBuilders must not be null"); return this; }