diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search/sort')
4 files changed, 9 insertions, 9 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java index 21acd2b6c4..dfced1d8f5 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java @@ -337,17 +337,17 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> { if (token == XContentParser.Token.FIELD_NAME) { currentFieldName = parser.currentName(); } else if (token == XContentParser.Token.START_OBJECT) { - if (context.parseFieldMatcher().match(currentFieldName, NESTED_FILTER)) { + if (context.getParseFieldMatcher().match(currentFieldName, NESTED_FILTER)) { nestedFilter = context.parseInnerQueryBuilder(); } else { throw new ParsingException(parser.getTokenLocation(), "Expected " + NESTED_FILTER.getPreferredName() + " element."); } } else if (token.isValue()) { - if (context.parseFieldMatcher().match(currentFieldName, NESTED_PATH)) { + if (context.getParseFieldMatcher().match(currentFieldName, NESTED_PATH)) { nestedPath = parser.text(); - } else if (context.parseFieldMatcher().match(currentFieldName, MISSING)) { + } else if (context.getParseFieldMatcher().match(currentFieldName, MISSING)) { missing = parser.objectText(); - } else if (context.parseFieldMatcher().match(currentFieldName, ORDER)) { + } else if (context.getParseFieldMatcher().match(currentFieldName, ORDER)) { String sortOrder = parser.text(); if ("asc".equals(sortOrder)) { order = SortOrder.ASC; @@ -356,9 +356,9 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> { } else { throw new ParsingException(parser.getTokenLocation(), "Sort order [{}] not supported.", sortOrder); } - } else if (context.parseFieldMatcher().match(currentFieldName, SORT_MODE)) { + } else if (context.getParseFieldMatcher().match(currentFieldName, SORT_MODE)) { sortMode = SortMode.fromString(parser.text()); - } else if (context.parseFieldMatcher().match(currentFieldName, UNMAPPED_TYPE)) { + } else if (context.getParseFieldMatcher().match(currentFieldName, UNMAPPED_TYPE)) { unmappedType = parser.text(); } else { throw new ParsingException(parser.getTokenLocation(), "Option [{}] not supported.", currentFieldName); diff --git a/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java index d8878fed29..ef86c45afd 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java @@ -407,7 +407,7 @@ public class GeoDistanceSortBuilder extends SortBuilder<GeoDistanceSortBuilder> */ public static GeoDistanceSortBuilder fromXContent(QueryParseContext context, String elementName) throws IOException { XContentParser parser = context.parser(); - ParseFieldMatcher parseFieldMatcher = context.parseFieldMatcher(); + ParseFieldMatcher parseFieldMatcher = context.getParseFieldMatcher(); String fieldName = null; List<GeoPoint> geoPoints = new ArrayList<>(); DistanceUnit unit = DistanceUnit.DEFAULT; diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java index 7f0f07045a..8267429f77 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java @@ -84,7 +84,7 @@ public class ScoreSortBuilder extends SortBuilder<ScoreSortBuilder> { */ public static ScoreSortBuilder fromXContent(QueryParseContext context, String fieldName) throws IOException { XContentParser parser = context.parser(); - ParseFieldMatcher matcher = context.parseFieldMatcher(); + ParseFieldMatcher matcher = context.getParseFieldMatcher(); XContentParser.Token token; String currentName = parser.currentName(); diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java index 2751d49751..3e0314bda1 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java @@ -231,7 +231,7 @@ public class ScriptSortBuilder extends SortBuilder<ScriptSortBuilder> { public static ScriptSortBuilder fromXContent(QueryParseContext context, String elementName) throws IOException { ScriptParameterParser scriptParameterParser = new ScriptParameterParser(); XContentParser parser = context.parser(); - ParseFieldMatcher parseField = context.parseFieldMatcher(); + ParseFieldMatcher parseField = context.getParseFieldMatcher(); Script script = null; ScriptSortType type = null; SortMode sortMode = null; |