Skip to content

Commit 1e453ba

Browse files
committed
Removed type from Pinned retriever - build successful
1 parent e868dd6 commit 1e453ba

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,11 @@ public static PinnedRetrieverBuilder fromXContent(XContentParser parser, Retriev
8181

8282
final List<String> ids;
8383
final List<SpecifiedDocument> docs;
84-
String type;
8584

8685
public PinnedRetrieverBuilder(List<String> ids, List<SpecifiedDocument> docs, RetrieverBuilder retrieverBuilder, int rankWindowSize) {
8786
super(new ArrayList<>(), rankWindowSize);
8887
this.ids = ids != null ? ids : new ArrayList<>();
8988
this.docs = docs != null ? docs : new ArrayList<>();
90-
this.type = NAME;
9189
addChild(new PinnedRetrieverBuilderWrapper(retrieverBuilder));
9290
}
9391

@@ -102,14 +100,12 @@ public PinnedRetrieverBuilder(
102100
super(retrieverSource, rankWindowSize);
103101
this.ids = ids;
104102
this.docs = docs;
105-
this.type = NAME;
106103
this.retrieverName = retrieverName;
107104
this.preFilterQueryBuilders = preFilterQueryBuilders;
108105
}
109106

110107
public PinnedRetrieverBuilder(StreamInput in) throws IOException {
111108
super(new ArrayList<>(), in.readInt());
112-
this.type = in.readString();
113109
if (in.getTransportVersion().onOrAfter(TransportVersions.PINNED_RETRIEVER)) {
114110
this.ids = in.readOptionalStringCollectionAsList();
115111
this.docs = in.readBoolean() ? in.readCollectionAsList(SpecifiedDocument::new) : new ArrayList<>();
@@ -154,7 +150,6 @@ protected SearchSourceBuilder finalizeSourceBuilder(SearchSourceBuilder source)
154150

155151
@Override
156152
public void doToXContent(XContentBuilder builder, Params params) throws IOException {
157-
builder.field("type", type);
158153
builder.field("rank_window_size", rankWindowSize());
159154
if (ids.isEmpty() == false) {
160155
builder.field("ids", ids);
@@ -190,12 +185,12 @@ protected RankDoc[] combineInnerRetrieverResults(List<ScoreDoc[]> rankResults, b
190185
@Override
191186
public boolean doEquals(Object o) {
192187
PinnedRetrieverBuilder that = (PinnedRetrieverBuilder) o;
193-
return super.doEquals(o) && Objects.equals(ids, that.ids) && Objects.equals(docs, that.docs) && Objects.equals(type, that.type);
188+
return super.doEquals(o) && Objects.equals(ids, that.ids) && Objects.equals(docs, that.docs);
194189
}
195190

196191
@Override
197192
public int doHashCode() {
198-
return Objects.hash(super.doHashCode(), ids, docs, type);
193+
return Objects.hash(super.doHashCode(), ids, docs);
199194
}
200195

201196
/**
@@ -225,7 +220,6 @@ public QueryBuilder explainQuery() {
225220

226221
public void writeTo(StreamOutput out) throws IOException {
227222
out.writeInt(rankWindowSize());
228-
out.writeString(type);
229223
if (out.getTransportVersion().onOrAfter(TransportVersions.PINNED_RETRIEVER)) {
230224
out.writeOptionalStringCollection(ids);
231225
if (docs.isEmpty()) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ public void testBwcSerialization() throws IOException {
176176
assertTrue(deserialized.ids.isEmpty());
177177
assertTrue(deserialized.docs.isEmpty());
178178
assertEquals(builder.rankWindowSize(), deserialized.rankWindowSize());
179-
assertEquals(builder.type, deserialized.type);
180179
}
181180
}
182181

@@ -192,7 +191,6 @@ public void testBwcSerialization() throws IOException {
192191
assertEquals(builder.ids, deserialized.ids);
193192
assertEquals(builder.docs, deserialized.docs);
194193
assertEquals(builder.rankWindowSize(), deserialized.rankWindowSize());
195-
assertEquals(builder.type, deserialized.type);
196194
}
197195
}
198196
}

0 commit comments

Comments
 (0)