Alias field does not work with geo_shape query

server/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java

@@ -160,7 +160,7 @@ public Query buildShapeQuery(SearchExecutionContext context, MappedFieldType fie
                 "Field [" + fieldName + "] is of unsupported type [" + fieldType.typeName() + "] for [" + NAME + "] query");
         }
         final GeoShapeQueryable ft = (GeoShapeQueryable) fieldType;
-        return new ConstantScoreQuery(ft.geoShapeQuery(shape, fieldName, strategy, relation, context));
+        return new ConstantScoreQuery(ft.geoShapeQuery(shape, fieldType.name(), strategy, relation, context));
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/query/LegacyGeoShapeQueryProcessor.java

@@ -137,7 +137,7 @@ private static Shape buildS4J(Geometry geometry) {
 
             @Override
             public ShapeBuilder<?, ?, ?> visit(LinearRing ring) {
-                throw new UnsupportedOperationException("circle is not supported");
+                throw new UnsupportedOperationException("LinearRing is not supported");
             }
 
             @Override

server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java

@@ -16,19 +16,18 @@
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.geo.builders.EnvelopeBuilder;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.geo.GeometryTestUtils;
 import org.elasticsearch.geometry.Geometry;
+import org.elasticsearch.geometry.Rectangle;
 import org.elasticsearch.geometry.utils.WellKnownText;
 import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.test.AbstractQueryTestCase;
 import org.junit.After;
-import org.locationtech.jts.geom.Coordinate;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -126,10 +125,8 @@ public void testNoRelation() {
 
     // see #3878
     public void testThatXContentSerializationInsideOfArrayWorks() throws Exception {
-        EnvelopeBuilder envelopeBuilder = new EnvelopeBuilder(new Coordinate(0, 10), new Coordinate(10, 0));
-        GeoShapeQueryBuilder geoQuery = randomBoolean() ?
-            QueryBuilders.geoShapeQuery("searchGeometry", envelopeBuilder) :
-            QueryBuilders.geoShapeQuery("searchGeometry", envelopeBuilder.buildGeometry());
+        Rectangle rectangle = new Rectangle(0, 10, 10, 0);
+        GeoShapeQueryBuilder geoQuery = QueryBuilders.geoShapeQuery("searchGeometry", rectangle);
         JsonXContent.contentBuilder().startArray().value(geoQuery).endArray();
     }
 

server/src/test/java/org/elasticsearch/search/geo/GeoPointShapeQueryTests.java

@@ -8,18 +8,57 @@
 
 package org.elasticsearch.search.geo;
 
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.geo.GeometryTestUtils;
+import org.elasticsearch.geometry.Point;
+import org.elasticsearch.geometry.utils.WellKnownText;
 
-public class GeoPointShapeQueryTests extends GeoQueryTests {
+import java.io.IOException;
+
+import static org.elasticsearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.geoShapeQuery;
+
+public class GeoPointShapeQueryTests extends GeoPointShapeQueryTestCase {
 
     @Override
-    protected XContentBuilder createDefaultMapping() throws Exception {
+    protected void createMapping(String indexName, String fieldName, Settings settings) throws Exception {
         XContentBuilder xcb = XContentFactory.jsonBuilder().startObject()
-            .startObject("properties").startObject(defaultGeoFieldName)
+            .startObject("properties").startObject(fieldName)
             .field("type", "geo_point")
             .endObject().endObject().endObject();
+        client().admin().indices().prepareCreate(indexName).setMapping(xcb).setSettings(settings).get();
+    }
+
+    public void testFieldAlias() throws IOException {
+        String mapping = Strings.toString(XContentFactory.jsonBuilder()
+            .startObject()
+            .startObject("properties")
+            .startObject(defaultGeoFieldName)
+            .field("type", "geo_point")
+            .endObject()
+            .startObject("alias")
+            .field("type", "alias")
+            .field("path", defaultGeoFieldName)
+            .endObject()
+            .endObject()
+            .endObject());
+
+        client().admin().indices().prepareCreate(defaultIndexName).setMapping(mapping).get();
+        ensureGreen();
+
+        Point point = GeometryTestUtils.randomPoint(false);
+        client().prepareIndex(defaultIndexName).setId("1")
+            .setSource(jsonBuilder().startObject().field(defaultGeoFieldName, WellKnownText.toWKT(point)).endObject())
+            .setRefreshPolicy(IMMEDIATE).get();
 
-        return xcb;
+        SearchResponse response = client().prepareSearch(defaultIndexName)
+            .setQuery(geoShapeQuery("alias", point))
+            .get();
+        assertEquals(1, response.getHits().getTotalHits().value);
     }
 }