Conversation
- DefaultSchemaMigration.entityReplacement now returns Optional<EntityMatch> (return type was mismatched with interface despite @CompileStatic due to Groovy generic erasure; would ClassCast at runtime on any call site using .map(EntityMatch::getMatch)) - UnmigratedCell returns Optional.empty() when lookup misses, rather than wrapping a null match inside EntityMatch.of() - AbstractMergeCellMigrator: fix two multipleCandidates flags that used size() > 0 (always true) instead of size() > 1 - minor fixes ING-5131
|
This PR cannot be merged yet because a required label is missing: |
There was a problem hiding this comment.
Pull request overview
Fixes alignment migration entity replacement handling by consistently returning Optional<EntityMatch> and correcting join-context migration logic so multi-candidate/join flags are computed correctly. This addresses a runtime ClassCast risk and improves behavior when no replacement exists.
Changes:
- Update
DefaultSchemaMigrationandUnmigratedCellto returnOptional<EntityMatch>correctly (and returnOptional.empty()on lookup misses). - Fix incorrect “multiple candidates/sources” conditions in
AbstractMergeCellMigrator(size() > 0→size() > 1) and clean up related variable naming. - Minor log/message escaping and test comment corrections.
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| common/plugins/eu.esdihumboldt.hale.common.filter/src/eu/esdihumboldt/hale/common/filter/internal/EntityReplacementVisitor.java | Javadoc correction for mismatch detection helper. |
| common/plugins/eu.esdihumboldt.hale.common.filter/src/eu/esdihumboldt/hale/common/filter/AbstractGeotoolsFilter.java | Escape apostrophes for MessageFormat-formatted SimpleLog messages. |
| common/plugins/eu.esdihumboldt.hale.common.align/src/eu/esdihumboldt/hale/common/align/migrate/impl/UnmigratedCell.java | Return Optional.empty() when no mapping exists; wrap mappings via EntityMatch.of. |
| common/plugins/eu.esdihumboldt.hale.common.align.merge/src/eu/esdihumboldt/hale/common/align/merge/impl/DefaultSchemaMigration.groovy | Align return type with AlignmentMigration (Optional<EntityMatch>) and avoid null matches. |
| common/plugins/eu.esdihumboldt.hale.common.align.merge/src/eu/esdihumboldt/hale/common/align/merge/impl/AbstractMigration.groovy | Log message updated to print the matched entity (EntityMatch.match). |
| common/plugins/eu.esdihumboldt.hale.common.align.merge/src/eu/esdihumboldt/hale/common/align/merge/impl/AbstractMergeCellMigrator.java | Correct multi-candidate/source conditions and rename transferedSource → transferredSource. |
| common/plugins/eu.esdihumboldt.hale.common.align.merge.test/src/eu/esdihumboldt/hale/common/align/merge/test/impl/JoinRetainConditionsTest.groovy | Update comments to match expected propagation target. |
| common/plugins/eu.esdihumboldt.hale.common.align.merge.test/src/eu/esdihumboldt/hale/common/align/merge/test/impl/DefaultMergeCellMigratorTest.groovy | Update comment to reflect expected absence of a condition. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
hale studio builds for this pull request: Build triggered for commit 7e789ba. |
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
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.
ING-5131