diff options
author | Christoph Büscher <christoph@elastic.co> | 2016-04-15 12:05:45 +0200 |
---|---|---|
committer | Christoph Büscher <christoph@elastic.co> | 2016-04-15 15:15:32 +0200 |
commit | de036d63d8417da87a7a80d1d5ff7ac4755f4ec7 (patch) | |
tree | d5f9ea05e03429f6696f27b9156e302e206c128d /core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java | |
parent | 15c59d07b325c3e72dd0e8fc90cc0811285efff9 (diff) |
Rename context.parseFieldMatcher() to context.getParseFieldMatcher
Diffstat (limited to 'core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java')
-rw-r--r-- | core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java index d7c3c8435d..a422b6eb6f 100644 --- a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java @@ -377,15 +377,15 @@ public class GeoDistanceQueryBuilder extends AbstractQueryBuilder<GeoDistanceQue } } } else if (token.isValue()) { - if (parseContext.parseFieldMatcher().match(currentFieldName, DISTANCE_FIELD)) { + if (parseContext.getParseFieldMatcher().match(currentFieldName, DISTANCE_FIELD)) { if (token == XContentParser.Token.VALUE_STRING) { vDistance = parser.text(); // a String } else { vDistance = parser.numberValue(); // a Number } - } else if (parseContext.parseFieldMatcher().match(currentFieldName, UNIT_FIELD)) { + } else if (parseContext.getParseFieldMatcher().match(currentFieldName, UNIT_FIELD)) { unit = DistanceUnit.fromString(parser.text()); - } else if (parseContext.parseFieldMatcher().match(currentFieldName, DISTANCE_TYPE_FIELD)) { + } else if (parseContext.getParseFieldMatcher().match(currentFieldName, DISTANCE_TYPE_FIELD)) { geoDistance = GeoDistance.fromString(parser.text()); } else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.LAT_SUFFIX)) { point.resetLat(parser.doubleValue()); @@ -393,22 +393,22 @@ public class GeoDistanceQueryBuilder extends AbstractQueryBuilder<GeoDistanceQue } else if (currentFieldName.endsWith(GeoPointFieldMapper.Names.LON_SUFFIX)) { point.resetLon(parser.doubleValue()); fieldName = currentFieldName.substring(0, currentFieldName.length() - GeoPointFieldMapper.Names.LON_SUFFIX.length()); - } else if (parseContext.parseFieldMatcher().match(currentFieldName, AbstractQueryBuilder.NAME_FIELD)) { + } else if (parseContext.getParseFieldMatcher().match(currentFieldName, AbstractQueryBuilder.NAME_FIELD)) { queryName = parser.text(); - } else if (parseContext.parseFieldMatcher().match(currentFieldName, AbstractQueryBuilder.BOOST_FIELD)) { + } else if (parseContext.getParseFieldMatcher().match(currentFieldName, AbstractQueryBuilder.BOOST_FIELD)) { boost = parser.floatValue(); - } else if (parseContext.parseFieldMatcher().match(currentFieldName, OPTIMIZE_BBOX_FIELD)) { + } else if (parseContext.getParseFieldMatcher().match(currentFieldName, OPTIMIZE_BBOX_FIELD)) { optimizeBbox = parser.textOrNull(); - } else if (parseContext.parseFieldMatcher().match(currentFieldName, COERCE_FIELD)) { + } else if (parseContext.getParseFieldMatcher().match(currentFieldName, COERCE_FIELD)) { coerce = parser.booleanValue(); if (coerce == true) { ignoreMalformed = true; } - } else if (parseContext.parseFieldMatcher().match(currentFieldName, IGNORE_MALFORMED_FIELD)) { + } else if (parseContext.getParseFieldMatcher().match(currentFieldName, IGNORE_MALFORMED_FIELD)) { ignoreMalformed = parser.booleanValue(); - } else if (parseContext.parseFieldMatcher().match(currentFieldName, IGNORE_UNMAPPED_FIELD)) { + } else if (parseContext.getParseFieldMatcher().match(currentFieldName, IGNORE_UNMAPPED_FIELD)) { ignoreUnmapped = parser.booleanValue(); - } else if (parseContext.parseFieldMatcher().match(currentFieldName, VALIDATION_METHOD_FIELD)) { + } else if (parseContext.getParseFieldMatcher().match(currentFieldName, VALIDATION_METHOD_FIELD)) { validationMethod = GeoValidationMethod.fromString(parser.text()); } else { if (fieldName == null) { |