@@ -64,7 +64,6 @@ public abstract class AbstractHighlighterBuilder<HB extends AbstractHighlighterB
6464 public static final ParseField TYPE_FIELD = new ParseField ("type" );
6565 public static final ParseField FRAGMENTER_FIELD = new ParseField ("fragmenter" );
6666 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 ();
6867 public static final ParseField PHRASE_LIMIT_FIELD = new ParseField ("phrase_limit" );
6968 public static final ParseField OPTIONS_FIELD = new ParseField ("options" );
7069 public static final ParseField HIGHLIGHT_QUERY_FIELD = new ParseField ("highlight_query" );
@@ -152,9 +151,6 @@ protected AbstractHighlighterBuilder(StreamInput in) throws IOException {
152151 }
153152 order (in .readOptionalWriteable (Order ::readFromStream ));
154153 highlightFilter (in .readOptionalBoolean ());
155- if (in .getTransportVersion ().before (TransportVersions .V_8_8_0 )) {
156- in .readOptionalBoolean (); // force_source, now deprecated
157- }
158154 boundaryScannerType (in .readOptionalWriteable (BoundaryScannerType ::readFromStream ));
159155 boundaryMaxScan (in .readOptionalVInt ());
160156 if (in .readBoolean ()) {
@@ -193,9 +189,6 @@ public final void writeTo(StreamOutput out) throws IOException {
193189 }
194190 out .writeOptionalWriteable (order );
195191 out .writeOptionalBoolean (highlightFilter );
196- if (out .getTransportVersion ().before (TransportVersions .V_8_8_0 )) {
197- out .writeOptionalBoolean (false );
198- }
199192 out .writeOptionalWriteable (boundaryScannerType );
200193 out .writeOptionalVInt (boundaryMaxScan );
201194 boolean hasBounaryChars = boundaryChars != null ;
@@ -674,7 +667,6 @@ static <HB extends AbstractHighlighterBuilder<HB>> BiFunction<XContentParser, HB
674667 parser .declareString (HB ::highlighterType , TYPE_FIELD );
675668 parser .declareString (HB ::fragmenter , FRAGMENTER_FIELD );
676669 parser .declareInt (HB ::noMatchSize , NO_MATCH_SIZE_FIELD );
677- parser .declareBoolean ((builder , value ) -> {}, FORCE_SOURCE_FIELD ); // force_source is ignored
678670 parser .declareInt (HB ::phraseLimit , PHRASE_LIMIT_FIELD );
679671 parser .declareInt (HB ::maxAnalyzedOffset , MAX_ANALYZED_OFFSET_FIELD );
680672 parser .declareObject (HB ::options , (XContentParser p , Void c ) -> {
0 commit comments