Skip to content

Expression or condition #3445

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

Jump to bottom
Merged
thunderhook merged 7 commits into from
Nov 24, 2023
Merged

Expression or condition #3445

thunderhook merged 7 commits into from
Nov 24, 2023

Conversation

@the-mgi
Copy link
Contributor

@the-mgi the-mgi commented Nov 20, 2023

fixes #3413

@the-mgi
an if branch if there is both expression and condionQualifiedByName
0388cbb 
if expression and conditionQualifiedByName both exists on the same @mapping config, then it should lead to compile time error, and a new error message that says so.
@the-mgi
added if condition error MappingOptions
8feb215
@thunderhook thunderhook self-requested a review November 22, 2023 21:30
thunderhook
thunderhook requested changes Nov 22, 2023
View reviewed changes
Copy link
Contributor

@thunderhook thunderhook left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Hi @the-mgi!

Sorry it took so long to review. (now that I see it, 2 days isn't that long 😅 )

Would you be so kind and add a unit test? This would look similar to theIssue2668Test.

Thanks in advance!

@the-mgi
Copy link
Contributor Author

the-mgi commented Nov 23, 2023 •
edited
Loading

pleasure.
fyi test case added, added proper whitespace

@the-mgi the-mgi changed the title Expression or condition [WIP] Expression or condition Nov 23, 2023
@the-mgi the-mgi changed the title [WIP] Expression or condition Expression or condition Nov 23, 2023
@the-mgi the-mgi requested a review from thunderhook November 23, 2023 10:41
@the-mgi
Copy link
Contributor Author

the-mgi commented Nov 23, 2023

FYI there is a failing test mapstruct/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletoset/FruitsMapper.java on local on main branch, and on expression-or-condition.

@thunderhook thunderhook added this to the 1.6.0.Beta2 milestone Nov 23, 2023
@thunderhook thunderhook merged commit 2bb2aef into mapstruct:main Nov 24, 2023
@the-mgi the-mgi deleted the expression-or-condition branch November 25, 2023 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thunderhook thunderhook thunderhook approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

1.6.0.Beta2

Development

Successfully merging this pull request may close these issues.

Using Mapping#expression and Mapping#conditionalQualifiedBy(Name) should lead to compile error

2 participants

@the-mgi @thunderhook