diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight')
2 files changed, 7 insertions, 9 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java b/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java index 43e8bf1eb8..ece1f1df0c 100644 --- a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java @@ -32,7 +32,6 @@ import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder.BoundaryScannerType; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder.Order; @@ -595,7 +594,7 @@ public abstract class AbstractHighlighterBuilder<HB extends AbstractHighlighterB } static <HB extends AbstractHighlighterBuilder<HB>> BiFunction<XContentParser, HB, HB> setupParser( - ObjectParser<HB, QueryParseContext> parser) { + ObjectParser<HB, Void> parser) { parser.declareStringArray(fromList(String.class, HB::preTags), PRE_TAGS_FIELD); parser.declareStringArray(fromList(String.class, HB::postTags), POST_TAGS_FIELD); parser.declareString(HB::order, ORDER_FIELD); @@ -612,14 +611,14 @@ public abstract class AbstractHighlighterBuilder<HB extends AbstractHighlighterB parser.declareInt(HB::noMatchSize, NO_MATCH_SIZE_FIELD); parser.declareBoolean(HB::forceSource, FORCE_SOURCE_FIELD); parser.declareInt(HB::phraseLimit, PHRASE_LIMIT_FIELD); - parser.declareObject(HB::options, (XContentParser p, QueryParseContext c) -> { + parser.declareObject(HB::options, (XContentParser p, Void c) -> { try { return p.map(); } catch (IOException e) { throw new RuntimeException("Error parsing options", e); } }, OPTIONS_FIELD); - parser.declareObject(HB::highlightQuery, (XContentParser p, QueryParseContext c) -> { + parser.declareObject(HB::highlightQuery, (XContentParser p, Void c) -> { try { return parseInnerQueryBuilder(p); } catch (IOException e) { diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java b/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java index 55310dafb0..ff45b9889f 100644 --- a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java @@ -30,7 +30,6 @@ import org.elasticsearch.common.xcontent.ObjectParser.NamedObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.fetch.subphase.highlight.SearchContextHighlight.FieldOptions; @@ -258,7 +257,7 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde private static final BiFunction<XContentParser, HighlightBuilder, HighlightBuilder> PARSER; static { - ObjectParser<HighlightBuilder, QueryParseContext> parser = new ObjectParser<>("highlight"); + ObjectParser<HighlightBuilder, Void> parser = new ObjectParser<>("highlight"); parser.declareString(HighlightBuilder::tagsSchema, new ParseField("tags_schema")); parser.declareString(HighlightBuilder::encoder, ENCODER_FIELD); parser.declareNamedObjects(HighlightBuilder::fields, Field.PARSER, (HighlightBuilder hb) -> hb.useExplicitFieldOrder(true), @@ -417,13 +416,13 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde } public static class Field extends AbstractHighlighterBuilder<Field> { - static final NamedObjectParser<Field, QueryParseContext> PARSER; + static final NamedObjectParser<Field, Void> PARSER; static { - ObjectParser<Field, QueryParseContext> parser = new ObjectParser<>("highlight_field"); + ObjectParser<Field, Void> parser = new ObjectParser<>("highlight_field"); parser.declareInt(Field::fragmentOffset, FRAGMENT_OFFSET_FIELD); parser.declareStringArray(fromList(String.class, Field::matchedFields), MATCHED_FIELDS_FIELD); BiFunction<XContentParser, Field, Field> decoratedParser = setupParser(parser); - PARSER = (XContentParser p, QueryParseContext c, String name) -> decoratedParser.apply(p, new Field(name)); + PARSER = (XContentParser p, Void c, String name) -> decoratedParser.apply(p, new Field(name)); } private final String name; |