Skip to content

Commit 227011b

Browse files
committed
Fixed the retriever builder comments and error message
1 parent 9bfcb4b commit 227011b

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,13 @@ public int rankWindowSize() {
157157

158158
/**
159159
* Creates a PinnedQueryBuilder with the appropriate pinned documents.
160-
* Prioritizes docs over ids if both are present.
161160
*
162161
* @param baseQuery the base query to pin documents to
163162
* @return a PinnedQueryBuilder
164163
* @throws IllegalArgumentException if baseQuery is null
165164
*/
166165
private QueryBuilder createPinnedQuery(QueryBuilder baseQuery) {
167-
Objects.requireNonNull(baseQuery, "Underlying query cannot be null for pinned retriever");
166+
Objects.requireNonNull(baseQuery, "pinned retriever requires retriever with associated query");
168167

169168
if (docs != null && docs.isEmpty() == false) {
170169
return new PinnedQueryBuilder(baseQuery, docs.toArray(new SpecifiedDocument[0]));
@@ -177,7 +176,7 @@ protected SearchSourceBuilder finalizeSourceBuilder(SearchSourceBuilder source)
177176
validateSort(source);
178177
QueryBuilder underlyingQuery = source.query();
179178
if (underlyingQuery == null) {
180-
throw new IllegalArgumentException("[underlying query] must not be null for pinned retriever");
179+
throw new IllegalArgumentException("pinned retriever requires retriever with associated query");
181180
}
182181
source.query(createPinnedQuery(underlyingQuery));
183182
return source;

x-pack/plugin/search-business-rules/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_retriever.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ setup:
379379
---
380380
"pinned retriever error case - null inner query":
381381
- do:
382-
catch: /illegal_argument_exception.+reason=\[underlying query\] must not be null for pinned retriever/
382+
catch: /illegal_argument_exception.+reason=pinned retriever requires retriever with associated query/
383383
search:
384384
index: test-index1
385385
body:

0 commit comments

Comments
 (0)