Skip to content
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.

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

#1130: improve behaviour on ambigous xpath match #1138

Conversation

leonrohne27
Copy link
Contributor

@leonrohne27 leonrohne27 commented Mar 17, 2025

Fixes: #1130

Implements:

  • Now logs a warning instead of an error + stacktrace
  • Instead of raising an exception that prevents the merge, it now takes the first match of the XPath and merges that

@leonrohne27 leonrohne27 self-assigned this Mar 18, 2025
@coveralls
Copy link
Collaborator

Pull Request Test Coverage Report for Build 13918986572

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 67.657%

Totals Coverage Status
Change from base Build 13918607876: 0.0%
Covered Lines: 7825
Relevant Lines: 11138

💛 - Coveralls

@coveralls
Copy link
Collaborator

coveralls commented Mar 18, 2025

Pull Request Test Coverage Report for Build 13990864868

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 13 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.02%) to 67.667%

Files with Coverage Reduction New Missed Lines %
com/devonfw/tools/ide/merge/xmlmerger/XmlMergeStrategy.java 2 84.29%
com/devonfw/tools/ide/merge/xmlmerger/matcher/IdComputer.java 11 72.86%
Totals Coverage Status
Change from base Build 13987579828: -0.02%
Covered Lines: 7832
Relevant Lines: 11146

💛 - Coveralls

Copy link
Member

@hohwille hohwille left a comment

Choose a reason for hiding this comment

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

@leonrohne27 thanks for your PR. You already solved the problem 👍
Have a look at my review comments to complete the story and avoid undesired other behaviour. Then we can merge this.

@hohwille hohwille added this to the release:2025.03.002 milestone Mar 21, 2025
@hohwille hohwille changed the title Fix/1130 improve behaviour on ambigous xpath match #1130: improve behaviour on ambigous xpath match Mar 21, 2025
@hohwille hohwille added enhancement New feature or request merger labels Mar 21, 2025
@hohwille hohwille merged commit 10254a8 into devonfw:main Mar 21, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request merger
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

improve behaviour on ambiguous XPath match
4 participants