diff --git a/indexer-acceptance-test/src/test/java/org/opengroup/osdu/util/ElasticUtils.java b/indexer-acceptance-test/src/test/java/org/opengroup/osdu/util/ElasticUtils.java index 0f767a8387058fc2e87cf3584e842b9f3fef78db..43e8f65bf1fd734bf95f9195a3c46d3d36cf04f5 100644 --- a/indexer-acceptance-test/src/test/java/org/opengroup/osdu/util/ElasticUtils.java +++ b/indexer-acceptance-test/src/test/java/org/opengroup/osdu/util/ElasticUtils.java @@ -19,8 +19,10 @@ package org.opengroup.osdu.util; import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.ElasticsearchException; +import co.elastic.clients.elasticsearch._types.FieldSort; import co.elastic.clients.elasticsearch._types.FieldValue; import co.elastic.clients.elasticsearch._types.GeoShapeRelation; +import co.elastic.clients.elasticsearch._types.SortOptions; import co.elastic.clients.elasticsearch._types.Time; import co.elastic.clients.elasticsearch._types.mapping.TypeMapping; import co.elastic.clients.elasticsearch._types.query_dsl.*; @@ -512,7 +514,13 @@ public class ElasticUtils { try { ElasticsearchClient client = this.getOrCreateClient(username, password, host); - SearchRequest request = SearchRequest.of(builder -> builder.index(index)); + SortOptions idSort = SortOptions.of( + sortBuilder -> sortBuilder.field( + FieldSort.of(fieldSortBuilder -> fieldSortBuilder.field("id")) + ) + ); + + SearchRequest request = SearchRequest.of(builder -> builder.index(index).sort(idSort)); SearchResponse<RecordData> searchResponse = client.search(request, RecordData.class); HitsMetadata<RecordData> hits = searchResponse.hits(); diff --git a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java index eeae9569c12bbdbe607350d0b03d67bf71b173e7..b2dd5868a577bc6bdf8e95849e845ed11e7b4e1c 100644 --- a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java +++ b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java @@ -21,8 +21,10 @@ import static org.opengroup.osdu.common.RecordSteps.X_COLLABORATION; import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.ElasticsearchException; +import co.elastic.clients.elasticsearch._types.FieldSort; import co.elastic.clients.elasticsearch._types.FieldValue; import co.elastic.clients.elasticsearch._types.GeoShapeRelation; +import co.elastic.clients.elasticsearch._types.SortOptions; import co.elastic.clients.elasticsearch._types.Time; import co.elastic.clients.elasticsearch._types.mapping.TypeMapping; import co.elastic.clients.elasticsearch._types.query_dsl.BoolQuery; @@ -542,7 +544,13 @@ public class ElasticUtils { try { ElasticsearchClient client = this.getOrCreateClient(username, password, host); - SearchRequest request = SearchRequest.of(builder -> builder.index(index)); + SortOptions idSort = SortOptions.of( + sortBuilder -> sortBuilder.field( + FieldSort.of(fieldSortBuilder -> fieldSortBuilder.field("id")) + ) + ); + + SearchRequest request = SearchRequest.of(builder -> builder.index(index).sort(idSort)); SearchResponse<RecordData> searchResponse = client.search(request, RecordData.class); HitsMetadata<RecordData> hits = searchResponse.hits();