Skip to content

Commit

Permalink
simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
iverase committed Jan 24, 2024
1 parent 37702e1 commit a4d613e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
10 changes: 5 additions & 5 deletions server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,11 @@ public static GeoPoint parseGeoPoint(XContentParser parser, final boolean ignore
*/
public static GeoPoint parseGeoPoint(XContentParser parser, final boolean ignoreZValue, final EffectivePoint effectivePoint)
throws IOException, ElasticsearchParseException {
return geoPointParser.parsePoint(parser, ignoreZValue, value -> {
GeoPoint point = new GeoPoint();
point.resetFromString(value, ignoreZValue, effectivePoint);
return point;
});
return geoPointParser.parsePoint(
parser,
ignoreZValue,
value -> new GeoPoint().resetFromString(value, ignoreZValue, effectivePoint)
);
}

private static GenericPointParser<GeoPoint> geoPointParser = new GenericPointParser<>("geo_point", "lon", "lat") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
*/
public static CartesianPoint parsePoint(XContentParser parser, final boolean ignoreZValue) throws IOException,
ElasticsearchParseException {
return cartesianPointParser.parsePoint(parser, ignoreZValue, value -> {
CartesianPoint point = new CartesianPoint();
point.resetFromString(value, ignoreZValue);
return point;
});
return cartesianPointParser.parsePoint(parser, ignoreZValue, value -> new CartesianPoint().resetFromString(value, ignoreZValue));
}

public static CartesianPoint parsePoint(Object value, boolean ignoreZValue) throws ElasticsearchParseException {
Expand Down

0 comments on commit a4d613e

Please sign in to comment.