Skip to content

Commit 8bab3d2

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 18bf6e4 commit 8bab3d2

File tree

2 files changed

+15
-39
lines changed

2 files changed

+15
-39
lines changed

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,7 @@ public static PinnedRetrieverBuilder fromXContent(XContentParser parser, Retriev
7979
private final List<String> ids;
8080
private final List<SpecifiedDocument> docs;
8181

82-
public PinnedRetrieverBuilder(
83-
List<String> ids,
84-
List<SpecifiedDocument> docs,
85-
RetrieverBuilder retrieverBuilder,
86-
int rankWindowSize
87-
) {
82+
public PinnedRetrieverBuilder(List<String> ids, List<SpecifiedDocument> docs, RetrieverBuilder retrieverBuilder, int rankWindowSize) {
8883
super(new ArrayList<>(), rankWindowSize);
8984
this.ids = ids != null ? ids : new ArrayList<>();
9085
this.docs = docs != null ? docs : new ArrayList<>();
@@ -156,14 +151,7 @@ public void doToXContent(XContentBuilder builder, Params params) throws IOExcept
156151

157152
@Override
158153
protected PinnedRetrieverBuilder clone(List<RetrieverSource> newChildRetrievers, List<QueryBuilder> newPreFilterQueryBuilders) {
159-
return new PinnedRetrieverBuilder(
160-
ids,
161-
docs,
162-
newChildRetrievers,
163-
rankWindowSize,
164-
retrieverName,
165-
newPreFilterQueryBuilders
166-
);
154+
return new PinnedRetrieverBuilder(ids, docs, newChildRetrievers, rankWindowSize, retrieverName, newPreFilterQueryBuilders);
167155
}
168156

169157
@Override
@@ -214,4 +202,4 @@ public QueryBuilder explainQuery() {
214202
return createPinnedQuery(in.explainQuery());
215203
}
216204
}
217-
}
205+
}

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

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
import org.elasticsearch.common.Strings;
1111
import org.elasticsearch.common.settings.Settings;
12-
import org.elasticsearch.index.query.QueryBuilder;
13-
import org.elasticsearch.index.query.QueryBuilders;
1412
import org.elasticsearch.search.SearchModule;
1513
import org.elasticsearch.search.builder.SearchSourceBuilder;
1614
import org.elasticsearch.search.retriever.RetrieverBuilder;
@@ -24,11 +22,9 @@
2422
import org.elasticsearch.xcontent.ParseField;
2523
import org.elasticsearch.xcontent.XContentParser;
2624
import org.elasticsearch.xcontent.json.JsonXContent;
27-
import org.elasticsearch.xpack.searchbusinessrules.PinnedQueryBuilder;
2825
import org.elasticsearch.xpack.searchbusinessrules.SpecifiedDocument;
2926

3027
import java.io.IOException;
31-
import java.lang.reflect.Field;
3228
import java.util.ArrayList;
3329
import java.util.List;
3430

@@ -41,19 +37,16 @@ public class PinnedRetrieverBuilderTests extends AbstractXContentTestCase<Pinned
4137
public static PinnedRetrieverBuilder createRandomPinnedRetrieverBuilder() {
4238
boolean useIds = randomBoolean();
4339
boolean useDocs = !useIds || randomBoolean();
44-
40+
4541
List<String> ids = useIds ? List.of(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10)) : new ArrayList<>();
46-
List<SpecifiedDocument> docs = useDocs ? List.of(
47-
new SpecifiedDocument(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10)),
48-
new SpecifiedDocument(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10))
49-
) : new ArrayList<>();
50-
51-
return new PinnedRetrieverBuilder(
52-
ids,
53-
docs,
54-
TestRetrieverBuilder.createRandomTestRetrieverBuilder(),
55-
randomIntBetween(1, 100)
56-
);
42+
List<SpecifiedDocument> docs = useDocs
43+
? List.of(
44+
new SpecifiedDocument(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10)),
45+
new SpecifiedDocument(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10))
46+
)
47+
: new ArrayList<>();
48+
49+
return new PinnedRetrieverBuilder(ids, docs, TestRetrieverBuilder.createRandomTestRetrieverBuilder(), randomIntBetween(1, 100));
5750
}
5851

5952
@Override
@@ -65,10 +58,7 @@ protected PinnedRetrieverBuilder createTestInstance() {
6558
protected PinnedRetrieverBuilder doParseInstance(XContentParser parser) throws IOException {
6659
return (PinnedRetrieverBuilder) RetrieverBuilder.parseTopLevelRetrieverBuilder(
6760
parser,
68-
new RetrieverParserContext(
69-
new SearchUsage(),
70-
nf -> true
71-
)
61+
new RetrieverParserContext(new SearchUsage(), nf -> true)
7262
);
7363
}
7464

@@ -79,9 +69,7 @@ protected boolean supportsUnknownFields() {
7969

8070
@Override
8171
protected String[] getShuffleFieldsExceptions() {
82-
return new String[] {
83-
PinnedRetrieverBuilder.IDS_FIELD.getPreferredName(),
84-
PinnedRetrieverBuilder.DOCS_FIELD.getPreferredName() };
72+
return new String[] { PinnedRetrieverBuilder.IDS_FIELD.getPreferredName(), PinnedRetrieverBuilder.DOCS_FIELD.getPreferredName() };
8573
}
8674

8775
@Override
@@ -170,4 +158,4 @@ public void testPinnedRetrieverParsing() throws IOException {
170158
}
171159
}
172160
}
173-
}
161+
}

0 commit comments

Comments
 (0)