Skip to content

Fix nullaway problems that appeared after reactor upgrade. #3057

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 2 commits into from
Nov 3, 2025
+3 −2
Merged

Fix nullaway problems that appeared after reactor upgrade. #3057

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b7d005
Fix nullaway problems that appeared after reactor upgrade.
meistermeier Nov 3, 2025
4382455
Adjust call after review.
meistermeier Nov 3, 2025
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
2 changes: 1 addition & 1 deletion src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ private <T> Mono<Tuple2<T, DynamicLabels>> determineDynamicLabels(T entityToBeSa
.one()
.map(m -> (Collection<String>) m.get(Constants.NAME_OF_LABELS))
.switchIfEmpty(Mono.just(Collections.emptyList()))
.zipWith(Mono.just((Collection<String>) propertyAccessor.getProperty(p)))
.zipWith(Mono.justOrEmpty((Collection<String>) propertyAccessor.getProperty(p)))
Copy link
Collaborator

@michael-simons michael-simons Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.zipWith(Mono.justOrEmpty((Collection<String>) propertyAccessor.getProperty(p)))
.zipWith(Mono.just(
(Collection<String>) Objects.requireNonNullElseGet(propertyAccessor.getProperty(p), List::of)))

Otherwise the flow does not run at all and you don't get any dynamic label.

.map(t -> Tuples.of(entityToBeSaved, new DynamicLabels(entityMetaData, t.getT1(), t.getT2())));
}).orElse(Mono.just(Tuples.of(entityToBeSaved, DynamicLabels.EMPTY)));
}
Expand Down
2 changes: 1 addition & 1 deletion ...org/springframework/data/neo4j/integration/reactive/ReactiveNeo4jClientKotlinInteropIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class ReactiveNeo4jClientKotlinInteropIT @Autowired constructor(
}.one()

StepVerifier.create(queen)
.expectNextMatches { it.name == "Queen" && it.member.size == 4 }
.expectNextMatches { it!!.name == "Queen" && it.member.size == 4 }
.verifyComplete()

StepVerifier.create(neo4jClient.query("MATCH (n:IDontExists) RETURN id(n)").fetchAs<Long>().one())
Expand Down