close ring

provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/provider/impl/GeoQueryBuilder.java

@@ -55,12 +55,20 @@ public final class GeoQueryBuilder {
         return null;
     }
 
-    private QueryBuilder getPolygonQuery(SpatialFilter spatialFilter) {
-        List<GeoPoint> points = new ArrayList<>();
+    private QueryBuilder getPolygonQuery(SpatialFilter spatialFilter) throws IOException {
+        List<Point> queryPolygon = spatialFilter.getByGeoPolygon().getPoints();
+        List<Coordinate> points = new ArrayList<>();
+        if (!queryPolygon.get(0).equals(queryPolygon.get(queryPolygon.size() - 1))) {
+            List<Point> closedRing = new ArrayList<>();
+            closedRing.addAll(queryPolygon);
+            closedRing.add(queryPolygon.get(0));
+            spatialFilter.getByGeoPolygon().setPoints(closedRing);
+        }
         for (Point point : spatialFilter.getByGeoPolygon().getPoints()) {
-            points.add(new GeoPoint(point.getLatitude(), point.getLongitude()));
+            points.add(new Coordinate(point.getLongitude(), point.getLatitude()));
         }
-        return geoPolygonQuery(spatialFilter.getField(), points).ignoreUnmapped(true);
+        CoordinatesBuilder cb = new CoordinatesBuilder().coordinates(points);
+        return geoWithinQuery(spatialFilter.getField(), new PolygonBuilder(cb)).ignoreUnmapped(true);
     }
 
     private QueryBuilder getBoundingBoxQuery(SpatialFilter spatialFilter) throws IOException {

provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/provider/impl/QueryServiceImpl.java

@@ -43,8 +43,6 @@ public class QueryServiceImpl extends QueryBase implements IQueryService {
     @Inject
     private AuditLogger auditLogger;
     @Inject
-    private SearchConfigurationProperties configurationProperties;
-    @Inject
     private IAggregationParserUtil aggregationParserUtil;
 
     @Override