From a4d613e2ade19d05751998d918852db6945f36cb Mon Sep 17 00:00:00 2001 From: Ignacio Vera Date: Wed, 24 Jan 2024 10:38:17 +0100 Subject: [PATCH] simplify --- .../java/org/elasticsearch/common/geo/GeoUtils.java | 10 +++++----- .../xpack/spatial/common/CartesianPoint.java | 6 +----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java b/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java index 2033dd8baa5e9..cfc7bd9041713 100644 --- a/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java +++ b/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java @@ -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 geoPointParser = new GenericPointParser<>("geo_point", "lon", "lat") { diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/common/CartesianPoint.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/common/CartesianPoint.java index 4f427eac9439f..bb3b832672459 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/common/CartesianPoint.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/common/CartesianPoint.java @@ -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 {