Skip to content

Bump org.springframework.data:spring-data-elasticsearch (#507) #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2025
Merged

Bump org.springframework.data:spring-data-elasticsearch (#507) #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ dependencyResolutionManagement {
}

create("springLibs") {
version("spring", "6.2.8")
version("spring-boot", "3.5.3")
library("data-commons", "org.springframework.data:spring-data-commons:3.5.1")
library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.1")
version("spring", "6.2.10")
version("spring-boot", "3.5.5")
library("data-commons", "org.springframework.data:spring-data-commons:3.5.3")
library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.3")
library("web", "org.springframework", "spring-web").versionRef("spring")
library("webflux", "org.springframework", "spring-webflux").versionRef("spring")
library("context", "org.springframework", "spring-context").versionRef("spring")
Expand All @@ -32,7 +32,7 @@ dependencyResolutionManagement {
library("boot-test", "org.springframework.boot", "spring-boot-test").versionRef("spring-boot")
library("boot-test-autoconfigure", "org.springframework.boot", "spring-boot-test-autoconfigure").versionRef("spring-boot")
library("boot-testcontainers", "org.springframework.boot", "spring-boot-testcontainers").versionRef("spring-boot")
library("projectreactor", "io.projectreactor:reactor-test:3.7.7")
library("projectreactor", "io.projectreactor:reactor-test:3.7.9")
plugin("spring-boot", "org.springframework.boot").versionRef("spring-boot")
}

Expand Down
10 changes: 3 additions & 7 deletions spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/RequestFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,13 +841,9 @@ private SearchRequest prepareSearchRequest(
sourceBuilder.seqNoAndPrimaryTerm(true);
}

if (query.getPageable().isPaged()) {
sourceBuilder.from((int) query.getPageable().getOffset());
sourceBuilder.size(query.getPageable().getPageSize());
} else {
sourceBuilder.from(0);
sourceBuilder.size(INDEX_MAX_RESULT_WINDOW);
}
sourceBuilder
.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0))
.size(query.getRequestSize());

if (query.getSourceFilter() != null) {
sourceBuilder.fetchSource(getFetchSourceContext(query));
Expand Down
17 changes: 5 additions & 12 deletions spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/RequestConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,11 +1328,8 @@ public MsearchRequest searchMsearchRequest(
.timeout(timeStringMs(query.getTimeout())) //
;

if (query.getPageable().isPaged()) {
bb //
.from((int) query.getPageable().getOffset()) //
.size(query.getPageable().getPageSize());
}
bb.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0))
.size(query.getRequestSize());

if (!isEmpty(query.getFields())) {
bb.fields(fb -> {
Expand Down Expand Up @@ -1479,13 +1476,9 @@ private <T> void prepareSearchRequest(Query query, @Nullable String routing, @Nu
builder.seqNoPrimaryTerm(true);
}

if (query.getPageable().isPaged()) {
builder //
.from((int) query.getPageable().getOffset()) //
.size(query.getPageable().getPageSize());
} else {
builder.from(0).size(INDEX_MAX_RESULT_WINDOW);
}
builder
.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0))
.size(query.getRequestSize());

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