diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index 08187dc4a6ef7..a03c24e755cd8 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -1616,7 +1616,7 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t if (subSearchSourceBuilders.size() == 1) { builder.field(QUERY_FIELD.getPreferredName(), subSearchSourceBuilders.get(0).getQueryBuilder()); } else { - builder.array(SUB_SEARCHES_FIELD.getPreferredName(), subSearchSourceBuilders); + builder.xContentList(SUB_SEARCHES_FIELD.getPreferredName(), subSearchSourceBuilders); } } diff --git a/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java b/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java index 54fd178ce671f..2f76127b88e26 100644 --- a/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java @@ -99,7 +99,6 @@ protected MultiGetShardRequest mutateInstance(MultiGetShardRequest instance) thr } } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/96910") public void testForceSyntheticUnsupported() { MultiGetShardRequest request = createTestInstance(true); StreamOutput out = new BytesStreamOutput(); diff --git a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java index 1f81fa1dbf6b3..f27e8beb1d1d9 100644 --- a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java +++ b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java @@ -40,6 +40,7 @@ import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; @@ -257,11 +258,13 @@ public void testWillCallRequestCacheKeyDifferentiators() throws IOException { assertThat(invoked.get(), is(true)); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/96910") public void testForceSyntheticUnsupported() throws IOException { SearchRequest request = createSearchRequest(); if (request.source() != null) { request.source().rankBuilder(null); + if (request.source().subSearches().size() >= 2) { + request.source().subSearches(new ArrayList<>()); + } } request.setForceSyntheticSource(true); ShardSearchRequest shardRequest = createShardSearchReqest(request);