From 5bce5dd88074d864ea621c43aae958e667e89b87 Mon Sep 17 00:00:00 2001 From: "seunghyun.cheong" Date: Sat, 24 Jun 2023 16:34:04 +0900 Subject: [PATCH] Adding GeoDistanceOrder's direction in request. Original Pull Request #2602 Closes #2601 (cherry picked from commit 8a164b103937d6911f388ecd106996578119a599) Polishing (cherry picked from commit b7570ffa957254d114e161cf73e173135fb3ee54) add implementation for old client (cherry picked from commit d43b44ba9c2de7a5732187d9a13f8ca94893ac5a) # Conflicts: # src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java # src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java --- .../client/elc/RequestConverter.java | 3 +- .../elasticsearch/client/elc/TypeUtils.java | 15 ++++++++ .../client/erhlc/RequestFactory.java | 2 ++ ...ustomMethodRepositoryIntegrationTests.java | 35 +++++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java index 429d4992b..8f926b29e 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java @@ -1373,9 +1373,10 @@ class RequestConverter { return SortOptions.of(so -> so // .geoDistance(gd -> gd // .field(fieldName) // - .location(loc -> loc.latlon(QueryBuilders.latLon(geoDistanceOrder.getGeoPoint())))// + .location(loc -> loc.latlon(QueryBuilders.latLon(geoDistanceOrder.getGeoPoint()))) // .distanceType(TypeUtils.geoDistanceType(geoDistanceOrder.getDistanceType())) .mode(TypeUtils.sortMode(finalMode)) // + .order(TypeUtils.sortOrder(geoDistanceOrder.getDirection())) // .unit(TypeUtils.distanceUnit(geoDistanceOrder.getUnit())) // .ignoreUnmapped(geoDistanceOrder.getIgnoreUnmapped()))); } else { diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/TypeUtils.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/TypeUtils.java index 9b4d12151..f2506e8e0 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/TypeUtils.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/TypeUtils.java @@ -27,6 +27,7 @@ import co.elastic.clients.elasticsearch.core.search.ScoreMode; import java.time.Duration; +import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.core.RefreshPolicy; import org.springframework.data.elasticsearch.core.query.GeoDistanceOrder; import org.springframework.data.elasticsearch.core.query.IndexQuery; @@ -136,6 +137,20 @@ final class TypeUtils { } + @Nullable + static SortOrder sortOrder(@Nullable Sort.Direction direction) { + + if (direction == null) { + return null; + } + + return switch (direction) { + case ASC -> SortOrder.Asc; + case DESC -> SortOrder.Desc; + }; + + } + @Nullable static HighlighterFragmenter highlighterFragmenter(@Nullable String value) { diff --git a/src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java b/src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java index e4a685f4d..5fe773a0b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java @@ -963,6 +963,8 @@ class RequestFactory { sort.ignoreUnmapped(geoDistanceOrder.getIgnoreUnmapped()); } + sort.order(order.isAscending() ? SortOrder.ASC : SortOrder.DESC); + return sort; } else { FieldSortBuilder sort = SortBuilders // diff --git a/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java index d481ee9c7..59fdaeb51 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java @@ -1590,6 +1590,41 @@ public abstract class CustomMethodRepositoryIntegrationTests implements NewElast assertThat(searchHits.getSearchHit(2).getId()).isEqualTo("oslo"); } + @Test // #2601 + void shouldUseGeoSortReverseParameter() { + GeoPoint munich = new GeoPoint(48.137154, 11.5761247); + GeoPoint berlin = new GeoPoint(52.520008, 13.404954); + GeoPoint vienna = new GeoPoint(48.20849, 16.37208); + GeoPoint oslo = new GeoPoint(59.9127, 10.7461); + + List entities = new ArrayList<>(); + + SampleEntity entity1 = new SampleEntity(); + entity1.setId("berlin"); + entity1.setLocation(berlin); + entities.add(entity1); + + SampleEntity entity2 = new SampleEntity(); + entity2.setId("vienna"); + entity2.setLocation(vienna); + entities.add(entity2); + + SampleEntity entity3 = new SampleEntity(); + entity3.setId("oslo"); + entity3.setLocation(oslo); + entities.add(entity3); + + repository.saveAll(entities); + + SearchHits searchHits = repository + .searchBy(Sort.by(new GeoDistanceOrder("location", munich).with(Sort.Direction.DESC))); + + assertThat(searchHits.getTotalHits()).isEqualTo(3); + assertThat(searchHits.getSearchHit(0).getId()).isEqualTo("oslo"); + assertThat(searchHits.getSearchHit(1).getId()).isEqualTo("berlin"); + assertThat(searchHits.getSearchHit(2).getId()).isEqualTo("vienna"); + } + @Test // DATAES-749 void shouldReturnSearchPage() { List entities = createSampleEntities("abc", 20);