Skip to content

Commit 760415d

Browse files
committed
Fixed merge issues
1 parent 2cfcdc1 commit 760415d

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

x-pack/plugin/search-business-rules/src/test/java/org/elasticsearch/xpack/searchbusinessrules/retriever/PinnedRetrieverBuilderTests.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ public static PinnedRetrieverBuilder createRandomPinnedRetrieverBuilder() {
4747
: new ArrayList<>();
4848

4949
return new PinnedRetrieverBuilder(ids, docs, TestRetrieverBuilder.createRandomTestRetrieverBuilder(), randomIntBetween(1, 100));
50-
List<SpecifiedDocument> docs = useDocs
51-
? List.of(
52-
new SpecifiedDocument(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10)),
53-
new SpecifiedDocument(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10))
54-
)
55-
: new ArrayList<>();
56-
57-
return new PinnedRetrieverBuilder(ids, docs, TestRetrieverBuilder.createRandomTestRetrieverBuilder(), randomIntBetween(1, 100));
5850
}
5951

6052
@Override
@@ -67,7 +59,6 @@ protected PinnedRetrieverBuilder doParseInstance(XContentParser parser) throws I
6759
return (PinnedRetrieverBuilder) RetrieverBuilder.parseTopLevelRetrieverBuilder(
6860
parser,
6961
new RetrieverParserContext(new SearchUsage(), nf -> true)
70-
new RetrieverParserContext(new SearchUsage(), nf -> true)
7162
);
7263
}
7364

@@ -79,7 +70,6 @@ protected boolean supportsUnknownFields() {
7970
@Override
8071
protected String[] getShuffleFieldsExceptions() {
8172
return new String[] { PinnedRetrieverBuilder.IDS_FIELD.getPreferredName(), PinnedRetrieverBuilder.DOCS_FIELD.getPreferredName() };
82-
return new String[] { PinnedRetrieverBuilder.IDS_FIELD.getPreferredName(), PinnedRetrieverBuilder.DOCS_FIELD.getPreferredName() };
8373
}
8474

8575
@Override
@@ -169,5 +159,3 @@ public void testPinnedRetrieverParsing() throws IOException {
169159
}
170160
}
171161
}
172-
173-
}

0 commit comments

Comments
 (0)