Fix merge of definitions and declarations #412
Conversation
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
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
andreas-hilti
force-pushed
the
fix/merge
branch
from
a657cc5 to
601080f
Compare
andreas-hilti
commented
Sep 28, 2025
| result.Vulnerabilities = vulnerabilitiesMerger.Merge(bom1.Vulnerabilities, bom2.Vulnerabilities); | ||
|
|
||
| if (bom1.Definitions != null && bom2.Definitions != null) | ||
| if (bom1.Definitions != null || bom2.Definitions != null) |
Contributor
Author
There was a problem hiding this comment.
Definitions were skipped if not all BOMs had them.
| } | ||
|
|
||
| if (bom1.Declarations != null && bom2.Declarations != null) | ||
| if (bom1.Declarations != null || bom2.Declarations != null) |
Contributor
Author
There was a problem hiding this comment.
Similarly, Declarations were skipped if not all BOMs had them.
| result.Declarations.Targets.Organizations = new ListMergeHelper<OrganizationalEntity>().Merge(bom1.Declarations.Targets.Organizations, bom2.Declarations.Targets.Organizations); | ||
| result.Declarations.Targets.Components = new ListMergeHelper<Component>().Merge(bom1.Declarations.Targets.Components, bom2.Declarations.Targets.Components); | ||
| result.Declarations.Targets.Services = new ListMergeHelper<Service>().Merge(bom1.Declarations.Targets.Services, bom2.Declarations.Targets.Services); | ||
| result.Declarations.Targets = new Targets(); |
Contributor
Author
There was a problem hiding this comment.
Targets wasn't initialized.
|
|
||
| if (bomSubject != null) | ||
| { | ||
| if (result.Metadata == null) |
Contributor
Author
There was a problem hiding this comment.
Metadata wasn't initialized.
| } | ||
| } | ||
|
|
||
| if (result.Dependencies == null) |
Contributor
Author
There was a problem hiding this comment.
Dependencies were not initialized.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes a couple of issues discovered while working on merge functionality