Skip to content

Commit 2cfcdc1

Browse files
committed
Added integration test and fixed the code style issues
1 parent 8bab3d2 commit 2cfcdc1

File tree

3 files changed

+403
-5
lines changed

3 files changed

+403
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ public int rankWindowSize() {
118118
* @return a PinnedQueryBuilder or the original query if no pinned documents
119119
*/
120120
private QueryBuilder createPinnedQuery(QueryBuilder baseQuery) {
121-
if (!docs.isEmpty()) {
121+
if (docs.isEmpty() == false) {
122122
return new PinnedQueryBuilder(baseQuery, docs.toArray(new SpecifiedDocument[0]));
123-
} else if (!ids.isEmpty()) {
123+
} else if (ids.isEmpty() == false) {
124124
return new PinnedQueryBuilder(baseQuery, ids.toArray(new String[0]));
125125
} else {
126126
return baseQuery;
@@ -135,10 +135,10 @@ protected SearchSourceBuilder finalizeSourceBuilder(SearchSourceBuilder source)
135135

136136
@Override
137137
public void doToXContent(XContentBuilder builder, Params params) throws IOException {
138-
if (ids != null && !ids.isEmpty()) {
138+
if (ids != null && ids.isEmpty() == false) {
139139
builder.array(IDS_FIELD.getPreferredName(), ids.toArray());
140140
}
141-
if (docs != null && !docs.isEmpty()) {
141+
if (docs != null && docs.isEmpty() == false) {
142142
builder.startArray(DOCS_FIELD.getPreferredName());
143143
for (SpecifiedDocument doc : docs) {
144144
builder.value(doc);

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class PinnedRetrieverBuilderTests extends AbstractXContentTestCase<Pinned
3636

3737
public static PinnedRetrieverBuilder createRandomPinnedRetrieverBuilder() {
3838
boolean useIds = randomBoolean();
39-
boolean useDocs = !useIds || randomBoolean();
39+
boolean useDocs = useIds == false || randomBoolean();
4040

4141
List<String> ids = useIds ? List.of(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10)) : new ArrayList<>();
4242
List<SpecifiedDocument> docs = useDocs
@@ -47,6 +47,14 @@ 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));
5058
}
5159

5260
@Override
@@ -59,6 +67,7 @@ protected PinnedRetrieverBuilder doParseInstance(XContentParser parser) throws I
5967
return (PinnedRetrieverBuilder) RetrieverBuilder.parseTopLevelRetrieverBuilder(
6068
parser,
6169
new RetrieverParserContext(new SearchUsage(), nf -> true)
70+
new RetrieverParserContext(new SearchUsage(), nf -> true)
6271
);
6372
}
6473

@@ -70,6 +79,7 @@ protected boolean supportsUnknownFields() {
7079
@Override
7180
protected String[] getShuffleFieldsExceptions() {
7281
return new String[] { PinnedRetrieverBuilder.IDS_FIELD.getPreferredName(), PinnedRetrieverBuilder.DOCS_FIELD.getPreferredName() };
82+
return new String[] { PinnedRetrieverBuilder.IDS_FIELD.getPreferredName(), PinnedRetrieverBuilder.DOCS_FIELD.getPreferredName() };
7383
}
7484

7585
@Override
@@ -159,3 +169,5 @@ public void testPinnedRetrieverParsing() throws IOException {
159169
}
160170
}
161171
}
172+
173+
}

0 commit comments

Comments
 (0)