From 82f952cb86430c69d5bd25db766e9ba02d4522a8 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Wed, 15 Jul 2020 17:47:23 -0400 Subject: [PATCH 1/2] Fix compilation in Eclipse Eclipse was confused by #59583. It can't see a the public inner interface within the superclass. This time. Usually that is fine, but the Eclipse gods don't like this particular code, I guess. --- .../org/elasticsearch/index/mapper/GeoPointFieldMapper.java | 3 ++- .../xpack/spatial/index/mapper/PointFieldMapper.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java index aec585ad615a9..c0c799dd339a0 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java @@ -186,7 +186,8 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName) { } - protected static class ParsedGeoPoint extends GeoPoint implements ParsedPoint { + // Eclipse requires the AbstractPointGeometryFieldMapper prefix or it can't find ParsedPoint + protected static class ParsedGeoPoint extends GeoPoint implements AbstractPointGeometryFieldMapper.ParsedPoint { @Override public void validate(String fieldName) { if (lat() > 90.0 || lat() < -90.0) { diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java index c34fc29ca1af4..5307e895340d2 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java @@ -136,7 +136,8 @@ public String typeName() { } } - protected static class ParsedCartesianPoint extends CartesianPoint implements ParsedPoint { + // Eclipse requires the AbstractPointGeometryFieldMapper prefix or it can't find ParsedPoint + protected static class ParsedCartesianPoint extends CartesianPoint implements AbstractPointGeometryFieldMapper.ParsedPoint { @Override public void validate(String fieldName) { if (Float.isFinite(getX()) == false) { From a953eed060b9bbf27ef015f9fdaa5149f20007ce Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Wed, 15 Jul 2020 18:04:25 -0400 Subject: [PATCH 2/2] Add bug url reference --- .../java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java | 1 + .../xpack/spatial/index/mapper/PointFieldMapper.java | 1 + 2 files changed, 2 insertions(+) diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java index c0c799dd339a0..5f1b7013037a7 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java @@ -187,6 +187,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName) { } // Eclipse requires the AbstractPointGeometryFieldMapper prefix or it can't find ParsedPoint + // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=565255 protected static class ParsedGeoPoint extends GeoPoint implements AbstractPointGeometryFieldMapper.ParsedPoint { @Override public void validate(String fieldName) { diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java index 5307e895340d2..556bb4c636d05 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java @@ -137,6 +137,7 @@ public String typeName() { } // Eclipse requires the AbstractPointGeometryFieldMapper prefix or it can't find ParsedPoint + // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=565255 protected static class ParsedCartesianPoint extends CartesianPoint implements AbstractPointGeometryFieldMapper.ParsedPoint { @Override public void validate(String fieldName) {