Skip to content

Commit 6270142

Browse files
Bump org.springframework.data:spring-data-elasticsearch (#507)
Bumps [org.springframework.data:spring-data-elasticsearch](https://github.com/spring-projects/spring-data-elasticsearch) from 5.5.1 to 5.5.2. - [Release notes](https://github.com/spring-projects/spring-data-elasticsearch/releases) - [Commits](spring-projects/spring-data-elasticsearch@5.5.1...5.5.2) --- updated-dependencies: - dependency-name: org.springframework.data:spring-data-elasticsearch dependency-version: 5.5.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Andriy Redko <drreta@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent fe653ad commit 6270142

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencyResolutionManagement {
1919
version("spring", "6.2.8")
2020
version("spring-boot", "3.5.3")
2121
library("data-commons", "org.springframework.data:spring-data-commons:3.5.2")
22-
library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.1")
22+
library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.2")
2323
library("web", "org.springframework", "spring-web").versionRef("spring")
2424
library("webflux", "org.springframework", "spring-webflux").versionRef("spring")
2525
library("context", "org.springframework", "spring-context").versionRef("spring")

spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/RequestFactory.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -899,13 +899,9 @@ private SearchRequest prepareSearchRequest(
899899
sourceBuilder.seqNoAndPrimaryTerm(true);
900900
}
901901

902-
if (query.getPageable().isPaged()) {
903-
sourceBuilder.from((int) query.getPageable().getOffset());
904-
sourceBuilder.size(query.getPageable().getPageSize());
905-
} else {
906-
sourceBuilder.from(0);
907-
sourceBuilder.size(INDEX_MAX_RESULT_WINDOW);
908-
}
902+
sourceBuilder
903+
.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0))
904+
.size(query.getRequestSize());
909905

910906
if (query.getSourceFilter() != null) {
911907
sourceBuilder.fetchSource(getFetchSourceContext(query));

spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/RequestConverter.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,11 +1340,8 @@ public MsearchRequest searchMsearchRequest(
13401340
.timeout(timeStringMs(query.getTimeout())) //
13411341
;
13421342

1343-
if (query.getPageable().isPaged()) {
1344-
bb //
1345-
.from((int) query.getPageable().getOffset()) //
1346-
.size(query.getPageable().getPageSize());
1347-
}
1343+
bb.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0))
1344+
.size(query.getRequestSize());
13481345

13491346
if (!isEmpty(query.getFields())) {
13501347
bb.fields(fb -> {
@@ -1490,13 +1487,9 @@ private <T> void prepareSearchRequest(Query query, @Nullable String routing, @Nu
14901487
builder.seqNoPrimaryTerm(true);
14911488
}
14921489

1493-
if (query.getPageable().isPaged()) {
1494-
builder //
1495-
.from((int) query.getPageable().getOffset()) //
1496-
.size(query.getPageable().getPageSize());
1497-
} else {
1498-
builder.from(0).size(INDEX_MAX_RESULT_WINDOW);
1499-
}
1490+
builder
1491+
.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0))
1492+
.size(query.getRequestSize());
15001493

15011494
if (!isEmpty(query.getFields())) {
15021495
var fieldAndFormats = query.getFields().stream().map(field -> FieldAndFormat.of(b -> b.field(field))).toList();

0 commit comments

Comments
 (0)