feat: Add addOrOfNotNull and addAndOfNotNull methods#78
Merged
chinhtrung merged 5 commits intomainfrom Dec 16, 2025
Merged
Conversation
chinhtrung
changed the title
chinhtrung
changed the title
luanpotter
reviewed
Dec 16, 2025
yawn-api/src/main/kotlin/com/faire/yawn/criteria/query/TypeSafeCriteriaWithWhere.kt
Show resolved
Hide resolved
QuinnB73
approved these changes
Dec 16, 2025
| * Instead of manually filtering nulls with `addOr(listOfNotNull(...))`, you can pass | ||
| * nullable criteria directly and let this method handle the filtering. | ||
| * | ||
| * Note: If all predicates are null (resulting in an empty list), no condition is added to the query. |
Collaborator
There was a problem hiding this comment.
nit: That's only true because of the hidden implementation detail that we're deferring to Hibernate, so it could be worth mentioning Hibernate in some way so that once we decouple Yawn from Hibernate we know to either maintain this behaviour or stop documenting it
Contributor
Author
There was a problem hiding this comment.
I just added a quick empty check to ensure that we control the behaviours without the hidden implementation detail from Hibernate. Does it look good to you?
QuinnB73
approved these changes
Dec 16, 2025
chinhtrung
deleted the
trungnguyen.implementaddOrOfNotNullandaddAndOfNotNull
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add addOrOfNotNull and addAndOfNotNull convenience methods
Summary
Adds two new convenience methods to TypeSafeCriteriaWithWhere for handling nullable criteria in dynamic query building.
Changes
Problem Solved
When building dynamic queries with conditionally nullable criteria, developers previously had to manually filter nulls:
// Before
addOr(listOfNotNull(criteria1, criteria2, criteria3))
addAnd(listOfNotNull(criteria1, criteria2, criteria3))
// After
addOrOfNotNull(criteria1, criteria2, criteria3)
addAndOfNotNull(criteria1, criteria2, criteria3)
Test Coverage
Added comprehensive tests in YawnCriterionTest demonstrating both methods correctly filter out null criteria while preserving the expected query logic.