Skip to content

HHH-18953 correctly handle Optional in reactive repos #9461

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
Dec 18, 2024
Merged

HHH-18953 correctly handle Optional in reactive repos #9461

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
4 changes: 4 additions & 0 deletions ...l-generator/src/jakartaData/java/org/hibernate/processor/test/data/reactive/Library2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import java.time.LocalDate;
import java.util.List;
import java.util.Optional;

@Repository
public interface Library2 {
Expand All @@ -32,6 +33,9 @@ public interface Library2 {
@Find
Uni<Book> book(String isbn);

@Find
Uni<Optional<Book>> maybeBook(String isbn);

@Find
Uni<List<Book>> books(@By("isbn") List<String> isbns);

Expand Down
9 changes: 8 additions & 1 deletion .../metamodel-generator/src/main/java/org/hibernate/processor/annotation/IdFinderMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ public String getAttributeDeclarationString() {

private void throwIfNull(StringBuilder declaration) {
if (containerType != null) {
if ( isReactive() ) {
declaration
.append("\n\t\t\t.map(")
.append(annotationMetaEntity.importType(containerType))
.append("::")
.append("ofNullable");
}
declaration
.append(')');
}
Expand Down Expand Up @@ -157,7 +164,7 @@ private void varOrReturn(StringBuilder declaration) {
declaration
.append("\ttry {\n\t");
}
if (containerType != null) {
if (containerType != null && !isReactive()) {
declaration
.append("\treturn ")
.append(annotationMetaEntity.staticImport(containerType, "ofNullable"))
Expand Down
Loading