@@ -64,7 +64,6 @@ public abstract class AbstractHighlighterBuilder<HB extends AbstractHighlighterB
64
64
public static final ParseField TYPE_FIELD = new ParseField ("type" );
65
65
public static final ParseField FRAGMENTER_FIELD = new ParseField ("fragmenter" );
66
66
public static final ParseField NO_MATCH_SIZE_FIELD = new ParseField ("no_match_size" );
67
- public static final ParseField FORCE_SOURCE_FIELD = new ParseField ("force_source" ).withAllDeprecated ();
68
67
public static final ParseField PHRASE_LIMIT_FIELD = new ParseField ("phrase_limit" );
69
68
public static final ParseField OPTIONS_FIELD = new ParseField ("options" );
70
69
public static final ParseField HIGHLIGHT_QUERY_FIELD = new ParseField ("highlight_query" );
@@ -152,9 +151,6 @@ protected AbstractHighlighterBuilder(StreamInput in) throws IOException {
152
151
}
153
152
order (in .readOptionalWriteable (Order ::readFromStream ));
154
153
highlightFilter (in .readOptionalBoolean ());
155
- if (in .getTransportVersion ().before (TransportVersions .V_8_8_0 )) {
156
- in .readOptionalBoolean (); // force_source, now deprecated
157
- }
158
154
boundaryScannerType (in .readOptionalWriteable (BoundaryScannerType ::readFromStream ));
159
155
boundaryMaxScan (in .readOptionalVInt ());
160
156
if (in .readBoolean ()) {
@@ -193,9 +189,6 @@ public final void writeTo(StreamOutput out) throws IOException {
193
189
}
194
190
out .writeOptionalWriteable (order );
195
191
out .writeOptionalBoolean (highlightFilter );
196
- if (out .getTransportVersion ().before (TransportVersions .V_8_8_0 )) {
197
- out .writeOptionalBoolean (false );
198
- }
199
192
out .writeOptionalWriteable (boundaryScannerType );
200
193
out .writeOptionalVInt (boundaryMaxScan );
201
194
boolean hasBounaryChars = boundaryChars != null ;
@@ -674,7 +667,6 @@ static <HB extends AbstractHighlighterBuilder<HB>> BiFunction<XContentParser, HB
674
667
parser .declareString (HB ::highlighterType , TYPE_FIELD );
675
668
parser .declareString (HB ::fragmenter , FRAGMENTER_FIELD );
676
669
parser .declareInt (HB ::noMatchSize , NO_MATCH_SIZE_FIELD );
677
- parser .declareBoolean ((builder , value ) -> {}, FORCE_SOURCE_FIELD ); // force_source is ignored
678
670
parser .declareInt (HB ::phraseLimit , PHRASE_LIMIT_FIELD );
679
671
parser .declareInt (HB ::maxAnalyzedOffset , MAX_ANALYZED_OFFSET_FIELD );
680
672
parser .declareObject (HB ::options , (XContentParser p , Void c ) -> {
0 commit comments