Skip to content

Commit

Permalink
Guard against null geoBoundingBox (#50506) (#50608)
Browse files Browse the repository at this point in the history
A geo box with a top value of Double.NEGATIVE_INFINITY will yield an empty
xContent which translates to a null `geoBoundingBox`. This commit marks the
field as `Nullable` and guards against null when retrieving the `topLeft`
and `bottomRight` fields.

Fixes #50505

(cherry picked from commit 051718f)
Signed-off-by: Andrei Dan <andrei.dan@elastic.co>
  • Loading branch information
andreidan authored Jan 3, 2020
1 parent 1abecad commit 856607b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.elasticsearch.search.aggregations.metrics;

import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.geo.GeoBoundingBox;
import org.elasticsearch.common.geo.GeoPoint;
Expand All @@ -30,14 +31,17 @@

import java.io.IOException;

import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
import static org.elasticsearch.common.geo.GeoBoundingBox.BOTTOM_RIGHT_FIELD;
import static org.elasticsearch.common.geo.GeoBoundingBox.BOUNDS_FIELD;
import static org.elasticsearch.common.geo.GeoBoundingBox.LAT_FIELD;
import static org.elasticsearch.common.geo.GeoBoundingBox.LON_FIELD;
import static org.elasticsearch.common.geo.GeoBoundingBox.TOP_LEFT_FIELD;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;

public class ParsedGeoBounds extends ParsedAggregation implements GeoBounds {

// A top of Double.NEGATIVE_INFINITY yields an empty xContent, so the bounding box is null
@Nullable
private GeoBoundingBox geoBoundingBox;

@Override
Expand All @@ -54,13 +58,15 @@ public XContentBuilder doXContentBody(XContentBuilder builder, Params params) th
}

@Override
@Nullable
public GeoPoint topLeft() {
return geoBoundingBox.topLeft();
return geoBoundingBox != null ? geoBoundingBox.topLeft() : null;
}

@Override
@Nullable
public GeoPoint bottomRight() {
return geoBoundingBox.bottomRight();
return geoBoundingBox != null ? geoBoundingBox.bottomRight() : null;
}

private static final ObjectParser<ParsedGeoBounds, Void> PARSER = new ObjectParser<>(ParsedGeoBounds.class.getSimpleName(), true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.search.aggregations.ParsedAggregation;
import org.elasticsearch.search.aggregations.metrics.InternalGeoBounds;
import org.elasticsearch.search.aggregations.metrics.ParsedGeoBounds;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
import org.elasticsearch.test.InternalAggregationTestCase;

Expand Down

0 comments on commit 856607b

Please sign in to comment.