Skip to content

Commit 9e57f02

Browse files
Bump org.springframework.data:spring-data-elasticsearch (#507) (#523)
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] <[email protected]> Signed-off-by: Andriy Redko <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent cd784dd commit 9e57f02

File tree

3 files changed

+13
-24
lines changed

3 files changed

+13
-24
lines changed

settings.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ dependencyResolutionManagement {
1616
}
1717

1818
create("springLibs") {
19-
version("spring", "6.2.8")
20-
version("spring-boot", "3.5.3")
21-
library("data-commons", "org.springframework.data:spring-data-commons:3.5.1")
22-
library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.1")
19+
version("spring", "6.2.10")
20+
version("spring-boot", "3.5.5")
21+
library("data-commons", "org.springframework.data:spring-data-commons:3.5.3")
22+
library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.3")
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")
@@ -32,7 +32,7 @@ dependencyResolutionManagement {
3232
library("boot-test", "org.springframework.boot", "spring-boot-test").versionRef("spring-boot")
3333
library("boot-test-autoconfigure", "org.springframework.boot", "spring-boot-test-autoconfigure").versionRef("spring-boot")
3434
library("boot-testcontainers", "org.springframework.boot", "spring-boot-testcontainers").versionRef("spring-boot")
35-
library("projectreactor", "io.projectreactor:reactor-test:3.7.7")
35+
library("projectreactor", "io.projectreactor:reactor-test:3.7.9")
3636
plugin("spring-boot", "org.springframework.boot").versionRef("spring-boot")
3737
}
3838

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
@@ -841,13 +841,9 @@ private SearchRequest prepareSearchRequest(
841841
sourceBuilder.seqNoAndPrimaryTerm(true);
842842
}
843843

844-
if (query.getPageable().isPaged()) {
845-
sourceBuilder.from((int) query.getPageable().getOffset());
846-
sourceBuilder.size(query.getPageable().getPageSize());
847-
} else {
848-
sourceBuilder.from(0);
849-
sourceBuilder.size(INDEX_MAX_RESULT_WINDOW);
850-
}
844+
sourceBuilder
845+
.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0))
846+
.size(query.getRequestSize());
851847

852848
if (query.getSourceFilter() != null) {
853849
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
@@ -1328,11 +1328,8 @@ public MsearchRequest searchMsearchRequest(
13281328
.timeout(timeStringMs(query.getTimeout())) //
13291329
;
13301330

1331-
if (query.getPageable().isPaged()) {
1332-
bb //
1333-
.from((int) query.getPageable().getOffset()) //
1334-
.size(query.getPageable().getPageSize());
1335-
}
1331+
bb.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0))
1332+
.size(query.getRequestSize());
13361333

13371334
if (!isEmpty(query.getFields())) {
13381335
bb.fields(fb -> {
@@ -1483,13 +1480,9 @@ private <T> void prepareSearchRequest(Query query, @Nullable String routing, @Nu
14831480
builder.seqNoPrimaryTerm(true);
14841481
}
14851482

1486-
if (query.getPageable().isPaged()) {
1487-
builder //
1488-
.from((int) query.getPageable().getOffset()) //
1489-
.size(query.getPageable().getPageSize());
1490-
} else {
1491-
builder.from(0).size(INDEX_MAX_RESULT_WINDOW);
1492-
}
1483+
builder
1484+
.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0))
1485+
.size(query.getRequestSize());
14931486

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

0 commit comments

Comments
 (0)